@mcpc-tech/unplugin-dev-inspector-mcp 0.0.31 → 0.0.34

package/dist/config-updater.js

@@ -15,7 +15,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
-import process2, { cwd } from "node:process";
+import process$1, { cwd } from "node:process";
 import { homedir } from "os";
 import fs, { existsSync } from "fs";
 import * as http from "http";
@@ -24,7 +24,7 @@ import * as zlib from "zlib";
 import { fileURLToPath } from "node:url";
 import path$1, { dirname, join } from "path";
 import { fileURLToPath as fileURLToPath$1 } from "url";
-import { convertToModelMessages, jsonSchema, streamText, tool } from "ai";
+import { asSchema, convertToModelMessages, jsonSchema, streamText, tool } from "ai";
 import { ClientSideConnection, PROTOCOL_VERSION, ndJsonStream, planEntrySchema } from "@agentclientprotocol/sdk";
 import { spawn } from "node:child_process";
 import { mkdir, readFile, writeFile } from "fs/promises";
@@ -58123,13 +58123,13 @@ var require_getMachineId_bsd$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 var require_getMachineId_win$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.getMachineId = void 0;
-	const process$4 = __require("process");
+	const process$5 = __require("process");
 	const execAsync_1 = require_execAsync$1();
 	const api_1 = (init_esm$2(), __toCommonJS(esm_exports$2));
 	async function getMachineId() {
 		const args = "QUERY HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography /v MachineGuid";
 		let command = "%windir%\\System32\\REG.exe";
-		if (process$4.arch === "ia32" && "PROCESSOR_ARCHITEW6432" in process$4.env) command = "%windir%\\sysnative\\cmd.exe /c " + command;
+		if (process$5.arch === "ia32" && "PROCESSOR_ARCHITEW6432" in process$5.env) command = "%windir%\\sysnative\\cmd.exe /c " + command;
 		try {
 			const parts = (await (0, execAsync_1.execAsync)(`${command} ${args}`)).stdout.split("REG_SZ");
 			if (parts.length === 2) return parts[1].trim();
@@ -58159,10 +58159,10 @@ var require_getMachineId_unsupported$1 = /* @__PURE__ */ __commonJSMin(((exports
 var require_getMachineId$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.getMachineId = void 0;
-	const process$3 = __require("process");
+	const process$4 = __require("process");
 	let getMachineId;
 	exports.getMachineId = getMachineId;
-	switch (process$3.platform) {
+	switch (process$4.platform) {
 		case "darwin":
 			exports.getMachineId = getMachineId = require_getMachineId_darwin$1().getMachineId;
 			break;
@@ -66275,13 +66275,13 @@ var require_getMachineId_bsd = /* @__PURE__ */ __commonJSMin(((exports) => {
 var require_getMachineId_win = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.getMachineId = void 0;
-	const process$2 = __require("process");
+	const process$3 = __require("process");
 	const execAsync_1 = require_execAsync();
 	const api_1 = (init_esm$2(), __toCommonJS(esm_exports$2));
 	async function getMachineId() {
 		const args = "QUERY HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography /v MachineGuid";
 		let command = "%windir%\\System32\\REG.exe";
-		if (process$2.arch === "ia32" && "PROCESSOR_ARCHITEW6432" in process$2.env) command = "%windir%\\sysnative\\cmd.exe /c " + command;
+		if (process$3.arch === "ia32" && "PROCESSOR_ARCHITEW6432" in process$3.env) command = "%windir%\\sysnative\\cmd.exe /c " + command;
 		try {
 			const parts = (await (0, execAsync_1.execAsync)(`${command} ${args}`)).stdout.split("REG_SZ");
 			if (parts.length === 2) return parts[1].trim();
@@ -66311,10 +66311,10 @@ var require_getMachineId_unsupported = /* @__PURE__ */ __commonJSMin(((exports)
 var require_getMachineId = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.getMachineId = void 0;
-	const process$1 = __require("process");
+	const process$2 = __require("process");
 	let getMachineId;
 	exports.getMachineId = getMachineId;
-	switch (process$1.platform) {
+	switch (process$2.platform) {
 		case "darwin":
 			exports.getMachineId = getMachineId = require_getMachineId_darwin().getMachineId;
 			break;
@@ -83385,7 +83385,7 @@ function parseTags(htmlString, tags) {
 }
 new TextEncoder();
 TransformStream;
-var GEMINI_PREFERRED_FORMAT = process2.env.GEMINI_PREFERRED_FORMAT === "0" ? false : true;
+var GEMINI_PREFERRED_FORMAT = process$1.env.GEMINI_PREFERRED_FORMAT === "0" ? false : true;
 function sanitizePropertyKey(name) {
 	return name.replace(/[@.,/\\:;!?#$%^&*()[\]{}]/g, "_").substring(0, 64);
 }
@@ -83439,7 +83439,7 @@ function createTransport(def) {
 		command: defAny.command,
 		args: defAny.args,
 		env: {
-			...process2.env,
+			...process$1.env,
 			...defAny.env ?? {}
 		},
 		cwd: cwd()
@@ -83504,11 +83504,11 @@ var cleanupAllPooledClients = async () => {
 		}
 	}));
 };
-process2.once?.("exit", () => {
+process$1.once?.("exit", () => {
 	cleanupAllPooledClients();
 });
-process2.once?.("SIGINT", () => {
-	cleanupAllPooledClients().finally(() => process2.exit(0));
+process$1.once?.("SIGINT", () => {
+	cleanupAllPooledClients().finally(() => process$1.exit(0));
 });
 async function composeMcpDepTools(mcpConfig, filterIn) {
 	const allTools = {};
@@ -84068,12 +84068,12 @@ var AgenticExecutor = class {
 		this.tracingEnabled = false;
 		this.logger = createLogger(`mcpc.agentic.${name}`, server);
 		try {
-			this.tracingEnabled = process2.env.MCPC_TRACING_ENABLED === "true";
+			this.tracingEnabled = process$1.env.MCPC_TRACING_ENABLED === "true";
 			if (this.tracingEnabled) initializeTracing({
 				enabled: true,
 				serviceName: `mcpc-agentic-${name}`,
-				exportTo: process2.env.MCPC_TRACING_EXPORT ?? "otlp",
-				otlpEndpoint: process2.env.MCPC_TRACING_OTLP_ENDPOINT ?? "http://localhost:4318/v1/traces"
+				exportTo: process$1.env.MCPC_TRACING_EXPORT ?? "otlp",
+				otlpEndpoint: process$1.env.MCPC_TRACING_OTLP_ENDPOINT ?? "http://localhost:4318/v1/traces"
 			});
 		} catch {
 			this.tracingEnabled = false;
@@ -85006,10 +85006,10 @@ var BaseSamplingExecutor = class {
 		this.logger = createLogger(`mcpc.sampling.${name}`, server);
 		try {
 			const tracingConfig = {
-				enabled: process2.env.MCPC_TRACING_ENABLED === "true",
+				enabled: process$1.env.MCPC_TRACING_ENABLED === "true",
 				serviceName: `mcpc-sampling-${name}`,
-				exportTo: process2.env.MCPC_TRACING_EXPORT ?? "otlp",
-				otlpEndpoint: process2.env.MCPC_TRACING_OTLP_ENDPOINT ?? "http://localhost:4318/v1/traces"
+				exportTo: process$1.env.MCPC_TRACING_EXPORT ?? "otlp",
+				otlpEndpoint: process$1.env.MCPC_TRACING_OTLP_ENDPOINT ?? "http://localhost:4318/v1/traces"
 			};
 			this.tracingEnabled = tracingConfig.enabled;
 			if (this.tracingEnabled) initializeTracing(tracingConfig);
@@ -86415,10 +86415,10 @@ var ComposableMCPServer = class extends Server {
 		if (!await this.pluginManager.triggerRegisterAgentTool(context2)) throw new Error(`No plugin registered to handle execution mode "${mode}". Did you override the default mode plugin, but in the wrong way?`);
 	}
 };
-var isSCF = () => Boolean(process2.env.SCF_RUNTIME || process2.env.PROD_SCF);
+var isSCF = () => Boolean(process$1.env.SCF_RUNTIME || process$1.env.PROD_SCF);
 if (isSCF()) console.log({
 	isSCF: isSCF(),
-	SCF_RUNTIME: process2.env.SCF_RUNTIME
+	SCF_RUNTIME: process$1.env.SCF_RUNTIME
 });
 function parseMcpcConfigs(conf) {
 	return conf ?? [];
@@ -87261,7 +87261,7 @@ function setupInspectorMiddleware(middlewares, config) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.37/node_modules/@mcpc-tech/acp-ai-provider/index.mjs
+//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.41/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";
@@ -87418,8 +87418,13 @@ var ToolProxyHost = class {
 	* Start TCP server and return MCP server config for ACP
 	*/
 	async start() {
-		if (this.server) throw new Error("Tool proxy already started");
-		await this.startServer();
+		if (!this.server) await this.startServer();
+		return this.getServerConfig();
+	}
+	/**
+	* Get MCP server configuration
+	*/
+	getServerConfig() {
 		return {
 			name: this.serverName,
 			command: "node",
@@ -87499,8 +87504,10 @@ var ToolProxyHost = class {
 					text: typeof result === "string" ? result : JSON.stringify(result)
 				}] };
 				this.sendResponse(socket, createResponse(request.id, toolResult));
-			} else if (request.method === "getTools") this.sendResponse(socket, createResponse(request.id, this.getToolDefinitions()));
-			else this.sendResponse(socket, createErrorResponse(request.id, JsonRpcErrorCode.METHOD_NOT_FOUND, `Unknown method: ${request.method}`));
+			} else if (request.method === "getTools") {
+				const definitions = this.getToolDefinitions();
+				this.sendResponse(socket, createResponse(request.id, definitions));
+			} else this.sendResponse(socket, createErrorResponse(request.id, JsonRpcErrorCode.METHOD_NOT_FOUND, `Unknown method: ${request.method}`));
 		} catch (error) {
 			this.sendResponse(socket, createErrorResponse(request.id, JsonRpcErrorCode.INTERNAL_ERROR, error instanceof Error ? error.message : String(error)));
 		}
@@ -87600,16 +87607,22 @@ function convertAiSdkMessagesToAcp(options, isFreshSession) {
 	}
 	return contentBlocks;
 }
-function extractACPTools(tools) {
+function extractACPTools(tools, prepared = true) {
 	const acpTools2 = [];
 	if (!tools) return acpTools2;
-	for (const t of tools) if (t.type === "function") {
+	const toolsArray = Array.isArray(tools) ? tools : Object.entries(tools).map(([name, tool2]) => ({
+		type: "function",
+		name,
+		...tool2
+	}));
+	for (const t of toolsArray) if (t.type === "function") {
 		const toolInputSchema = t.inputSchema;
 		if (hasRegisteredExecute(t.name) && toolInputSchema) {
 			const execute = getExecuteByName(t.name);
 			if (execute) acpTools2.push({
 				...t,
 				name: t.name,
+				inputSchema: prepared ? toolInputSchema : asSchema(toolInputSchema).jsonSchema,
 				execute
 			});
 		}
@@ -87642,12 +87655,10 @@ var ACPAISDKClient = class {
 			optionId: params.options[0]?.optionId || "allow"
 		} };
 	}
-	writeTextFile(params) {
-		console.log("[acp-ai-provider] Write file request (not implemented):", params.path);
+	writeTextFile(_params) {
 		throw new Error("File operations not implemented in language model client");
 	}
-	readTextFile(params) {
-		console.log("[acp-ai-provider] Read file request (not implemented):", params.path);
+	readTextFile(_params) {
 		throw new Error("File operations not implemented in language model client");
 	}
 };
@@ -87693,6 +87704,7 @@ 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,
@@ -87729,7 +87741,7 @@ var ACPLanguageModel = class {
 	async connectClient() {
 		if (this.connection) return;
 		if (!this.agentProcess) {
-			const sessionCwd = this.config.session?.cwd || (typeof process2.cwd === "function" ? process2.cwd() : "/");
+			const sessionCwd = this.config.session?.cwd || (typeof process$1.cwd === "function" ? process$1.cwd() : "/");
 			this.agentProcess = spawn(this.config.command, this.config.args ?? [], {
 				stdio: [
 					"pipe",
@@ -87737,7 +87749,7 @@ var ACPLanguageModel = class {
 					"inherit"
 				],
 				env: {
-					...process2.env,
+					...process$1.env,
 					...this.config.env
 				},
 				cwd: sessionCwd
@@ -87765,7 +87777,7 @@ var ACPLanguageModel = class {
 		if (initResult.authMethods?.length ?? false) {
 			if (!this.config.authMethodId || !validAuthMethods) console.log("[acp-ai-provider] Warning: No authMethodId specified in config, skipping authentication step. If this is not desired, please set one of the authMethodId in the ACPProviderSettings.", JSON.stringify(initResult.authMethods, null, 2));
 			if (this.config.authMethodId && validAuthMethods) await this.connection.authenticate({ methodId: this.config.authMethodId ?? initResult.authMethods?.[0].id });
-		} else console.log(`[acp-ai-provider] No authentication methods required by the ACP agent, skipping authentication step.`);
+		}
 	}
 	/**
 	* Starts a new session or updates the existing one.
@@ -87773,22 +87785,22 @@ var ACPLanguageModel = class {
 	*/
 	async startSession(acpTools2) {
 		if (!this.connection) throw new Error("Not connected");
-		console.log(`[acp-ai-provider] startSession called with ${acpTools2?.length ?? 0} tools`);
 		const mcpServers = [...this.config.session?.mcpServers ?? []];
 		let toolsAdded = false;
 		if (acpTools2 && acpTools2.length > 0 && !this.toolProxyHost) {
-			console.log("[acp-ai-provider] Setting up tool proxy for client-side tools...");
+			console.log("[acp-ai-provider] Setting up tool proxy for client-side tools...", acpTools2.map((t) => t.name));
 			this.toolProxyHost = new ToolProxyHost("acp-ai-sdk-tools");
 			for (const t of acpTools2) this.toolProxyHost.registerTool(t.name, t);
+			toolsAdded = true;
+		}
+		if (this.toolProxyHost) {
 			const proxyConfig = await this.toolProxyHost.start();
 			mcpServers.push(proxyConfig);
-			toolsAdded = true;
 		}
 		if (this.sessionId && toolsAdded) {
-			console.log("[acp-ai-provider] Updating session to include new tools...");
 			this.sessionResponse = await this.connection.newSession({
 				...this.config.session,
-				cwd: this.config.session?.cwd ?? process2.cwd(),
+				cwd: this.config.session?.cwd ?? process$1.cwd(),
 				mcpServers
 			});
 			this.sessionId = this.sessionResponse.sessionId;
@@ -87800,7 +87812,7 @@ var ACPLanguageModel = class {
 		if (this.config.existingSessionId) {
 			await this.connection.loadSession({
 				sessionId: this.config.existingSessionId,
-				cwd: this.config.session?.cwd ?? process2.cwd(),
+				cwd: this.config.session?.cwd ?? process$1.cwd(),
 				mcpServers
 			});
 			this.sessionId = this.config.existingSessionId;
@@ -87809,7 +87821,7 @@ var ACPLanguageModel = class {
 		} else {
 			this.sessionResponse = await this.connection.newSession({
 				...this.config.session,
-				cwd: this.config.session?.cwd ?? process2.cwd(),
+				cwd: this.config.session?.cwd ?? process$1.cwd(),
 				mcpServers
 			});
 			this.sessionId = this.sessionResponse.sessionId;
@@ -87830,7 +87842,7 @@ var ACPLanguageModel = class {
 	}
 	async applySessionDelay() {
 		if (this.config.sessionDelayMs) {
-			console.log(`[acp-ai-provider] Waiting for ${this.config.sessionDelayMs}ms after session setup...`);
+			console.log(`[acp-ai-provider] Waiting ${this.config.sessionDelayMs}ms after session setup...`);
 			await new Promise((resolve$2) => setTimeout(resolve$2, this.config.sessionDelayMs));
 		}
 	}
@@ -87865,14 +87877,9 @@ var ACPLanguageModel = class {
 	*
 	* @param acpTools - Optional list of tools to register during session initialization.
 	*/
-	async initSession(acpTools2) {
-		let toolsArray = [];
-		if (acpTools2) if (Array.isArray(acpTools2)) toolsArray = acpTools2;
-		else toolsArray = Object.entries(acpTools2).map(([name, tool2]) => ({
-			...tool2,
-			name
-		}));
-		await this.ensureConnected(toolsArray);
+	async initSession(tools) {
+		const acpTools2 = extractACPTools(tools, false);
+		await this.ensureConnected(acpTools2.length > 0 ? acpTools2 : void 0);
 		return this.sessionResponse;
 	}
 	/**
@@ -87999,6 +88006,11 @@ 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) {
@@ -88039,7 +88051,6 @@ var ACPLanguageModel = class {
 				break;
 			}
 			case "tool_call_update": {
-				console.log(`###[acp-ai-provider] tool_call_update received:`, JSON.stringify(update$1, null, 2));
 				const { toolCallId, toolName, toolResult, isError, status } = this.parseToolResult(update$1);
 				let toolInfo = this.toolCallsMap.get(toolCallId);
 				if (status === "in_progress") {
@@ -88292,9 +88303,9 @@ var ACPProvider = class {
 	* Initializes the session and returns session info (models, modes, meta).
 	* Call this before prompting to discover available options.
 	*/
-	initSession(acpTools2) {
+	initSession(tools) {
 		if (!this.model) this.languageModel();
-		return this.model.initSession(acpTools2);
+		return this.model.initSession(tools);
 	}
 	/**
 	* Initializes the connection to the agent process without starting a session.
@@ -88333,6 +88344,22 @@ function createACPProvider(config) {
 //#endregion
 //#region src/middleware/acp-middleware.ts
 /**
+* Provider manager - stores one provider per agent config
+* Key: agentKey (command:args), Value: ProviderEntry
+*/
+const providerManager = /* @__PURE__ */ new Map();
+/**
+* Session to provider mapping for quick lookup
+* Key: sessionId, Value: agentKey
+*/
+const sessionToProvider = /* @__PURE__ */ new Map();
+/**
+* Generate a unique key for an agent configuration
+*/
+function getAgentKey(command, args) {
+	return `${command}:${(args || []).join(",")}`;
+}
+/**
 * Call MCP method via transport and wait for response
 */
 function callMcpMethodViaTransport(transport, method, params) {
@@ -88390,6 +88417,163 @@ function getActiveTransport() {
 	return connectionManager.transports[sessionIds[0]];
 }
 function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
+	/**
+	* Initialize a session for an agent
+	* POST /api/acp/init-session
+	* Body: { agent, envVars }
+	* Returns: { sessionId }
+	*/
+	middlewares.use("/api/acp/init-session", async (req, res) => {
+		if (handleCors(res, req.method)) return;
+		if (req.method !== "POST") {
+			res.statusCode = 405;
+			res.end("Method Not Allowed");
+			return;
+		}
+		try {
+			const body = await readBody(req);
+			const { agent, envVars } = JSON.parse(body);
+			const cwd$1 = process.cwd();
+			const agentKey = getAgentKey(agent.command, agent.args);
+			console.log(`[dev-inspector] [acp] Requesting session for agent: ${agent.name} (${agentKey})`);
+			let providerEntry = providerManager.get(agentKey);
+			let sessionId = "";
+			if (providerEntry) {
+				if (providerEntry.sessions.size > 0) {
+					const firstSession = providerEntry.sessions.values().next().value;
+					if (firstSession) {
+						sessionId = firstSession.sessionId;
+						console.log(`[dev-inspector] [acp] Reusing existing session: ${sessionId} for ${agent.name}`);
+					}
+				}
+				if (!sessionId && providerEntry.initializationPromise) {
+					console.log(`[dev-inspector] [acp] Joining pending initialization for ${agent.name}`);
+					try {
+						sessionId = await providerEntry.initializationPromise;
+					} catch (e) {
+						throw e;
+					}
+				}
+			}
+			if (!sessionId) {
+				let provider;
+				if (providerEntry) {
+					console.log(`[dev-inspector] [acp] Reusing existing provider for ${agent.name}`);
+					provider = providerEntry.provider;
+				} else {
+					console.log(`[dev-inspector] [acp] Creating new global provider for ${agent.name}`);
+					provider = createACPProvider({
+						command: agent.command,
+						args: agent.args,
+						env: {
+							...process.env,
+							...envVars
+						},
+						session: {
+							cwd: cwd$1,
+							mcpServers: []
+						},
+						authMethodId: agent.authMethodId,
+						persistSession: true
+					});
+					providerEntry = {
+						provider,
+						agentKey,
+						sessions: /* @__PURE__ */ new Map(),
+						createdAt: Date.now(),
+						initializationPromise: void 0
+					};
+					providerManager.set(agentKey, providerEntry);
+				}
+				console.log(`[dev-inspector] [acp] Spawning new process/session for ${agent.name}`);
+				const initPromise = (async () => {
+					const transport = getActiveTransport();
+					let initialTools = {};
+					if (transport) try {
+						const rawTools = await loadMcpToolsV5(transport);
+						initialTools = acpTools(rawTools);
+						console.log(`[dev-inspector] [acp] Pre-loading ${Object.keys(rawTools).length} tools for session init`);
+					} catch (e) {
+						console.warn("[dev-inspector] [acp] Failed to pre-load tools:", e);
+					}
+					const sid = (await provider.initSession(initialTools)).sessionId || `session-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
+					if (providerEntry) {
+						providerEntry.sessions.set(sid, {
+							sessionId: sid,
+							createdAt: Date.now()
+						});
+						providerEntry.initializationPromise = void 0;
+					}
+					sessionToProvider.set(sid, agentKey);
+					return sid;
+				})();
+				if (providerEntry) providerEntry.initializationPromise = initPromise;
+				try {
+					sessionId = await initPromise;
+					console.log(`[dev-inspector] [acp] Session initialized: ${sessionId}`);
+				} catch (error) {
+					if (providerEntry) providerEntry.initializationPromise = void 0;
+					throw error;
+				}
+			}
+			res.setHeader("Content-Type", "application/json");
+			res.end(JSON.stringify({ sessionId }));
+		} catch (error) {
+			console.error("ACP Init Session Error:", error);
+			if (!res.headersSent) {
+				res.statusCode = 500;
+				res.end(JSON.stringify({ error: error instanceof Error ? error.message : "Internal Server Error" }));
+			}
+		}
+	});
+	/**
+	* Cleanup a session
+	* POST /api/acp/cleanup-session
+	* Body: { sessionId }
+	*/
+	middlewares.use("/api/acp/cleanup-session", async (req, res) => {
+		if (handleCors(res, req.method)) return;
+		if (req.method !== "POST") {
+			res.statusCode = 405;
+			res.end("Method Not Allowed");
+			return;
+		}
+		try {
+			const body = await readBody(req);
+			const { sessionId } = JSON.parse(body);
+			const agentKey = sessionToProvider.get(sessionId);
+			if (agentKey) {
+				const providerEntry = providerManager.get(agentKey);
+				if (providerEntry) {
+					console.log(`[dev-inspector] [acp] Cleaning up session: ${sessionId} (Provider sessions left: ${providerEntry.sessions.size - 1})`);
+					providerEntry.sessions.delete(sessionId);
+					if (providerEntry.sessions.size === 0) {
+						console.log(`[dev-inspector] [acp] No active sessions for ${agentKey}, cleaning up provider`);
+						try {
+							providerEntry.provider.cleanup();
+						} catch (e) {
+							console.error("Error cleaning up provider:", e);
+						}
+						providerManager.delete(agentKey);
+					}
+				}
+				sessionToProvider.delete(sessionId);
+			}
+			res.setHeader("Content-Type", "application/json");
+			res.end(JSON.stringify({ success: true }));
+		} catch (error) {
+			console.error("ACP Cleanup Session Error:", error);
+			if (!res.headersSent) {
+				res.statusCode = 500;
+				res.end(JSON.stringify({ error: "Internal Server Error" }));
+			}
+		}
+	});
+	/**
+	* Chat endpoint
+	* POST /api/acp/chat
+	* Body: { messages, agent, envVars, sessionId? }
+	*/
 	middlewares.use("/api/acp/chat", async (req, res) => {
 		if (handleCors(res, req.method)) return;
 		if (req.method !== "POST") {
@@ -88399,18 +88583,36 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 		}
 		try {
 			const body = await readBody(req);
-			const { messages, agent, envVars } = JSON.parse(body);
+			const { messages, agent, envVars, sessionId } = JSON.parse(body);
 			const cwd$1 = process.cwd();
-			const provider = createACPProvider({
-				command: agent.command,
-				args: agent.args,
-				env: envVars,
-				session: {
-					cwd: cwd$1,
-					mcpServers: []
-				},
-				authMethodId: agent.authMethodId
-			});
+			let provider;
+			let shouldCleanupProvider = true;
+			let existingProviderEntry;
+			if (sessionId) {
+				const agentKey = sessionToProvider.get(sessionId);
+				if (agentKey) existingProviderEntry = providerManager.get(agentKey);
+			}
+			if (existingProviderEntry) {
+				console.log(`[dev-inspector] [acp] Using existing global provider for session: ${sessionId}`);
+				provider = existingProviderEntry.provider;
+				shouldCleanupProvider = false;
+			} else {
+				console.log(`[dev-inspector] [acp] Creating new provider (no session found or provided)`);
+				provider = createACPProvider({
+					command: agent.command,
+					args: agent.args,
+					env: {
+						...process.env,
+						...envVars
+					},
+					session: {
+						cwd: cwd$1,
+						mcpServers: []
+					},
+					authMethodId: agent.authMethodId
+				});
+				await provider.initSession();
+			}
 			const transport = getActiveTransport();
 			let mcpTools = {};
 			if (transport) mcpTools = await loadMcpToolsV5(transport);
@@ -88426,7 +88628,7 @@ function setupAcpMiddleware(middlewares, serverContext, acpOptions) {
 			req.on("close", () => {
 				console.log("[dev-inspector] [acp] Client disconnected, aborting stream");
 				abortController.abort();
-				provider.cleanup();
+				if (shouldCleanupProvider) provider.cleanup();
 			});
 			const response = streamText({
 				model: provider.languageModel(model, mode),

package/dist/index.cjs

@@ -71,6 +71,25 @@ const createDevInspectorPlugin = (name, transformFactory) => {
 			load(id) {
 				if (id === "\0" + virtualModuleName) return `
 // Development-only code - removed in production builds
+
+// Global tools registry
+if (typeof window !== 'undefined') {
+  if (!window.__INSPECTOR_TOOLS__) {
+    window.__INSPECTOR_TOOLS__ = [];
+  }
+  // Exposed for the inspector client to retrieve tools
+  window.__getInspectorTools = () => window.__INSPECTOR_TOOLS__;
+}
+
+/**
+ * Register a custom tool for the inspector
+ */
+export function registerInspectorTool(tool) {
+  if (typeof window === 'undefined') return;
+  window.__INSPECTOR_TOOLS__ = window.__INSPECTOR_TOOLS__ || [];
+  window.__INSPECTOR_TOOLS__.push(tool);
+}
+
 if (typeof window !== 'undefined' && typeof document !== 'undefined') {
   // Create inspector element
   const inspector = document.createElement('dev-inspector-mcp');

package/dist/index.js

@@ -67,6 +67,25 @@ const createDevInspectorPlugin = (name, transformFactory) => {
 			load(id) {
 				if (id === "\0" + virtualModuleName) return `
 // Development-only code - removed in production builds
+
+// Global tools registry
+if (typeof window !== 'undefined') {
+  if (!window.__INSPECTOR_TOOLS__) {
+    window.__INSPECTOR_TOOLS__ = [];
+  }
+  // Exposed for the inspector client to retrieve tools
+  window.__getInspectorTools = () => window.__INSPECTOR_TOOLS__;
+}
+
+/**
+ * Register a custom tool for the inspector
+ */
+export function registerInspectorTool(tool) {
+  if (typeof window === 'undefined') return;
+  window.__INSPECTOR_TOOLS__ = window.__INSPECTOR_TOOLS__ || [];
+  window.__INSPECTOR_TOOLS__.push(tool);
+}
+
 if (typeof window !== 'undefined' && typeof document !== 'undefined') {
   // Create inspector element
   const inspector = document.createElement('dev-inspector-mcp');