@codehz/ai 0.1.3 → 0.1.5

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);
@@ -1380,6 +1388,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 +1459,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 +1588,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 +1625,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 +1640,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");
@@ -1899,7 +1906,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,
@@ -2289,7 +2296,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`))
@@ -2511,20 +2518,35 @@ var OllamaAdapter = class extends AdapterBase {
 /**
 * Mock Adapter
 *
-* 面向测试的脚本化 adapter：
-* - 按 turn 顺序消费请求，验证调用方是否正确续接 replay / tool_result
+* 面向测试的回调驱动 adapter：
+* - 每次请求执行用户提供的 handler
+* - 验证调用方是否正确续接 replay / tool_result
 * - 发出可控的 message / reasoning / tool_call 流
 * - 注入 warning / auxiliary / content_filter / 中断 / provider error
 *
 * 这不是通用“假模型”，而是测试工具调用编排与错误路径的测试夹具。
 */
+function assertMockRequest(request, expectation, context) {
+	const prefix = `MockAdapter turn ${context.turnIndex + 1} expectation failed`;
+	if (expectation.minItems !== void 0 && request.input.length < expectation.minItems) throw new AIRequestError(`${prefix}: expected at least ${expectation.minItems} input item(s)`, "MOCK_EXPECTATION_FAILED");
+	if (expectation.maxItems !== void 0 && request.input.length > expectation.maxItems) throw new AIRequestError(`${prefix}: expected at most ${expectation.maxItems} input item(s)`, "MOCK_EXPECTATION_FAILED");
+	if (expectation.tools === "present" && (!request.tools || request.tools.length === 0)) throw new AIRequestError(`${prefix}: expected tools to be present`, "MOCK_EXPECTATION_FAILED");
+	if (expectation.tools === "absent" && request.tools && request.tools.length > 0) throw new AIRequestError(`${prefix}: expected tools to be absent`, "MOCK_EXPECTATION_FAILED");
+	if (expectation.toolChoice === "present" && request.toolChoice === void 0) throw new AIRequestError(`${prefix}: expected toolChoice to be present`, "MOCK_EXPECTATION_FAILED");
+	if (expectation.toolChoice === "absent" && request.toolChoice !== void 0) throw new AIRequestError(`${prefix}: expected toolChoice to be absent`, "MOCK_EXPECTATION_FAILED");
+	if (expectation.requireReplayFromPreviousTurn && context.previousReplay.length > 0) assertReplayIncluded(request.input, context.previousReplay, prefix);
+	if (expectation.requireToolResultsForPendingCalls && context.pendingToolCalls.length > 0) {
+		const toolResultIds = new Set(request.input.filter((item) => item.type === "tool_result").map((item) => item.callId));
+		for (const call of context.pendingToolCalls) if (!toolResultIds.has(call.id)) throw new AIRequestError(`${prefix}: expected tool_result for pending tool call "${call.id}"`, "MOCK_EXPECTATION_FAILED");
+	}
+	if (expectation.items && expectation.items.length > 0) if (expectation.ordered) assertOrderedItems(request.input, expectation.items, prefix);
+	else assertUnorderedItems(request.input, expectation.items, prefix);
+}
 var MockAdapter = class extends AdapterBase {
 	kind = "mock";
 	nativeStreaming = false;
-	turns;
-	onExhausted;
+	handler;
 	providerMetadata;
-	defaultStream;
 	cursor = 0;
 	previousReplay = [];
 	pendingToolCalls = [];
@@ -2532,25 +2554,19 @@ var MockAdapter = class extends AdapterBase {
 	activeStream = false;
 	constructor(options) {
 		super();
-		this.turns = options.turns;
-		this.onExhausted = options.onExhausted ?? "throw";
+		this.handler = options.handler;
 		this.providerMetadata = options.providerMetadata;
-		this.defaultStream = resolveMockTextStreamOptions(options.stream, "adapter stream");
 	}
 	async buildRequest(request) {
 		const turnIndex = this.cursor;
-		const turn = this.resolveTurn(turnIndex);
-		const turnName = turn.name;
-		const context = this.buildTurnContext(turnIndex);
-		if (turn.expect) if (typeof turn.expect === "function") await turn.expect(request, context);
-		else assertRequestMatchesExpectation(request, turn.expect, context);
+		const context = this.buildHandlerContext(turnIndex);
 		const remainingPendingToolCalls = consumePendingToolCalls(this.pendingToolCalls, request.input);
+		const handlerResult = this.handler(request, context);
 		this.cursor += 1;
 		return {
 			request,
-			turn,
+			handlerResult,
 			turnIndex,
-			turnName,
 			remainingPendingToolCalls
 		};
 	}
@@ -2560,76 +2576,79 @@ var MockAdapter = class extends AdapterBase {
 		try {
 			const mockRequest = providerRequest;
 			const output = [];
-			for (const [stepIndex, step] of mockRequest.turn.steps.entries()) switch (step.type) {
-				case "warning":
-					yield factory.responseWarning(step.message, step.code);
-					break;
-				case "auxiliary":
-					yield factory.responseAuxiliary({
-						usage: step.usage,
-						billing: step.billing,
-						auxiliary: step.auxiliary
-					});
-					break;
-				case "message": {
-					const item = createMessageFromStep(step, request, mockRequest.turnIndex, stepIndex);
-					yield* emitMessage(factory, item, resolveStepStreamOptions(this.defaultStream, step.stream, "message"));
-					output.push(item);
-					break;
-				}
-				case "reasoning": {
-					const item = createReasoningFromStep(step, request, mockRequest.turnIndex, stepIndex);
-					yield* emitReasoning(factory, item, resolveStepStreamOptions(this.defaultStream, step.stream, "reasoning"));
-					output.push(item);
-					break;
-				}
-				case "tool_call": {
-					const item = createToolCallFromStep(step);
-					yield* emitToolCall(factory, item, step.streamArguments ?? true, resolveStepStreamOptions(this.defaultStream, step.stream, "tool_call"));
-					output.push(item);
-					break;
-				}
-				case "output": {
-					assertSupportedOutputItem(step.item);
-					const item = attachSyntheticId(step.item, request, mockRequest.turnIndex, stepIndex);
-					yield* emitOutputItem(factory, item, resolveStepStreamOptions(this.defaultStream, step.stream, "output"));
-					output.push(item);
-					break;
-				}
-				case "complete": {
-					const response = this.finalizeTurn(request, factory, mockRequest, output, step);
-					yield factory.responseCompleted(response);
-					return;
-				}
-				case "error": {
-					yield factory.responseWarning(step.message, step.code);
-					const response = this.finalizeTurn(request, factory, mockRequest, output, {
-						type: "complete",
-						stopReason: step.stopReason ?? "error",
-						providerMetadata: step.providerMetadata
-					});
-					yield factory.responseCompleted(response);
-					return;
+			let stepCount = 0;
+			for await (const step of mockRequest.handlerResult) {
+				stepCount += 1;
+				switch (step.type) {
+					case "warning":
+						yield factory.responseWarning(step.message, step.code);
+						break;
+					case "auxiliary":
+						yield factory.responseAuxiliary({
+							usage: step.usage,
+							billing: step.billing,
+							auxiliary: step.auxiliary
+						});
+						break;
+					case "message": {
+						const item = createMessageFromStep(step, request, mockRequest.turnIndex, stepCount - 1);
+						yield* emitMessage(factory, item, resolveStepStreamOptions(void 0, step.stream, "message"));
+						output.push(item);
+						break;
+					}
+					case "reasoning": {
+						const item = createReasoningFromStep(step, request, mockRequest.turnIndex, stepCount - 1);
+						yield* emitReasoning(factory, item, resolveStepStreamOptions(void 0, step.stream, "reasoning"));
+						output.push(item);
+						break;
+					}
+					case "tool_call": {
+						const item = createToolCallFromStep(step);
+						yield* emitToolCall(factory, item, step.streamArguments ?? true, resolveStepStreamOptions(void 0, step.stream, "tool_call"));
+						output.push(item);
+						break;
+					}
+					case "output": {
+						assertSupportedOutputItem(step.item);
+						const item = attachSyntheticId(step.item, request, mockRequest.turnIndex, stepCount - 1);
+						yield* emitOutputItem(factory, item, resolveStepStreamOptions(void 0, step.stream, "output"));
+						output.push(item);
+						break;
+					}
+					case "complete": {
+						const response = this.finalizeTurn(request, factory, mockRequest, output, step, stepCount);
+						yield factory.responseCompleted(response);
+						return;
+					}
+					case "error": {
+						yield factory.responseWarning(step.message, step.code);
+						const response = this.finalizeTurn(request, factory, mockRequest, output, {
+							type: "complete",
+							stopReason: step.stopReason ?? "error",
+							providerMetadata: step.providerMetadata
+						}, stepCount);
+						yield factory.responseCompleted(response);
+						return;
+					}
+					case "interrupt":
+						this.pendingToolCalls = mockRequest.remainingPendingToolCalls;
+						return;
+					case "throw": throw typeof step.error === "string" ? new Error(step.error) : step.error;
 				}
-				case "interrupt":
-					this.pendingToolCalls = mockRequest.remainingPendingToolCalls;
-					return;
-				case "throw": throw typeof step.error === "string" ? new Error(step.error) : step.error;
 			}
-			const response = this.finalizeTurn(request, factory, mockRequest, output, { type: "complete" });
+			const response = this.finalizeTurn(request, factory, mockRequest, output, { type: "complete" }, stepCount);
 			yield factory.responseCompleted(response);
 		} finally {
 			this.activeStream = false;
 		}
 	}
-	finalizeTurn(request, factory, mockRequest, output, completion) {
+	finalizeTurn(request, factory, mockRequest, output, completion, stepCount) {
 		const replay = completion.replay ?? replayFromOutput(output);
 		const toolCalls = output.filter((item) => item.type === "tool_call");
 		this.previousReplay = replay;
 		this.pendingToolCalls = [...mockRequest.remainingPendingToolCalls, ...toolCalls];
 		this.history.push({
 			turnIndex: mockRequest.turnIndex,
-			turnName: mockRequest.turnName,
 			requestId: request.requestId,
 			replay,
 			toolCalls
@@ -2643,8 +2662,7 @@ var MockAdapter = class extends AdapterBase {
 			auxiliary: completion.auxiliary,
 			providerMetadata: {
 				turnIndex: mockRequest.turnIndex,
-				turnName: mockRequest.turnName,
-				scriptedSteps: mockRequest.turn.steps.length,
+				stepCount,
 				pendingToolCallIds: this.pendingToolCalls.map((item) => item.id),
 				historyLength: this.history.length,
 				...this.providerMetadata,
@@ -2655,18 +2673,7 @@ var MockAdapter = class extends AdapterBase {
 			rawResponseId: completion.rawResponseId
 		}, factory);
 	}
-	resolveTurn(turnIndex) {
-		const turn = this.turns[turnIndex];
-		if (turn !== void 0) return turn;
-		const lastTurn = this.turns.at(-1);
-		if (this.onExhausted === "repeat-last" && lastTurn !== void 0) return lastTurn;
-		if (this.onExhausted === "complete-empty") return {
-			name: "exhausted",
-			steps: []
-		};
-		throw new AIRequestError(`MockAdapter turn ${turnIndex + 1} requested, but only ${this.turns.length} turn(s) were scripted`, "MOCK_TURN_EXHAUSTED");
-	}
-	buildTurnContext(turnIndex) {
+	buildHandlerContext(turnIndex) {
 		return {
 			turnIndex,
 			previousReplay: this.previousReplay.map(cloneItem),
@@ -2679,6 +2686,32 @@ var MockAdapter = class extends AdapterBase {
 		};
 	}
 };
+function withMockStreaming(handler, options) {
+	const defaults = resolveMockTextStreamOptions(options, "mock stream wrapper");
+	if (!defaults) throw new AIRequestError("mock stream wrapper requires streaming options", "MOCK_STREAM_CONFIG_INVALID");
+	return async function* streamWrappedHandler(request, context) {
+		const source = await handler(request, context);
+		for await (const step of source) yield applyDefaultStreaming(step, defaults);
+	};
+}
+function applyDefaultStreaming(step, defaults) {
+	switch (step.type) {
+		case "message":
+		case "reasoning":
+		case "tool_call":
+		case "output":
+			if (step.stream !== void 0) return step;
+			return {
+				...step,
+				stream: {
+					charsPerSecond: defaults.charsPerSecond,
+					chunkSize: defaults.chunkSize,
+					initialDelayMs: defaults.initialDelayMs
+				}
+			};
+		default: return step;
+	}
+}
 function createMessageFromStep(step, request, turnIndex, stepIndex) {
 	return {
 		...messageItem(normalizeBlocks(step.content), { id: step.id ?? `mock-msg-${request.requestId}-${turnIndex}-${stepIndex}` }),
@@ -2811,22 +2844,6 @@ function consumePendingToolCalls(pending, input) {
 	const fulfilledIds = new Set(input.filter((item) => item.type === "tool_result").map((item) => item.callId));
 	return pending.filter((item) => !fulfilledIds.has(item.id)).map(cloneItem);
 }
-function assertRequestMatchesExpectation(request, expectation, context) {
-	const prefix = `MockAdapter turn ${context.turnIndex + 1} expectation failed`;
-	if (expectation.minItems !== void 0 && request.input.length < expectation.minItems) throw new AIRequestError(`${prefix}: expected at least ${expectation.minItems} input item(s)`, "MOCK_EXPECTATION_FAILED");
-	if (expectation.maxItems !== void 0 && request.input.length > expectation.maxItems) throw new AIRequestError(`${prefix}: expected at most ${expectation.maxItems} input item(s)`, "MOCK_EXPECTATION_FAILED");
-	if (expectation.tools === "present" && (!request.tools || request.tools.length === 0)) throw new AIRequestError(`${prefix}: expected tools to be present`, "MOCK_EXPECTATION_FAILED");
-	if (expectation.tools === "absent" && request.tools && request.tools.length > 0) throw new AIRequestError(`${prefix}: expected tools to be absent`, "MOCK_EXPECTATION_FAILED");
-	if (expectation.toolChoice === "present" && request.toolChoice === void 0) throw new AIRequestError(`${prefix}: expected toolChoice to be present`, "MOCK_EXPECTATION_FAILED");
-	if (expectation.toolChoice === "absent" && request.toolChoice !== void 0) throw new AIRequestError(`${prefix}: expected toolChoice to be absent`, "MOCK_EXPECTATION_FAILED");
-	if (expectation.requireReplayFromPreviousTurn && context.previousReplay.length > 0) assertReplayIncluded(request.input, context.previousReplay, prefix);
-	if (expectation.requireToolResultsForPendingCalls && context.pendingToolCalls.length > 0) {
-		const toolResultIds = new Set(request.input.filter((item) => item.type === "tool_result").map((item) => item.callId));
-		for (const call of context.pendingToolCalls) if (!toolResultIds.has(call.id)) throw new AIRequestError(`${prefix}: expected tool_result for pending tool call "${call.id}"`, "MOCK_EXPECTATION_FAILED");
-	}
-	if (expectation.items && expectation.items.length > 0) if (expectation.ordered) assertOrderedItems(request.input, expectation.items, prefix);
-	else assertUnorderedItems(request.input, expectation.items, prefix);
-}
 function assertReplayIncluded(input, replay, prefix) {
 	const fingerprints = input.map(fingerprintItem);
 	let cursor = 0;
@@ -2993,6 +3010,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, 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 };
+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 };
 
 //# sourceMappingURL=index.mjs.map