@mcpc-tech/unplugin-dev-inspector-mcp 0.0.24 → 0.0.27

package/dist/config-updater.cjs

@@ -87226,7 +87226,7 @@ function setupInspectorMiddleware(middlewares, config) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.31/node_modules/@mcpc-tech/acp-ai-provider/index.mjs
+//#region ../../node_modules/.pnpm/@mcpc-tech+acp-ai-provider@0.1.33/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";
@@ -87236,9 +87236,6 @@ function formatToolError(toolResult) {
 	}
 	return parts.join("\n");
 }
-function extractBase64Data(data$1) {
-	return data$1.includes(",") ? data$1.split(",")[1] : data$1;
-}
 function createResponse(id, result) {
 	return {
 		jsonrpc: "2.0",
@@ -87516,6 +87513,65 @@ function getExecuteByName(name) {
 function hasRegisteredExecute(name) {
 	return executeRegistry.has(name);
 }
+function extractBase64Data(data$1) {
+	return data$1.includes(",") ? data$1.split(",")[1] : data$1;
+}
+function convertAiSdkMessagesToAcp(options, isFreshSession) {
+	const messages = !isFreshSession ? options.prompt.filter((m) => m.role === "user").slice(-1) : options.prompt;
+	const contentBlocks = [];
+	for (const msg of messages) {
+		let prefix = "";
+		if (msg.role === "system") prefix = "System: ";
+		else if (msg.role === "assistant") prefix = "Assistant: ";
+		else if (msg.role === "tool") prefix = "Result: ";
+		if (Array.isArray(msg.content)) {
+			let isFirst = true;
+			for (const part of msg.content) if (part.type === "text") {
+				const text$2 = isFirst ? `${prefix}${part.text} ` : part.text;
+				contentBlocks.push({
+					type: "text",
+					text: text$2
+				});
+				isFirst = false;
+			} else if (part.type === "tool-result") {
+				const resultText = JSON.stringify(part.result);
+				const text$2 = isFirst ? `${prefix}${resultText} ` : resultText;
+				contentBlocks.push({
+					type: "text",
+					text: text$2
+				});
+				isFirst = false;
+			} else if (part.type === "file" && typeof part.data === "string") {
+				const type = part.mediaType.startsWith("image/") ? "image" : part.mediaType.startsWith("audio/") ? "audio" : null;
+				if (type) contentBlocks.push({
+					type,
+					mimeType: part.mediaType,
+					data: extractBase64Data(part.data)
+				});
+			}
+		} else if (typeof msg.content === "string") contentBlocks.push({
+			type: "text",
+			text: `${prefix}${msg.content} `
+		});
+	}
+	return contentBlocks;
+}
+function extractACPTools(tools) {
+	const acpTools2 = [];
+	if (!tools) return acpTools2;
+	for (const t$5 of tools) if (t$5.type === "function") {
+		const toolInputSchema = t$5.inputSchema;
+		if (hasRegisteredExecute(t$5.name) && toolInputSchema) {
+			const execute = getExecuteByName(t$5.name);
+			if (execute) acpTools2.push({
+				...t$5,
+				name: t$5.name,
+				execute
+			});
+		}
+	}
+	return acpTools2;
+}
 var ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2 = "acp.acp_provider_agent_dynamic_tool";
 var providerAgentDynamicToolSchema = zod.default.object({
 	toolCallId: zod.default.string().describe("The unique ID of the tool call."),
@@ -87565,6 +87621,7 @@ var ACPLanguageModel = class {
 	client = null;
 	currentModelId = null;
 	currentModeId = null;
+	isFreshSession = true;
 	textBlockIndex = 0;
 	thinkBlockIndex = 0;
 	currentTextId = null;
@@ -87588,36 +87645,27 @@ var ACPLanguageModel = class {
 	}
 	/**
 	* Parses a 'tool_call' notification update into a structured object.
+	* Note: We only use rawInput for tool input (content is for UI display).
 	*/
 	parseToolCall(update$1) {
 		if (update$1.sessionUpdate !== "tool_call") throw new Error("Invalid update type for parseToolCall");
-		const toolCallId = update$1.toolCallId;
-		const toolName = update$1.title || update$1.toolCallId;
-		let toolInput = {};
-		if (update$1.content && update$1.content.length > 0) toolInput = update$1.content;
-		else if (update$1.rawInput) toolInput = update$1.rawInput;
 		return {
-			toolCallId,
-			toolName,
-			toolInput
+			toolCallId: update$1.toolCallId,
+			toolName: update$1.title || update$1.toolCallId,
+			toolInput: update$1.rawInput ?? {}
 		};
 	}
 	/**
 	* Parses a 'tool_call_update' notification update into a structured object.
+	* Note: We only use rawOutput for tool result (content is for UI display).
 	*/
 	parseToolResult(update$1) {
 		if (update$1.sessionUpdate !== "tool_call_update") throw new Error("Invalid update type for parseToolResult");
-		const toolCallId = update$1.toolCallId;
-		const toolName = update$1.title || update$1.toolCallId;
-		let toolResult = null;
-		if (update$1.content && update$1.content.length > 0) toolResult = update$1.content;
-		else if (update$1.rawOutput) toolResult = update$1.rawOutput;
-		const isError = update$1.status === "failed";
 		return {
-			toolCallId,
-			toolName,
-			toolResult,
-			isError,
+			toolCallId: update$1.toolCallId,
+			toolName: update$1.title || update$1.toolCallId,
+			toolResult: update$1.rawOutput ?? null,
+			isError: update$1.status === "failed",
 			status: update$1.status
 		};
 	}
@@ -87626,36 +87674,6 @@ var ACPLanguageModel = class {
 	* When session exists, only extracts the last user message (history is in session).
 	* Prefixes text with role since ACP ContentBlock has no role field.
 	*/
-	getPromptContent(options) {
-		const messages = this.sessionId ? options.prompt.filter((m) => m.role === "user").slice(-1) : options.prompt;
-		const contentBlocks = [];
-		for (const msg of messages) {
-			if (msg.role === "tool") continue;
-			const prefix = msg.role === "system" ? "System: " : msg.role === "assistant" ? "Assistant: " : "";
-			if (Array.isArray(msg.content)) {
-				let isFirst = true;
-				for (const part of msg.content) if (part.type === "text") {
-					const text$2 = isFirst ? `${prefix}${part.text} ` : part.text;
-					contentBlocks.push({
-						type: "text",
-						text: text$2
-					});
-					isFirst = false;
-				} else if (part.type === "file" && typeof part.data === "string") {
-					const type = part.mediaType.startsWith("image/") ? "image" : part.mediaType.startsWith("audio/") ? "audio" : null;
-					if (type) contentBlocks.push({
-						type,
-						mimeType: part.mediaType,
-						data: extractBase64Data(part.data)
-					});
-				}
-			} else if (typeof msg.content === "string") contentBlocks.push({
-				type: "text",
-				text: `${prefix}${msg.content} `
-			});
-		}
-		return contentBlocks;
-	}
 	/**
 	* Ensures the ACP agent process is running and a session is established.
 	* @param acpTools - Tools from streamText options to proxy
@@ -87706,30 +87724,6 @@ var ACPLanguageModel = class {
 		} else console.log(`[acp-ai-provider] No authentication methods required by the ACP agent, skipping authentication step.`);
 	}
 	/**
-	* Prepares the list of MCP servers, including the tool proxy if needed.
-	*/
-	async prepareMcpServers(acpTools2) {
-		const mcpServers = [...this.config.session?.mcpServers ?? []];
-		if (acpTools2 && acpTools2.length > 0) {
-			if (!this.toolProxyHost) this.toolProxyHost = new ToolProxyHost("acp-ai-sdk-tools");
-			for (const t$5 of acpTools2) this.toolProxyHost.registerTool(t$5.name, t$5);
-			if (!this.toolProxyHost) {
-				this.toolProxyHost = new ToolProxyHost("acp-ai-sdk-tools");
-				for (const t$5 of acpTools2) this.toolProxyHost.registerTool(t$5.name, t$5);
-				const proxyConfig = await this.toolProxyHost.start();
-				mcpServers.push(proxyConfig);
-			}
-		}
-		return mcpServers;
-	}
-	async prepareToolProxy(acpTools2, mcpServers) {
-		if (this.toolProxyHost) return;
-		this.toolProxyHost = new ToolProxyHost("acp-ai-sdk-tools");
-		for (const t$5 of acpTools2) this.toolProxyHost.registerTool(t$5.name, t$5);
-		const proxyConfig = await this.toolProxyHost.start();
-		mcpServers.push(proxyConfig);
-	}
-	/**
 	* Starts a new session or updates the existing one.
 	* Assumes connectClient() has been called.
 	*/
@@ -87754,6 +87748,7 @@ var ACPLanguageModel = class {
 				mcpServers
 			});
 			this.sessionId = this.sessionResponse.sessionId;
+			this.isFreshSession = true;
 			await this.applySessionDelay();
 			return;
 		}
@@ -87766,6 +87761,7 @@ var ACPLanguageModel = class {
 			});
 			this.sessionId = this.config.existingSessionId;
 			this.sessionResponse = { sessionId: this.config.existingSessionId };
+			this.isFreshSession = false;
 		} else {
 			this.sessionResponse = await this.connection.newSession({
 				...this.config.session,
@@ -87773,6 +87769,7 @@ var ACPLanguageModel = class {
 				mcpServers
 			});
 			this.sessionId = this.sessionResponse.sessionId;
+			this.isFreshSession = true;
 		}
 		const { models, modes } = this.sessionResponse ?? {};
 		if (models?.currentModelId) this.currentModelId = models.currentModelId;
@@ -87958,30 +87955,84 @@ var ACPLanguageModel = class {
 					this.currentThinkingId = null;
 				}
 				const { toolCallId, toolName, toolInput } = this.parseToolCall(update$1);
-				controller.enqueue({
-					type: "tool-call",
-					toolCallId,
-					toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
-					input: JSON.stringify({
+				const existingToolCall = this.toolCallsMap.get(toolCallId);
+				const hasInput = toolInput && typeof toolInput === "object" && Object.keys(toolInput).length > 0;
+				if (!existingToolCall) {
+					this.toolCallsMap.set(toolCallId, {
+						index: this.toolCallsMap.size,
+						name: toolName,
+						inputStarted: true,
+						inputAvailable: !!hasInput
+					});
+					controller.enqueue({
+						type: "tool-input-start",
+						id: toolCallId,
+						toolName
+					});
+					if (hasInput) controller.enqueue({
+						type: "tool-call",
 						toolCallId,
-						toolName,
-						args: toolInput
-					})
-				});
-				this.toolCallsMap.set(toolCallId, {
-					index: this.toolCallsMap.size,
-					name: toolName
-				});
+						toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
+						input: JSON.stringify({
+							toolCallId,
+							toolName,
+							args: toolInput
+						})
+					});
+				} else if (!existingToolCall.inputAvailable && hasInput) {
+					existingToolCall.inputAvailable = true;
+					controller.enqueue({
+						type: "tool-call",
+						toolCallId,
+						toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
+						input: JSON.stringify({
+							toolCallId,
+							toolName,
+							args: toolInput
+						})
+					});
+				}
 				break;
 			}
 			case "tool_call_update": {
 				const { toolCallId, toolName, toolResult, isError, status } = this.parseToolResult(update$1);
-				if (!["completed", "failed"].includes(status)) break;
 				let toolInfo = this.toolCallsMap.get(toolCallId);
+				if (status === "in_progress") {
+					if (!toolInfo) {
+						toolInfo = {
+							index: this.toolCallsMap.size,
+							name: toolName,
+							inputStarted: true,
+							inputAvailable: true
+						};
+						this.toolCallsMap.set(toolCallId, toolInfo);
+						controller.enqueue({
+							type: "tool-input-start",
+							id: toolCallId,
+							toolName
+						});
+					}
+					if (!toolInfo.inputAvailable) {
+						toolInfo.inputAvailable = true;
+						controller.enqueue({
+							type: "tool-call",
+							toolCallId,
+							toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
+							input: JSON.stringify({
+								toolCallId,
+								toolName,
+								args: {}
+							})
+						});
+					}
+					break;
+				}
+				if (!["completed", "failed"].includes(status)) break;
 				if (!toolInfo) {
 					toolInfo = {
 						index: this.toolCallsMap.size,
-						name: toolName
+						name: toolName,
+						inputAvailable: true
 					};
 					this.toolCallsMap.set(toolCallId, toolInfo);
 					controller.enqueue({
@@ -87993,6 +88044,18 @@ var ACPLanguageModel = class {
 							toolName
 						})
 					});
+				} else if (!toolInfo.inputAvailable) {
+					toolInfo.inputAvailable = true;
+					controller.enqueue({
+						type: "tool-call",
+						toolCallId,
+						toolName: ACP_PROVIDER_AGENT_DYNAMIC_TOOL_NAME2,
+						input: JSON.stringify({
+							toolCallId,
+							toolName,
+							args: {}
+						})
+					});
 				}
 				controller.enqueue({
 					type: "tool-result",
@@ -88015,7 +88078,8 @@ var ACPLanguageModel = class {
 	async doGenerate(options) {
 		try {
 			await this.ensureConnected();
-			const promptContent = this.getPromptContent(options);
+			const promptContent = convertAiSdkMessagesToAcp(options, this.isFreshSession);
+			this.isFreshSession = false;
 			let accumulatedText = "";
 			const toolCalls = [];
 			const toolResults = /* @__PURE__ */ new Map();
@@ -88088,22 +88152,10 @@ var ACPLanguageModel = class {
 	* Implements the streaming generation method.
 	*/
 	async doStream(options) {
-		const acpTools2 = [];
-		if (options.tools) {
-			for (const t$5 of options.tools) if (t$5.type === "function") {
-				const toolInputSchema = t$5.inputSchema;
-				if (hasRegisteredExecute(t$5.name) && toolInputSchema) {
-					const execute = getExecuteByName(t$5.name);
-					if (execute) acpTools2.push({
-						...t$5,
-						name: t$5.name,
-						execute
-					});
-				}
-			}
-		}
+		const acpTools2 = extractACPTools(options.tools);
 		await this.ensureConnected(acpTools2.length > 0 ? acpTools2 : void 0);
-		const promptContent = this.getPromptContent(options);
+		const promptContent = convertAiSdkMessagesToAcp(options, this.isFreshSession);
+		this.isFreshSession = false;
 		const connection = this.connection;
 		const sessionId = this.sessionId;
 		const client = this.client;