getcompanion-ai/co-mono
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/co-mono.git synced 2026-04-17 07:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve Google Cloud Code Assist error handling (#665)

Browse source 
* Improve Cloud Code Assist error messages

- Extract just the message from verbose JSON error responses
- Extract cause from generic 'fetch failed' errors for better diagnostics

* Make 'other side closed' network error retryable

* Make 'other side closed' network error retryable
This commit is contained in:
Danila Poyarkov 2026-01-13 02:41:20 +03:00 • committed by GitHub
parent 259a41c8fd
commit 9e4ae98358
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
packages/ai/src/providers/google-gemini-cli.ts
View file

@ -211,13 +211,29 @@ function extractRetryDelay(errorText: string): number | undefined {
} }
/** /**
* Check if an error is retryable (rate limit, server error, etc.) * Check if an error is retryable (rate limit, server error, network error, etc.)
*/ */
function isRetryableError(status: number, errorText: string): boolean { function isRetryableError(status: number, errorText: string): boolean {
if (status === 429 || status === 500 || status === 502 || status === 503 || status === 504) { if (status === 429 || status === 500 || status === 502 || status === 503 || status === 504) {
return true; return true;
} }
return /resource.?exhausted|rate.?limit|overloaded|service.?unavailable/i.test(errorText); return /resource.?exhausted|rate.?limit|overloaded|service.?unavailable|other.?side.?closed/i.test(errorText);
}
/**
* Extract a clean, user-friendly error message from Google API error response.
* Parses JSON error responses and returns just the message field.
*/
function extractErrorMessage(errorText: string): string {
try {
const parsed = JSON.parse(errorText) as { error?: { message?: string } };
if (parsed.error?.message) {
return parsed.error.message;
}
} catch {
// Not JSON, return as-is
}
return errorText;
} }
/** /**
@ -385,7 +401,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
} }
// Not retryable or max retries exceeded // Not retryable or max retries exceeded
throw new Error(`Cloud Code Assist API error (${response.status}): ${errorText}`); throw new Error(`Cloud Code Assist API error (${response.status}): ${extractErrorMessage(errorText)}`);
} catch (error) { } catch (error) {
// Check for abort - fetch throws AbortError, our code throws "Request was aborted" // Check for abort - fetch throws AbortError, our code throws "Request was aborted"
if (error instanceof Error) { if (error instanceof Error) {
@ -393,7 +409,11 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
throw new Error("Request was aborted"); throw new Error("Request was aborted");
} }
} }
// Extract detailed error message from fetch errors (Node includes cause)
lastError = error instanceof Error ? error : new Error(String(error)); lastError = error instanceof Error ? error : new Error(String(error));
if (lastError.message === "fetch failed" && lastError.cause instanceof Error) {
lastError = new Error(`Network error: ${lastError.cause.message}`);
}
// Network errors are retryable // Network errors are retryable
if (attempt < MAX_RETRIES) { if (attempt < MAX_RETRIES) {
const delayMs = BASE_DELAY_MS * 2 ** attempt; const delayMs = BASE_DELAY_MS * 2 ** attempt;

4
packages/coding-agent/src/core/agent-session.ts
View file

@ -1520,8 +1520,8 @@ export class AgentSession {
if (isContextOverflow(message, contextWindow)) return false; if (isContextOverflow(message, contextWindow)) return false;
const err = message.errorMessage; const err = message.errorMessage;
// Match: overloaded_error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection error // Match: overloaded_error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection error, other side closed
return /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error/i.test( return /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|other side closed/i.test(
err, err,
); );
} }