@databricks/ai-sdk-provider 0.3.0 → 0.4.1

package/README.md

@@ -178,22 +178,6 @@ for await (const part of result.fullStream) {
 }
 ```
 
-### MCP Utilities
-
-```typescript
-import {
-  MCP_APPROVAL_STATUS_KEY,
-  MCP_APPROVAL_REQUEST_TYPE,
-  MCP_APPROVAL_RESPONSE_TYPE,
-  isMcpApprovalRequest,
-  isMcpApprovalResponse,
-  createApprovalStatusOutput,
-  getMcpApprovalState,
-} from '@databricks/ai-sdk-provider'
-```
-
-MCP (Model Context Protocol) approval utilities for handling approval workflows.
-
 ## Examples
 
 ### Responses Endpoint

package/dist/index.cjs

@@ -615,119 +615,6 @@ const responsesAgentChunkSchema = zod_v4.z.union([
 */
 const looseResponseAgentChunkSchema = zod_v4.z.union([responsesAgentChunkSchema, zod_v4.z.object({ type: zod_v4.z.string() }).loose()]);
 
-//#endregion
-//#region src/mcp.ts
-/**
-* MCP Approval Utility Functions
-*
-* Shared utilities for handling MCP (Model Context Protocol) approval requests
-* and responses across client and server code.
-*/
-/** Key used in tool output to indicate approval status */
-const MCP_APPROVAL_STATUS_KEY = "__approvalStatus__";
-/** Type string for MCP approval requests in provider metadata */
-const MCP_APPROVAL_REQUEST_TYPE = "mcp_approval_request";
-/** Type string for MCP approval responses in provider metadata */
-const MCP_APPROVAL_RESPONSE_TYPE = "mcp_approval_response";
-/**
-* Check if output contains an approval status marker.
-*
-* @example
-* if (isApprovalStatusOutput(output)) {
-*   console.log(output.__approvalStatus__); // TypeScript knows this is boolean
-* }
-*/
-function isApprovalStatusOutput(output) {
-	return typeof output === "object" && output !== null && MCP_APPROVAL_STATUS_KEY in output && typeof output[MCP_APPROVAL_STATUS_KEY] === "boolean";
-}
-/**
-* Check if provider metadata indicates an MCP approval request.
-*
-* @example
-* const metadata = extractDatabricksMetadata(part);
-* if (isMcpApprovalRequest(metadata)) {
-*   // Handle MCP approval request
-* }
-*/
-function isMcpApprovalRequest(metadata) {
-	return metadata?.type?.toString() === MCP_APPROVAL_REQUEST_TYPE;
-}
-/**
-* Check if provider metadata indicates an MCP approval response.
-*/
-function isMcpApprovalResponse(metadata) {
-	return metadata?.type?.toString() === MCP_APPROVAL_RESPONSE_TYPE;
-}
-/**
-* Extract Databricks metadata from a tool call part's callProviderMetadata.
-*
-* @example
-* const metadata = extractDatabricksMetadata(part);
-* const toolName = metadata?.toolName;
-* const isMcp = isMcpApprovalRequest(metadata);
-*/
-function extractDatabricksMetadata(part) {
-	if ("callProviderMetadata" in part && part.callProviderMetadata?.databricks) return part.callProviderMetadata.databricks;
-}
-/**
-* Extract the approval status boolean from an output object.
-*
-* @returns `true` if approved, `false` if denied, `undefined` if not an approval output
-*
-* @example
-* const status = extractApprovalStatus(output);
-* if (status !== undefined) {
-*   console.log(status ? 'Approved' : 'Denied');
-* }
-*/
-function extractApprovalStatus(output) {
-	if (isApprovalStatusOutput(output)) return output[MCP_APPROVAL_STATUS_KEY];
-}
-/**
-* Extract approval status from a tool result's output value.
-* Handles the nested structure where output.type === 'json' and value contains the status.
-*
-* @example
-* const status = extractApprovalStatusFromToolResult(toolResult.output);
-*/
-function extractApprovalStatusFromToolResult(output) {
-	if (output.type === "json" && output.value && typeof output.value === "object" && MCP_APPROVAL_STATUS_KEY in output.value) {
-		const value = output.value[MCP_APPROVAL_STATUS_KEY];
-		if (typeof value === "boolean") return value;
-	}
-}
-/**
-* Create an approval status output object.
-*
-* @example
-* await addToolResult({
-*   toolCallId,
-*   output: createApprovalStatusOutput(true), // Approve
-* });
-*/
-function createApprovalStatusOutput(approve) {
-	return { [MCP_APPROVAL_STATUS_KEY]: approve };
-}
-/**
-* Determine the MCP approval state from a tool output.
-*
-* Logic:
-* - No output → 'awaiting-approval' (user hasn't responded yet)
-* - Output with __approvalStatus__: true → 'approved'
-* - Output with __approvalStatus__: false → 'denied'
-* - Output without __approvalStatus__ → 'approved' (tool executed, so it was approved)
-*
-* @example
-* const approvalState = getMcpApprovalState(part.output);
-* // 'awaiting-approval' | 'approved' | 'denied'
-*/
-function getMcpApprovalState(output) {
-	if (!output) return "awaiting-approval";
-	const status = extractApprovalStatus(output);
-	if (status === void 0) return "approved";
-	return status ? "approved" : "denied";
-}
-
 //#endregion
 //#region src/responses-agent-language-model/responses-convert-to-message-parts.ts
 const convertResponsesAgentChunkToMessagePart = (chunk, options = { useRemoteToolCalling: false }) => {
@@ -843,25 +730,24 @@ const convertOutputItemDone = (item, options) => {
 			toolCallId: item.id,
 			toolName: item.name,
 			input: item.arguments,
-			...options.useRemoteToolCalling && {
-				dynamic: true,
-				providerExecuted: true
-			},
+			providerExecuted: true,
+			dynamic: true,
 			providerMetadata: { databricks: {
-				type: MCP_APPROVAL_REQUEST_TYPE,
 				itemId: item.id,
-				serverLabel: item.server_label
+				serverLabel: item.server_label,
+				approvalRequestId: item.id
 			} }
+		}, {
+			type: "tool-approval-request",
+			approvalId: item.id,
+			toolCallId: item.id
 		}];
 		case "mcp_approval_response": return [{
 			type: "tool-result",
 			toolCallId: item.approval_request_id,
 			toolName: options.toolNamesByCallId?.get(item.approval_request_id) ?? "mcp_approval",
-			result: createApprovalStatusOutput(item.approve),
-			providerMetadata: { databricks: {
-				type: MCP_APPROVAL_RESPONSE_TYPE,
-				...item.id != null && { itemId: item.id }
-			} }
+			result: { approved: item.approve },
+			providerMetadata: { databricks: { itemId: item.id ?? item.approval_request_id } }
 		}];
 		default: return [];
 	}
@@ -913,23 +799,27 @@ const convertResponsesAgentResponseToMessagePart = (response, options = { useRem
 				toolCallId: output.id,
 				toolName: output.name,
 				input: output.arguments,
+				providerExecuted: true,
+				dynamic: true,
 				providerMetadata: { databricks: {
-					type: MCP_APPROVAL_REQUEST_TYPE,
 					itemId: output.id,
-					serverLabel: output.server_label
+					serverLabel: output.server_label,
+					approvalRequestId: output.id
 				} }
 			});
+			parts.push({
+				type: "tool-approval-request",
+				approvalId: output.id,
+				toolCallId: output.id
+			});
 			break;
 		case "mcp_approval_response":
 			parts.push({
 				type: "tool-result",
 				toolCallId: output.approval_request_id,
 				toolName: toolNamesByCallId.get(output.approval_request_id) ?? "mcp_approval",
-				result: createApprovalStatusOutput(output.approve),
-				providerMetadata: { databricks: {
-					type: MCP_APPROVAL_RESPONSE_TYPE,
-					...output.id != null && { itemId: output.id }
-				} }
+				result: { approved: output.approve },
+				providerMetadata: { databricks: { itemId: output.id ?? output.approval_request_id } }
 			});
 			break;
 		default: break;
@@ -942,6 +832,8 @@ const convertResponsesAgentResponseToMessagePart = (response, options = { useRem
 async function convertToResponsesInput({ prompt, systemMessageMode }) {
 	const input = [];
 	const warnings = [];
+	const processedApprovalIds = /* @__PURE__ */ new Set();
+	const approvalIdsWithToolResult = /* @__PURE__ */ new Set();
 	const toolCallResultsByToolCallId = prompt.filter((p) => p.role === "tool").flatMap((p) => p.content).reduce((reduction, toolCallResult) => {
 		if (toolCallResult.type === "tool-result") reduction[toolCallResult.toolCallId] = toolCallResult;
 		return reduction;
@@ -1008,37 +900,16 @@ async function convertToResponsesInput({ prompt, systemMessageMode }) {
 						break;
 					case "tool-call": {
 						const toolName = providerOptions?.toolName ?? part.toolName;
-						if (providerOptions?.type === MCP_APPROVAL_REQUEST_TYPE) {
+						const approvalRequestId = providerOptions?.approvalRequestId;
+						if (approvalRequestId) {
 							const serverLabel = providerOptions?.serverLabel ?? "";
-							const argumentsString = JSON.stringify(part.input);
-							const id = part.toolCallId;
 							input.push({
-								type: MCP_APPROVAL_REQUEST_TYPE,
-								id,
+								type: "mcp_approval_request",
+								id: approvalRequestId,
 								name: toolName,
-								arguments: argumentsString,
+								arguments: JSON.stringify(part.input),
 								server_label: serverLabel
 							});
-							const toolResult = toolCallResultsByToolCallId[part.toolCallId];
-							if (toolResult) {
-								/**
-								* The tool call result is either the approval status or the actual output from the tool call.
-								* If it's the approval status, we need to add an approval response part.
-								* If it's the tool call output, we don't include the approval response part but we do include the tool call output part.
-								*/
-								const approvalStatus = extractApprovalStatusFromToolResult(toolResult.output);
-								if (approvalStatus !== void 0) input.push({
-									type: MCP_APPROVAL_RESPONSE_TYPE,
-									id: toolResult.toolCallId,
-									approval_request_id: toolResult.toolCallId,
-									approve: approvalStatus
-								});
-								else input.push({
-									type: "function_call_output",
-									call_id: toolResult.toolCallId,
-									output: convertToolResultOutputToString(toolResult.output)
-								});
-							}
 							break;
 						}
 						input.push({
@@ -1057,24 +928,12 @@ async function convertToResponsesInput({ prompt, systemMessageMode }) {
 						break;
 					}
 					case "tool-result":
-						if (providerOptions?.type === MCP_APPROVAL_RESPONSE_TYPE) {
-							const approvalRequestId = providerOptions?.approvalRequestId ?? part.toolCallId;
-							const approve = providerOptions?.approve ?? false;
-							const reason = providerOptions?.reason ?? "";
-							input.push({
-								type: MCP_APPROVAL_RESPONSE_TYPE,
-								id: approvalRequestId,
-								approval_request_id: approvalRequestId,
-								approve,
-								reason
-							});
-							break;
-						}
 						input.push({
 							type: "function_call_output",
 							call_id: part.toolCallId,
 							output: convertToolResultOutputToString(part.output)
 						});
+						approvalIdsWithToolResult.add(part.toolCallId);
 						break;
 					case "reasoning":
 						if (!itemId) break;
@@ -1090,7 +949,20 @@ async function convertToResponsesInput({ prompt, systemMessageMode }) {
 				}
 			}
 			break;
-		case "tool": break;
+		case "tool":
+			for (const part of content) if (part.type === "tool-approval-response") {
+				if (processedApprovalIds.has(part.approvalId)) continue;
+				processedApprovalIds.add(part.approvalId);
+				if (approvalIdsWithToolResult.has(part.approvalId)) continue;
+				input.push({
+					type: "mcp_approval_response",
+					id: part.approvalId,
+					approval_request_id: part.approvalId,
+					approve: part.approved,
+					...part.reason && { reason: part.reason }
+				});
+			}
+			break;
 		default: {
 			const _exhaustiveCheck = role;
 			throw new Error(`Unsupported role: ${String(_exhaustiveCheck)}`);
@@ -1104,11 +976,8 @@ async function convertToResponsesInput({ prompt, systemMessageMode }) {
 const ProviderOptionsSchema$1 = zod_v4.z.object({
 	itemId: zod_v4.z.string().nullish(),
 	toolName: zod_v4.z.string().nullish(),
-	type: zod_v4.z.enum(["mcp_approval_request", "mcp_approval_response"]).nullish(),
 	serverLabel: zod_v4.z.string().nullish(),
-	approvalRequestId: zod_v4.z.string().nullish(),
-	approve: zod_v4.z.boolean().nullish(),
-	reason: zod_v4.z.string().nullish()
+	approvalRequestId: zod_v4.z.string().nullish()
 });
 const convertToolResultOutputToString = (output) => {
 	switch (output.type) {
@@ -1406,7 +1275,9 @@ var DatabricksResponsesAgentLanguageModel = class {
 								type: "tool-call",
 								toolCallId: toolCallFromPreviousMessages.toolCallId,
 								toolName: toolCallFromPreviousMessages.toolName,
-								input: JSON.stringify(toolCallFromPreviousMessages.input)
+								input: JSON.stringify(toolCallFromPreviousMessages.input),
+								providerExecuted: true,
+								dynamic: true
 							});
 						}
 					}
@@ -1418,7 +1289,7 @@ var DatabricksResponsesAgentLanguageModel = class {
 						const toolCalls = allParts.filter((p) => p.type === "tool-call");
 						const toolResults = allParts.filter((p) => p.type === "tool-result");
 						for (const toolCall of toolCalls) {
-							if (toolCall.providerMetadata?.databricks?.type === MCP_APPROVAL_REQUEST_TYPE) continue;
+							if (toolCall.providerMetadata?.databricks?.approvalRequestId != null) continue;
 							if (!toolResults.some((r) => r.toolCallId === toolCall.toolCallId)) controller.enqueue({
 								...toolCall,
 								providerExecuted: true,
@@ -2212,16 +2083,5 @@ const createDatabricksProvider = (settings) => {
 };
 
 //#endregion
-exports.MCP_APPROVAL_REQUEST_TYPE = MCP_APPROVAL_REQUEST_TYPE;
-exports.MCP_APPROVAL_RESPONSE_TYPE = MCP_APPROVAL_RESPONSE_TYPE;
-exports.MCP_APPROVAL_STATUS_KEY = MCP_APPROVAL_STATUS_KEY;
-exports.createApprovalStatusOutput = createApprovalStatusOutput;
 exports.createDatabricksProvider = createDatabricksProvider;
-exports.extractApprovalStatus = extractApprovalStatus;
-exports.extractApprovalStatusFromToolResult = extractApprovalStatusFromToolResult;
-exports.extractDatabricksMetadata = extractDatabricksMetadata;
-exports.getMcpApprovalState = getMcpApprovalState;
-exports.isApprovalStatusOutput = isApprovalStatusOutput;
-exports.isMcpApprovalRequest = isMcpApprovalRequest;
-exports.isMcpApprovalResponse = isMcpApprovalResponse;
 //# sourceMappingURL=index.cjs.map