betahi-copilot-bridge 0.20.4 → 0.20.6

package/README.md

@@ -1,7 +1,7 @@
 <h1 align="center">copilot-bridge</h1>
 
 <p align="center">
-  <a href="https://www.npmjs.com/package/betahi-copilot-bridge"><img src="https://img.shields.io/npm/v/betahi-copilot-bridge.svg?v=0.20.4" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/betahi-copilot-bridge"><img src="https://img.shields.io/npm/v/betahi-copilot-bridge.svg?v=0.20.6" alt="npm version"></a>
   <a href="https://github.com/betahi/copilot-bridge/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/betahi-copilot-bridge.svg" alt="license"></a>
 </p>
 
@@ -168,8 +168,8 @@ COPILOT_WEB_SEARCH_BACKEND = "gpt-5.5"
 | Value | Search path | Requirement |
 | ----- | ----------- | ----------- |
 | Copilot model id, for example `gpt-5.5` | Copilot HTTP `/responses` + `web_search_preview` | The model must support Copilot Responses web search. |
-| `searxng` | Local SearXNG at `http://localhost:8080` | Start SearXNG yourself. Setup guide: https://github.com/betaHi/openclaw-searxng-search. |
-| `copilot-cli` or `copilot` | GitHub Copilot CLI `web_search` tool, using the current request model | Install and sign in to GitHub Copilot CLI yourself. |
+| `searxng`, use `"COPILOT_WEB_SEARCH_BACKEND": "searxng"` | Local SearXNG at `http://localhost:8080` | Start SearXNG yourself. Setup guide: https://github.com/betaHi/openclaw-searxng-search. |
+| `copilot-cli` or `copilot`, use `"COPILOT_WEB_SEARCH_BACKEND": "copilot-cli"` | GitHub Copilot CLI `web_search` tool, using the current request model | Install and sign in to GitHub Copilot CLI yourself. |
 
 The bridge never installs Docker, SearXNG, or Copilot CLI automatically.
 

package/dist/main.js

