@codehz/ai 0.1.4 → 0.1.6

package/README.md

@@ -39,7 +39,7 @@ for await (const event of stream) {
 
 ```ts
 type AIRequest = {
-  instructions?: string; // 系统指令
+  instructions?: string | InstructionBlock[]; // 系统级指令
   input: InputItem[]; // 输入 items
   tools?: ToolDefinition[]; // 工具声明
   toolChoice?: ToolChoice; // 工具选择策略
@@ -53,7 +53,7 @@ type AIRequest = {
 
 | Item 类型     | 用途                                |
 | ------------- | ----------------------------------- |
-| `message`     | 用户 / 助手 / 系统消息              |
+| `message`     | 用户 / 助手消息                     |
 | `reasoning`   | 思维链（输入侧 replay）             |
 | `tool_call`   | 模型发起的工具调用（输入侧 replay） |
 | `tool_result` | 工具执行结果                        |

package/dist/index.d.mts

@@ -4,13 +4,16 @@
  *
  * 覆盖文本、JSON、图片、二进制引用和后端私有内容。
  */
-type ContentBlock = {
+type TextContentBlock = {
   type: "text";
   text: string;
-} | {
+};
+type JsonContentBlock = {
   type: "json";
   json: unknown;
-} | {
+};
+type InstructionBlock = TextContentBlock | JsonContentBlock;
+type ContentBlock = InstructionBlock | {
   type: "image";
   imageUrl: string;
 } | {
@@ -25,7 +28,7 @@ type ContentBlock = {
 type MessageItem = {
   type: "message";
   id?: string;
-  role: "user" | "assistant" | "system" | "developer";
+  role: "user" | "assistant";
   content: ContentBlock[];
 };
 type ReasoningItem = {
@@ -78,7 +81,7 @@ type IncludeSettings = {
   providerMetadata?: "off" | "best_effort";
 };
 type AIRequest = {
-  instructions?: string | ContentBlock[];
+  instructions?: string | InstructionBlock[];
   input: InputItem[];
   tools?: ToolDefinition[];
   toolChoice?: ToolChoice;
@@ -91,13 +94,13 @@ type AIRequest = {
 //#region src/types/response.d.ts
 type StopReason = "end_turn" | "tool_call" | "max_output_tokens" | "content_filter" | "error" | "unknown";
 type Usage = {
-  inputTokens?: number;
-  outputTokens?: number;
+  /** Provider prompt / input token count */inputTokens?: number; /** Provider completion / output token count */
+  outputTokens?: number; /** Reasoning tokens when provider exposes output breakdown (e.g. OpenAI Responses) */
   reasoningTokens?: number;
-  totalTokens?: number;
-  cachedInputTokens?: number;
-  cacheWriteInputTokens?: number;
-  billableInputTokens?: number;
+  totalTokens?: number; /** Tokens read from prompt cache (OpenAI cached_tokens, Anthropic cache_read_input_tokens) */
+  cachedInputTokens?: number; /** Tokens written to prompt cache (Anthropic cache_creation_input_tokens) */
+  cacheWriteInputTokens?: number; /** Best-effort billable input (full-rate input; excludes discounted cache reads where known) */
+  billableInputTokens?: number; /** Best-effort billable output (non-reasoning slice when provider gives reasoning breakdown) */
   billableOutputTokens?: number;
 };
 type BillingInfo = {
@@ -542,7 +545,7 @@ type ResponsesAPIRequest = {
 };
 type ResponsesInputItem = {
   type: "message";
-  role: "user" | "assistant" | "system" | "developer";
+  role: "user" | "assistant";
   content: string;
 } | {
   type: "message";
@@ -959,9 +962,9 @@ declare function blockToText(b: ContentBlock): string;
  */
 declare function contentBlocksToText(blocks: ContentBlock[]): string;
 /**
- * 将 instructions（string | ContentBlock[]）归一化为纯文本。
+ * 将 instructions（string | InstructionBlock[]）归一化为纯文本。
  */
-declare function instructionsToText(instructions: string | ContentBlock[]): string;
+declare function instructionsToText(instructions: string | InstructionBlock[]): string;
 /**
  * 从 OutputItem 数组中提取所有 message 类型 item 的文本内容。
  */
@@ -1043,5 +1046,49 @@ type SyntheticStreamOptions = {
  */
 declare function syntheticStream(options: SyntheticStreamOptions): AsyncIterable<AIStreamEvent>;
 //#endregion
-export { type AIClient, AIError, AIMappingError, AIProviderError, type AIRequest, AIRequestError, type AIResponse, AIStreamError, type AIStreamEvent, AdapterAuxiliaryState, AdapterBase, AuxiliaryCollector, type AuxiliaryFinalizeOptions, type AuxiliaryFinalizeResult, type AuxiliaryInfo, type BackendAdapter, type BackendTrace, type BillingInfo, type BillingPostprocessHook, type BillingSource, ChatCompletionsAdapter, type ChatCompletionsAdapterOptions, type ContentBlock, type CreateAIClientOptions, type EventFactory, type EventFactoryBackend, type EventFactoryState, type FetchFn, type IncludeSettings, type InputItem, type LookupResult, type MessageCompletedEvent, type MessageDeltaEvent, type MessageItem, type MessageStartedEvent, MessagesAdapter, type MessagesAdapterOptions, MockAdapter, type MockAdapterOptions, type MockAuxiliaryStep, type MockCompleteStep, type MockErrorStep, type MockHandler, type MockHandlerContext, type MockHistoryRecord, type MockInputExpectation, type MockInterruptStep, type MockMessageStep, type MockOutputStep, type MockReasoningStep, type MockRequestExpectation, type MockStaticHandler, type MockStep, type MockTextStreamOptions, type MockThrowStep, type MockToolCallStep, type MockWarningStep, type NormalizeOptions, type NormalizedRequest, OllamaAdapter, type OllamaAdapterOptions, type OpaqueItem, type OutputItem, type ReasoningCompletedEvent, type ReasoningDeltaEvent, type ReasoningItem, type ReasoningStartedEvent, type ReplayItem, type ResponseAuxiliaryEvent, type ResponseCompletedEvent, type ResponseStartedEvent, type ResponseWarningEvent, ResponsesAdapter, type ResponsesAdapterOptions, type SSEEvent, type StopReason, type StreamEventBase, type StreamResult, type SyntheticStreamOptions, type ToolCallCompletedEvent, type ToolCallDeltaEvent, type ToolCallItem, type ToolCallStartedEvent, type ToolChoice, type ToolDefinition, type ToolResultItem, type Usage, type UsageSource, type ValidationIssue, WarningCode, aggregateEvents, assertMockRequest, assertValidRequest, blockToText, collectStream, contentBlocksToText, createAIClient, createEventFactory, emitMalformedStreamWarning, extractText, imageBlock, instructionsToText, jsonBlock, mapReasoningVisibility, mapStopReason, messageItem, metadataSourceList, normalizeRequest, opaqueBlock, opaqueItem, parseSSEEvents, reasoningItem, replayFromOutput, syntheticStream, textBlock, toolCallItem, toolResultItem, validateRequest, withMockStreaming };
+//#region src/helpers/usage-mapping.d.ts
+/** OpenAI Chat Completions `usage` */
+declare function usageFromChatCompletions(raw: {
+  prompt_tokens?: number;
+  completion_tokens?: number;
+  total_tokens?: number;
+  prompt_tokens_details?: {
+    cached_tokens?: number;
+    [key: string]: unknown;
+  };
+  completion_tokens_details?: {
+    reasoning_tokens?: number;
+    [key: string]: unknown;
+  };
+}): Partial<Usage>;
+/** OpenAI Responses API `usage` */
+declare function usageFromOpenAIResponses(raw: {
+  input_tokens?: number;
+  output_tokens?: number;
+  total_tokens?: number;
+  input_tokens_details?: {
+    cached_tokens?: number;
+    [key: string]: unknown;
+  };
+  output_tokens_details?: {
+    reasoning_tokens?: number;
+    [key: string]: unknown;
+  };
+  [key: string]: unknown;
+}): Partial<Usage>;
+/** Anthropic Messages `usage`（message_start / message_delta） */
+declare function usageFromAnthropicMessages(raw: {
+  input_tokens?: number;
+  output_tokens?: number;
+  cache_creation_input_tokens?: number;
+  cache_read_input_tokens?: number;
+  [key: string]: unknown;
+}): Partial<Usage>;
+/** Ollama 流式 chunk（无 cache / reasoning 细分时仅填基础与 billable 镜像） */
+declare function usageFromOllama(raw: {
+  prompt_eval_count?: number;
+  eval_count?: number;
+}): Partial<Usage>;
+//#endregion
+export { type AIClient, AIError, AIMappingError, AIProviderError, type AIRequest, AIRequestError, type AIResponse, AIStreamError, type AIStreamEvent, AdapterAuxiliaryState, AdapterBase, AuxiliaryCollector, type AuxiliaryFinalizeOptions, type AuxiliaryFinalizeResult, type AuxiliaryInfo, type BackendAdapter, type BackendTrace, type BillingInfo, type BillingPostprocessHook, type BillingSource, ChatCompletionsAdapter, type ChatCompletionsAdapterOptions, type ContentBlock, type CreateAIClientOptions, type EventFactory, type EventFactoryBackend, type EventFactoryState, type FetchFn, type IncludeSettings, type InputItem, type InstructionBlock, type JsonContentBlock, type LookupResult, type MessageCompletedEvent, type MessageDeltaEvent, type MessageItem, type MessageStartedEvent, MessagesAdapter, type MessagesAdapterOptions, MockAdapter, type MockAdapterOptions, type MockAuxiliaryStep, type MockCompleteStep, type MockErrorStep, type MockHandler, type MockHandlerContext, type MockHistoryRecord, type MockInputExpectation, type MockInterruptStep, type MockMessageStep, type MockOutputStep, type MockReasoningStep, type MockRequestExpectation, type MockStaticHandler, type MockStep, type MockTextStreamOptions, type MockThrowStep, type MockToolCallStep, type MockWarningStep, type NormalizeOptions, type NormalizedRequest, OllamaAdapter, type OllamaAdapterOptions, type OpaqueItem, type OutputItem, type ReasoningCompletedEvent, type ReasoningDeltaEvent, type ReasoningItem, type ReasoningStartedEvent, type ReplayItem, type ResponseAuxiliaryEvent, type ResponseCompletedEvent, type ResponseStartedEvent, type ResponseWarningEvent, ResponsesAdapter, type ResponsesAdapterOptions, type SSEEvent, type StopReason, type StreamEventBase, type StreamResult, type SyntheticStreamOptions, type TextContentBlock, type ToolCallCompletedEvent, type ToolCallDeltaEvent, type ToolCallItem, type ToolCallStartedEvent, type ToolChoice, type ToolDefinition, type ToolResultItem, type Usage, type UsageSource, type ValidationIssue, WarningCode, aggregateEvents, assertMockRequest, assertValidRequest, blockToText, collectStream, contentBlocksToText, createAIClient, createEventFactory, emitMalformedStreamWarning, extractText, imageBlock, instructionsToText, jsonBlock, mapReasoningVisibility, mapStopReason, messageItem, metadataSourceList, normalizeRequest, opaqueBlock, opaqueItem, parseSSEEvents, reasoningItem, replayFromOutput, syntheticStream, textBlock, toolCallItem, toolResultItem, usageFromAnthropicMessages, usageFromChatCompletions, usageFromOllama, usageFromOpenAIResponses, validateRequest, withMockStreaming };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -63,12 +63,7 @@ const WarningCode = {
 };
 //#endregion
 //#region src/core/validation.ts
-const MESSAGE_ROLES = /* @__PURE__ */ new Set([
-	"user",
-	"assistant",
-	"system",
-	"developer"
-]);
+const MESSAGE_ROLES = /* @__PURE__ */ new Set(["user", "assistant"]);
 const REASONING_VISIBILITIES = /* @__PURE__ */ new Set([
 	"full",
 	"summary",
@@ -122,6 +117,19 @@ function validateContentArray(content, field, issues, code) {
 	}
 	for (let i = 0; i < content.length; i++) validateContentBlock(content[i], `${field}[${i}]`, issues);
 }
+function validateInstructionArray(content, field, issues) {
+	if (!Array.isArray(content)) {
+		pushIssue(issues, field, "INSTRUCTIONS_INVALID", `${field} must be an InstructionBlock[]`);
+		return;
+	}
+	for (let i = 0; i < content.length; i++) {
+		const block = content[i];
+		const blockField = `${field}[${i}]`;
+		validateContentBlock(block, blockField, issues);
+		if (!isRecord(block) || typeof block.type !== "string") continue;
+		if (block.type !== "text" && block.type !== "json") pushIssue(issues, blockField, "INSTRUCTIONS_INVALID", `${blockField} only supports text/json blocks`);
+	}
+}
 function validateInputItem(item, field, issues) {
 	if (!isRecord(item)) {
 		pushIssue(issues, field, "INPUT_INVALID_ITEM", `${field} must be a valid InputItem`);
@@ -192,8 +200,8 @@ function validateToolChoice(toolChoice, issues) {
 */
 function validateRequest(request) {
 	const issues = [];
-	if (request.instructions !== void 0) if (typeof request.instructions === "string") {} else if (Array.isArray(request.instructions)) validateContentArray(request.instructions, "instructions", issues, "INSTRUCTIONS_INVALID");
-	else pushIssue(issues, "instructions", "INSTRUCTIONS_INVALID", "instructions must be a string or ContentBlock[]");
+	if (request.instructions !== void 0) if (typeof request.instructions === "string") {} else if (Array.isArray(request.instructions)) validateInstructionArray(request.instructions, "instructions", issues);
+	else pushIssue(issues, "instructions", "INSTRUCTIONS_INVALID", "instructions must be a string or InstructionBlock[]");
 	if (!Array.isArray(request.input) || request.input.length === 0) pushIssue(issues, "input", "INPUT_EMPTY", "input must be a non-empty array");
 	if (Array.isArray(request.input)) for (let i = 0; i < request.input.length; i++) validateInputItem(request.input[i], `input[${i}]`, issues);
 	if (request.temperature !== void 0) {
@@ -713,7 +721,7 @@ function contentBlocksToText(blocks) {
 	return blocks.map(blockToText).join("\n");
 }
 /**
-* 将 instructions（string | ContentBlock[]）归一化为纯文本。
+* 将 instructions（string | InstructionBlock[]）归一化为纯文本。
 */
 function instructionsToText(instructions) {
 	return typeof instructions === "string" ? instructions : contentBlocksToText(instructions);
@@ -1003,6 +1011,93 @@ function mergeWarnings(...groups) {
 	return merged.length > 0 ? merged : void 0;
 }
 //#endregion
+//#region src/helpers/usage-mapping.ts
+function num(value) {
+	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function record(obj) {
+	const out = {};
+	for (const [key, value] of Object.entries(obj)) if (value !== void 0) out[key] = value;
+	return out;
+}
+function billableFromOpenAIStyle(inputTokens, outputTokens, cachedInputTokens, reasoningTokens) {
+	let billableInputTokens;
+	if (inputTokens !== void 0) billableInputTokens = cachedInputTokens !== void 0 ? Math.max(0, inputTokens - cachedInputTokens) : inputTokens;
+	let billableOutputTokens;
+	if (outputTokens !== void 0) billableOutputTokens = reasoningTokens !== void 0 ? Math.max(0, outputTokens - reasoningTokens) : outputTokens;
+	return record({
+		billableInputTokens,
+		billableOutputTokens
+	});
+}
+/** OpenAI Chat Completions `usage` */
+function usageFromChatCompletions(raw) {
+	const inputTokens = num(raw.prompt_tokens);
+	const outputTokens = num(raw.completion_tokens);
+	const cachedInputTokens = num(raw.prompt_tokens_details?.cached_tokens);
+	const reasoningTokens = num(raw.completion_tokens_details?.reasoning_tokens);
+	return record({
+		inputTokens,
+		outputTokens,
+		totalTokens: num(raw.total_tokens) ?? (inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0),
+		cachedInputTokens,
+		reasoningTokens,
+		...billableFromOpenAIStyle(inputTokens, outputTokens, cachedInputTokens, reasoningTokens)
+	});
+}
+/** OpenAI Responses API `usage` */
+function usageFromOpenAIResponses(raw) {
+	const inputTokens = num(raw.input_tokens);
+	const outputTokens = num(raw.output_tokens);
+	const cachedInputTokens = num(raw.input_tokens_details?.cached_tokens);
+	const reasoningTokens = num(raw.output_tokens_details?.reasoning_tokens);
+	return record({
+		inputTokens,
+		outputTokens,
+		totalTokens: num(raw.total_tokens) ?? (inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0),
+		cachedInputTokens,
+		reasoningTokens,
+		...billableFromOpenAIStyle(inputTokens, outputTokens, cachedInputTokens, reasoningTokens)
+	});
+}
+/** Anthropic Messages `usage`（message_start / message_delta） */
+function usageFromAnthropicMessages(raw) {
+	const inputTokens = num(raw.input_tokens);
+	const outputTokens = num(raw.output_tokens);
+	const cacheWriteInputTokens = num(raw.cache_creation_input_tokens);
+	const cachedInputTokens = num(raw.cache_read_input_tokens);
+	const inputParts = [
+		inputTokens,
+		cacheWriteInputTokens,
+		cachedInputTokens
+	].filter((n) => n !== void 0);
+	const summedInput = inputParts.length > 0 ? inputParts.reduce((sum, n) => sum + n, 0) : void 0;
+	const totalTokens = summedInput !== void 0 && outputTokens !== void 0 ? summedInput + outputTokens : void 0;
+	let billableInputTokens;
+	if (inputTokens !== void 0 || cacheWriteInputTokens !== void 0) billableInputTokens = (inputTokens ?? 0) + (cacheWriteInputTokens ?? 0);
+	return record({
+		inputTokens,
+		outputTokens,
+		totalTokens,
+		cachedInputTokens,
+		cacheWriteInputTokens,
+		billableInputTokens,
+		billableOutputTokens: outputTokens
+	});
+}
+/** Ollama 流式 chunk（无 cache / reasoning 细分时仅填基础与 billable 镜像） */
+function usageFromOllama(raw) {
+	const inputTokens = num(raw.prompt_eval_count);
+	const outputTokens = num(raw.eval_count);
+	return record({
+		inputTokens,
+		outputTokens,
+		totalTokens: inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0,
+		billableInputTokens: inputTokens,
+		billableOutputTokens: outputTokens
+	});
+}
+//#endregion
 //#region src/helpers/sse-parser.ts
 /**
 * 将 SSE 文本块解析为事件数组。
@@ -1305,11 +1400,7 @@ var ResponsesAdapter = class extends AdapterBase {
 		let rawResponseId;
 		if (completedResponse) {
 			rawResponseId = completedResponse.id;
-			if (completedResponse.usage) auxiliary.recordUsage({
-				inputTokens: completedResponse.usage.input_tokens,
-				outputTokens: completedResponse.usage.output_tokens,
-				totalTokens: completedResponse.usage.total_tokens
-			}, "final", completedResponse.usage);
+			if (completedResponse.usage) auxiliary.recordUsage(usageFromOpenAIResponses(completedResponse.usage), "final", completedResponse.usage);
 		}
 		const replay = [...replayFromOutput(output)];
 		if (completedResponse?.id) replay.push(opaqueItem("responses", "replay", { id: completedResponse.id }));
@@ -1380,6 +1471,10 @@ function parseMessagesSSE(chunk) {
 function rollbackTrailingAssistantMessages$2(messages) {
 	while (messages.length > 0 && messages[messages.length - 1]?.role === "assistant") messages.pop();
 }
+/** 用 response 级别的命名空间合成 content block 的 item ID，避免多轮工具循环 ID 碰撞 */
+function synthesizeItemId(kind, blockIndex, responseId) {
+	return `${kind}-${blockIndex}-${responseId}`;
+}
 function parseToolUseInput(input) {
 	try {
 		const parsed = JSON.parse(input);
@@ -1447,11 +1542,6 @@ var MessagesAdapter = class extends AdapterBase {
 		if (request.instructions) systemPrompt = instructionsToMessagesText(request.instructions);
 		for (const item of request.input) switch (item.type) {
 			case "message": {
-				if (item.role === "system" || item.role === "developer") {
-					const text = contentBlocksToText(ensureMessagesTextBlocks(item.content, `input message (${item.role}) content`));
-					systemPrompt = systemPrompt ? `${systemPrompt}\n${text}` : text;
-					break;
-				}
 				const role = item.role === "user" ? "user" : "assistant";
 				const supportedContent = ensureMessagesTextBlocks(item.content, `input message (${item.role}) content`);
 				if (supportedContent.length === 1 && supportedContent[0]?.type === "text") messages.push({
@@ -1581,7 +1671,7 @@ var MessagesAdapter = class extends AdapterBase {
 		let argsBuffer = "";
 		let stopReason;
 		let stopSequence;
-		let rawResponseId;
+		let rawResponseId = "";
 		if (request.include?.providerMetadata !== "off") {
 			const headerMetadata = pickProviderHeaders(response.headers);
 			auxiliary.recordProviderMetadata("header", Object.keys(headerMetadata).length > 0 ? { headers: headerMetadata } : void 0);
@@ -1618,14 +1708,14 @@ var MessagesAdapter = class extends AdapterBase {
 						switch (block.type) {
 							case "text":
 								currentItemType = "message";
-								currentItemId = `msg-${block.type}-${currentContentBlockIndex}`;
+								currentItemId = synthesizeItemId("msg", currentContentBlockIndex, rawResponseId);
 								textBuffer = "";
 								yield factory.messageStarted(currentItemId);
 								break;
 							case "thinking":
 								hasStreamedReasoning = true;
 								currentItemType = "reasoning";
-								currentItemId = `reason-${currentContentBlockIndex}`;
+								currentItemId = synthesizeItemId("reason", currentContentBlockIndex, rawResponseId);
 								currentThinkingVisibility = "full";
 								thinkingBuffer = "";
 								yield factory.reasoningStarted(currentItemId, "full");
@@ -1633,7 +1723,7 @@ var MessagesAdapter = class extends AdapterBase {
 							case "redacted_thinking": {
 								hasStreamedReasoning = true;
 								currentItemType = "reasoning";
-								currentItemId = `reason-redacted-${currentContentBlockIndex}`;
+								currentItemId = synthesizeItemId("reason-redacted", currentContentBlockIndex, rawResponseId);
 								currentThinkingVisibility = "redacted";
 								const data = block.data;
 								yield factory.reasoningStarted(currentItemId, "redacted");
@@ -1721,11 +1811,7 @@ var MessagesAdapter = class extends AdapterBase {
 						stopReason = sseEvent.data.delta.stop_reason;
 						stopSequence = sseEvent.data.delta.stop_sequence;
 						const u = sseEvent.data.usage;
-						if (u) auxiliary.recordUsage({
-							inputTokens: u.input_tokens,
-							outputTokens: u.output_tokens,
-							totalTokens: u.input_tokens + u.output_tokens
-						}, "stream", u);
+						if (u) auxiliary.recordUsage(usageFromAnthropicMessages(u), "stream", u);
 						continue;
 					}
 					case "message_stop": break;
@@ -1899,7 +1985,7 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 		}
 		for (const item of request.input) switch (item.type) {
 			case "message": {
-				const role = item.role === "developer" ? "system" : item.role === "system" ? "system" : item.role === "user" ? "user" : "assistant";
+				const role = item.role;
 				const text = contentBlocksToChatText(item.content, `input message (${item.role}) content`);
 				messages.push({
 					role,
@@ -2060,11 +2146,7 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 				if (malformedWarning) yield malformedWarning;
 				for (const chunk of chunks) {
 					responseId = chunk.id;
-					if (chunk.usage) auxiliary.recordUsage({
-						inputTokens: chunk.usage.prompt_tokens,
-						outputTokens: chunk.usage.completion_tokens,
-						totalTokens: chunk.usage.total_tokens
-					}, "final", chunk.usage);
+					if (chunk.usage) auxiliary.recordUsage(usageFromChatCompletions(chunk.usage), "final", chunk.usage);
 					for (const choice of chunk.choices) {
 						if (choice.index !== 0) continue;
 						const delta = choice.delta;
@@ -2289,7 +2371,7 @@ var OllamaAdapter = class extends AdapterBase {
 		});
 		for (const item of request.input) switch (item.type) {
 			case "message": {
-				const role = item.role === "developer" ? "system" : item.role === "system" ? "system" : item.role === "user" ? "user" : "assistant";
+				const role = item.role;
 				messages.push({
 					role,
 					content: contentBlocksToText(ensureOllamaTextBlocks(item.content, `input message (${item.role}) content`))
@@ -2434,11 +2516,10 @@ var OllamaAdapter = class extends AdapterBase {
 							yield factory.toolCallCompleted(toolCall);
 							output.push(toolCall);
 						}
-						if (request.include?.usage !== "off" && (chunk.prompt_eval_count !== void 0 || chunk.eval_count !== void 0)) auxiliary.recordUsage({
-							inputTokens: chunk.prompt_eval_count,
-							outputTokens: chunk.eval_count,
-							totalTokens: chunk.prompt_eval_count !== void 0 && chunk.eval_count !== void 0 ? chunk.prompt_eval_count + chunk.eval_count : void 0
-						}, "final", {
+						if (request.include?.usage !== "off" && (chunk.prompt_eval_count !== void 0 || chunk.eval_count !== void 0)) auxiliary.recordUsage(usageFromOllama({
+							prompt_eval_count: chunk.prompt_eval_count,
+							eval_count: chunk.eval_count
+						}), "final", {
 							prompt_eval_count: chunk.prompt_eval_count,
 							eval_count: chunk.eval_count
 						});
@@ -3003,6 +3084,6 @@ function* emitToolCallEvents(item, factory) {
 	yield factory.toolCallCompleted(item);
 }
 //#endregion
-export { AIError, AIMappingError, AIProviderError, AIRequestError, AIStreamError, AdapterAuxiliaryState, AdapterBase, AuxiliaryCollector, ChatCompletionsAdapter, MessagesAdapter, MockAdapter, OllamaAdapter, ResponsesAdapter, WarningCode, aggregateEvents, assertMockRequest, assertValidRequest, blockToText, collectStream, contentBlocksToText, createAIClient, createEventFactory, emitMalformedStreamWarning, extractText, imageBlock, instructionsToText, jsonBlock, mapReasoningVisibility, mapStopReason, messageItem, metadataSourceList, normalizeRequest, opaqueBlock, opaqueItem, parseSSEEvents, reasoningItem, replayFromOutput, syntheticStream, textBlock, toolCallItem, toolResultItem, validateRequest, withMockStreaming };
+export { AIError, AIMappingError, AIProviderError, AIRequestError, AIStreamError, AdapterAuxiliaryState, AdapterBase, AuxiliaryCollector, ChatCompletionsAdapter, MessagesAdapter, MockAdapter, OllamaAdapter, ResponsesAdapter, WarningCode, aggregateEvents, assertMockRequest, assertValidRequest, blockToText, collectStream, contentBlocksToText, createAIClient, createEventFactory, emitMalformedStreamWarning, extractText, imageBlock, instructionsToText, jsonBlock, mapReasoningVisibility, mapStopReason, messageItem, metadataSourceList, normalizeRequest, opaqueBlock, opaqueItem, parseSSEEvents, reasoningItem, replayFromOutput, syntheticStream, textBlock, toolCallItem, toolResultItem, usageFromAnthropicMessages, usageFromChatCompletions, usageFromOllama, usageFromOpenAIResponses, validateRequest, withMockStreaming };
 
 //# sourceMappingURL=index.mjs.map