@mcpc-tech/unplugin-dev-inspector-mcp 0.0.38 → 0.0.40

package/dist/config-updater.cjs

@@ -37,6 +37,7 @@ let url = require("url");
 let ai = require("ai");
 let _agentclientprotocol_sdk = require("@agentclientprotocol/sdk");
 let node_child_process = require("node:child_process");
+let module$1 = require("module");
 let fs_promises = require("fs/promises");
 
 //#region ../../node_modules/.pnpm/@mcpc-tech+cmcp@0.0.15/node_modules/@mcpc-tech/cmcp/index.mjs
@@ -34870,7 +34871,7 @@ var require_snapshot_utils = /* @__PURE__ */ require_chunk.__commonJSMin(((expor
 //#region ../../node_modules/.pnpm/undici@7.16.0/node_modules/undici/lib/mock/snapshot-recorder.js
 var require_snapshot_recorder = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
 	const { writeFile: writeFile$1, readFile: readFile$1, mkdir: mkdir$1 } = require("node:fs/promises");
-	const { dirname: dirname$1, resolve } = require("node:path");
+	const { dirname: dirname$2, resolve } = require("node:path");
 	const { setTimeout: setTimeout$1, clearTimeout: clearTimeout$1 } = require("node:timers");
 	const { InvalidArgumentError, UndiciError } = require_errors$1();
 	const { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
@@ -35149,7 +35150,7 @@ var require_snapshot_recorder = /* @__PURE__ */ require_chunk.__commonJSMin(((ex
 			const path$3 = filePath || this.#snapshotPath;
 			if (!path$3) throw new InvalidArgumentError("Snapshot path is required");
 			const resolvedPath = resolve(path$3);
-			await mkdir$1(dirname$1(resolvedPath), { recursive: true });
+			await mkdir$1(dirname$2(resolvedPath), { recursive: true });
 			const data$1 = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
 				hash,
 				snapshot
@@ -83446,6 +83447,19 @@ async function getOrCreateMcpClient(defKey, def) {
 		mcpClientConnecting.delete(defKey);
 	}
 }
+async function releaseMcpClient(defKey) {
+	const entry = mcpClientPool.get(defKey);
+	if (!entry) return;
+	entry.refCount -= 1;
+	if (entry.refCount <= 0) {
+		mcpClientPool.delete(defKey);
+		try {
+			await entry.client.close();
+		} catch (err) {
+			console.error("Error closing MCP client:", err);
+		}
+	}
+}
 var cleanupAllPooledClients = async () => {
 	const entries = Array.from(mcpClientPool.entries());
 	mcpClientPool.clear();
@@ -83503,7 +83517,12 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
 			console.error(`Error creating MCP client for ${name}:`, error);
 		}
 	}
-	const cleanupClients = async () => {};
+	const cleanupClients = async () => {
+		await Promise.all(acquiredKeys.map((k) => releaseMcpClient(k)));
+		acquiredKeys.length = 0;
+		Object.keys(allTools).forEach((key) => delete allTools[key]);
+		Object.keys(allClients).forEach((key) => delete allClients[key]);
+	};
 	return {
 		tools: allTools,
 		clients: allClients,
@@ -86305,6 +86324,17 @@ var ComposableMCPServer = class extends _modelcontextprotocol_sdk_server_index_j
 			server: this,
 			toolNames: Object.keys(allTools)
 		});
+		this.onclose = async () => {
+			await cleanupClients();
+			await this.disposePlugins();
+			await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+		};
+		this.onerror = async (error) => {
+			await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
+			await cleanupClients();
+			await this.disposePlugins();
+			await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+		};
 		const toolNameToDetailList = Object.entries(allTools);
 		const publicToolNames = this.getPublicToolNames();
 		const hiddenToolNames = this.getHiddenToolNames();
@@ -86896,14 +86926,20 @@ var ConnectionManager = class {
 //#endregion
 //#region src/utils/cors.ts
 /**
-* Set CORS headers and handle preflight requests
-* Returns true if request was handled (preflight), false otherwise
+* Set CORS headers and handle preflight requests.
+*
+* Uses the browser's requested headers (Access-Control-Request-Headers) when present
+* to avoid mismatches that can break CORS preflight (e.g. 'user-agent').
+*
+* Returns true if request was handled (preflight), false otherwise.
 */
-function handleCors(res, method) {
+function handleCors(req, res) {
 	res.setHeader("Access-Control-Allow-Origin", "*");
 	res.setHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, OPTIONS");
-	res.setHeader("Access-Control-Allow-Headers", "Content-Type, mcp-session-id, mcp-protocol-version");
-	if (method === "OPTIONS") {
+	const requested = req.headers["access-control-request-headers"];
+	const requestedValue = Array.isArray(requested) ? requested.join(", ") : requested;
+	res.setHeader("Access-Control-Allow-Headers", requestedValue ?? "Content-Type, mcp-session-id, mcp-protocol-version");
+	if (req.method === "OPTIONS") {
 		res.statusCode = 204;
 		res.end();
 		return true;
@@ -86929,7 +86965,7 @@ async function setupMcpMiddleware(middlewares, serverContext) {
 	middlewares.use(async (req, res, next$1) => {
 		const url$1 = req.url || "";
 		if (url$1.startsWith("/__mcp__")) {
-			if (handleCors(res, req.method)) return;
+			if (handleCors(req, res)) return;
 		}
 		if (url$1.startsWith("/__mcp__") && !url$1.startsWith("/__mcp__/sse") && !url$1.startsWith("/__mcp__/messages")) {
 			if (req.method === "POST") await handleStreamableHttpPost(req, res, serverContext, connectionManager);
@@ -87166,7 +87202,7 @@ function setupInspectorMiddleware(middlewares, config) {
 	let filesChecked = false;
 	middlewares.use((req, res, next$1) => {
 		if (req.url?.startsWith("/__inspector__")) {
-			if (handleCors(res, req.method)) return;
+			if (handleCors(req, res)) return;
 		}
 		if (!filesChecked) {
 			cachedScript = getInspectorScript();
@@ -87209,7 +87245,7 @@ function setupInspectorMiddleware(middlewares, config) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.41/node_modules/@mcpc-tech/acp-ai-provider/index.mjs
+//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.43/node_modules/@mcpc-tech/acp-ai-provider/index.mjs
 (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 function formatToolError(toolResult) {
 	if (!toolResult || toolResult.length === 0) return "Unknown tool error";
@@ -87652,7 +87688,6 @@ var ACPLanguageModel = class {
 	*/
 	parseToolCall(update$1) {
 		if (update$1.sessionUpdate !== "tool_call") throw new Error("Invalid update type for parseToolCall");
-		console.log("Parsing tool call update:", JSON.stringify(update$1, null, 2));
 		return {
 			toolCallId: update$1.toolCallId,
 			toolName: update$1.title || update$1.toolCallId,
@@ -87954,11 +87989,6 @@ var ACPLanguageModel = class {
 					this.currentThinkingId = null;
 				}
 				const { toolCallId, toolName, toolInput } = this.parseToolCall(update$1);
-				console.log(`Parsing tool call: ${JSON.stringify({
-					toolCallId,
-					toolName,
-					toolInput
-				}, null, 2)}`);
 				const existingToolCall = this.toolCallsMap.get(toolCallId);
 				const hasInput = toolInput && typeof toolInput === "object" && Object.keys(toolInput).length > 0;
 				if (!existingToolCall) {
@@ -87985,13 +88015,14 @@ var ACPLanguageModel = class {
 					});
 				} else if (!existingToolCall.inputAvailable && hasInput) {
 					existingToolCall.inputAvailable = true;
+					if (update$1.title && existingToolCall.name !== update$1.title && update$1.title !== toolCallId) existingToolCall.name = update$1.title;
 					controller.enqueue({
 						type: "tool-call",
 						toolCallId,
 						toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
 						input: JSON.stringify({
 							toolCallId,
-							toolName,
+							toolName: existingToolCall.name,
 							args: toolInput
 						})
 					});
@@ -88018,13 +88049,14 @@ var ACPLanguageModel = class {
 					}
 					if (!toolInfo.inputAvailable) {
 						toolInfo.inputAvailable = true;
+						if (update$1.title && toolInfo.name !== update$1.title && update$1.title !== toolCallId) toolInfo.name = update$1.title;
 						controller.enqueue({
 							type: "tool-call",
 							toolCallId,
 							toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
 							input: JSON.stringify({
 								toolCallId,
-								toolName,
+								toolName: toolInfo.name,
 								args: {}
 							})
 						});
@@ -88050,13 +88082,14 @@ var ACPLanguageModel = class {
 					});
 				} else if (!toolInfo.inputAvailable) {
 					toolInfo.inputAvailable = true;
+					if (update$1.title && toolInfo.name !== update$1.title && update$1.title !== toolCallId) toolInfo.name = update$1.title;
 					controller.enqueue({
 						type: "tool-call",
 						toolCallId,
 						toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
 						input: JSON.stringify({
 							toolCallId,
-							toolName,
+							toolName: toolInfo.name,
 							args: {}
 						})
 					});
@@ -88083,7 +88116,6 @@ var ACPLanguageModel = class {
 		try {
 			await this.ensureConnected();
 			const promptContent = convertAiSdkMessagesToAcp(options, this.isFreshSession);
-			console.log(`###########`, promptContent);
 			this.isFreshSession = false;
 			let accumulatedText = "";
 			const toolCalls = [];
@@ -88290,6 +88322,36 @@ function createACPProvider(config) {
 	return new ACPProvider(config);
 }
 
+//#endregion
+//#region src/utils/npm-package.ts
+/**
+* Resolve npm package bin entry point
+* Returns the absolute path to the bin file, or null if resolution fails
+*/
+function resolveNpmPackageBin(packageName) {
+	try {
+		const packageJsonPath = (0, module$1.createRequire)(require("url").pathToFileURL(__filename).href).resolve(`${packageName}/package.json`);
+		const packageJson = JSON.parse((0, fs.readFileSync)(packageJsonPath, "utf-8"));
+		let binPath;
+		if (typeof packageJson.bin === "string") binPath = packageJson.bin;
+		else if (typeof packageJson.bin === "object") {
+			const binEntries = Object.entries(packageJson.bin);
+			const matchingEntry = binEntries.find(([name]) => name === packageJson.name.split("/").pop());
+			binPath = matchingEntry ? matchingEntry[1] : binEntries[0]?.[1];
+		}
+		if (!binPath) {
+			console.warn(`[dev-inspector] [acp] No bin entry found in ${packageName}/package.json`);
+			return null;
+		}
+		const binFullPath = (0, path.join)((0, path.dirname)(packageJsonPath), binPath);
+		console.log(`[dev-inspector] [acp] Resolved ${packageName} bin to: ${binFullPath}`);
+		return binFullPath;
+	} catch (error) {
+		console.warn(`[dev-inspector] [acp] Failed to resolve npm package ${packageName}:`, error);
+		return null;
+	}
+}
+
 //#endregion
 //#region src/middleware/acp-middleware.ts
 /**
@@ -88358,10 +88420,13 @@ async function loadMcpToolsV5(transport) {
 			inputSchema: (0, ai.jsonSchema)(toolInfo.inputSchema),
 			execute: async (args) => {
 				console.log(`[dev-inspector] [acp] Executing MCP tool: ${toolName}`);
-				return await callMcpMethodViaTransport(transport, "tools/call", {
+				const result = await callMcpMethodViaTransport(transport, "tools/call", {
 					name: toolName,
 					arguments: args
 				});
+				const parsedResult = _modelcontextprotocol_sdk_types_js.CallToolResultSchema.safeParse(result);
+				if (!parsedResult.success) return result;
+				return parsedResult.data?.content?.map((item) => item?.text).join("\n");
 			}
 		});
 	}
@@ -88405,7 +88470,7 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 	* Returns: { sessionId }
 	*/
 	middlewares.use("/api/acp/init-session", async (req, res) => {
-		if (handleCors(res, req.method)) return;
+		if (handleCors(req, res)) return;
 		if (req.method !== "POST") {
 			res.statusCode = 405;
 			res.end("Method Not Allowed");
@@ -88451,9 +88516,19 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 						return;
 					}
 					console.log(`[dev-inspector] [acp] Creating new global provider for ${agent.name}`);
+					let command = agent.command;
+					let args = agent.args;
+					if (agent.npmPackage) {
+						const binPath = resolveNpmPackageBin(agent.npmPackage);
+						if (binPath) {
+							command = binPath;
+							args = agent.npmArgs || [];
+							console.log(`[dev-inspector] [acp] Using resolved npm package: ${agent.npmPackage}`);
+						} else console.log(`[dev-inspector] [acp] Failed to resolve npm package, falling back to: ${agent.command}`);
+					}
 					provider = createACPProvider({
-						command: agent.command,
-						args: agent.args,
+						command,
+						args,
 						env: {
 							...process.env,
 							...envVars
@@ -88522,7 +88597,7 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 	* Body: { sessionId }
 	*/
 	middlewares.use("/api/acp/cleanup-session", async (req, res) => {
-		if (handleCors(res, req.method)) return;
+		if (handleCors(req, res)) return;
 		if (req.method !== "POST") {
 			res.statusCode = 405;
 			res.end("Method Not Allowed");
@@ -88565,7 +88640,7 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 	* Body: { messages, agent, envVars, sessionId? }
 	*/
 	middlewares.use("/api/acp/chat", async (req, res) => {
-		if (handleCors(res, req.method)) return;
+		if (handleCors(req, res)) return;
 		if (req.method !== "POST") {
 			res.statusCode = 405;
 			res.end("Method Not Allowed");
@@ -88588,9 +88663,19 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 				shouldCleanupProvider = false;
 			} else {
 				console.log(`[dev-inspector] [acp] Creating new provider (no session found or provided)`);
+				let command = agent.command;
+				let args = agent.args;
+				if (agent.npmPackage) {
+					const binPath = resolveNpmPackageBin(agent.npmPackage);
+					if (binPath) {
+						command = binPath;
+						args = agent.npmArgs || [];
+						console.log(`[dev-inspector] [acp] Using resolved npm package: ${agent.npmPackage}`);
+					}
+				}
 				provider = createACPProvider({
-					command: agent.command,
-					args: agent.args,
+					command,
+					args,
 					env: {
 						...process.env,
 						...envVars

package/dist/config-updater.js

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { randomUUID } from "crypto";
-import { CallToolRequestSchema, CompleteRequestSchema, ErrorCode, GetPromptRequestSchema, JSONRPCMessageSchema, ListPromptsRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema, McpError, PingRequestSchema, ReadResourceRequestSchema, SetLevelRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema } from "@modelcontextprotocol/sdk/types.js";
+import { CallToolRequestSchema, CallToolResultSchema, CompleteRequestSchema, ErrorCode, GetPromptRequestSchema, JSONRPCMessageSchema, ListPromptsRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema, McpError, PingRequestSchema, ReadResourceRequestSchema, SetLevelRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import z$1, { z } from "zod";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { Readable, Writable } from "node:stream";
@@ -18,7 +18,7 @@ import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import process$1, { cwd } from "node:process";
 import { homedir } from "os";
 import { execSync } from "child_process";
-import fs, { existsSync } from "fs";
+import fs, { existsSync, readFileSync } from "fs";
 import * as http from "http";
 import * as https from "https";
 import * as zlib from "zlib";
@@ -28,6 +28,7 @@ import { fileURLToPath as fileURLToPath$1 } from "url";
 import { asSchema, convertToModelMessages, jsonSchema, streamText, tool } from "ai";
 import { ClientSideConnection, PROTOCOL_VERSION, ndJsonStream, planEntrySchema } from "@agentclientprotocol/sdk";
 import { spawn } from "node:child_process";
+import { createRequire as createRequire$1 } from "module";
 import { mkdir, readFile, writeFile } from "fs/promises";
 
 //#region rolldown:runtime
@@ -83481,6 +83482,19 @@ async function getOrCreateMcpClient(defKey, def) {
 		mcpClientConnecting.delete(defKey);
 	}
 }
+async function releaseMcpClient(defKey) {
+	const entry = mcpClientPool.get(defKey);
+	if (!entry) return;
+	entry.refCount -= 1;
+	if (entry.refCount <= 0) {
+		mcpClientPool.delete(defKey);
+		try {
+			await entry.client.close();
+		} catch (err) {
+			console.error("Error closing MCP client:", err);
+		}
+	}
+}
 var cleanupAllPooledClients = async () => {
 	const entries = Array.from(mcpClientPool.entries());
 	mcpClientPool.clear();
@@ -83538,7 +83552,12 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
 			console.error(`Error creating MCP client for ${name}:`, error);
 		}
 	}
-	const cleanupClients = async () => {};
+	const cleanupClients = async () => {
+		await Promise.all(acquiredKeys.map((k) => releaseMcpClient(k)));
+		acquiredKeys.length = 0;
+		Object.keys(allTools).forEach((key) => delete allTools[key]);
+		Object.keys(allClients).forEach((key) => delete allClients[key]);
+	};
 	return {
 		tools: allTools,
 		clients: allClients,
@@ -86340,6 +86359,17 @@ var ComposableMCPServer = class extends Server {
 			server: this,
 			toolNames: Object.keys(allTools)
 		});
+		this.onclose = async () => {
+			await cleanupClients();
+			await this.disposePlugins();
+			await this.logger.info(`[${name}] Event: closed - cleaned up dependent clients and plugins`);
+		};
+		this.onerror = async (error) => {
+			await this.logger.error(`[${name}] Event: error - ${error?.stack ?? String(error)}`);
+			await cleanupClients();
+			await this.disposePlugins();
+			await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
+		};
 		const toolNameToDetailList = Object.entries(allTools);
 		const publicToolNames = this.getPublicToolNames();
 		const hiddenToolNames = this.getHiddenToolNames();
@@ -86931,14 +86961,20 @@ var ConnectionManager = class {
 //#endregion
 //#region src/utils/cors.ts
 /**
-* Set CORS headers and handle preflight requests
-* Returns true if request was handled (preflight), false otherwise
+* Set CORS headers and handle preflight requests.
+*
+* Uses the browser's requested headers (Access-Control-Request-Headers) when present
+* to avoid mismatches that can break CORS preflight (e.g. 'user-agent').
+*
+* Returns true if request was handled (preflight), false otherwise.
 */
-function handleCors(res, method) {
+function handleCors(req, res) {
 	res.setHeader("Access-Control-Allow-Origin", "*");
 	res.setHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, OPTIONS");
-	res.setHeader("Access-Control-Allow-Headers", "Content-Type, mcp-session-id, mcp-protocol-version");
-	if (method === "OPTIONS") {
+	const requested = req.headers["access-control-request-headers"];
+	const requestedValue = Array.isArray(requested) ? requested.join(", ") : requested;
+	res.setHeader("Access-Control-Allow-Headers", requestedValue ?? "Content-Type, mcp-session-id, mcp-protocol-version");
+	if (req.method === "OPTIONS") {
 		res.statusCode = 204;
 		res.end();
 		return true;
@@ -86964,7 +87000,7 @@ async function setupMcpMiddleware(middlewares, serverContext) {
 	middlewares.use(async (req, res, next$1) => {
 		const url = req.url || "";
 		if (url.startsWith("/__mcp__")) {
-			if (handleCors(res, req.method)) return;
+			if (handleCors(req, res)) return;
 		}
 		if (url.startsWith("/__mcp__") && !url.startsWith("/__mcp__/sse") && !url.startsWith("/__mcp__/messages")) {
 			if (req.method === "POST") await handleStreamableHttpPost(req, res, serverContext, connectionManager);
@@ -87201,7 +87237,7 @@ function setupInspectorMiddleware(middlewares, config) {
 	let filesChecked = false;
 	middlewares.use((req, res, next$1) => {
 		if (req.url?.startsWith("/__inspector__")) {
-			if (handleCors(res, req.method)) return;
+			if (handleCors(req, res)) return;
 		}
 		if (!filesChecked) {
 			cachedScript = getInspectorScript();
@@ -87244,7 +87280,7 @@ function setupInspectorMiddleware(middlewares, config) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.41/node_modules/@mcpc-tech/acp-ai-provider/index.mjs
+//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.43/node_modules/@mcpc-tech/acp-ai-provider/index.mjs
 createRequire(import.meta.url);
 function formatToolError(toolResult) {
 	if (!toolResult || toolResult.length === 0) return "Unknown tool error";
@@ -87687,7 +87723,6 @@ var ACPLanguageModel = class {
 	*/
 	parseToolCall(update$1) {
 		if (update$1.sessionUpdate !== "tool_call") throw new Error("Invalid update type for parseToolCall");
-		console.log("Parsing tool call update:", JSON.stringify(update$1, null, 2));
 		return {
 			toolCallId: update$1.toolCallId,
 			toolName: update$1.title || update$1.toolCallId,
@@ -87989,11 +88024,6 @@ var ACPLanguageModel = class {
 					this.currentThinkingId = null;
 				}
 				const { toolCallId, toolName, toolInput } = this.parseToolCall(update$1);
-				console.log(`Parsing tool call: ${JSON.stringify({
-					toolCallId,
-					toolName,
-					toolInput
-				}, null, 2)}`);
 				const existingToolCall = this.toolCallsMap.get(toolCallId);
 				const hasInput = toolInput && typeof toolInput === "object" && Object.keys(toolInput).length > 0;
 				if (!existingToolCall) {
@@ -88020,13 +88050,14 @@ var ACPLanguageModel = class {
 					});
 				} else if (!existingToolCall.inputAvailable && hasInput) {
 					existingToolCall.inputAvailable = true;
+					if (update$1.title && existingToolCall.name !== update$1.title && update$1.title !== toolCallId) existingToolCall.name = update$1.title;
 					controller.enqueue({
 						type: "tool-call",
 						toolCallId,
 						toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
 						input: JSON.stringify({
 							toolCallId,
-							toolName,
+							toolName: existingToolCall.name,
 							args: toolInput
 						})
 					});
@@ -88053,13 +88084,14 @@ var ACPLanguageModel = class {
 					}
 					if (!toolInfo.inputAvailable) {
 						toolInfo.inputAvailable = true;
+						if (update$1.title && toolInfo.name !== update$1.title && update$1.title !== toolCallId) toolInfo.name = update$1.title;
 						controller.enqueue({
 							type: "tool-call",
 							toolCallId,
 							toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
 							input: JSON.stringify({
 								toolCallId,
-								toolName,
+								toolName: toolInfo.name,
 								args: {}
 							})
 						});
@@ -88085,13 +88117,14 @@ var ACPLanguageModel = class {
 					});
 				} else if (!toolInfo.inputAvailable) {
 					toolInfo.inputAvailable = true;
+					if (update$1.title && toolInfo.name !== update$1.title && update$1.title !== toolCallId) toolInfo.name = update$1.title;
 					controller.enqueue({
 						type: "tool-call",
 						toolCallId,
 						toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
 						input: JSON.stringify({
 							toolCallId,
-							toolName,
+							toolName: toolInfo.name,
 							args: {}
 						})
 					});
@@ -88118,7 +88151,6 @@ var ACPLanguageModel = class {
 		try {
 			await this.ensureConnected();
 			const promptContent = convertAiSdkMessagesToAcp(options, this.isFreshSession);
-			console.log(`###########`, promptContent);
 			this.isFreshSession = false;
 			let accumulatedText = "";
 			const toolCalls = [];
@@ -88325,6 +88357,36 @@ function createACPProvider(config) {
 	return new ACPProvider(config);
 }
 
+//#endregion
+//#region src/utils/npm-package.ts
+/**
+* Resolve npm package bin entry point
+* Returns the absolute path to the bin file, or null if resolution fails
+*/
+function resolveNpmPackageBin(packageName) {
+	try {
+		const packageJsonPath = createRequire$1(import.meta.url).resolve(`${packageName}/package.json`);
+		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+		let binPath;
+		if (typeof packageJson.bin === "string") binPath = packageJson.bin;
+		else if (typeof packageJson.bin === "object") {
+			const binEntries = Object.entries(packageJson.bin);
+			const matchingEntry = binEntries.find(([name]) => name === packageJson.name.split("/").pop());
+			binPath = matchingEntry ? matchingEntry[1] : binEntries[0]?.[1];
+		}
+		if (!binPath) {
+			console.warn(`[dev-inspector] [acp] No bin entry found in ${packageName}/package.json`);
+			return null;
+		}
+		const binFullPath = join(dirname(packageJsonPath), binPath);
+		console.log(`[dev-inspector] [acp] Resolved ${packageName} bin to: ${binFullPath}`);
+		return binFullPath;
+	} catch (error) {
+		console.warn(`[dev-inspector] [acp] Failed to resolve npm package ${packageName}:`, error);
+		return null;
+	}
+}
+
 //#endregion
 //#region src/middleware/acp-middleware.ts
 /**
@@ -88393,10 +88455,13 @@ async function loadMcpToolsV5(transport) {
 			inputSchema: jsonSchema(toolInfo.inputSchema),
 			execute: async (args) => {
 				console.log(`[dev-inspector] [acp] Executing MCP tool: ${toolName}`);
-				return await callMcpMethodViaTransport(transport, "tools/call", {
+				const result = await callMcpMethodViaTransport(transport, "tools/call", {
 					name: toolName,
 					arguments: args
 				});
+				const parsedResult = CallToolResultSchema.safeParse(result);
+				if (!parsedResult.success) return result;
+				return parsedResult.data?.content?.map((item) => item?.text).join("\n");
 			}
 		});
 	}
@@ -88440,7 +88505,7 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 	* Returns: { sessionId }
 	*/
 	middlewares.use("/api/acp/init-session", async (req, res) => {
-		if (handleCors(res, req.method)) return;
+		if (handleCors(req, res)) return;
 		if (req.method !== "POST") {
 			res.statusCode = 405;
 			res.end("Method Not Allowed");
@@ -88486,9 +88551,19 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 						return;
 					}
 					console.log(`[dev-inspector] [acp] Creating new global provider for ${agent.name}`);
+					let command = agent.command;
+					let args = agent.args;
+					if (agent.npmPackage) {
+						const binPath = resolveNpmPackageBin(agent.npmPackage);
+						if (binPath) {
+							command = binPath;
+							args = agent.npmArgs || [];
+							console.log(`[dev-inspector] [acp] Using resolved npm package: ${agent.npmPackage}`);
+						} else console.log(`[dev-inspector] [acp] Failed to resolve npm package, falling back to: ${agent.command}`);
+					}
 					provider = createACPProvider({
-						command: agent.command,
-						args: agent.args,
+						command,
+						args,
 						env: {
 							...process.env,
 							...envVars
@@ -88557,7 +88632,7 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 	* Body: { sessionId }
 	*/
 	middlewares.use("/api/acp/cleanup-session", async (req, res) => {
-		if (handleCors(res, req.method)) return;
+		if (handleCors(req, res)) return;
 		if (req.method !== "POST") {
 			res.statusCode = 405;
 			res.end("Method Not Allowed");
@@ -88600,7 +88675,7 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 	* Body: { messages, agent, envVars, sessionId? }
 	*/
 	middlewares.use("/api/acp/chat", async (req, res) => {
-		if (handleCors(res, req.method)) return;
+		if (handleCors(req, res)) return;
 		if (req.method !== "POST") {
 			res.statusCode = 405;
 			res.end("Method Not Allowed");
@@ -88623,9 +88698,19 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 				shouldCleanupProvider = false;
 			} else {
 				console.log(`[dev-inspector] [acp] Creating new provider (no session found or provided)`);
+				let command = agent.command;
+				let args = agent.args;
+				if (agent.npmPackage) {
+					const binPath = resolveNpmPackageBin(agent.npmPackage);
+					if (binPath) {
+						command = binPath;
+						args = agent.npmArgs || [];
+						console.log(`[dev-inspector] [acp] Using resolved npm package: ${agent.npmPackage}`);
+					}
+				}
 				provider = createACPProvider({
-					command: agent.command,
-					args: agent.args,
+					command,
+					args,
 					env: {
 						...process.env,
 						...envVars