@mcpc-tech/cli 0.1.52 → 0.1.53

package/app.cjs

@@ -9807,6 +9807,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -10282,11 +10283,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -10391,16 +10402,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();
@@ -13596,15 +13611,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -13729,15 +13746,32 @@ var flushHeaders = (outgoing) => {
 };
 var responseViaCache = async (res, outgoing) => {
   let [status, body, header] = res[cacheKey];
-  if (header instanceof Headers) {
+  let hasContentLength = false;
+  if (!header) {
+    header = { "content-type": "text/plain; charset=UTF-8" };
+  } else if (header instanceof Headers) {
+    hasContentLength = header.has("content-length");
     header = buildOutgoingHttpHeaders(header);
+  } else if (Array.isArray(header)) {
+    const headerObj = new Headers(header);
+    hasContentLength = headerObj.has("content-length");
+    header = buildOutgoingHttpHeaders(headerObj);
+  } else {
+    for (const key in header) {
+      if (key.length === 14 && key.toLowerCase() === "content-length") {
+        hasContentLength = true;
+        break;
+      }
+    }
   }
-  if (typeof body === "string") {
-    header["Content-Length"] = Buffer.byteLength(body);
-  } else if (body instanceof Uint8Array) {
-    header["Content-Length"] = body.byteLength;
-  } else if (body instanceof Blob) {
-    header["Content-Length"] = body.size;
+  if (!hasContentLength) {
+    if (typeof body === "string") {
+      header["Content-Length"] = Buffer.byteLength(body);
+    } else if (body instanceof Uint8Array) {
+      header["Content-Length"] = body.byteLength;
+    } else if (body instanceof Blob) {
+      header["Content-Length"] = body.size;
+    }
   }
   outgoing.writeHead(status, header);
   if (typeof body === "string" || body instanceof Uint8Array) {
@@ -14891,7 +14925,7 @@ var import_promises4 = require("node:fs/promises");
 var import_node_os3 = require("node:os");
 var import_node_path6 = require("node:path");
 var import_node_process10 = __toESM(require("node:process"), 1);
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -15314,7 +15348,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };

package/app.mjs

@@ -9803,6 +9803,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -10278,11 +10279,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -10387,16 +10398,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();
@@ -13592,15 +13607,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -13725,15 +13742,32 @@ var flushHeaders = (outgoing) => {
 };
 var responseViaCache = async (res, outgoing) => {
   let [status, body, header] = res[cacheKey];
-  if (header instanceof Headers) {
+  let hasContentLength = false;
+  if (!header) {
+    header = { "content-type": "text/plain; charset=UTF-8" };
+  } else if (header instanceof Headers) {
+    hasContentLength = header.has("content-length");
     header = buildOutgoingHttpHeaders(header);
+  } else if (Array.isArray(header)) {
+    const headerObj = new Headers(header);
+    hasContentLength = headerObj.has("content-length");
+    header = buildOutgoingHttpHeaders(headerObj);
+  } else {
+    for (const key in header) {
+      if (key.length === 14 && key.toLowerCase() === "content-length") {
+        hasContentLength = true;
+        break;
+      }
+    }
   }
-  if (typeof body === "string") {
-    header["Content-Length"] = Buffer.byteLength(body);
-  } else if (body instanceof Uint8Array) {
-    header["Content-Length"] = body.byteLength;
-  } else if (body instanceof Blob) {
-    header["Content-Length"] = body.size;
+  if (!hasContentLength) {
+    if (typeof body === "string") {
+      header["Content-Length"] = Buffer.byteLength(body);
+    } else if (body instanceof Uint8Array) {
+      header["Content-Length"] = body.byteLength;
+    } else if (body instanceof Blob) {
+      header["Content-Length"] = body.size;
+    }
   }
   outgoing.writeHead(status, header);
   if (typeof body === "string" || body instanceof Uint8Array) {
@@ -14887,7 +14921,7 @@ import { mkdir, readFile as readFile3, writeFile as writeFile2 } from "node:fs/p
 import { homedir } from "node:os";
 import { dirname, join as join3, resolve as resolve4 } from "node:path";
 import process10 from "node:process";
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -15310,7 +15344,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };

package/bin/mcpc.cjs

@@ -2334,15 +2334,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -5479,7 +5481,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -5902,7 +5904,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -13366,6 +13368,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -13841,11 +13844,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -13950,16 +13963,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();

package/bin/mcpc.mjs

@@ -2342,15 +2342,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -5487,7 +5489,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -5910,7 +5912,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -13373,6 +13375,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -13848,11 +13851,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -13957,16 +13970,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();

package/bin.cjs

@@ -2333,15 +2333,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -5478,7 +5480,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -5901,7 +5903,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -13365,6 +13367,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -13840,11 +13843,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -13949,16 +13962,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();

package/bin.mjs

@@ -2341,15 +2341,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -5486,7 +5488,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -5909,7 +5911,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -13372,6 +13374,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -13847,11 +13850,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -13956,16 +13969,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();

package/index.cjs

@@ -2587,15 +2587,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -2720,15 +2722,32 @@ var flushHeaders = (outgoing) => {
 };
 var responseViaCache = async (res, outgoing) => {
   let [status, body, header] = res[cacheKey];
-  if (header instanceof Headers) {
+  let hasContentLength = false;
+  if (!header) {
+    header = { "content-type": "text/plain; charset=UTF-8" };
+  } else if (header instanceof Headers) {
+    hasContentLength = header.has("content-length");
     header = buildOutgoingHttpHeaders(header);
+  } else if (Array.isArray(header)) {
+    const headerObj = new Headers(header);
+    hasContentLength = headerObj.has("content-length");
+    header = buildOutgoingHttpHeaders(headerObj);
+  } else {
+    for (const key in header) {
+      if (key.length === 14 && key.toLowerCase() === "content-length") {
+        hasContentLength = true;
+        break;
+      }
+    }
   }
-  if (typeof body === "string") {
-    header["Content-Length"] = Buffer.byteLength(body);
-  } else if (body instanceof Uint8Array) {
-    header["Content-Length"] = body.byteLength;
-  } else if (body instanceof Blob) {
-    header["Content-Length"] = body.size;
+  if (!hasContentLength) {
+    if (typeof body === "string") {
+      header["Content-Length"] = Buffer.byteLength(body);
+    } else if (body instanceof Uint8Array) {
+      header["Content-Length"] = body.byteLength;
+    } else if (body instanceof Blob) {
+      header["Content-Length"] = body.size;
+    }
   }
   outgoing.writeHead(status, header);
   if (typeof body === "string" || body instanceof Uint8Array) {
@@ -6710,7 +6729,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -7133,7 +7152,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -14699,6 +14718,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -15174,11 +15194,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -15283,16 +15313,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();

package/index.mjs

@@ -2580,15 +2580,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -2713,15 +2715,32 @@ var flushHeaders = (outgoing) => {
 };
 var responseViaCache = async (res, outgoing) => {
   let [status, body, header] = res[cacheKey];
-  if (header instanceof Headers) {
+  let hasContentLength = false;
+  if (!header) {
+    header = { "content-type": "text/plain; charset=UTF-8" };
+  } else if (header instanceof Headers) {
+    hasContentLength = header.has("content-length");
     header = buildOutgoingHttpHeaders(header);
+  } else if (Array.isArray(header)) {
+    const headerObj = new Headers(header);
+    hasContentLength = headerObj.has("content-length");
+    header = buildOutgoingHttpHeaders(headerObj);
+  } else {
+    for (const key in header) {
+      if (key.length === 14 && key.toLowerCase() === "content-length") {
+        hasContentLength = true;
+        break;
+      }
+    }
   }
-  if (typeof body === "string") {
-    header["Content-Length"] = Buffer.byteLength(body);
-  } else if (body instanceof Uint8Array) {
-    header["Content-Length"] = body.byteLength;
-  } else if (body instanceof Blob) {
-    header["Content-Length"] = body.size;
+  if (!hasContentLength) {
+    if (typeof body === "string") {
+      header["Content-Length"] = Buffer.byteLength(body);
+    } else if (body instanceof Uint8Array) {
+      header["Content-Length"] = body.byteLength;
+    } else if (body instanceof Blob) {
+      header["Content-Length"] = body.size;
+    }
   }
   outgoing.writeHead(status, header);
   if (typeof body === "string" || body instanceof Uint8Array) {
@@ -6703,7 +6722,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -7126,7 +7145,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -14691,6 +14710,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -15166,11 +15186,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -15275,16 +15305,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/cli",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "homepage": "https://jsr.io/@mcpc/cli",
   "dependencies": {
     "@hono/zod-openapi": "^0.19.2",
@@ -8,7 +8,7 @@
     "@modelcontextprotocol/sdk": "^1.8.0",
     "zod": "^3.24.2",
     "@ai-sdk/provider": "^2.0.0",
-    "@mcpc-tech/acp-ai-provider": "^0.1.20",
+    "@mcpc-tech/acp-ai-provider": "^0.1.52",
     "@mcpc-tech/ripgrep-napi": "^0.0.4",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.56.0",

package/server.cjs

@@ -2575,15 +2575,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -2708,15 +2710,32 @@ var flushHeaders = (outgoing) => {
 };
 var responseViaCache = async (res, outgoing) => {
   let [status, body, header] = res[cacheKey];
-  if (header instanceof Headers) {
+  let hasContentLength = false;
+  if (!header) {
+    header = { "content-type": "text/plain; charset=UTF-8" };
+  } else if (header instanceof Headers) {
+    hasContentLength = header.has("content-length");
     header = buildOutgoingHttpHeaders(header);
+  } else if (Array.isArray(header)) {
+    const headerObj = new Headers(header);
+    hasContentLength = headerObj.has("content-length");
+    header = buildOutgoingHttpHeaders(headerObj);
+  } else {
+    for (const key in header) {
+      if (key.length === 14 && key.toLowerCase() === "content-length") {
+        hasContentLength = true;
+        break;
+      }
+    }
   }
-  if (typeof body === "string") {
-    header["Content-Length"] = Buffer.byteLength(body);
-  } else if (body instanceof Uint8Array) {
-    header["Content-Length"] = body.byteLength;
-  } else if (body instanceof Blob) {
-    header["Content-Length"] = body.size;
+  if (!hasContentLength) {
+    if (typeof body === "string") {
+      header["Content-Length"] = Buffer.byteLength(body);
+    } else if (body instanceof Uint8Array) {
+      header["Content-Length"] = body.byteLength;
+    } else if (body instanceof Blob) {
+      header["Content-Length"] = body.size;
+    }
   }
   outgoing.writeHead(status, header);
   if (typeof body === "string" || body instanceof Uint8Array) {
@@ -6698,7 +6717,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -7121,7 +7140,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -14676,6 +14695,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -15151,11 +15171,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -15260,16 +15290,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();

package/server.mjs

@@ -2583,15 +2583,17 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      this[cacheKey] = [init?.status || 200, body, headers];
+      ;
+      this[cacheKey] = [init?.status || 200, body, headers || init?.headers];
     }
   }
   get headers() {
     const cache = this[cacheKey];
     if (cache) {
       if (!(cache[2] instanceof Headers)) {
-        cache[2] = new Headers(cache[2]);
+        cache[2] = new Headers(
+          cache[2] || { "content-type": "text/plain; charset=UTF-8" }
+        );
       }
       return cache[2];
     }
@@ -2716,15 +2718,32 @@ var flushHeaders = (outgoing) => {
 };
 var responseViaCache = async (res, outgoing) => {
   let [status, body, header] = res[cacheKey];
-  if (header instanceof Headers) {
+  let hasContentLength = false;
+  if (!header) {
+    header = { "content-type": "text/plain; charset=UTF-8" };
+  } else if (header instanceof Headers) {
+    hasContentLength = header.has("content-length");
     header = buildOutgoingHttpHeaders(header);
+  } else if (Array.isArray(header)) {
+    const headerObj = new Headers(header);
+    hasContentLength = headerObj.has("content-length");
+    header = buildOutgoingHttpHeaders(headerObj);
+  } else {
+    for (const key in header) {
+      if (key.length === 14 && key.toLowerCase() === "content-length") {
+        hasContentLength = true;
+        break;
+      }
+    }
   }
-  if (typeof body === "string") {
-    header["Content-Length"] = Buffer.byteLength(body);
-  } else if (body instanceof Uint8Array) {
-    header["Content-Length"] = body.byteLength;
-  } else if (body instanceof Blob) {
-    header["Content-Length"] = body.size;
+  if (!hasContentLength) {
+    if (typeof body === "string") {
+      header["Content-Length"] = Buffer.byteLength(body);
+    } else if (body instanceof Uint8Array) {
+      header["Content-Length"] = body.byteLength;
+    } else if (body instanceof Blob) {
+      header["Content-Length"] = body.size;
+    }
   }
   outgoing.writeHead(status, header);
   if (typeof body === "string" || body instanceof Uint8Array) {
@@ -6706,7 +6725,7 @@ function getDefaultAgents() {
 }
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
-var CLI_VERSION = "0.1.52";
+var CLI_VERSION = "0.1.53";
 function extractServerName(command, commandArgs) {
   for (const arg of commandArgs) {
     if (!arg.startsWith("-")) {
@@ -7129,7 +7148,7 @@ function applyModeOverride(config, mode) {
     agent.options.mode = mode;
     if (mode === "ai_acp" && !agent.options.acpSettings) {
       agent.options.acpSettings = {
-        command: "claude-code-acp",
+        command: "claude-agent-acp",
         args: [],
         session: {}
       };
@@ -14683,6 +14702,7 @@ var ComposableMCPServer = class extends Server {
   toolManager;
   logger = createLogger("mcpc.compose");
   fileLoaders = /* @__PURE__ */ new Map();
+  pluginsDisposed = false;
   // Legacy property for backward compatibility
   get toolNameMapping() {
     return this.toolManager.getToolNameMapping();
@@ -15158,11 +15178,21 @@ var ComposableMCPServer = class extends Server {
   async disposePlugins() {
     await this.pluginManager.dispose();
   }
+  /**
+   * Dispose plugins only once to avoid duplicated cleanup in chained handlers.
+   */
+  async disposePluginsOnce() {
+    if (this.pluginsDisposed) {
+      return;
+    }
+    this.pluginsDisposed = true;
+    await this.disposePlugins();
+  }
   /**
    * Close the server and ensure all plugins are disposed
    */
   async close() {
-    await this.disposePlugins();
+    await this.disposePluginsOnce();
     await super.close();
   }
   async compose(name, description, depsConfig = {
@@ -15267,16 +15297,20 @@ var ComposableMCPServer = class extends Server {
       server: this,
       toolNames: Object.keys(allTools)
     });
+    const previousOnClose = this.onclose;
     this.onclose = async () => {
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+      previousOnClose?.();
     };
+    const previousOnError = this.onerror;
     this.onerror = async (error) => {
       await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
       await cleanupClients();
-      await this.disposePlugins();
+      await this.disposePluginsOnce();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+      previousOnError?.(error);
     };
     const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();