Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix: 避免把成功握手状态标为供应商失败原因

ficowang4ea75478ff5d
diff --git a/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.ts b/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.ts
index 20431b248c..5b10cafd5e 100644
--- a/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.ts
@@ -260,6 +260,19 @@ describe('native provider failure diagnostics', () => {
expect(fetchImpl).toHaveBeenCalledTimes(2);
});
+ it('does not report HTTP 200 as the cause of a malformed response stream', async () => {
+ const fetchImpl = vi.fn(async () => new Response('data: invalid-json\n\n', {
+ status: 200, headers: { 'content-type': 'text/event-stream' },
+ }));
+ const send = createPiProviderFetch({ row, providerId: 'together', apiKey: 'fixture-key', fetchImpl });
+ const text = await (await send('https://unused.invalid', request())).text();
+ expect(text).toContain('response.failed');
+ expect(text).toContain('phase=adapter-event');
+ expect(text).toContain('category=unknown');
+ expect(text).not.toContain('HTTP 200');
+ expect(text).not.toContain('invalid-json');
+ });
+
it('does not reuse HTTP failure status from an earlier request', async () => {
const fetchImpl = vi.fn<typeof fetch>()
.mockResolvedValueOnce(new Response('{}', { status: 401 }))
@@ -274,27 +287,30 @@ describe('native provider failure diagnostics', () => {
});
-it('keeps iterator exceptions private and labels the stream-read phase', async () => {
+it.each([undefined, 200, 302])('keeps iterator exceptions private after HTTP %s and labels the stream-read phase', async (status) => {
const row = PROVIDER_MODEL_CATALOG.providers.together.find(row => row.execution.pi.api === 'openai-completions')!;
+ let adapterFetch: typeof fetch | undefined;
const iterator = {
async *[Symbol.asyncIterator]() {
+ if (status !== undefined) await adapterFetch!('https://fixture.invalid');
yield { type: 'text_delta', delta: 'fixture prefix' };
throw new Error('secret-fixture-key private prompt');
},
};
- const stream = vi.spyOn(openaiCompletions, 'streamSimple').mockReturnValueOnce(
- iterator as unknown as ReturnType<typeof openaiCompletions.streamSimple>,
- );
+ const stream = vi.spyOn(openaiCompletions, 'streamSimple').mockImplementationOnce((_model, _context, options) => {
+ adapterFetch = options?.fetch;
+ return iterator as unknown as ReturnType<typeof openaiCompletions.streamSimple>;
+ });
try {
const send = createPiProviderFetch({ row, providerId: 'together', apiKey: 'fixture-key',
- fetchImpl: async () => { throw new Error('unused'); },
+ fetchImpl: async () => new Response(null, { status: status ?? 200 }),
});
const response = await send('https://unused.invalid', { body: JSON.stringify({ model: row.id, input: 'ping' }) });
const error = await response.text().catch(error => error as Error);
expect(error).toBeInstanceOf(Error);
expect((error as Error).message).toContain('phase=stream-read');
expect((error as Error).message).toContain('category=unknown');
- expect((error as Error).message).not.toMatch(/secret-fixture-key|private prompt/);
+ expect((error as Error).message).not.toMatch(/secret-fixture-key|private prompt|HTTP/);
} finally {
stream.mockRestore();
}
diff --git a/apps/desktop/src/main/maker-host/pi-provider-transport.ts b/apps/desktop/src/main/maker-host/pi-provider-transport.ts
index 2359bda977..f89482d268 100644
--- a/apps/desktop/src/main/maker-host/pi-provider-transport.ts
+++ b/apps/desktop/src/main/maker-host/pi-provider-transport.ts
@@ -256,7 +256,8 @@ export function createPiProviderFetch(options: PiProviderTransportOptions): type
: httpStatus !== undefined && httpStatus >= 500 ? 'provider_unavailable'
: httpStatus !== undefined && httpStatus >= 400 ? 'request_rejected'
: 'unknown';
- const status = httpStatus === undefined ? '' : `; HTTP ${httpStatus}`;
+ const status = httpStatus !== undefined && httpStatus >= 400 && httpStatus < 600
+ ? `; HTTP ${httpStatus}` : '';
return `Native provider request failed [phase=${phase}${status}; category=${category}; request=${responseId}]`;
};
const cloudflareGateway = model.provider === 'cloudflare-ai-gateway';