@@ -2197,6 +2197,7 @@ function translateErrorToAnthropicErrorEvent() {
 //#endregion
 //#region src/bridges/claude/web-search.ts
 const ANTHROPIC_WEB_SEARCH_TOOL_PATTERN = /^web_search_\d{8}$/;
+const CLAUDE_CODE_WEB_SEARCH_TOOL_NAME = "WebSearch";
 const DEFAULT_SEARXNG_BASE_URL = "http://localhost:8080";
 const SEARCH_RESULT_LIMIT = 8;
 const SEARXNG_READINESS_TIMEOUT_MS = 800;
@@ -2207,7 +2208,7 @@ const COPILOT_CHAT_WRAPPER_PATH_PATTERN = /github\.copilot-chat[/\\]copilotCli/;
 const isRecord$1 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const isAnthropicNativeWebSearchTool = (tool) => {
 	if (!isRecord$1(tool)) return false;
-	return tool.name === "web_search" && typeof tool.type === "string" && ANTHROPIC_WEB_SEARCH_TOOL_PATTERN.test(tool.type);
+	return tool.name === "web_search" && typeof tool.type === "string" && ANTHROPIC_WEB_SEARCH_TOOL_PATTERN.test(tool.type) || tool.name === CLAUDE_CODE_WEB_SEARCH_TOOL_NAME;
 };
 const hasAnthropicNativeWebSearch = (payload) => payload.tools?.some(isAnthropicNativeWebSearchTool) ?? false;
 const textFromContent$1 = (content) => {
@@ -2914,6 +2915,24 @@ modelRoutes.get("/", async (c) => {
 
 //#endregion
 //#region src/bridges/codex/chat-fallback.ts
+const isResponsesFunctionTool = (tool) => tool.type === "function";
+const isResponsesWebSearchTool = (tool) => tool.type === "web_search" || tool.type === "web_search_preview";
+const WEB_SEARCH_FUNCTION_TOOL = {
+	type: "function",
+	function: {
+		name: "web_search",
+		description: "Search the web for current information and source URLs.",
+		parameters: {
+			type: "object",
+			properties: { query: {
+				type: "string",
+				description: "The web search query."
+			} },
+			required: ["query"],
+			additionalProperties: false
+		}
+	}
+};
 const collectText = (content) => {
 	if (typeof content === "string") return {
 		text: content,
@@ -2989,9 +3008,9 @@ const responsesPayloadToChatPayload = (request, capability) => {
 		tool_call_id: item.call_id,
 		content: item.output
 	});
-	const tools = request.tools?.filter((t) => {
+	const functionTools = request.tools?.filter(isResponsesFunctionTool).filter((t) => {
 		const name = t.function?.name ?? t.name;
-		return t.type === "function" && typeof name === "string" && name.length > 0;
+		return typeof name === "string" && name.length > 0;
 	}).map((t) => ({
 		type: "function",
 		function: {
@@ -3000,6 +3019,13 @@ const responsesPayloadToChatPayload = (request, capability) => {
 			parameters: t.function?.parameters ?? t.parameters
 		}
 	}));
+	const hasWebSearchTool = request.tools?.some(isResponsesWebSearchTool) ?? false;
+	const hasNamedWebSearchFunction = functionTools?.some((tool) => tool.function.name === "web_search") ?? false;
+	const tools = [...functionTools ?? [], ...hasWebSearchTool && !hasNamedWebSearchFunction ? [WEB_SEARCH_FUNCTION_TOOL] : []];
+	if (hasWebSearchTool) messages.unshift({
+		role: "system",
+		content: "A web_search tool is available for current web information and source URLs. Use it when the user asks to search the web; do not use it for unrelated tasks."
+	});
 	const payload = {
 		model: capability.id,
 		messages,
@@ -3008,7 +3034,7 @@ const responsesPayloadToChatPayload = (request, capability) => {
 		temperature: request.temperature,
 		top_p: request.top_p,
 		user: request.user,
-		tools: tools && tools.length > 0 ? tools : void 0,
+		tools: tools.length > 0 ? tools : void 0,
 		tool_choice: tools && tools.length > 0 ? request.tool_choice : void 0
 	};
 	placeReasoning(payload, capability, request.reasoning?.effort);
@@ -3191,7 +3217,7 @@ const getRequestedQuery = (request) => {
 	const cleaned = textFromContent([...inputItemsFromRequest(request)].reverse().find((item) => item.role === "user")?.content).replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, " ").replace(/\s+/g, " ").trim();
 	return cleaned.match(/\bsearch(?:\s+the\s+web)?(?:\s+for)?\s+(.+)$/i)?.[1]?.trim() || cleaned || "web search";
 };
-const buildSearchInput = (request) => {
+const buildSearchInput = (request, requestedQuery) => {
 	const conversation = inputItemsFromRequest(request).flatMap((item) => {
 		const role = typeof item.role === "string" ? item.role : item.type;
 		const text = textFromContent(item.content ?? item.output);
@@ -3203,24 +3229,41 @@ const buildSearchInput = (request) => {
 		"Return useful search results as plain text lines in this exact shape:",
 		"1. Title - https://example.com/page",
 		"Include only real source URLs from the search results.",
+		`Search query:\n${requestedQuery}`,
 		request.instructions ? `Instructions:\n${request.instructions}` : "",
 		conversation ? `Conversation:\n${conversation}` : ""
 	].filter(Boolean).join("\n\n");
 };
-const createExecutionRequest = (request) => ({
-	clientName: "Codex",
-	configurationHint: "Set COPILOT_WEB_SEARCH_BACKEND in ~/.codex/config.toml to a Copilot Responses search model id such as gpt-5.5, searxng, or copilot-cli.",
-	maxOutputTokens: request.max_output_tokens,
-	requestedQuery: getRequestedQuery(request),
-	searchInput: buildSearchInput(request),
-	temperature: request.temperature,
-	topP: request.top_p
-});
+const createExecutionRequest = (request, requestedQuery) => {
+	const query = requestedQuery?.trim() || getRequestedQuery(request);
+	return {
+		clientName: "Codex",
+		configurationHint: "Set COPILOT_WEB_SEARCH_BACKEND in ~/.codex/config.toml to a Copilot Responses search model id such as gpt-5.5, searxng, or copilot-cli.",
+		maxOutputTokens: request.max_output_tokens,
+		requestedQuery: query,
+		searchInput: buildSearchInput(request, query),
+		temperature: request.temperature,
+		topP: request.top_p
+	};
+};
 const isCodexNativeWebSearchTool = (tool) => {
 	if (!isRecord(tool)) return false;
 	return tool.type === "web_search" || tool.type === "web_search_preview";
 };
+const isCodexNativeWebSearchToolChoice = (toolChoice) => {
+	if (!isRecord(toolChoice)) return false;
+	return toolChoice.type === "web_search" || toolChoice.type === "web_search_preview";
+};
+const hasOnlyCodexNativeWebSearchTools = (tools) => {
+	if (!Array.isArray(tools) || tools.length === 0) return false;
+	return tools.every(isCodexNativeWebSearchTool);
+};
 const hasCodexNativeWebSearch = (request) => request.tools?.some(isCodexNativeWebSearchTool) ?? false;
+const isCodexNativeWebSearchRequested = (request) => {
+	if (!hasCodexNativeWebSearch(request)) return false;
+	if (isCodexNativeWebSearchToolChoice(request.tool_choice)) return true;
+	return request.tool_choice === "required" && hasOnlyCodexNativeWebSearchTools(request.tools);
+};
 const fallbackSearchText = (search) => {
 	if (search.text) return search.text;
 	if (search.results.length === 0) return "Web search did not return search results.";
@@ -3344,7 +3387,7 @@ const codexWebSearchResponseToSse = (response) => {
 	} });
 };
 async function createCodexWebSearchResponse(config, request, options) {
-	return buildCodexWebSearchResponse(request, await createWebSearchExecution(config, createExecutionRequest(request), {
+	return buildCodexWebSearchResponse(request, await createWebSearchExecution(config, createExecutionRequest(request, options.requestedQuery), {
 		backend: options.backend,
 		copilotCliModel: request.model
 	}));
@@ -3520,6 +3563,17 @@ const logResponsesUpstreamError = async (message, response, context) => {
 const readCodexUserConfig = async () => {
 	return readCodexUserConfigFromDisk(process.env.CODEX_CONFIG_PATH ?? CODEX_DEFAULTS.configPath);
 };
+const getCodexWebSearchQueryFromChatResponse = (chatJson) => {
+	const toolCall = chatJson.choices.flatMap((choice) => choice.message.tool_calls ?? []).find((call) => call.function.name === "web_search");
+	if (!toolCall) return;
+	try {
+		const parsed = JSON.parse(toolCall.function.arguments);
+		if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) && typeof parsed.query === "string") return parsed.query;
+	} catch {
+		return toolCall.function.arguments;
+	}
+	return toolCall.function.arguments;
+};
 responsesRoutes.post("/", async (c) => {
 	try {
 		await checkRateLimit();
@@ -3540,7 +3594,7 @@ responsesRoutes.post("/", async (c) => {
 	const capability = getModelCapability(payload.model);
 	try {
 		if (capability?.fallback === "chat-completions") {
-			if (hasCodexNativeWebSearch(payload)) {
+			if (isCodexNativeWebSearchRequested(payload)) {
 				const response = await createCodexWebSearchResponse(config, payload, { backend: codexUserConfig.webSearchBackend });
 				if (payload.stream) return new Response(codexWebSearchResponseToSse(response), {
 					status: 200,
@@ -3577,6 +3631,25 @@ responsesRoutes.post("/", async (c) => {
 				});
 			}
 			const chatJson = await upstream$1.json();
+			const requestedWebSearchQuery = getCodexWebSearchQueryFromChatResponse(chatJson);
+			if (requestedWebSearchQuery) {
+				const response = await createCodexWebSearchResponse(config, payload, {
+					backend: codexUserConfig.webSearchBackend,
+					requestedQuery: requestedWebSearchQuery
+				});
+				if (payload.stream) return new Response(codexWebSearchResponseToSse(response), {
+					status: 200,
+					headers: {
+						"content-type": "text/event-stream; charset=utf-8",
+						"cache-control": "no-cache",
+						connection: "keep-alive"
+					}
+				});
+				return new Response(JSON.stringify(response), {
+					status: 200,
+					headers: { "content-type": "application/json" }
+				});
+			}
 			if (payload.stream) {
 				const stream = synthesizeResponsesSseFromChat(payload, chatJson);
 				return new Response(stream, {