ghc-proxy 0.5.7 → 0.5.8

package/dist/main.mjs

@@ -2,9 +2,9 @@
 import { createRequire } from "node:module";
 import process$1 from "node:process";
 import { formatWithOptions, parseArgs, promisify } from "node:util";
-import path, { sep } from "node:path";
+import path, { join, sep } from "node:path";
 import * as tty from "node:tty";
-import fs from "node:fs/promises";
+import fs, { mkdir, readdir, unlink, writeFile } from "node:fs/promises";
 import os from "node:os";
 import { randomUUID } from "node:crypto";
 import { execFile, execFileSync } from "node:child_process";
@@ -6579,7 +6579,7 @@ const checkUsage = defineCommand({
 
 //#endregion
 //#region src/lib/version.ts
-const VERSION = "0.5.7";
+const VERSION = "0.5.8";
 
 //#endregion
 //#region src/debug.ts
@@ -18538,7 +18538,7 @@ var require_snapshot_utils = /* @__PURE__ */ __commonJSMin$1(((exports, module)
 //#endregion
 //#region node_modules/undici/lib/mock/snapshot-recorder.js
 var require_snapshot_recorder = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
-	const { writeFile, readFile, mkdir } = __require$1("node:fs/promises");
+	const { writeFile: writeFile$1, readFile, mkdir: mkdir$1 } = __require$1("node:fs/promises");
 	const { dirname, resolve } = __require$1("node:path");
 	const { setTimeout: setTimeout$1, clearTimeout: clearTimeout$1 } = __require$1("node:timers");
 	const { InvalidArgumentError, UndiciError } = require_errors();
@@ -18825,12 +18825,12 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJSMin$1(((exports, modul
 			const path = filePath || this.#snapshotPath;
 			if (!path) throw new InvalidArgumentError("Snapshot path is required");
 			const resolvedPath = resolve(path);
-			await mkdir(dirname(resolvedPath), { recursive: true });
+			await mkdir$1(dirname(resolvedPath), { recursive: true });
 			const data = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
 				hash,
 				snapshot
 			}));
-			await writeFile(resolvedPath, JSON.stringify(data, null, 2), { flush: true });
+			await writeFile$1(resolvedPath, JSON.stringify(data, null, 2), { flush: true });
 		}
 		/**
 		* Clears all recorded snapshots
@@ -47639,8 +47639,11 @@ function normalizeSystemBlocks(system) {
 	}];
 }
 function normalizeToolResultContent(block) {
-	if (typeof block.content === "string") return [textBlock(block.content)];
-	return block.content.map((contentBlock) => {
+	return normalizeToolResultContentValue(block.content);
+}
+function normalizeToolResultContentValue(content) {
+	if (typeof content === "string") return [textBlock(content)];
+	return content.map((contentBlock) => {
 		switch (contentBlock.type) {
 			case "text": return textBlock(contentBlock.text);
 			case "image": return imageBlock(contentBlock.source.media_type, contentBlock.source.data);
@@ -47648,6 +47651,15 @@ function normalizeToolResultContent(block) {
 		}
 	});
 }
+function normalizeMcpToolResultContent(block) {
+	return normalizeToolResultContentValue(block.content);
+}
+function normalizeServerToolResultContent(block) {
+	return [textBlock(typeof block.content === "string" ? block.content : JSON.stringify(block.content) ?? "")];
+}
+function describeDocumentBlock(block) {
+	return `[document attachment omitted: ${typeof block.source.type === "string" ? block.source.type : "unknown"}]`;
+}
 function normalizeMessage(message) {
 	if (typeof message.content === "string") return {
 		role: message.role,
@@ -47662,7 +47674,13 @@ function normalizeMessage(message) {
 				thinking: block.thinking,
 				signature: block.signature
 			};
-			case "tool_use": return {
+			case "redacted_thinking": return {
+				kind: "redacted_thinking",
+				data: block.data
+			};
+			case "tool_use":
+			case "server_tool_use":
+			case "mcp_tool_use": return {
 				kind: "tool_use",
 				id: block.id,
 				name: block.name,
@@ -47674,6 +47692,25 @@ function normalizeMessage(message) {
 				content: normalizeToolResultContent(block),
 				isError: block.is_error
 			};
+			case "mcp_tool_result": return {
+				kind: "tool_result",
+				toolUseId: block.tool_use_id,
+				content: normalizeMcpToolResultContent(block),
+				isError: block.is_error
+			};
+			case "server_tool_result":
+			case "web_search_tool_result":
+			case "web_fetch_tool_result":
+			case "code_execution_tool_result":
+			case "bash_code_execution_tool_result":
+			case "text_editor_code_execution_tool_result":
+			case "tool_search_tool_result": return {
+				kind: "tool_result",
+				toolUseId: block.tool_use_id,
+				content: normalizeServerToolResultContent(block),
+				isError: block.is_error
+			};
+			case "document": return textBlock(describeDocumentBlock(block));
 			default: return assertNever(block);
 		}
 	});
@@ -48038,6 +48075,10 @@ function mapBlocks(response) {
 				thinking: block.thinking,
 				signature: block.signature
 			};
+			case "redacted_thinking": return {
+				type: "redacted_thinking",
+				data: block.data
+			};
 			case "tool_use": return {
 				type: "tool_use",
 				id: block.id,
@@ -48212,6 +48253,10 @@ function toConversationBlock(block) {
 			text: block.thinking,
 			signature: block.signature
 		};
+		case "redacted_thinking": return {
+			kind: "redacted_thinking",
+			data: block.data
+		};
 		case "tool_use": return {
 			kind: "tool_use",
 			id: block.id,
@@ -48260,6 +48305,9 @@ function recordAnthropicRequestIssues(request, context) {
 		for (const block of turn.blocks) if (block.kind === "thinking") {
 			sawThinking = true;
 			if (sawToolUse) sawTextOrThinkingAfterTool = true;
+		} else if (block.kind === "redacted_thinking") {
+			sawThinking = true;
+			if (sawToolUse) sawTextOrThinkingAfterTool = true;
 		} else if (block.kind === "text") {
 			if (sawToolUse) sawTextOrThinkingAfterTool = true;
 		} else if (block.kind === "tool_use") sawToolUse = true;
@@ -48931,12 +48979,30 @@ function estimateContentBlockChars(blocks) {
 		case "thinking":
 			chars += block.thinking.length;
 			break;
+		case "redacted_thinking":
+			chars += block.data.length;
+			break;
 		case "tool_use":
+		case "server_tool_use":
+		case "mcp_tool_use":
 			chars += JSON.stringify(block.input).length;
 			break;
 		case "tool_result":
+		case "mcp_tool_result":
 			chars += typeof block.content === "string" ? block.content.length : JSON.stringify(block.content ?? "").length;
 			break;
+		case "server_tool_result":
+		case "web_search_tool_result":
+		case "web_fetch_tool_result":
+		case "code_execution_tool_result":
+		case "bash_code_execution_tool_result":
+		case "text_editor_code_execution_tool_result":
+		case "tool_search_tool_result":
+			chars += JSON.stringify(block.content ?? "").length;
+			break;
+		case "document":
+			chars += JSON.stringify(block).length;
+			break;
 		case "image":
 			chars += 1e3;
 			break;
@@ -49027,12 +49093,29 @@ const anthropicThinkingBlockSchema = object({
 	thinking: string(),
 	signature: string().optional()
 }).loose();
+const anthropicRedactedThinkingBlockSchema = object({
+	type: literal("redacted_thinking"),
+	data: string()
+}).loose();
 const anthropicToolUseBlockSchema = object({
 	type: literal("tool_use"),
 	id: string().min(1),
 	name: string().min(1),
 	input: jsonObjectSchema
 }).loose();
+const anthropicServerToolUseBlockSchema = object({
+	type: literal("server_tool_use"),
+	id: string().min(1),
+	name: string().min(1),
+	input: jsonObjectSchema
+}).loose();
+const anthropicMcpToolUseBlockSchema = object({
+	type: literal("mcp_tool_use"),
+	id: string().min(1),
+	name: string().min(1),
+	input: jsonObjectSchema,
+	server_name: string().min(1)
+}).loose();
 const anthropicToolResultContentBlockSchema = union([anthropicTextBlockSchema, anthropicImageBlockSchema]);
 const anthropicToolResultBlockSchema = object({
 	type: literal("tool_result"),
@@ -49040,12 +49123,39 @@ const anthropicToolResultBlockSchema = object({
 	content: union([string(), array(anthropicToolResultContentBlockSchema)]),
 	is_error: boolean().optional()
 }).loose();
+const anthropicMcpToolResultBlockSchema = object({
+	type: literal("mcp_tool_result"),
+	tool_use_id: string().min(1),
+	content: union([string(), array(anthropicToolResultContentBlockSchema)]),
+	is_error: boolean().optional()
+}).loose();
+const anthropicServerToolResultBlockSchema = object({
+	type: _enum([
+		"server_tool_result",
+		"web_search_tool_result",
+		"web_fetch_tool_result",
+		"code_execution_tool_result",
+		"bash_code_execution_tool_result",
+		"text_editor_code_execution_tool_result",
+		"tool_search_tool_result"
+	]),
+	tool_use_id: string().min(1),
+	content: unknown(),
+	is_error: boolean().optional()
+}).loose();
+const anthropicDocumentBlockSchema = object({
+	type: literal("document"),
+	source: jsonObjectSchema
+}).loose();
 const anthropicUserMessageSchema = object({
 	role: literal("user"),
 	content: union([string(), array(union([
 		anthropicTextBlockSchema,
 		anthropicImageBlockSchema,
-		anthropicToolResultBlockSchema
+		anthropicToolResultBlockSchema,
+		anthropicMcpToolResultBlockSchema,
+		anthropicServerToolResultBlockSchema,
+		anthropicDocumentBlockSchema
 	]))])
 }).loose();
 const anthropicAssistantMessageSchema = object({
@@ -49053,7 +49163,12 @@ const anthropicAssistantMessageSchema = object({
 	content: union([string(), array(union([
 		anthropicTextBlockSchema,
 		anthropicThinkingBlockSchema,
-		anthropicToolUseBlockSchema
+		anthropicRedactedThinkingBlockSchema,
+		anthropicToolUseBlockSchema,
+		anthropicServerToolUseBlockSchema,
+		anthropicMcpToolUseBlockSchema,
+		anthropicMcpToolResultBlockSchema,
+		anthropicServerToolResultBlockSchema
 	]))])
 }).loose();
 const anthropicMessageSchema = union([anthropicUserMessageSchema, anthropicAssistantMessageSchema]);
@@ -49912,11 +50027,16 @@ function translateUserMessage(message) {
 	const items = [];
 	const pendingContent = [];
 	for (const block of message.content) {
-		if (block.type === "tool_result") {
+		if (block.type === "tool_result" || block.type === "mcp_tool_result") {
 			flushPendingContent(pendingContent, items, { role: "user" });
 			items.push(createFunctionCallOutput(block));
 			continue;
 		}
+		if (isServerToolResultBlock(block)) {
+			flushPendingContent(pendingContent, items, { role: "user" });
+			items.push(createServerFunctionCallOutput(block));
+			continue;
+		}
 		const converted = translateUserContentBlock(block);
 		if (converted) pendingContent.push(converted);
 	}
@@ -49930,7 +50050,7 @@ function translateAssistantMessage(message) {
 	const items = [];
 	const pendingContent = [];
 	for (const block of message.content) {
-		if (block.type === "tool_use") {
+		if (block.type === "tool_use" || block.type === "server_tool_use" || block.type === "mcp_tool_use") {
 			flushPendingContent(pendingContent, items, {
 				role: "assistant",
 				phase: assistantPhase
@@ -49938,6 +50058,30 @@ function translateAssistantMessage(message) {
 			items.push(createFunctionToolCall(block));
 			continue;
 		}
+		if (block.type === "redacted_thinking") {
+			flushPendingContent(pendingContent, items, {
+				role: "assistant",
+				phase: assistantPhase
+			});
+			items.push(createRedactedReasoningContent(block));
+			continue;
+		}
+		if (block.type === "mcp_tool_result") {
+			flushPendingContent(pendingContent, items, {
+				role: "assistant",
+				phase: assistantPhase
+			});
+			items.push(createFunctionCallOutput(block));
+			continue;
+		}
+		if (isServerToolResultBlock(block)) {
+			flushPendingContent(pendingContent, items, {
+				role: "assistant",
+				phase: assistantPhase
+			});
+			items.push(createServerFunctionCallOutput(block));
+			continue;
+		}
 		if (block.type === "thinking" && block.signature) {
 			const compaction = createCompactionContent(block);
 			if (compaction) {
@@ -49973,6 +50117,7 @@ function translateUserContentBlock(block) {
 	switch (block.type) {
 		case "text": return createTextContent(block.text);
 		case "image": return createImageContent(block);
+		case "document": return createDocumentContent(block);
 		default: return;
 	}
 }
@@ -50002,7 +50147,7 @@ function resolveAssistantPhase(content) {
 	let hasToolUse = false;
 	for (const block of content) {
 		if (block.type === "text") hasText = true;
-		else if (block.type === "tool_use") hasToolUse = true;
+		else if (block.type === "tool_use" || block.type === "server_tool_use" || block.type === "mcp_tool_use") hasToolUse = true;
 		if (hasText && hasToolUse) break;
 	}
 	if (!hasText) return;
@@ -50027,6 +50172,23 @@ function createImageContent(block) {
 		detail: "auto"
 	};
 }
+function createDocumentContent(block) {
+	const source = block.source;
+	if (source.type === "file" && typeof source.file_id === "string") return {
+		type: "input_file",
+		file_id: source.file_id
+	};
+	if (source.type === "url" && typeof source.url === "string") return {
+		type: "input_file",
+		file_url: source.url
+	};
+	if (source.type === "base64" && typeof source.media_type === "string" && typeof source.data === "string") return {
+		type: "input_file",
+		file_data: `data:${source.media_type};base64,${source.data}`
+	};
+	if (source.type === "text" && typeof source.data === "string") return createTextContent(source.data);
+	return createTextContent("[document attachment omitted]");
+}
 function createReasoningContent(block) {
 	const { encryptedContent, id } = SignatureCodec.decodeReasoning(block.signature ?? "");
 	const thinking = block.thinking === THINKING_TEXT ? "" : block.thinking;
@@ -50040,6 +50202,13 @@ function createReasoningContent(block) {
 		encrypted_content: encryptedContent
 	};
 }
+function createRedactedReasoningContent(block) {
+	return {
+		type: "reasoning",
+		summary: [],
+		encrypted_content: block.data
+	};
+}
 function createCompactionContent(block) {
 	const compaction = decodeCompactionCarrierSignature(block.signature ?? "");
 	if (!compaction) return;
@@ -50066,6 +50235,17 @@ function createFunctionCallOutput(block) {
 		status: block.is_error ? "incomplete" : "completed"
 	};
 }
+function createServerFunctionCallOutput(block) {
+	return {
+		type: "function_call_output",
+		call_id: block.tool_use_id,
+		output: typeof block.content === "string" ? block.content : JSON.stringify(block.content) ?? "",
+		status: block.is_error ? "incomplete" : "completed"
+	};
+}
+function isServerToolResultBlock(block) {
+	return block.type === "server_tool_result" || block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result" || block.type === "code_execution_tool_result" || block.type === "bash_code_execution_tool_result" || block.type === "text_editor_code_execution_tool_result" || block.type === "tool_search_tool_result";
+}
 function translateSystemPrompt(system) {
 	if (!system) return null;
 	if (typeof system === "string") return system;
@@ -51452,8 +51632,13 @@ function fixStreamIds(rawData, eventName, state) {
 function createResponsesPassthroughStrategy(copilotClient, payload, options) {
 	const tracker = createStreamIdTracker();
 	return {
-		execute() {
-			return copilotClient.createResponses(payload, options);
+		async execute() {
+			try {
+				return await copilotClient.createResponses(payload, options);
+			} catch (error) {
+				if (error instanceof HTTPError && error.status === 400) dumpFailedPayload(payload, error).catch(() => {});
+				throw error;
+			}
 		},
 		isStream(result) {
 			return Boolean(payload.stream) && isAsyncIterable(result);
@@ -51490,6 +51675,29 @@ function tryExtractTerminalResponse(rawData) {
 		if (response && typeof response === "object") return response;
 	} catch {}
 }
+const DUMP_DIR = join(PATHS.APP_DIR, "dumps");
+const MAX_DUMPS = 20;
+const TIMESTAMP_CHARS_RE = /[:.]/g;
+const DUMP_FILE_RE = /^\d{3}-/;
+async function dumpFailedPayload(payload, error) {
+	try {
+		await mkdir(DUMP_DIR, { recursive: true });
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const ts = now.replace(TIMESTAMP_CHARS_RE, "-");
+		const file = join(DUMP_DIR, `${error.status}-${ts}.json`);
+		await writeFile(file, JSON.stringify({
+			timestamp: now,
+			error: {
+				status: error.status,
+				message: error.message
+			},
+			payload
+		}, null, 2));
+		consola.warn(`Dumped failed /responses payload → ${file}`);
+		const dumps = (await readdir(DUMP_DIR)).filter((f) => DUMP_FILE_RE.test(f) && f.endsWith(".json")).sort();
+		if (dumps.length > MAX_DUMPS) await Promise.all(dumps.slice(0, dumps.length - MAX_DUMPS).map((f) => unlink(join(DUMP_DIR, f)).catch(() => {})));
+	} catch {}
+}
 
 //#endregion
 //#region src/routes/responses/handler.ts
@@ -51586,8 +51794,52 @@ function rejectUnsupportedBuiltinTools(payload) {
 	for (const tool of payload.tools) if (tool.type === "web_search") throwInvalidRequestError("The selected Copilot endpoint does not support the Responses web_search tool.", "tools", "unsupported_tool_web_search");
 }
 function applyResponsesInputPolicies(payload) {
+	payload.store = false;
+	stripUnresolvableInputItems(payload);
+	stripPhaseFromInputMessages(payload);
 	rejectUnsupportedRemoteImageUrls(payload);
 }
+/**
+* Strip `phase` from input message items. The `phase` field is an output
+* annotation that some models may reject when sent back as input.
+*/
+function stripPhaseFromInputMessages(payload) {
+	if (!Array.isArray(payload.input)) return;
+	let stripped = 0;
+	for (const item of payload.input) {
+		if (typeof item !== "object" || item === null) continue;
+		const rec = item;
+		if ((!("type" in rec) || rec.type === "message") && "phase" in rec) {
+			delete rec.phase;
+			stripped++;
+		}
+	}
+	if (stripped > 0) consola.debug(`Stripped phase from ${stripped} input message item(s)`);
+}
+/**
+* Remove input items that Copilot cannot resolve and would trigger 404:
+* - `item_reference` items (opaque IDs from store=true sessions)
+* - `function_call_output` items whose `call_id` has no matching prior
+*   `function_call` in the same input array (orphaned outputs)
+*/
+function stripUnresolvableInputItems(payload) {
+	if (!Array.isArray(payload.input)) return;
+	const functionCallIds = /* @__PURE__ */ new Set();
+	for (const item of payload.input) {
+		if (typeof item !== "object" || item === null) continue;
+		const rec = item;
+		if (rec.type === "function_call" && typeof rec.call_id === "string") functionCallIds.add(rec.call_id);
+	}
+	const originalLength = payload.input.length;
+	payload.input = payload.input.filter((item) => {
+		if (typeof item !== "object" || item === null) return true;
+		const rec = item;
+		if (rec.type === "item_reference") return false;
+		if (rec.type === "function_call_output" && typeof rec.call_id === "string" && !functionCallIds.has(rec.call_id)) return false;
+		return true;
+	});
+	if (payload.input.length !== originalLength) consola.debug(`Stripped ${originalLength - payload.input.length} unresolvable input items (item_reference / orphaned function_call_output)`);
+}
 function rejectUnsupportedRemoteImageUrls(payload) {
 	if (!Array.isArray(payload.input) || !containsRemoteImageUrl(payload.input)) return;
 	throwInvalidRequestError("The selected Copilot endpoint does not support external image URLs on the Responses API. Use file_id or data URL image input instead.", "input", "unsupported_input_image_remote_url");
@@ -51702,7 +51954,7 @@ function parseBooleanParam(value) {
 //#region src/routes/responses/route.ts
 function createResponsesRoutes() {
 	return new Elysia().use(requestGuardPlugin).post("/responses", async function* ({ body, request, server }) {
-		if (hasStreamingFlag(body)) disableIdleTimeout(server, request);
+		disableIdleTimeout(server, request);
 		const { result, modelMapping } = await handleResponsesCore({
 			body,
 			signal: request.signal,
@@ -51711,7 +51963,8 @@ function createResponsesRoutes() {
 		if (modelMapping) setRequestModelMapping(request, modelMapping);
 		if (result.kind === "json") return result.data;
 		yield* sseAdapter(result.generator);
-	}, { guarded: true }).post("/responses/input_tokens", async ({ body, request }) => {
+	}, { guarded: true }).post("/responses/input_tokens", async ({ body, request, server }) => {
+		disableIdleTimeout(server, request);
 		return handleCreateResponseInputTokensCore({
 			body,
 			headers: request.headers,