opencode-gemini-auth 1.1.0 → 1.1.4

package/README.md

@@ -62,6 +62,15 @@ When you want Opencode to use a local checkout of this plugin, point the
 Replace `/absolute/path/to/opencode-gemini-auth` with the absolute path to
 your local clone.
 
+## Manual Google Cloud Setup
+
+If automatic provisioning fails, use the console:
+
+1. Go to the Google Cloud Console and create (or select) a project, e.g. `gemini`.
+2. Select that project.
+3. Enable the **Gemini for Google Cloud API** (`cloudaicompanion.googleapis.com`).
+4. Re-run `opencode auth login` and enter the project **ID** (not the display name).
+
 ## Debugging Gemini Requests
 
 Set `OPENCODE_GEMINI_DEBUG=1` in the environment when you run an Opencode

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-gemini-auth",
   "module": "index.ts",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "author": "jenslys",
   "repository": "https://github.com/jenslys/opencode-gemini-auth",
   "files": [

package/src/plugin/request.ts

@@ -8,6 +8,20 @@ const STREAM_ACTION = "streamGenerateContent";
 const MODEL_FALLBACKS: Record<string, string> = {
   "gemini-2.5-flash-image": "gemini-2.5-flash",
 };
+const GEMINI_PREVIEW_LINK = "https://goo.gle/enable-preview-features";
+
+interface GeminiApiError {
+  code?: number;
+  message?: string;
+  status?: string;
+  [key: string]: unknown;
+}
+
+interface GeminiApiBody {
+  response?: unknown;
+  error?: GeminiApiError;
+  [key: string]: unknown;
+}
 
 export function isGenerativeLanguageRequest(input: RequestInfo): input is string {
   return typeof input === "string" && input.includes("generativelanguage.googleapis.com");
@@ -40,7 +54,7 @@ export function prepareGeminiRequest(
   init: RequestInit | undefined,
   accessToken: string,
   projectId: string,
-): { request: RequestInfo; init: RequestInit; streaming: boolean } {
+): { request: RequestInfo; init: RequestInit; streaming: boolean; requestedModel?: string } {
   const baseInit: RequestInit = { ...init };
   const headers = new Headers(init?.headers ?? {});
 
@@ -124,6 +138,7 @@ export function prepareGeminiRequest(
       body,
     },
     streaming,
+    requestedModel: rawModel,
   };
 }
 
@@ -131,9 +146,13 @@ export async function transformGeminiResponse(
   response: Response,
   streaming: boolean,
   debugContext?: GeminiDebugContext | null,
+  requestedModel?: string,
 ): Promise<Response> {
   const contentType = response.headers.get("content-type") ?? "";
-  if (!streaming && !contentType.includes("application/json")) {
+  const isJsonResponse = contentType.includes("application/json");
+  const isEventStreamResponse = contentType.includes("text/event-stream");
+
+  if (!isJsonResponse && !isEventStreamResponse) {
     logGeminiDebugResponse(debugContext, response, {
       note: "Non-JSON response (body omitted)",
     });
@@ -154,13 +173,24 @@ export async function transformGeminiResponse(
       note: streaming ? "Streaming SSE payload" : undefined,
     });
 
-    if (streaming) {
+    if (streaming && response.ok && isEventStreamResponse) {
       return new Response(transformStreamingPayload(text), init);
     }
 
-    const parsed = JSON.parse(text) as { response?: unknown };
-    if (parsed.response !== undefined) {
-      return new Response(JSON.stringify(parsed.response), init);
+    const parsed = parseGeminiApiBody(text);
+    if (!parsed) {
+      return new Response(text, init);
+    }
+
+    const patched = rewriteGeminiPreviewAccessError(parsed, response.status, requestedModel);
+    const effectiveBody = patched ?? parsed;
+
+    if (effectiveBody.response !== undefined) {
+      return new Response(JSON.stringify(effectiveBody.response), init);
+    }
+
+    if (patched) {
+      return new Response(JSON.stringify(effectiveBody), init);
     }
 
     return new Response(text, init);
@@ -173,3 +203,76 @@ export async function transformGeminiResponse(
     return response;
   }
 }
+
+function rewriteGeminiPreviewAccessError(
+  body: GeminiApiBody,
+  status: number,
+  requestedModel?: string,
+): GeminiApiBody | null {
+  if (!needsPreviewAccessOverride(status, body, requestedModel)) {
+    return null;
+  }
+
+  const error: GeminiApiError = body.error ?? {};
+  const trimmedMessage = typeof error.message === "string" ? error.message.trim() : "";
+  const messagePrefix = trimmedMessage.length > 0
+    ? trimmedMessage
+    : "Gemini 3 preview features are not enabled for this account.";
+  const enhancedMessage = `${messagePrefix} Request preview access at ${GEMINI_PREVIEW_LINK} before using Gemini 3 models.`;
+
+  return {
+    ...body,
+    error: {
+      ...error,
+      message: enhancedMessage,
+    },
+  };
+}
+
+function needsPreviewAccessOverride(
+  status: number,
+  body: GeminiApiBody,
+  requestedModel?: string,
+): boolean {
+  if (status !== 404) {
+    return false;
+  }
+
+  if (isGeminiThreeModel(requestedModel)) {
+    return true;
+  }
+
+  const errorMessage = typeof body.error?.message === "string" ? body.error.message : "";
+  return isGeminiThreeModel(errorMessage);
+}
+
+function isGeminiThreeModel(target?: string): boolean {
+  if (!target) {
+    return false;
+  }
+
+  return /gemini[\s-]?3/i.test(target);
+}
+
+function parseGeminiApiBody(rawText: string): GeminiApiBody | null {
+  try {
+    const parsed = JSON.parse(rawText);
+    if (Array.isArray(parsed)) {
+      const firstObject = parsed.find(function (item: unknown) {
+        return typeof item === "object" && item !== null;
+      });
+      if (firstObject && typeof firstObject === "object") {
+        return firstObject as GeminiApiBody;
+      }
+      return null;
+    }
+
+    if (parsed && typeof parsed === "object") {
+      return parsed as GeminiApiBody;
+    }
+
+    return null;
+  } catch {
+    return null;
+  }
+}

package/src/plugin/token.ts

@@ -139,14 +139,13 @@ export async function refreshAccessToken(
     storeCachedAuth(updatedAuth);
     invalidateProjectContextCache(auth.refresh);
 
-    const refreshTokenRotated =
-      typeof payload.refresh_token === "string" && payload.refresh_token !== parts.refreshToken;
-
-    if (refreshTokenRotated) {
+    try {
       await client.auth.set({
         path: { id: GEMINI_PROVIDER_ID },
         body: updatedAuth,
       });
+    } catch (storeError) {
+      console.error("Failed to persist refreshed Gemini OAuth credentials:", storeError);
     }
 
     return updatedAuth;

package/src/plugin.ts

@@ -79,7 +79,12 @@ export const GeminiCLIOAuthPlugin = async (
 
           const projectContext = await resolveProjectContext();
 
-          const { request, init: transformedInit, streaming } = prepareGeminiRequest(
+          const {
+            request,
+            init: transformedInit,
+            streaming,
+            requestedModel,
+          } = prepareGeminiRequest(
             input,
             init,
             accessToken,
@@ -99,7 +104,7 @@ export const GeminiCLIOAuthPlugin = async (
           });
 
           const response = await fetch(request, transformedInit);
-          return transformGeminiResponse(response, streaming, debugContext);
+          return transformGeminiResponse(response, streaming, debugContext, requestedModel);
         },
       };
     },