@databricks/ai-sdk-provider 0.1.0 → 0.2.0

package/dist/index.d.cts

@@ -14,9 +14,9 @@ type DatabricksLanguageModelConfig = {
 interface DatabricksProvider extends ProviderV2 {
   /** Agents */
   chatAgent(modelId: string): LanguageModelV2;
-  responsesAgent(modelId: string): LanguageModelV2;
-  /** FMAPI */
-  fmapi(modelId: string): LanguageModelV2;
+  responses(modelId: string): LanguageModelV2;
+  /** Foundation Models */
+  chatCompletions(modelId: string): LanguageModelV2;
 }
 interface DatabricksProviderSettings {
   /** Base URL for the Databricks API calls. */

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../src/databricks-provider.ts","../src/tools.ts","../src/mcp.ts"],"sourcesContent":null,"mappings":";;;;;KAMY,6BAAA;;iBAEK;EAFL,GAAA,EAAA,CAAA,OAAA,EAAA;IAA6B,IAAA,EAAA,MAAA;EAAA,CAAA,EAExB,GAAA,MAAA;EAAM,KAEb,CAAA,EAAA,aAAA;AAAa,CAAA;AAGN,UAAA,kBAAA,SAA2B,UAAR,CAAA;EAAA;EAAA,SAEN,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe,cACV,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe;EAGT,KANG,CAAA,OAAA,EAAA,MAAA,CAAA,EAMlB,eANkB;AAAU;AASrC,UAAA,0BAAA,CAA0B;EAAA;EAAA,OAI/B,EAAA,MAAA;EAAM;EAQK,OAAA,CAAA,EARX,MAQW,CAAA,MAAA,EAAA,MAAA,CAAA;EAQV;EAiDZ,QAAA,CAAA,EAAA,MAAA;EAAA;;AAAA;;UAzDS;;AC/BV;;;;;;;cDuCa,qCACD,+BACT;;;;cCzCU,uBAAA;;;;ADGb;;;;AAIuB;AAGvB;;AAE8B,cCAjB,0BDAiB,EAAA;EAAe,IACV,EAAA,MAAA;EAAe,WAGxB,EAAA,MAAA;EAAe,WANG,ECQ5B,CAAA,CAAA,MDR4B;EAAU,YAAA,UAAA;AAStD,CAAA;;;;;;;;;;AAhBA;;AAEiB,cEIJ,uBAAA,GFJI,oBAAA;;AAEM,cEKV,yBAAA,GFLU,sBAAA;AAGvB;AAAoC,cEKvB,0BAAA,GFLuB,uBAAA;;AAGD,KESvB,oBAAA,GFTuB;EAAe,CEU/C,uBAAuB,CFPA,EAAA,OAAA;CAAe;AANa;AASrC,KEQL,gBAAA,GFRK,mBAA0B,GAAA,UAAA,GAAA,QAAA;;AAI/B,UEOK,sBAAA,CFPL;EAAM,IAQR,CAAA,EAAA,MAAA;EAAa,QAAA,CAAA,EAAA,MAAA;EAQV,MAAA,CAAA,EAAA,MAAA;EAiDZ,WAAA,CAAA,EAAA,MAAA;EAAA,aAhDW,CAAA,EAAA,MAAA;EAA0B,iBACnC,CAAA,EAAA,MAAA;EA+CF,OAAA,CAAA,EAAA,OAAA;;;;ACxFD;;;;;;;iBCqDgB,sBAAA,6BAAmD;;;;ADzCnE;;;;;;iBC2DgB,oBAAA,WACJ,yBAAyB;;;;iBAQrB,qBAAA,WACJ,yBAAyB;;;;;AAxErC;;AAGA;;AAGa,iBAmFG,yBAAA,CAnFuB,IAAA,EAAA;yBAoFd;AA7EzB,CAAA,CAAA,EA8EI,sBA9EQ,GAAoB,SAC7B;;AAIH;;AAGA;;;;;;;;iBAwFgB,qBAAA;AAjEhB;;;;;;;iBA+EgB,mCAAA;;;AA7DhB,CAAA,CAAA,EAAgB,OAAA,GAAA,SAAA;;;;AAC2B;;;;AAQ3C;;AACY,iBAkFI,0BAAA,CAlFJ,OAAA,EAAA,OAAA,CAAA,EAkFkD,oBAlFlD;;AAA+B;;;;;;;;;AAiB3C;;;AAEI,iBAoFY,mBAAA,CApFZ,MAAA,EAAA,OAAA,CAAA,EAoFkD,gBApFlD;;;AAAsB"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../src/databricks-provider.ts","../src/tools.ts","../src/mcp.ts"],"sourcesContent":null,"mappings":";;;;;KAMY,6BAAA;;iBAEK;EAFL,GAAA,EAAA,CAAA,OAAA,EAAA;IAA6B,IAAA,EAAA,MAAA;EAAA,CAAA,EAExB,GAAA,MAAA;EAAM,KAEb,CAAA,EAAA,aAAA;AAAa,CAAA;AAGN,UAAA,kBAAA,SAA2B,UAAR,CAAA;EAAA;EAAA,SAEN,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe,SACf,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe;EAGM,eANP,CAAA,OAAA,EAAA,MAAA,CAAA,EAMR,eANQ;AAAU;AASrC,UAAA,0BAAA,CAA0B;EAAA;EAAA,OAI/B,EAAA,MAAA;EAAM;EAQK,OAAA,CAAA,EARX,MAQW,CAAA,MAAA,EAAA,MAAA,CAAA;EAQV;EAiDZ,QAAA,CAAA,EAAA,MAAA;EAAA;;AAAA;;UAzDS;;AC/BV;;;;;;;cDuCa,qCACD,+BACT;;;;cCzCU,uBAAA;;;;ADGb;;;;AAIuB;AAGvB;;AAE8B,cCAjB,0BDAiB,EAAA;EAAe,IACf,EAAA,MAAA;EAAe,WAGT,EAAA,MAAA;EAAe,WANP,ECQ5B,CAAA,CAAA,MDR4B;EAAU,YAAA,UAAA;AAStD,CAAA;;;;;;;;;;AAhBA;;AAEiB,cEIJ,uBAAA,GFJI,oBAAA;;AAEM,cEKV,yBAAA,GFLU,sBAAA;AAGvB;AAAoC,cEKvB,0BAAA,GFLuB,uBAAA;;AAGN,KESlB,oBAAA,GFTkB;EAAe,CEU1C,uBAAuB,CFPU,EAAA,OAAA;CAAe;AANG;AASrC,KEQL,gBAAA,GFRK,mBAA0B,GAAA,UAAA,GAAA,QAAA;;AAI/B,UEOK,sBAAA,CFPL;EAAM,IAQR,CAAA,EAAA,MAAA;EAAa,QAAA,CAAA,EAAA,MAAA;EAQV,MAAA,CAAA,EAAA,MAAA;EAiDZ,WAAA,CAAA,EAAA,MAAA;EAAA,aAhDW,CAAA,EAAA,MAAA;EAA0B,iBACnC,CAAA,EAAA,MAAA;EA+CF,OAAA,CAAA,EAAA,OAAA;;;;ACxFD;;;;;;;iBCqDgB,sBAAA,6BAAmD;;;;ADzCnE;;;;;;iBC2DgB,oBAAA,WACJ,yBAAyB;;;;iBAQrB,qBAAA,WACJ,yBAAyB;;;;;AAxErC;;AAGA;;AAGa,iBAmFG,yBAAA,CAnFuB,IAAA,EAAA;yBAoFd;AA7EzB,CAAA,CAAA,EA8EI,sBA9EQ,GAAoB,SAC7B;;AAIH;;AAGA;;;;;;;;iBAwFgB,qBAAA;AAjEhB;;;;;;;iBA+EgB,mCAAA;;;AA7DhB,CAAA,CAAA,EAAgB,OAAA,GAAA,SAAA;;;;AAC2B;;;;AAQ3C;;AACY,iBAkFI,0BAAA,CAlFJ,OAAA,EAAA,OAAA,CAAA,EAkFkD,oBAlFlD;;AAA+B;;;;;;;;;AAiB3C;;;AAEI,iBAoFY,mBAAA,CApFZ,MAAA,EAAA,OAAA,CAAA,EAoFkD,gBApFlD;;;AAAsB"}

