@codehz/ai 0.7.0 → 0.7.1

package/dist/index.d.mts

@@ -227,7 +227,8 @@ declare const WarningCode: {
   readonly CONTENT_FILTER: "CONTENT_FILTER"; /** 多 choice 仅支持 index 0，其余忽略 */
   readonly MULTIPLE_CHOICES_IGNORED: "MULTIPLE_CHOICES_IGNORED"; /** MCP 审批流不被支持 */
   readonly MCP_APPROVAL_REQUIRED: "MCP_APPROVAL_REQUIRED"; /** provider 侧 response.failed 等失败 */
-  readonly PROVIDER_FAILURE: "PROVIDER_FAILURE";
+  readonly PROVIDER_FAILURE: "PROVIDER_FAILURE"; /** 出站 opaque 超限被省略（避免下一轮 accept 自产毒） */
+  readonly OPAQUE_REPLAY_OMITTED: "OPAQUE_REPLAY_OMITTED";
 };
 type WarningCodeName = (typeof WarningCode)[keyof typeof WarningCode];
 /** 与 WarningCodeName 同义；保留以兼容既有 KnownWarningCode 命名 */
@@ -836,6 +837,11 @@ type HttpAdapterOptions = {
   fetch?: FetchFn; /** 额外请求头；后写覆盖内置鉴权 / Content-Type 等 */
   headers?: Record<string, string>; /** 额外 body 顶层字段；浅层合并，同名键可覆盖 */
   extraBody?: Record<string, unknown>;
+  /**
+   * 单条 opaque replay payload 体积上限（JSON.stringify 码元长度）。
+   * 默认 1 MiB；夹到 [1, 8 MiB] 硬顶。emit 与 accept 共用。
+   */
+  maxOpaquePayloadBytes?: number;
 };
 type HttpAdapterDefaults = {
   baseUrl: string;
@@ -849,6 +855,8 @@ declare abstract class HttpAdapterBase extends AdapterBase {
   protected fetchFn: FetchFn;
   protected headers: Record<string, string> | undefined;
   protected extraBody: Record<string, unknown> | undefined;
+  /** 已 clamp 的 opaque 体积上限（emit / accept 共用）。 */
+  protected maxOpaquePayloadBytes: number;
   constructor(options: HttpAdapterOptions, defaults: HttpAdapterDefaults);
   /** 合并内置 headers 与构造期自定义 headers。 */
   protected mergeHeaders(base: Record<string, string>): Record<string, string>;

package/dist/index.mjs

@@ -74,7 +74,9 @@ const WarningCode = {
 	/** MCP 审批流不被支持 */
 	MCP_APPROVAL_REQUIRED: "MCP_APPROVAL_REQUIRED",
 	/** provider 侧 response.failed 等失败 */
-	PROVIDER_FAILURE: "PROVIDER_FAILURE"
+	PROVIDER_FAILURE: "PROVIDER_FAILURE",
+	/** 出站 opaque 超限被省略（避免下一轮 accept 自产毒） */
+	OPAQUE_REPLAY_OMITTED: "OPAQUE_REPLAY_OMITTED"
 };
 /**
 * 去重键：以 message 为主（与旧 string[] 行为一致）。
@@ -1558,10 +1560,23 @@ function applyExtraBody(body, extraBody) {
 /**
 * Adapter 边界安全辅助
 *
-* - opaque replay 入站 envelope（大小 / 深度）
+* - opaque replay envelope（大小 / 深度；emit 与 accept 共用）
 * - provider HTTP 错误 body 出站脱敏
 */
-const MAX_OPAQUE_PAYLOAD_BYTES = 65536;
+/** 默认单条 opaque payload 上限（JSON.stringify 的 UTF-16 码元长度）。 */
+const DEFAULT_MAX_OPAQUE_PAYLOAD_BYTES = 1 * 1024 * 1024;
+/** 硬顶：配置不可超过；挡住离谱 blob / DoS。 */
+const HARD_MAX_OPAQUE_PAYLOAD_BYTES = 8 * 1024 * 1024;
+/**
+* 将调用方配置的 opaque 上限夹到合法区间。
+* 非有限 / <1 → 默认；> HARD → HARD。
+*/
+function clampOpaquePayloadLimit(maxBytes) {
+	if (maxBytes === void 0 || !Number.isFinite(maxBytes)) return DEFAULT_MAX_OPAQUE_PAYLOAD_BYTES;
+	const n = Math.floor(maxBytes);
+	if (n < 1) return DEFAULT_MAX_OPAQUE_PAYLOAD_BYTES;
+	return Math.min(n, HARD_MAX_OPAQUE_PAYLOAD_BYTES);
+}
 /** 测量 JSON 值嵌套深度（对象/数组）；循环引用按已访问节点深度计。 */
 function measureJsonDepth(value, seen = /* @__PURE__ */ new WeakSet()) {
 	if (value === null || typeof value !== "object") return 0;
@@ -1573,10 +1588,10 @@ function measureJsonDepth(value, seen = /* @__PURE__ */ new WeakSet()) {
 	return 1 + maxChild;
 }
 /**
-* Opaque replay 通用 envelope：必须是 object、体积 ≤ 64KB、深度 ≤ 8。
-* 不校验 adapter 专用字段形状。
+* Opaque replay 通用 envelope：必须是 object、体积 ≤ limit、深度 ≤ 8。
+* 不校验 adapter 专用字段形状。emit / accept 共用。
 */
-function validateOpaqueReplayEnvelope(payload) {
+function validateOpaqueReplayEnvelope(payload, options) {
 	if (typeof payload !== "object" || payload === null) return {
 		ok: false,
 		reason: "payload must be an object"
@@ -1594,9 +1609,10 @@ function validateOpaqueReplayEnvelope(payload) {
 		ok: false,
 		reason: "payload is not JSON-serializable"
 	};
-	if (raw.length > 65536) return {
+	const maxBytes = clampOpaquePayloadLimit(options?.maxBytes);
+	if (raw.length > maxBytes) return {
 		ok: false,
-		reason: `opaque payload exceeds max size (${raw.length} > ${MAX_OPAQUE_PAYLOAD_BYTES})`
+		reason: `opaque payload exceeds max size (${raw.length} > ${maxBytes})`
 	};
 	const depth = measureJsonDepth(payload);
 	if (depth > 8) return {
@@ -1605,9 +1621,9 @@ function validateOpaqueReplayEnvelope(payload) {
 	};
 	return { ok: true };
 }
-/** envelope 失败时抛 AIRequestError。 */
-function assertOpaqueReplayEnvelope(payload) {
-	const result = validateOpaqueReplayEnvelope(payload);
+/** envelope 失败时抛 AIRequestError（入站 accept 路径）。 */
+function assertOpaqueReplayEnvelope(payload, options) {
+	const result = validateOpaqueReplayEnvelope(payload, options);
 	if (!result.ok) throw new AIRequestError(`Invalid opaque replay payload: ${result.reason}`, "INVALID_OPAQUE_REPLAY");
 }
 /**
@@ -1838,6 +1854,8 @@ var HttpAdapterBase = class extends AdapterBase {
 	fetchFn;
 	headers;
 	extraBody;
+	/** 已 clamp 的 opaque 体积上限（emit / accept 共用）。 */
+	maxOpaquePayloadBytes;
 	constructor(options, defaults) {
 		super();
 		this.apiKey = options.apiKey;
@@ -1845,6 +1863,7 @@ var HttpAdapterBase = class extends AdapterBase {
 		this.fetchFn = options.fetch ?? globalThis.fetch;
 		this.headers = options.headers;
 		this.extraBody = options.extraBody;
+		this.maxOpaquePayloadBytes = clampOpaquePayloadLimit(options.maxOpaquePayloadBytes);
 	}
 	/** 合并内置 headers 与构造期自定义 headers。 */
 	mergeHeaders(base) {
@@ -2130,14 +2149,26 @@ function createNdjsonLineParser(isValid) {
 //#region src/provider/finalize-stream-turn.ts
 /**
 * 收敛 incomplete / finish 后的 replay + complete 路径。
-* adapter 负责构造 opaque payload；本 helper 统一拼接 replay 并 complete。
+* adapter 负责构造 opaque payload；本 helper 统一校验体积、拼接 replay 并 complete。
+*
+* emit 与 accept 共用 envelope 上限：超限则省略 opaque（不截断）并打 warning，
+* 避免写出下一轮 accept 必炸的自产毒。
 */
 /**
 * 从 item session 生成 canonical replay，可选追加 opaque 尾项，再 yield session.complete。
+* 超限 opaque 会被丢弃并 yield `OPAQUE_REPLAY_OMITTED` warning。
 */
 async function* finalizeStreamTurn(session, items, options = {}) {
 	const replay = [...replayFromOutput(items.completedItems())];
-	if (options.opaque) replay.push(options.opaque);
+	let opaque = options.opaque ?? null;
+	if (opaque) {
+		const check = validateOpaqueReplayEnvelope(opaque.payload, { maxBytes: options.maxOpaquePayloadBytes });
+		if (!check.ok) {
+			if (options.factory) yield options.factory.responseWarning(`Omitted opaque replay payload: ${check.reason}`, WarningCode.OPAQUE_REPLAY_OMITTED);
+			opaque = null;
+		}
+	}
+	if (opaque) replay.push(opaque);
 	yield* session.complete({
 		replay,
 		stopReason: options.stopReason,
@@ -2163,7 +2194,7 @@ const OPAQUE_SOURCE = {
 * Opaque replay 统一协议（入站薄层）
 *
 * 过滤：仅 `source === expectedSource` 且 `purpose === "replay"` 才处理，否则忽略。
-* envelope：object / ≤64KB / depth≤8；失败抛 AIRequestError / INVALID_OPAQUE_REPLAY。
+* envelope：object / ≤limit（默认 1MiB，硬顶 8MiB）/ depth≤8；失败抛 AIRequestError / INVALID_OPAQUE_REPLAY。
 * 写入 wire 尾部 assistant/model turn 前：先 rollbackTrailing*，再 append（responses 续写 id 除外）。
 * 已知 shape 非法 → 抛 INVALID_OPAQUE_REPLAY；未知 shape → 静默跳过。
 */
@@ -2171,9 +2202,9 @@ const OPAQUE_SOURCE = {
 * 接受本 adapter 的 opaque replay payload。
 * source/purpose 不匹配返回 null；匹配则 assert envelope 后返回 payload object。
 */
-function acceptOpaqueReplay(item, expectedSource) {
+function acceptOpaqueReplay(item, expectedSource, options) {
 	if (item.source !== expectedSource || item.purpose !== "replay") return null;
-	assertOpaqueReplayEnvelope(item.payload);
+	assertOpaqueReplayEnvelope(item.payload, options);
 	return item.payload;
 }
 //#endregion
@@ -2465,7 +2496,7 @@ function appendCompactedWindow(input, payload) {
 * stream / compact 共享的 input + instructions + opaque 续写映射。
 * compact 不附带 tools / stream 等生成字段。
 */
-function mapResponsesCore(request) {
+function mapResponsesCore(request, options) {
 	const input = [];
 	let previousResponseId;
 	let usedCompactedWindow = false;
@@ -2499,7 +2530,7 @@ function mapResponsesCore(request) {
 			break;
 		}
 		case "opaque": {
-			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.RESPONSES);
+			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.RESPONSES, { maxBytes: options?.maxOpaquePayloadBytes });
 			if (!payload) break;
 			if (payload.kind === "compacted_window") {
 				assertOptionalIdFields(payload);
@@ -2530,8 +2561,8 @@ function mapResponsesCore(request) {
 	return mapped;
 }
 /** 构建 Responses 流式请求体；调用方再 `withExtraBody` 合并构造期扩展字段。 */
-function buildResponsesRequest(request) {
-	const core = mapResponsesCore(request);
+function buildResponsesRequest(request, options) {
+	const core = mapResponsesCore(request, options);
 	const body = {
 		model: request.model,
 		input: core.input,
@@ -2566,10 +2597,10 @@ function buildResponsesRequest(request) {
 * 构建 Responses compact 请求体（POST /responses/compact）。
 * 仅映射 model / input / instructions / previous_response_id；无 stream / tools。
 */
-function buildResponsesCompactRequest(request) {
+function buildResponsesCompactRequest(request, options) {
 	if (!request.model || typeof request.model !== "string" || request.model.length === 0) throw new AIRequestError("compress requires a non-empty model", "INPUT_EMPTY");
 	if (!Array.isArray(request.input) || request.input.length === 0) throw new AIRequestError("compress requires a non-empty input", "INPUT_EMPTY");
-	const core = mapResponsesCore(request);
+	const core = mapResponsesCore(request, options);
 	const body = {
 		model: request.model,
 		input: core.input
@@ -3321,7 +3352,7 @@ var ResponsesAdapter = class extends HttpAdapterBase {
 		super(options, { baseUrl: "https://api.openai.com/v1" });
 	}
 	buildRequest(request) {
-		return this.withExtraBody(buildResponsesRequest(request));
+		return this.withExtraBody(buildResponsesRequest(request, { maxOpaquePayloadBytes: this.maxOpaquePayloadBytes }));
 	}
 	/**
 	* 原生上下文压缩：POST /responses/compact。
@@ -3329,7 +3360,7 @@ var ResponsesAdapter = class extends HttpAdapterBase {
 	*/
 	async compress(request) {
 		request.signal?.throwIfAborted();
-		const body = this.withExtraBody(buildResponsesCompactRequest(request));
+		const body = this.withExtraBody(buildResponsesCompactRequest(request, { maxOpaquePayloadBytes: this.maxOpaquePayloadBytes }));
 		const { data } = await postProviderJson({
 			fetchFn: this.fetchFn,
 			url: `${this.baseUrl}/responses/compact`,
@@ -3346,6 +3377,7 @@ var ResponsesAdapter = class extends HttpAdapterBase {
 			output: data.output
 		};
 		if (typeof data.id === "string" && data.id.length > 0 && data.id.length <= 256) payload.id = data.id;
+		assertOpaqueReplayEnvelope(payload, { maxBytes: this.maxOpaquePayloadBytes });
 		const result = { replay: [opaqueItem(OPAQUE_SOURCE.RESPONSES, "replay", payload)] };
 		if (data.usage) {
 			const usage = usageFromOpenAIResponses(data.usage);
@@ -3394,6 +3426,8 @@ var ResponsesAdapter = class extends HttpAdapterBase {
 			}) : null,
 			stopReason,
 			rawResponseId,
+			factory,
+			maxOpaquePayloadBytes: this.maxOpaquePayloadBytes,
 			onDuplicate: "silent"
 		});
 	}
@@ -3436,7 +3470,7 @@ function canonicalToMessagesBlock(b) {
 	};
 	throw new AIRequestError(`messages does not support content block type "${b.type}" in canonical mapping`, "UNSUPPORTED_CONTENT_BLOCK");
 }
-function buildMessagesRequest(request) {
+function buildMessagesRequest(request, options) {
 	mapper$7.assertNoServerTools(request.serverTools);
 	const messages = [];
 	let systemPrompt;
@@ -3505,7 +3539,7 @@ function buildMessagesRequest(request) {
 				break;
 			}
 			case "opaque": {
-				const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.MESSAGES);
+				const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.MESSAGES, { maxBytes: options?.maxOpaquePayloadBytes });
 				if (!payload) break;
 				if (payload.role === "assistant" && "content" in payload) {
 					assertMessagesReplayContent(payload.content);
@@ -3743,6 +3777,8 @@ async function* mapMessagesStream(host, providerRequest, factory, request) {
 		}) : null,
 		stopReason: stopReason ? mapStopReason(stopReason) : void 0,
 		rawResponseId,
+		factory,
+		maxOpaquePayloadBytes: host.maxOpaquePayloadBytes,
 		onDuplicate: "silent"
 	});
 }
@@ -3762,7 +3798,7 @@ var MessagesAdapter = class extends HttpAdapterBase {
 		this.apiVersion = options.apiVersion ?? "2023-06-01";
 	}
 	buildRequest(request) {
-		return this.withExtraBody(buildMessagesRequest(request));
+		return this.withExtraBody(buildMessagesRequest(request, { maxOpaquePayloadBytes: this.maxOpaquePayloadBytes }));
 	}
 	async *runStream(providerRequest, factory, request) {
 		yield* mapMessagesStream({
@@ -3770,7 +3806,8 @@ var MessagesAdapter = class extends HttpAdapterBase {
 			baseUrl: this.baseUrl,
 			apiKey: this.apiKey,
 			mergeHeaders: this.mergeHeaders.bind(this),
-			apiVersion: this.apiVersion
+			apiVersion: this.apiVersion,
+			maxOpaquePayloadBytes: this.maxOpaquePayloadBytes
 		}, providerRequest, factory, request);
 	}
 };
@@ -3821,7 +3858,7 @@ function assertChatReplayMessages(messages, field) {
 	if (!Array.isArray(messages)) throw new AIRequestError(`Invalid opaque replay payload: ${field} must be an array`, "INVALID_OPAQUE_REPLAY");
 	for (let i = 0; i < messages.length; i++) if (!isChatReplayMessage(messages[i])) throw new AIRequestError(`Invalid opaque replay payload: ${field}[${i}] is not a valid chat message`, "INVALID_OPAQUE_REPLAY");
 }
-function buildChatCompletionsRequest(request) {
+function buildChatCompletionsRequest(request, options) {
 	mapper$5.assertNoServerTools(request.serverTools);
 	const messages = [];
 	if (request.instructions) messages.push({
@@ -3871,7 +3908,7 @@ function buildChatCompletionsRequest(request) {
 			});
 			break;
 		case "opaque": {
-			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.CHAT_COMPLETIONS);
+			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.CHAT_COMPLETIONS, { maxBytes: options?.maxOpaquePayloadBytes });
 			if (!payload) break;
 			if ("messages" in payload) {
 				assertChatReplayMessages(payload.messages, "messages");
@@ -4019,6 +4056,8 @@ async function* mapChatCompletionsStream(host, providerRequest, factory, request
 		yield* finalizeStreamTurn(session, items, {
 			stopReason,
 			rawResponseId,
+			factory,
+			maxOpaquePayloadBytes: host.maxOpaquePayloadBytes,
 			opaque: assistantReplayMessage ? opaqueItem(OPAQUE_SOURCE.CHAT_COMPLETIONS, "replay", {
 				replaceCanonical: true,
 				messages: [assistantReplayMessage]
@@ -4171,14 +4210,15 @@ var ChatCompletionsAdapter = class extends HttpAdapterBase {
 		super(options, { baseUrl: "https://api.openai.com/v1" });
 	}
 	buildRequest(request) {
-		return this.withExtraBody(buildChatCompletionsRequest(request));
+		return this.withExtraBody(buildChatCompletionsRequest(request, { maxOpaquePayloadBytes: this.maxOpaquePayloadBytes }));
 	}
 	async *runStream(providerRequest, factory, request) {
 		yield* mapChatCompletionsStream({
 			beginJsonStream: this.beginJsonStream.bind(this),
 			baseUrl: this.baseUrl,
 			apiKey: this.apiKey,
-			mergeHeaders: this.mergeHeaders.bind(this)
+			mergeHeaders: this.mergeHeaders.bind(this),
+			maxOpaquePayloadBytes: this.maxOpaquePayloadBytes
 		}, providerRequest, factory, request);
 	}
 };
@@ -4203,7 +4243,7 @@ function toWireOllamaToolCalls(toolCalls) {
 		arguments: tc.function.arguments
 	} }));
 }
-function buildOllamaRequest(request) {
+function buildOllamaRequest(request, options) {
 	mapper$3.assertNoServerTools(request.serverTools);
 	const messages = [];
 	/** Local-only name → call id queue for best-effort tool_result association (not sent to Ollama). */
@@ -4254,7 +4294,7 @@ function buildOllamaRequest(request) {
 			});
 			break;
 		case "opaque": {
-			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.OLLAMA);
+			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.OLLAMA, { maxBytes: options?.maxOpaquePayloadBytes });
 			if (!payload) break;
 			if (payload.role === "assistant" && typeof payload.content === "string") {
 				mapper$3.rollbackTrailingAssistantMessages(messages);
@@ -4339,6 +4379,8 @@ async function* mapOllamaStream(host, providerRequest, factory, request) {
 		yield* finalizeStreamTurn(session, items, {
 			stopReason,
 			rawResponseId,
+			factory,
+			maxOpaquePayloadBytes: host.maxOpaquePayloadBytes,
 			opaque: accumulatedContent || pendingToolCalls.length > 0 ? opaqueItem(OPAQUE_SOURCE.OLLAMA, "replay", {
 				role: "assistant",
 				content: accumulatedContent,
@@ -4417,14 +4459,15 @@ var OllamaAdapter = class extends HttpAdapterBase {
 		super(options, { baseUrl: "http://localhost:11434" });
 	}
 	buildRequest(request) {
-		return this.withExtraBody(buildOllamaRequest(request));
+		return this.withExtraBody(buildOllamaRequest(request, { maxOpaquePayloadBytes: this.maxOpaquePayloadBytes }));
 	}
 	async *runStream(providerRequest, factory, request) {
 		yield* mapOllamaStream({
 			beginJsonStream: this.beginJsonStream.bind(this),
 			baseUrl: this.baseUrl,
 			apiKey: this.apiKey,
-			mergeHeaders: this.mergeHeaders.bind(this)
+			mergeHeaders: this.mergeHeaders.bind(this),
+			maxOpaquePayloadBytes: this.maxOpaquePayloadBytes
 		}, providerRequest, factory, request);
 	}
 };
@@ -4474,7 +4517,7 @@ function cloneContent(content) {
 		parts: content.parts.map(clonePart$1)
 	};
 }
-function buildGeminiRequest(request) {
+function buildGeminiRequest(request, options) {
 	mapper$1.assertNoServerTools(request.serverTools);
 	const contents = [];
 	let systemInstruction;
@@ -4515,7 +4558,7 @@ function buildGeminiRequest(request) {
 			});
 			break;
 		case "opaque": {
-			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.GEMINI);
+			const payload = acceptOpaqueReplay(item, OPAQUE_SOURCE.GEMINI, { maxBytes: options?.maxOpaquePayloadBytes });
 			if (!payload) break;
 			if (payload.replaceCanonical === true && "content" in payload) {
 				assertGeminiReplayContent(payload.content, "content");
@@ -4628,6 +4671,8 @@ async function* mapGeminiStream(host, providerRequest, factory, request) {
 		yield* finalizeStreamTurn(session, items, {
 			stopReason: reason,
 			rawResponseId,
+			factory,
+			maxOpaquePayloadBytes: host.maxOpaquePayloadBytes,
 			opaque: replayParts.length > 0 ? opaqueItem(OPAQUE_SOURCE.GEMINI, "replay", {
 				replaceCanonical: true,
 				content: {
@@ -4713,14 +4758,15 @@ var GeminiAdapter = class extends HttpAdapterBase {
 		super(options, { baseUrl: "https://generativelanguage.googleapis.com/v1beta" });
 	}
 	buildRequest(request) {
-		return this.withExtraBody(buildGeminiRequest(request));
+		return this.withExtraBody(buildGeminiRequest(request, { maxOpaquePayloadBytes: this.maxOpaquePayloadBytes }));
 	}
 	async *runStream(providerRequest, factory, request) {
 		yield* mapGeminiStream({
 			beginJsonStream: this.beginJsonStream.bind(this),
 			baseUrl: this.baseUrl,
 			apiKey: this.apiKey,
-			mergeHeaders: this.mergeHeaders.bind(this)
+			mergeHeaders: this.mergeHeaders.bind(this),
+			maxOpaquePayloadBytes: this.maxOpaquePayloadBytes
 		}, providerRequest, factory, request);
 	}
 };