copilot-relay 0.2.6 → 0.2.7

package/README.md

@@ -24,6 +24,11 @@ Public API:
 - `POST /v1/messages/count_tokens`
 - `GET /v1/models`
 - `GET /healthz`
+- `GET|HEAD /api/hello`
+
+`/api/hello` is a static reachability probe Claude Code sends on startup and
+around real traffic. Like `/healthz` it never contacts Copilot, so it proves the
+relay is listening and nothing more.
 
 Claude WebSearch is bridge-managed: when the model selects the WebSearch tool,
 the relay executes Copilot `/responses` with `web_search_preview`, then sends the

package/dist/main.js

@@ -1508,6 +1508,7 @@ function getFinishReason(response, hasFunctionCalls) {
 //#region src/copilot/chat.ts
 const usesMaxCompletionTokens = (modelId) => modelId.startsWith("gpt-5");
 const continuePrefillPrompt$1 = "Continue the assistant response from the previous assistant message.";
+const continueAfterNonUserPrompt = "Continue based on the context above.";
 const maxUserLength = 64;
 const sanitizeReasoningEffortForModel = (_modelId, reasoningEffort) => {
 	return reasoningEffort ?? void 0;
@@ -1536,7 +1537,14 @@ const buildRequestPayload = (payload) => {
 };
 const normalizeFinalAssistantPrefill$1 = (payload) => {
 	const lastMessage = payload.messages.at(-1);
-	if (lastMessage?.role !== "assistant") return payload;
+	if (!lastMessage || lastMessage.role === "user") return payload;
+	if (lastMessage.role !== "assistant") return {
+		...payload,
+		messages: [...payload.messages, {
+			role: "user",
+			content: continueAfterNonUserPrompt
+		}]
+	};
 	const messages = [...payload.messages];
 	if (typeof lastMessage.content !== "string") {
 		messages.pop();
@@ -2435,10 +2443,10 @@ const getWebSearchResultText = (search) => {
 	].join("\n");
 };
 const createWebSearchResultContextMessage = (search) => ({
-	role: "system",
+	role: "user",
 	content: [
 		"Trusted bridge retrieval context: the assistant selected web_search, and copilot-relay executed it.",
-		"Use this context for the final answer. Do not describe it as user-provided or injected. Do not call web_search again.",
+		"Use this context to complete the request. Do not describe it as user-provided or injected.",
 		"If the user requested a specific output format, answer using only matching information from this context.",
 		"If the user asked for a URL only, output only that URL with no surrounding text.",
 		"",
@@ -2447,24 +2455,26 @@ const createWebSearchResultContextMessage = (search) => ({
 		getWebSearchResultText(search)
 	].join("\n")
 });
-const createFinalWebSearchPayload = (payload, search) => {
-	const messages = payload.messages.flatMap((message) => {
-		if (message.role === "tool") return [{
-			role: "developer",
-			content: ["Prior local tool result from the conversation:", String(message.content ?? "")].join("\n")
-		}];
-		if (message.tool_calls && message.tool_calls.length > 0) return message.content ? [{
-			...message,
-			tool_calls: void 0
-		}] : [];
-		return [message];
-	});
+const isWebSearchTool = (tool, toolNameMapper) => isClaudeWebSearchToolName(toolNameMapper.toClaude(tool.function.name));
+const removeWebSearchTool = (tools, toolNameMapper) => {
+	if (!tools || tools.length === 0) return;
+	const remaining = tools.filter((tool) => !isWebSearchTool(tool, toolNameMapper));
+	return remaining.length > 0 ? remaining : void 0;
+};
+const normalizeFinalToolChoice = (toolChoice, tools, toolNameMapper) => {
+	if (!tools || tools.length === 0) return;
+	if (toolChoice === "required") return "auto";
+	if (toolChoice && typeof toolChoice === "object" && isClaudeWebSearchToolName(toolNameMapper.toClaude(toolChoice.function.name))) return "auto";
+	return toolChoice;
+};
+const createFinalWebSearchPayload = (payload, search, toolNameMapper) => {
+	const tools = removeWebSearchTool(payload.tools, toolNameMapper);
 	return {
 		...payload,
 		stream: false,
-		tools: void 0,
-		tool_choice: void 0,
-		messages: [...messages, createWebSearchResultContextMessage(search)]
+		tools,
+		tool_choice: normalizeFinalToolChoice(payload.tool_choice, tools, toolNameMapper),
+		messages: [...payload.messages, createWebSearchResultContextMessage(search)]
 	};
 };
 const mergeWebSearchAndFinalResponse = (searchResponse, finalResponse) => ({
@@ -2744,7 +2754,7 @@ const handleClaudeMessageRequest = async (config, claudePayload, requestSignal,
 			const searchResponse = createClaudeWebSearchResponse(search);
 			if (search.results.length === 0) claudeResponse = searchResponse;
 			else {
-				const finalResponse = await createChatCompletions(config, createFinalWebSearchPayload(openAIPayload, search), {
+				const finalResponse = await createChatCompletions(config, createFinalWebSearchPayload(openAIPayload, search, toolNameMapper), {
 					client: "claude",
 					requestedModel: claudePayload.model,
 					requestedThinkEffort: getClaudeRequestedThinkEffort(claudePayload),
@@ -2924,6 +2934,7 @@ const createServer = (config) => {
 		status: "ok"
 	}));
 	app.get("/healthz", (c) => c.json({ ok: true }));
+	app.on(["GET", "HEAD"], "/api/hello", (c) => c.body(null, 200));
 	app.route("/v1", claudeRoutes);
 	app.notFound(async (c) => {
 		const message = "Unsupported Claude API route";