package/dist/index.d.ts

@@ -14,9 +14,9 @@ type DatabricksLanguageModelConfig = {
 interface DatabricksProvider extends ProviderV2 {
   /** Agents */
   chatAgent(modelId: string): LanguageModelV2;
-  responsesAgent(modelId: string): LanguageModelV2;
-  /** FMAPI */
-  fmapi(modelId: string): LanguageModelV2;
+  responses(modelId: string): LanguageModelV2;
+  /** Foundation Models */
+  chatCompletions(modelId: string): LanguageModelV2;
 }
 interface DatabricksProviderSettings {
   /** Base URL for the Databricks API calls. */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/databricks-provider.ts","../src/tools.ts","../src/mcp.ts"],"sourcesContent":null,"mappings":";;;;;KAMY,6BAAA;;iBAEK;EAFL,GAAA,EAAA,CAAA,OAAA,EAAA;IAA6B,IAAA,EAAA,MAAA;EAAA,CAAA,EAExB,GAAA,MAAA;EAAM,KAEb,CAAA,EAAA,aAAA;AAAa,CAAA;AAGN,UAAA,kBAAA,SAA2B,UAAR,CAAA;EAAA;EAAA,SAEN,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe,cACV,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe;EAGT,KANG,CAAA,OAAA,EAAA,MAAA,CAAA,EAMlB,eANkB;AAAU;AASrC,UAAA,0BAAA,CAA0B;EAAA;EAAA,OAI/B,EAAA,MAAA;EAAM;EAQK,OAAA,CAAA,EARX,MAQW,CAAA,MAAA,EAAA,MAAA,CAAA;EAQV;EAiDZ,QAAA,CAAA,EAAA,MAAA;EAAA;;AAAA;;UAzDS;;AC/BV;;;;;;;cDuCa,qCACD,+BACT;;;;cCzCU,uBAAA;;;;ADGb;;;;AAIuB;AAGvB;;AAE8B,cCAjB,0BDAiB,EAAA;EAAe,IACV,EAAA,MAAA;EAAe,WAGxB,EAAA,MAAA;EAAe,WANG,ECQ5B,CAAA,CAAA,MDR4B;EAAU,YAAA,UAAA;AAStD,CAAA;;;;;;;;;;AAhBA;;AAEiB,cEIJ,uBAAA,GFJI,oBAAA;;AAEM,cEKV,yBAAA,GFLU,sBAAA;AAGvB;AAAoC,cEKvB,0BAAA,GFLuB,uBAAA;;AAGD,KESvB,oBAAA,GFTuB;EAAe,CEU/C,uBAAuB,CFPA,EAAA,OAAA;CAAe;AANa;AASrC,KEQL,gBAAA,GFRK,mBAA0B,GAAA,UAAA,GAAA,QAAA;;AAI/B,UEOK,sBAAA,CFPL;EAAM,IAQR,CAAA,EAAA,MAAA;EAAa,QAAA,CAAA,EAAA,MAAA;EAQV,MAAA,CAAA,EAAA,MAAA;EAiDZ,WAAA,CAAA,EAAA,MAAA;EAAA,aAhDW,CAAA,EAAA,MAAA;EAA0B,iBACnC,CAAA,EAAA,MAAA;EA+CF,OAAA,CAAA,EAAA,OAAA;;;;ACxFD;;;;;;;iBCqDgB,sBAAA,6BAAmD;;;;ADzCnE;;;;;;iBC2DgB,oBAAA,WACJ,yBAAyB;;;;iBAQrB,qBAAA,WACJ,yBAAyB;;;;;AAxErC;;AAGA;;AAGa,iBAmFG,yBAAA,CAnFuB,IAAA,EAAA;yBAoFd;AA7EzB,CAAA,CAAA,EA8EI,sBA9EQ,GAAoB,SAC7B;;AAIH;;AAGA;;;;;;;;iBAwFgB,qBAAA;AAjEhB;;;;;;;iBA+EgB,mCAAA;;;AA7DhB,CAAA,CAAA,EAAgB,OAAA,GAAA,SAAA;;;;AAC2B;;;;AAQ3C;;AACY,iBAkFI,0BAAA,CAlFJ,OAAA,EAAA,OAAA,CAAA,EAkFkD,oBAlFlD;;AAA+B;;;;;;;;;AAiB3C;;;AAEI,iBAoFY,mBAAA,CApFZ,MAAA,EAAA,OAAA,CAAA,EAoFkD,gBApFlD;;;AAAsB"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/databricks-provider.ts","../src/tools.ts","../src/mcp.ts"],"sourcesContent":null,"mappings":";;;;;KAMY,6BAAA;;iBAEK;EAFL,GAAA,EAAA,CAAA,OAAA,EAAA;IAA6B,IAAA,EAAA,MAAA;EAAA,CAAA,EAExB,GAAA,MAAA;EAAM,KAEb,CAAA,EAAA,aAAA;AAAa,CAAA;AAGN,UAAA,kBAAA,SAA2B,UAAR,CAAA;EAAA;EAAA,SAEN,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe,SACf,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,eAAA;EAAe;EAGM,eANP,CAAA,OAAA,EAAA,MAAA,CAAA,EAMR,eANQ;AAAU;AASrC,UAAA,0BAAA,CAA0B;EAAA;EAAA,OAI/B,EAAA,MAAA;EAAM;EAQK,OAAA,CAAA,EARX,MAQW,CAAA,MAAA,EAAA,MAAA,CAAA;EAQV;EAiDZ,QAAA,CAAA,EAAA,MAAA;EAAA;;AAAA;;UAzDS;;AC/BV;;;;;;;cDuCa,qCACD,+BACT;;;;cCzCU,uBAAA;;;;ADGb;;;;AAIuB;AAGvB;;AAE8B,cCAjB,0BDAiB,EAAA;EAAe,IACf,EAAA,MAAA;EAAe,WAGT,EAAA,MAAA;EAAe,WANP,ECQ5B,CAAA,CAAA,MDR4B;EAAU,YAAA,UAAA;AAStD,CAAA;;;;;;;;;;AAhBA;;AAEiB,cEIJ,uBAAA,GFJI,oBAAA;;AAEM,cEKV,yBAAA,GFLU,sBAAA;AAGvB;AAAoC,cEKvB,0BAAA,GFLuB,uBAAA;;AAGN,KESlB,oBAAA,GFTkB;EAAe,CEU1C,uBAAuB,CFPU,EAAA,OAAA;CAAe;AANG;AASrC,KEQL,gBAAA,GFRK,mBAA0B,GAAA,UAAA,GAAA,QAAA;;AAI/B,UEOK,sBAAA,CFPL;EAAM,IAQR,CAAA,EAAA,MAAA;EAAa,QAAA,CAAA,EAAA,MAAA;EAQV,MAAA,CAAA,EAAA,MAAA;EAiDZ,WAAA,CAAA,EAAA,MAAA;EAAA,aAhDW,CAAA,EAAA,MAAA;EAA0B,iBACnC,CAAA,EAAA,MAAA;EA+CF,OAAA,CAAA,EAAA,OAAA;;;;ACxFD;;;;;;;iBCqDgB,sBAAA,6BAAmD;;;;ADzCnE;;;;;;iBC2DgB,oBAAA,WACJ,yBAAyB;;;;iBAQrB,qBAAA,WACJ,yBAAyB;;;;;AAxErC;;AAGA;;AAGa,iBAmFG,yBAAA,CAnFuB,IAAA,EAAA;yBAoFd;AA7EzB,CAAA,CAAA,EA8EI,sBA9EQ,GAAoB,SAC7B;;AAIH;;AAGA;;;;;;;;iBAwFgB,qBAAA;AAjEhB;;;;;;;iBA+EgB,mCAAA;;;AA7DhB,CAAA,CAAA,EAAgB,OAAA,GAAA,SAAA;;;;AAC2B;;;;AAQ3C;;AACY,iBAkFI,0BAAA,CAlFJ,OAAA,EAAA,OAAA,CAAA,EAkFkD,oBAlFlD;;AAA+B;;;;;;;;;AAiB3C;;;AAEI,iBAoFY,mBAAA,CApFZ,MAAA,EAAA,OAAA,CAAA,EAoFkD,gBApFlD;;;AAAsB"}

