diff --git a/packages/adapters/gemini-local/src/server/execute.ts b/packages/adapters/gemini-local/src/server/execute.ts index df20937e..12ec7ad0 100644 --- a/packages/adapters/gemini-local/src/server/execute.ts +++ b/packages/adapters/gemini-local/src/server/execute.ts @@ -51,8 +51,9 @@ import { DEFAULT_GEMINI_LOCAL_MODEL, SANDBOX_INSTALL_COMMAND } from "../index.js import { describeGeminiFailure, detectGeminiAuthRequired, + isGeminiTransientNetworkError, isGeminiTurnLimitResult, - isGeminiUnknownSessionError, + isGeminiSessionUnrecoverableError, parseGeminiJsonl, } from "./parse.js"; import { firstNonEmptyLine } from "./utils.js"; @@ -569,6 +570,7 @@ export async function execute(ctx: AdapterExecutionContext): Promise { it("collects assistant text from message events with string content", () => { @@ -131,3 +135,69 @@ describe("parseGeminiJsonl", () => { expect(result.errorMessage).toBe("boom"); }); }); + +describe("isGeminiSessionUnrecoverableError", () => { + it("matches 'unknown session'", () => { + expect(isGeminiSessionUnrecoverableError("", "Error: unknown session 'abc-123'")).toBe(true); + }); + + it("matches 'session ... not found'", () => { + expect(isGeminiSessionUnrecoverableError("", "Resumed session abc-123 not found on disk")).toBe(true); + }); + + it("matches 'exceeds the maximum number of tokens' (compression overflow)", () => { + const stderr = + '_ApiError: {"error":{"code":400,"message":"The input token count exceeds the maximum number of tokens allowed 1048576","status":"INVALID_ARGUMENT"}} at ChatCompressionService.compress'; + expect(isGeminiSessionUnrecoverableError("", stderr)).toBe(true); + }); + + it("matches 'input token count exceeds'", () => { + expect( + isGeminiSessionUnrecoverableError("", "input token count exceeds maximum"), + ).toBe(true); + }); + + it("does not match unrelated stderr", () => { + expect(isGeminiSessionUnrecoverableError("", "Some other error")).toBe(false); + }); + + it("does not match transient network errors (those go to isGeminiTransientNetworkError)", () => { + expect( + isGeminiSessionUnrecoverableError( + "", + "_GaxiosError: getaddrinfo ENOTFOUND oauth2.googleapis.com", + ), + ).toBe(false); + }); +}); + +describe("isGeminiTransientNetworkError", () => { + it("matches DNS failure on oauth2.googleapis.com", () => { + const stderr = + "_GaxiosError: request to https://oauth2.googleapis.com/token failed, reason: getaddrinfo ENOTFOUND oauth2.googleapis.com"; + expect(isGeminiTransientNetworkError("", stderr)).toBe(true); + }); + + it("matches EAI_AGAIN", () => { + expect( + isGeminiTransientNetworkError("", "Error: getaddrinfo EAI_AGAIN sts.googleapis.com"), + ).toBe(true); + }); + + it("matches _UserRefreshClient ENOTFOUND", () => { + const stderr = + "at _UserRefreshClient.refreshTokenNoCache (.../google-auth-library/...)\n" + + " caused by: ENOTFOUND oauth2.googleapis.com"; + expect(isGeminiTransientNetworkError("", stderr)).toBe(true); + }); + + it("does not match unrelated stderr", () => { + expect(isGeminiTransientNetworkError("", "Some other error")).toBe(false); + }); + + it("does not match unknown-session errors (those go to isGeminiSessionUnrecoverableError)", () => { + expect( + isGeminiTransientNetworkError("", "Error: unknown session 'abc-123'"), + ).toBe(false); + }); +}); diff --git a/packages/adapters/gemini-local/src/server/parse.ts b/packages/adapters/gemini-local/src/server/parse.ts index d309c8c4..93686b61 100644 --- a/packages/adapters/gemini-local/src/server/parse.ts +++ b/packages/adapters/gemini-local/src/server/parse.ts @@ -199,14 +199,26 @@ export function parseGeminiJsonl(stdout: string) { }; } -export function isGeminiUnknownSessionError(stdout: string, stderr: string): boolean { +export function isGeminiSessionUnrecoverableError(stdout: string, stderr: string): boolean { const haystack = `${stdout}\n${stderr}` .split(/\r?\n/) .map((line) => line.trim()) .filter(Boolean) .join("\n"); - return /unknown\s+session|session\s+.*\s+not\s+found|resume\s+.*\s+not\s+found|checkpoint\s+.*\s+not\s+found|cannot\s+resume|failed\s+to\s+resume/i.test( + return /unknown\s+session|session\s+.*\s+not\s+found|resume\s+.*\s+not\s+found|checkpoint\s+.*\s+not\s+found|cannot\s+resume|failed\s+to\s+resume|exceeds\s+the\s+maximum\s+number\s+of\s+tokens|input\s+token\s+count\s+exceeds/i.test( + haystack, + ); +} + +export function isGeminiTransientNetworkError(stdout: string, stderr: string): boolean { + const haystack = `${stdout}\n${stderr}` + .split(/\r?\n/) + .map((line) => line.trim()) + .filter(Boolean) + .join("\n"); + + return /ENOTFOUND\s+oauth2\.googleapis\.com|ENOTFOUND\s+sts\.googleapis\.com|EAI_AGAIN|_GaxiosError.*ENOTFOUND|_UserRefreshClient.*ENOTFOUND/i.test( haystack, ); } diff --git a/packages/adapters/gemini-local/vitest.config.ts b/packages/adapters/gemini-local/vitest.config.ts new file mode 100644 index 00000000..f624398e --- /dev/null +++ b/packages/adapters/gemini-local/vitest.config.ts @@ -0,0 +1,7 @@ +import { defineConfig } from "vitest/config"; + +export default defineConfig({ + test: { + environment: "node", + }, +}); diff --git a/server/src/__tests__/adapter-session-codecs.test.ts b/server/src/__tests__/adapter-session-codecs.test.ts index 10905e51..fd5fa60e 100644 --- a/server/src/__tests__/adapter-session-codecs.test.ts +++ b/server/src/__tests__/adapter-session-codecs.test.ts @@ -7,7 +7,7 @@ import { } from "@paperclipai/adapter-cursor-local/server"; import { sessionCodec as geminiSessionCodec, - isGeminiUnknownSessionError, + isGeminiSessionUnrecoverableError, } from "@paperclipai/adapter-gemini-local/server"; import { sessionCodec as opencodeSessionCodec, @@ -220,19 +220,19 @@ describe("cursor resume recovery detection", () => { describe("gemini resume recovery detection", () => { it("detects unknown session errors from gemini output", () => { expect( - isGeminiUnknownSessionError( + isGeminiSessionUnrecoverableError( "", "unknown session id abc", ), ).toBe(true); expect( - isGeminiUnknownSessionError( + isGeminiSessionUnrecoverableError( "", "checkpoint latest not found", ), ).toBe(true); expect( - isGeminiUnknownSessionError( + isGeminiSessionUnrecoverableError( "{\"type\":\"result\",\"subtype\":\"success\"}", "", ), diff --git a/server/src/__tests__/gemini-local-adapter.test.ts b/server/src/__tests__/gemini-local-adapter.test.ts index 96e2e8ff..bc2d4643 100644 --- a/server/src/__tests__/gemini-local-adapter.test.ts +++ b/server/src/__tests__/gemini-local-adapter.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from "vitest"; import { isGeminiTurnLimitResult, - isGeminiUnknownSessionError, + isGeminiSessionUnrecoverableError, parseGeminiJsonl, } from "@paperclipai/adapter-gemini-local/server"; import { parseGeminiStdoutLine } from "@paperclipai/adapter-gemini-local/ui"; @@ -76,8 +76,8 @@ describe("gemini_local parser", () => { describe("gemini_local stale session detection", () => { it("treats missing session messages as an unknown session error", () => { - expect(isGeminiUnknownSessionError("", "unknown session id abc")).toBe(true); - expect(isGeminiUnknownSessionError("", "checkpoint latest not found")).toBe(true); + expect(isGeminiSessionUnrecoverableError("", "unknown session id abc")).toBe(true); + expect(isGeminiSessionUnrecoverableError("", "checkpoint latest not found")).toBe(true); }); });