@actiondock/mcp 2.0.9 → 2.0.11-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/mcp",
-  "version": "2.0.9",
+  "version": "2.0.11-beta.0",
   "description": "ActionDock MCP Adapter for exposing Actions as Model Context Protocol (MCP) Tools",
   "type": "module",
   "main": "./src/index.ts",
@@ -27,8 +27,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@actiondock/core": "^2.0.9",
-    "@actiondock/sdk": "^2.0.9",
+    "@actiondock/core": "2.0.11-beta.0",
+    "@actiondock/sdk": "2.0.11-beta.0",
     "@modelcontextprotocol/server": "^2.0.0"
   },
   "devDependencies": {

package/src/adapter.ts

@@ -17,6 +17,19 @@ import { McpServer } from "@modelcontextprotocol/server";
 import { toMcpSchema } from "./schemas";
 import { toMcpTaskPayload, type ActionDockMcpOptions } from "./types";
 
+/**
+ * 判断目标值是否为普通对象（Plain Object）。
+ * 
+ * @param value 待检查的值
+ */
+export function isPlainObject(value: unknown): value is Record<string, unknown> {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return false;
+  }
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+}
+
 /**
  * 将 ActionDock 标准的 ExecutionResult 信封结构转换为 MCP 协议规范的 Tool Call 返回结果。
  * 
@@ -24,6 +37,10 @@ import { toMcpTaskPayload, type ActionDockMcpOptions } from "./types";
  */
 export function toMcpResult(result: ExecutionResult) {
   if (result.ok) {
+    const structuredContent = isPlainObject(result.data)
+      ? (result.data as Record<string, unknown>)
+      : { value: result.data };
+
     return {
       content: [
         {
@@ -31,7 +48,7 @@ export function toMcpResult(result: ExecutionResult) {
           text: JSON.stringify(result),
         },
       ],
-      structuredContent: result.data as Record<string, unknown>,
+      structuredContent,
     };
   }
 
@@ -102,12 +119,16 @@ function createMcpToolCallback(
   };
 }
 
+export type ActionDockMcpServer = McpServer & {
+  close: () => Promise<void>;
+};
+
 /**
  * Creates and configures an McpServer instance bound to one or more ActionDock packages with Tasks extension support.
  */
 export async function createActionDockMcpServer(
   options: ActionDockMcpOptions = {}
-): Promise<McpServer> {
+): Promise<ActionDockMcpServer> {
   const targetRoots: string[] = [];
   if (options.projectRoot) {
     targetRoots.push(options.projectRoot);
@@ -359,5 +380,58 @@ export async function createActionDockMcpServer(
     };
   });
 
-  return server;
+  const originalClose = server.close.bind(server);
+  let isClosed = false;
+
+  const closeFn = async (): Promise<void> => {
+    if (isClosed) return;
+    isClosed = true;
+
+    process.removeListener("exit", onProcessExit);
+
+    for (const storage of storages) {
+      try {
+        storage.close();
+      } catch {
+        // ignore
+      }
+    }
+
+    if (!options.runtimeRegistry) {
+      try {
+        runtimeRegistry.close();
+      } catch {
+        // ignore
+      }
+    }
+
+    try {
+      await originalClose();
+    } catch {
+      // ignore
+    }
+  };
+
+  const onProcessExit = () => {
+    for (const storage of storages) {
+      try {
+        storage.close();
+      } catch {
+        // ignore
+      }
+    }
+    if (!options.runtimeRegistry) {
+      try {
+        runtimeRegistry.close();
+      } catch {
+        // ignore
+      }
+    }
+  };
+
+  process.once("exit", onProcessExit);
+
+  (server as any).close = closeFn;
+
+  return server as ActionDockMcpServer;
 }

package/src/stdio.ts

@@ -1,5 +1,5 @@
 import { serveStdio } from "@modelcontextprotocol/server/stdio";
-import { createActionDockMcpServer } from "./adapter";
+import { createActionDockMcpServer, type ActionDockMcpServer } from "./adapter";
 import type { ActionDockMcpOptions } from "./types";
 
 /**
@@ -8,9 +8,44 @@ import type { ActionDockMcpOptions } from "./types";
 export async function startMcpStdio(
   options: ActionDockMcpOptions = {}
 ): Promise<void> {
-  serveStdio(() => createActionDockMcpServer(options), {
-    onerror: (err) => {
-      process.stderr.write(`[MCP Error] ${err?.message || String(err)}\n`);
+  let activeServer: ActionDockMcpServer | undefined;
+
+  const stdioHandler = serveStdio(
+    async () => {
+      const server = await createActionDockMcpServer(options);
+      activeServer = server;
+      return server;
     },
+    {
+      onerror: (err) => {
+        process.stderr.write(`[MCP Error] ${err?.message || String(err)}\n`);
+      },
+    }
+  );
+
+  const cleanup = async () => {
+    if (activeServer) {
+      try {
+        await activeServer.close();
+      } catch {
+        // ignore
+      }
+    }
+  };
+
+  process.once("SIGINT", async () => {
+    await cleanup();
+    try {
+      await stdioHandler.close();
+    } catch {}
+    process.exit(0);
+  });
+
+  process.once("SIGTERM", async () => {
+    await cleanup();
+    try {
+      await stdioHandler.close();
+    } catch {}
+    process.exit(0);
   });
 }