package/dist/index.js

@@ -122,13 +122,13 @@ const convertLanguageModelV2PromptToChatAgentResponse = (prompt) => {
 	for (const msg of prompt) switch (msg.role) {
 		case "system": break;
 		case "user": {
-			const converted = convertUserMessage(msg, messageIndex);
+			const converted = convertUserMessage$1(msg, messageIndex);
 			messages.push(converted);
 			messageIndex++;
 			break;
 		}
 		case "assistant": {
-			const converted = convertAssistantMessage(msg, messageIndex);
+			const converted = convertAssistantMessage$1(msg, messageIndex);
 			messages.push(...converted);
 			messageIndex += converted.length;
 			break;
@@ -142,7 +142,7 @@ const convertLanguageModelV2PromptToChatAgentResponse = (prompt) => {
 	}
 	return messages;
 };
-const convertUserMessage = (msg, messageIndex) => {
+const convertUserMessage$1 = (msg, messageIndex) => {
 	const text = (msg.content ?? []).filter((part) => part.type === "text").map((part) => part.text).join("\n");
 	return {
 		role: "user",
@@ -150,7 +150,7 @@ const convertUserMessage = (msg, messageIndex) => {
 		id: `user-${messageIndex}`
 	};
 };
-const convertAssistantMessage = (msg, startIndex) => {
+const convertAssistantMessage$1 = (msg, startIndex) => {
 	const messages = [];
 	let messageIndex = startIndex;
 	const textContent = (msg.content ?? []).filter((part) => part.type === "text" || part.type === "reasoning").map((part) => part.type === "text" ? part.text : part.text).join("\n");
@@ -880,9 +880,12 @@ const convertResponsesAgentResponseToMessagePart = (response) => {
 			parts.push({
 				type: "tool-call",
 				toolCallId: output.call_id,
-				toolName: output.name,
+				toolName: DATABRICKS_TOOL_CALL_ID,
 				input: output.arguments,
-				providerMetadata: { databricks: { itemId: output.id } }
+				providerMetadata: { databricks: {
+					toolName: output.name,
+					itemId: output.id
+				} }
 			});
 			break;
 		case "reasoning":
@@ -987,7 +990,7 @@ async function convertToResponsesInput({ prompt, systemMessageMode }) {
 				const providerOptions = await parseProviderOptions({
 					provider: "databricks",
 					providerOptions: part.providerOptions,
-					schema: ProviderOptionsSchema
+					schema: ProviderOptionsSchema$1
 				});
 				const itemId = providerOptions?.itemId ?? void 0;
 				switch (part.type) {
@@ -1099,7 +1102,7 @@ async function convertToResponsesInput({ prompt, systemMessageMode }) {
 		warnings
 	};
 }
-const ProviderOptionsSchema = z.object({
+const ProviderOptionsSchema$1 = z.object({
 	itemId: z.string().nullish(),
 	toolName: z.string().nullish(),
 	type: z.enum(["mcp_approval_request", "mcp_approval_response"]).nullish(),
@@ -1116,6 +1119,52 @@ const convertToolResultOutputToString = (output) => {
 	}
 };
 
+//#endregion
+//#region src/responses-agent-language-model/responses-prepare-tools.ts
+/**
+* Prepare tools for the Responses API format.
+* Unlike the chat completions API, the responses API expects function tools
+* with name, description, and parameters at the top level (not nested under 'function').
+*/
+function prepareResponsesTools({ tools, toolChoice }) {
+	if (!tools || tools.length === 0) return {
+		tools: void 0,
+		toolChoice: void 0
+	};
+	const responsesTools = [];
+	for (const tool of tools) {
+		if (tool.type === "provider-defined" || tool.name === DATABRICKS_TOOL_CALL_ID) continue;
+		responsesTools.push({
+			type: "function",
+			name: tool.name,
+			description: tool.description,
+			parameters: tool.inputSchema
+		});
+	}
+	if (responsesTools.length === 0) return {
+		tools: void 0,
+		toolChoice: void 0
+	};
+	const convertedToolChoice = convertResponsesToolChoice(toolChoice);
+	return {
+		tools: responsesTools,
+		toolChoice: convertedToolChoice
+	};
+}
+function convertResponsesToolChoice(toolChoice) {
+	if (!toolChoice) return void 0;
+	switch (toolChoice.type) {
+		case "auto": return "auto";
+		case "none": return "none";
+		case "required": return "required";
+		case "tool": return {
+			type: "function",
+			name: toolChoice.toolName
+		};
+		default: return void 0;
+	}
+}
+
 //#endregion
 //#region src/responses-agent-language-model/responses-agent-language-model.ts
 function mapResponsesFinishReason({ finishReason, hasToolCalls }) {
@@ -1271,13 +1320,19 @@ var DatabricksResponsesAgentLanguageModel = class {
 			prompt: options.prompt,
 			systemMessageMode: "system"
 		});
+		const { tools, toolChoice } = prepareResponsesTools({
+			tools: options.tools,
+			toolChoice: options.toolChoice
+		});
 		return {
 			url: config.url({ path: "/responses" }),
 			headers: combineHeaders(config.headers(), options.headers),
 			body: {
 				model: modelId,
 				input,
-				stream
+				stream,
+				...tools ? { tools } : {},
+				...toolChoice && tools ? { tool_choice: toolChoice } : {}
 			},
 			fetch: config.fetch
 		};
@@ -1380,9 +1435,9 @@ const fmapiChunkSchema = z.object({
 	created: z.number(),
 	model: z.string(),
 	usage: z.object({
-		prompt_tokens: z.number(),
-		completion_tokens: z.number(),
-		total_tokens: z.number()
+		prompt_tokens: z.number().nullable().optional(),
+		completion_tokens: z.number().nullable().optional(),
+		total_tokens: z.number().nullable().optional()
 	}).nullable().optional(),
 	object: z.literal("chat.completion.chunk"),
 	choices: z.array(z.object({
@@ -1438,68 +1493,6 @@ const fmapiResponseSchema = z.object({
 	}))
 });
 
-//#endregion
-//#region src/fmapi-language-model/fmapi-tags.ts
-const TAGS = {
-	LEGACY_CALL_OPEN: "<uc_function_call>",
-	LEGACY_CALL_CLOSE: "</uc_function_call>",
-	LEGACY_RESULT_OPEN: "<uc_function_result>",
-	LEGACY_RESULT_CLOSE: "</uc_function_result>",
-	CALL_OPEN: "<tool_call>",
-	CALL_CLOSE: "</tool_call>",
-	RESULT_OPEN: "<tool_call_result>",
-	RESULT_CLOSE: "</tool_call_result>"
-};
-const tagSplitRegex = new RegExp(`(${escapeRegex(TAGS.LEGACY_CALL_OPEN)}.*?${escapeRegex(TAGS.LEGACY_CALL_CLOSE)}|${escapeRegex(TAGS.LEGACY_RESULT_OPEN)}.*?${escapeRegex(TAGS.LEGACY_RESULT_CLOSE)}|${escapeRegex(TAGS.CALL_OPEN)}.*?${escapeRegex(TAGS.CALL_CLOSE)}|${escapeRegex(TAGS.RESULT_OPEN)}.*?${escapeRegex(TAGS.RESULT_CLOSE)})`, "g");
-function parseTaggedToolCall(text) {
-	const inner = stripEnclosingTag(text, TAGS.LEGACY_CALL_OPEN, TAGS.LEGACY_CALL_CLOSE) ?? stripEnclosingTag(text, TAGS.CALL_OPEN, TAGS.CALL_CLOSE);
-	if (inner == null) return null;
-	try {
-		const parsed = JSON.parse(inner);
-		if (parsed && typeof parsed === "object" && "id" in parsed && "name" in parsed) return {
-			id: String(parsed.id),
-			name: String(parsed.name),
-			arguments: parsed.arguments
-		};
-	} catch {}
-	return null;
-}
-function parseTaggedToolResult(text) {
-	const inner = stripEnclosingTag(text, TAGS.LEGACY_RESULT_OPEN, TAGS.LEGACY_RESULT_CLOSE) ?? stripEnclosingTag(text, TAGS.RESULT_OPEN, TAGS.RESULT_CLOSE);
-	if (inner == null) return null;
-	try {
-		const parsed = JSON.parse(inner);
-		if (parsed && typeof parsed === "object" && "id" in parsed) return {
-			id: String(parsed.id),
-			content: parsed.content
-		};
-	} catch {}
-	return null;
-}
-function serializeToolCall(value) {
-	const payload = JSON.stringify({
-		id: value.id,
-		name: value.name,
-		arguments: value.arguments
-	});
-	return `${TAGS.CALL_OPEN}${payload}${TAGS.CALL_CLOSE}`;
-}
-function serializeToolResult(value) {
-	const payload = JSON.stringify({
-		id: value.id,
-		content: value.content
-	});
-	return `${TAGS.RESULT_OPEN}${payload}${TAGS.RESULT_CLOSE}`;
-}
-function stripEnclosingTag(text, open, close) {
-	const trimmed = text.trim();
-	if (trimmed.startsWith(open) && trimmed.endsWith(close)) return trimmed.slice(open.length, trimmed.length - close.length);
-	return null;
-}
-function escapeRegex(str) {
-	return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
 //#endregion
 //#region src/fmapi-language-model/fmapi-convert-to-message-parts.ts
 const convertFmapiChunkToMessagePart = (chunk, toolCallIdsByIndex) => {
@@ -1526,13 +1519,11 @@ const convertFmapiChunkToMessagePart = (chunk, toolCallIdsByIndex) => {
 		}
 	}
 	if (typeof choice.delta.content === "string") {
-		const extracted = extractPartsFromTextCompletion(choice.delta.content);
-		for (const part of extracted) if (part.type === "text") parts.push({
+		if (choice.delta.content) parts.push({
 			type: "text-delta",
 			id: chunk.id,
-			delta: part.text
+			delta: choice.delta.content
 		});
-		else parts.push(part);
 	} else if (Array.isArray(choice.delta.content)) parts.push(...mapContentItemsToStreamParts(choice.delta.content, chunk.id));
 	return parts;
 };
@@ -1548,56 +1539,22 @@ const convertFmapiResponseToMessagePart = (response) => {
 		});
 		return parts;
 	}
-	if (typeof choice.message.content === "string") {
-		const extracted = extractToolPartsFromText(choice.message.content);
-		if (extracted) for (const part of extracted) parts.push(part);
-		else parts.push({
-			type: "text",
-			text: choice.message.content
-		});
-	} else parts.push(...mapContentItemsToProviderContent(choice.message.content ?? []));
+	if (typeof choice.message.content === "string") parts.push({
+		type: "text",
+		text: choice.message.content
+	});
+	else parts.push(...mapContentItemsToProviderContent(choice.message.content ?? []));
 	return parts;
 };
 const convertToolCallToContent = (toolCall) => {
 	return {
 		type: "tool-call",
 		toolCallId: toolCall.id,
-		toolName: toolCall.function.name,
-		input: toolCall.function.arguments
+		toolName: DATABRICKS_TOOL_CALL_ID,
+		input: toolCall.function.arguments,
+		providerMetadata: { databricks: { toolName: toolCall.function.name } }
 	};
 };
-const extractPartsFromTextCompletion = (text) => {
-	const parts = text.split(tagSplitRegex);
-	const accumulated = [];
-	for (const segment of parts.filter((p) => p !== "")) {
-		const toolParts = extractToolPartsFromText(segment);
-		if (toolParts) accumulated.push(...toolParts);
-		else accumulated.push({
-			type: "text",
-			text: segment
-		});
-	}
-	return accumulated;
-};
-const extractToolPartsFromText = (text) => {
-	const trimmed = text.trim();
-	const call = parseTaggedToolCall(trimmed);
-	if (call) return [{
-		type: "tool-call",
-		input: typeof call.arguments === "string" ? call.arguments : JSON.stringify(call.arguments),
-		toolName: call.name,
-		toolCallId: call.id,
-		providerExecuted: true
-	}];
-	const result = parseTaggedToolResult(trimmed);
-	if (result) return [{
-		type: "tool-result",
-		result: result.content,
-		toolCallId: result.id,
-		toolName: DATABRICKS_TOOL_CALL_ID
-	}];
-	return null;
-};
 const mapContentItemsToStreamParts = (items, id) => {
 	const parts = [];
 	for (const item of items) switch (item.type) {
@@ -1643,43 +1600,38 @@ const mapContentItemsToProviderContent = (items) => {
 
 //#endregion
 //#region src/fmapi-language-model/fmapi-convert-to-input.ts
-const convertPromptToFmapiMessages = (prompt) => {
-	const messages = prompt.map((message) => {
-		const role = message.role === "system" ? "user" : message.role;
-		let contentItems = [];
-		switch (message.role) {
-			case "system":
-				contentItems = convertSystemContent(message);
-				break;
-			case "user":
-				contentItems = convertUserContent(message);
-				break;
-			case "assistant":
-				contentItems = convertAssistantContent(message);
-				break;
-			case "tool":
-				contentItems = convertToolContent(message);
-				break;
-		}
-		const content = contentItems.length === 0 ? "" : contentItems;
-		return {
-			role,
-			content
-		};
-	});
+const convertPromptToFmapiMessages = async (prompt) => {
+	const messages = [];
+	for (const message of prompt) switch (message.role) {
+		case "system":
+			messages.push(convertSystemMessage(message));
+			break;
+		case "user":
+			messages.push(convertUserMessage(message));
+			break;
+		case "assistant":
+			messages.push(await convertAssistantMessage(message));
+			break;
+		case "tool":
+			messages.push(...convertToolMessages(message));
+			break;
+	}
 	return { messages };
 };
-const convertSystemContent = (message) => {
-	return [{
-		type: "text",
-		text: message.content
-	}];
+const convertSystemMessage = (message) => {
+	return {
+		role: "system",
+		content: [{
+			type: "text",
+			text: message.content
+		}]
+	};
 };
-const convertUserContent = (message) => {
-	const items = [];
+const convertUserMessage = (message) => {
+	const content = [];
 	for (const part of message.content) switch (part.type) {
 		case "text":
-			items.push({
+			content.push({
 				type: "text",
 				text: part.text
 			});
@@ -1687,20 +1639,24 @@ const convertUserContent = (message) => {
 		case "file":
 			if (part.mediaType.startsWith("image/")) {
 				const url = toHttpUrlString(part.data);
-				if (url) items.push({
+				if (url) content.push({
 					type: "image",
 					image_url: url
 				});
 			}
 			break;
 	}
-	return items;
+	return {
+		role: "user",
+		content
+	};
 };
-const convertAssistantContent = (message) => {
-	const items = [];
+const convertAssistantMessage = async (message) => {
+	const contentItems = [];
+	const toolCalls = [];
 	for (const part of message.content) switch (part.type) {
 		case "text":
-			items.push({
+			contentItems.push({
 				type: "text",
 				text: part.text
 			});
@@ -1708,14 +1664,14 @@ const convertAssistantContent = (message) => {
 		case "file":
 			if (part.mediaType.startsWith("image/")) {
 				const url = toHttpUrlString(part.data);
-				if (url) items.push({
+				if (url) contentItems.push({
 					type: "image",
 					image_url: url
 				});
 			}
 			break;
 		case "reasoning":
-			items.push({
+			contentItems.push({
 				type: "reasoning",
 				summary: [{
 					type: "summary_text",
@@ -1723,38 +1679,36 @@ const convertAssistantContent = (message) => {
 				}]
 			});
 			break;
-		case "tool-call":
-			items.push({
-				type: "text",
-				text: serializeToolCall({
-					id: part.toolCallId,
-					name: part.toolName,
-					arguments: part.input
-				})
-			});
-			break;
-		case "tool-result":
-			items.push({
-				type: "text",
-				text: serializeToolResult({
-					id: part.toolCallId,
-					content: convertToolResultOutputToContentValue(part.output)
-				})
+		case "tool-call": {
+			const toolName = await getToolNameFromPart(part);
+			toolCalls.push({
+				id: part.toolCallId,
+				type: "function",
+				function: {
+					name: toolName,
+					arguments: typeof part.input === "string" ? part.input : JSON.stringify(part.input)
+				}
 			});
 			break;
+		}
 	}
-	return items;
+	return {
+		role: "assistant",
+		content: contentItems.length === 0 ? null : contentItems,
+		...toolCalls.length > 0 ? { tool_calls: toolCalls } : {}
+	};
 };
-const convertToolContent = (message) => {
-	const items = [];
-	for (const part of message.content) if (part.type === "tool-result") items.push({
-		type: "text",
-		text: serializeToolResult({
-			id: part.toolCallId,
-			content: convertToolResultOutputToContentValue(part.output)
-		})
-	});
-	return items;
+const convertToolMessages = (message) => {
+	const messages = [];
+	for (const part of message.content) if (part.type === "tool-result") {
+		const content = convertToolResultOutputToContentValue(part.output);
+		messages.push({
+			role: "tool",
+			tool_call_id: part.toolCallId,
+			content: typeof content === "string" ? content : JSON.stringify(content)
+		});
+	}
+	return messages;
 };
 const toHttpUrlString = (data) => {
 	if (data instanceof URL) return data.toString();
@@ -1773,6 +1727,15 @@ const convertToolResultOutputToContentValue = (output) => {
 		default: return null;
 	}
 };
+const ProviderOptionsSchema = z.object({ toolName: z.string().nullish() });
+const getToolNameFromPart = async (part) => {
+	const providerOptions = await parseProviderOptions({
+		provider: "databricks",
+		providerOptions: part.providerOptions,
+		schema: ProviderOptionsSchema
+	});
+	return providerOptions?.toolName ?? part.toolName;
+};
 
 //#endregion
 //#region src/fmapi-language-model/fmapi-language-model.ts
@@ -1789,7 +1752,7 @@ var DatabricksFmapiLanguageModel = class {
 	}
 	supportedUrls = {};
 	async doGenerate(options) {
-		const networkArgs = this.getArgs({
+		const networkArgs = await this.getArgs({
 			config: this.config,
 			options,
 			stream: false,
@@ -1819,7 +1782,7 @@ var DatabricksFmapiLanguageModel = class {
 		};
 	}
 	async doStream(options) {
-		const networkArgs = this.getArgs({
+		const networkArgs = await this.getArgs({
 			config: this.config,
 			options,
 			stream: true,
@@ -1869,9 +1832,9 @@ var DatabricksFmapiLanguageModel = class {
 					if (choice?.finish_reason === "stop") finishReason = "stop";
 					else if (choice?.finish_reason === "tool_calls") finishReason = "tool-calls";
 					if (chunk.value.usage) usage = {
-						inputTokens: chunk.value.usage.prompt_tokens,
-						outputTokens: chunk.value.usage.completion_tokens,
-						totalTokens: chunk.value.usage.total_tokens
+						inputTokens: chunk.value.usage.prompt_tokens ?? 0,
+						outputTokens: chunk.value.usage.completion_tokens ?? 0,
+						totalTokens: chunk.value.usage.total_tokens ?? 0
 					};
 					const parts = convertFmapiChunkToMessagePart(chunk.value, toolCallIdsByIndex);
 					for (const part of parts) {
@@ -1896,8 +1859,9 @@ var DatabricksFmapiLanguageModel = class {
 							controller.enqueue({
 								type: "tool-call",
 								toolCallId,
-								toolName,
-								input: inputText
+								toolName: DATABRICKS_TOOL_CALL_ID,
+								input: inputText,
+								providerMetadata: { databricks: { toolName } }
 							});
 						}
 					}
@@ -1912,14 +1876,15 @@ var DatabricksFmapiLanguageModel = class {
 			response: { headers: responseHeaders }
 		};
 	}
-	getArgs({ config, options, stream, modelId }) {
+	async getArgs({ config, options, stream, modelId }) {
 		const tools = options.tools?.map((tool) => convertToolToOpenAIFormat(tool)).filter((tool) => tool !== void 0);
 		const toolChoice = options.toolChoice ? convertToolChoiceToOpenAIFormat(options.toolChoice) : void 0;
+		const { messages } = await convertPromptToFmapiMessages(options.prompt);
 		return {
 			url: config.url({ path: "/chat/completions" }),
 			headers: combineHeaders(config.headers(), options.headers),
 			body: {
-				messages: convertPromptToFmapiMessages(options.prompt).messages,
+				messages,
 				stream,
 				model: modelId,
 				...tools && tools.length > 0 ? { tools } : {},
@@ -1995,9 +1960,9 @@ const createDatabricksProvider = (settings) => {
 		};
 	};
 	return {
+		responses: createResponsesAgent,
+		chatCompletions: createFmapi,
 		chatAgent: createChatAgent,
-		responsesAgent: createResponsesAgent,
-		fmapi: createFmapi,
 		imageModel: notImplemented("ImageModel"),
 		textEmbeddingModel: notImplemented("TextEmbeddingModel"),
 		languageModel: notImplemented("LanguageModel")