mirror of
https://github.com/tiennm99/ccs.git
synced 2026-07-17 14:16:21 +00:00
fix(cursor): harden anthropic response fallback paths
This commit is contained in:
@@ -3,6 +3,9 @@ import { GlmtTransformer } from '../glmt/glmt-transformer';
|
|||||||
import { SSEParser } from '../glmt/sse-parser';
|
import { SSEParser } from '../glmt/sse-parser';
|
||||||
import type { OpenAIResponse, SSEEvent } from '../glmt/pipeline';
|
import type { OpenAIResponse, SSEEvent } from '../glmt/pipeline';
|
||||||
|
|
||||||
|
const JSON_TRANSLATION_ERROR_MESSAGE = 'Failed to translate Cursor JSON response';
|
||||||
|
const STREAM_TRANSLATION_ERROR_MESSAGE = 'Failed to translate Cursor SSE response';
|
||||||
|
|
||||||
function createErrorResponse(message: string): Response {
|
function createErrorResponse(message: string): Response {
|
||||||
return new Response(
|
return new Response(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
@@ -22,18 +25,29 @@ function formatSseEvent(event: string, data: Record<string, unknown>): string {
|
|||||||
return `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
|
return `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasTranslatableChoices(value: unknown): value is OpenAIResponse {
|
||||||
|
if (typeof value !== 'object' || value === null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { choices } = value as OpenAIResponse;
|
||||||
|
return Array.isArray(choices) && choices.length > 0;
|
||||||
|
}
|
||||||
|
|
||||||
async function createAnthropicJsonResponse(response: Response): Promise<Response> {
|
async function createAnthropicJsonResponse(response: Response): Promise<Response> {
|
||||||
try {
|
try {
|
||||||
const openAiResponse = (await response.json()) as OpenAIResponse;
|
const openAiResponse = await response.json();
|
||||||
|
if (!hasTranslatableChoices(openAiResponse)) {
|
||||||
|
return createErrorResponse(JSON_TRANSLATION_ERROR_MESSAGE);
|
||||||
|
}
|
||||||
|
|
||||||
const anthropicResponse = new GlmtTransformer().transformResponse(openAiResponse);
|
const anthropicResponse = new GlmtTransformer().transformResponse(openAiResponse);
|
||||||
return new Response(JSON.stringify(anthropicResponse), {
|
return new Response(JSON.stringify(anthropicResponse), {
|
||||||
status: response.status,
|
status: response.status,
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch {
|
||||||
return createErrorResponse(
|
return createErrorResponse(JSON_TRANSLATION_ERROR_MESSAGE);
|
||||||
`Failed to translate Cursor JSON response: ${(error as Error).message}`
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,14 +94,14 @@ function createAnthropicStreamingResponse(response: Response): Response {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch {
|
||||||
controller.enqueue(
|
controller.enqueue(
|
||||||
encoder.encode(
|
encoder.encode(
|
||||||
formatSseEvent('error', {
|
formatSseEvent('error', {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
error: {
|
error: {
|
||||||
type: 'api_error',
|
type: 'api_error',
|
||||||
message: `Failed to translate Cursor SSE response: ${(error as Error).message}`,
|
message: STREAM_TRANSLATION_ERROR_MESSAGE,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -90,6 +90,12 @@ describe('translateAnthropicRequest', () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('handles empty messages arrays', () => {
|
||||||
|
const translated = translateAnthropicRequest({ messages: [] });
|
||||||
|
|
||||||
|
expect(translated.messages).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
it('uses a distinct fallback prefix for missing tool_use ids', () => {
|
it('uses a distinct fallback prefix for missing tool_use ids', () => {
|
||||||
const translated = translateAnthropicRequest({
|
const translated = translateAnthropicRequest({
|
||||||
messages: [
|
messages: [
|
||||||
@@ -125,6 +131,25 @@ describe('translateAnthropicRequest', () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('returns empty string for tool_result blocks without content', () => {
|
||||||
|
const translated = translateAnthropicRequest({
|
||||||
|
messages: [
|
||||||
|
{
|
||||||
|
role: 'user',
|
||||||
|
content: [{ type: 'tool_result', tool_use_id: 'toolu_1' }],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(translated.messages).toEqual([
|
||||||
|
{
|
||||||
|
role: 'tool',
|
||||||
|
tool_call_id: 'toolu_1',
|
||||||
|
content: '',
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
it('falls back when tool_use input cannot be serialized', () => {
|
it('falls back when tool_use input cannot be serialized', () => {
|
||||||
const circular: Record<string, unknown> = {};
|
const circular: Record<string, unknown> = {};
|
||||||
circular.self = circular;
|
circular.self = circular;
|
||||||
@@ -207,6 +232,61 @@ describe('createAnthropicProxyResponse', () => {
|
|||||||
expect(body.content[2]?.input).toEqual({ q: 'cursor daemon' });
|
expect(body.content[2]?.input).toEqual({ q: 'cursor daemon' });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('returns 502 when Cursor returns invalid JSON', async () => {
|
||||||
|
const transformed = await createAnthropicProxyResponse(
|
||||||
|
new Response('not json', {
|
||||||
|
status: 200,
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(transformed.status).toBe(502);
|
||||||
|
const body = (await transformed.json()) as { error?: { type?: string; message?: string } };
|
||||||
|
expect(body.error?.type).toBe('api_error');
|
||||||
|
expect(body.error?.message).toBe('Failed to translate Cursor JSON response');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns 502 when Cursor response is missing choices', async () => {
|
||||||
|
const transformed = await createAnthropicProxyResponse(
|
||||||
|
new Response(
|
||||||
|
JSON.stringify({
|
||||||
|
id: 'chatcmpl_missing_choices',
|
||||||
|
model: 'claude-sonnet-4.5',
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
status: 200,
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(transformed.status).toBe(502);
|
||||||
|
const body = (await transformed.json()) as { error?: { type?: string; message?: string } };
|
||||||
|
expect(body.error?.type).toBe('api_error');
|
||||||
|
expect(body.error?.message).toBe('Failed to translate Cursor JSON response');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns 502 when Cursor response has empty choices', async () => {
|
||||||
|
const transformed = await createAnthropicProxyResponse(
|
||||||
|
new Response(
|
||||||
|
JSON.stringify({
|
||||||
|
id: 'chatcmpl_empty_choices',
|
||||||
|
model: 'claude-sonnet-4.5',
|
||||||
|
choices: [],
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
status: 200,
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(transformed.status).toBe(502);
|
||||||
|
const body = (await transformed.json()) as { error?: { type?: string; message?: string } };
|
||||||
|
expect(body.error?.type).toBe('api_error');
|
||||||
|
expect(body.error?.message).toBe('Failed to translate Cursor JSON response');
|
||||||
|
});
|
||||||
|
|
||||||
it('converts OpenAI SSE chunks into Anthropic SSE events', async () => {
|
it('converts OpenAI SSE chunks into Anthropic SSE events', async () => {
|
||||||
const openAiSse = [
|
const openAiSse = [
|
||||||
'data: {"id":"chatcmpl_2","object":"chat.completion.chunk","created":1,"model":"claude-sonnet-4.5","choices":[{"index":0,"delta":{"role":"assistant","content":"Hello"},"finish_reason":null}]}\n\n',
|
'data: {"id":"chatcmpl_2","object":"chat.completion.chunk","created":1,"model":"claude-sonnet-4.5","choices":[{"index":0,"delta":{"role":"assistant","content":"Hello"},"finish_reason":null}]}\n\n',
|
||||||
|
|||||||
Reference in New Issue
Block a user