opencode-gemini-auth 1.4.4 → 1.4.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-gemini-auth",
   "module": "index.ts",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "author": "jenslys",
   "repository": "https://github.com/jenslys/opencode-gemini-auth",
   "files": [
@@ -11,7 +11,9 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "update:gemini-cli": "git -C .local/gemini-cli pull --ff-only"
+    "update:gemini-cli": "git -C .local/gemini-cli pull --ff-only",
+    "update:gemini-cli-version": "node commands/sync-gemini-cli-version.mjs",
+    "update:gemini-cli-sync": "npm run update:gemini-cli && npm run update:gemini-cli-version"
   },
   "devDependencies": {
     "@types/bun": "latest"

package/src/constants.ts

@@ -28,7 +28,6 @@ export const GEMINI_REDIRECT_URI = "http://localhost:8085/oauth2callback";
 export const GEMINI_CODE_ASSIST_ENDPOINT = "https://cloudcode-pa.googleapis.com";
 
 export const CODE_ASSIST_HEADERS = {
-  "User-Agent": "google-api-nodejs-client/9.15.1",
   "X-Goog-Api-Client": "gl-node/22.17.0",
   "Client-Metadata": "ideType=IDE_UNSPECIFIED,platform=PLATFORM_UNSPECIFIED,pluginType=GEMINI",
 } as const;

package/src/plugin/gemini-cli-version.ts

@@ -0,0 +1,5 @@
+/**
+ * Synced from `.local/gemini-cli/packages/cli/package.json`.
+ * Update with: `npm run update:gemini-cli-version`
+ */
+export const GEMINI_CLI_VERSION = "0.30.0-nightly.20260210.a2174751d";

package/src/plugin/project/api.ts

@@ -1,5 +1,6 @@
 import { CODE_ASSIST_HEADERS, GEMINI_CODE_ASSIST_ENDPOINT } from "../../constants";
 import { logGeminiDebugResponse, startGeminiDebugRequest } from "../debug";
+import { buildGeminiCliUserAgent } from "../user-agent";
 import {
   FREE_TIER_ID,
   type LoadCodeAssistPayload,
@@ -27,6 +28,7 @@ export async function loadManagedProject(
     const headers = {
       "Content-Type": "application/json",
       Authorization: `Bearer ${accessToken}`,
+      "User-Agent": buildGeminiCliUserAgent(),
       ...CODE_ASSIST_HEADERS,
     };
     const debugContext = startGeminiDebugRequest({
@@ -92,6 +94,7 @@ export async function onboardManagedProject(
   const headers = {
     "Content-Type": "application/json",
     Authorization: `Bearer ${accessToken}`,
+    "User-Agent": buildGeminiCliUserAgent(),
     ...CODE_ASSIST_HEADERS,
   };
 
@@ -143,6 +146,7 @@ export async function retrieveUserQuota(
   const headers = {
     "Content-Type": "application/json",
     Authorization: `Bearer ${accessToken}`,
+    "User-Agent": buildGeminiCliUserAgent(),
     ...CODE_ASSIST_HEADERS,
   };
 

package/src/plugin/request/prepare.ts

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 
 import { CODE_ASSIST_HEADERS, GEMINI_CODE_ASSIST_ENDPOINT } from "../../constants";
 import { normalizeThinkingConfig } from "../request-helpers";
+import { buildGeminiCliUserAgent } from "../user-agent";
 import { normalizeRequestPayloadIdentifiers, normalizeWrappedIdentifiers } from "./identifiers";
 import { addThoughtSignaturesToFunctionCalls, transformOpenAIToolCalls } from "./openai";
 import { isGenerativeLanguageRequest, toRequestUrlString } from "./shared";
@@ -38,6 +39,7 @@ export function prepareGeminiRequest(
 
   headers.set("Authorization", `Bearer ${accessToken}`);
   headers.delete("x-api-key");
+  headers.delete("x-goog-api-key");
 
   const match = toRequestUrlString(input).match(/\/models\/([^:]+):(\w+)/);
   if (!match) {
@@ -70,7 +72,7 @@ export function prepareGeminiRequest(
     headers.set("Accept", "text/event-stream");
   }
 
-  headers.set("User-Agent", CODE_ASSIST_HEADERS["User-Agent"]);
+  headers.set("User-Agent", buildGeminiCliUserAgent(effectiveModel));
   headers.set("X-Goog-Api-Client", CODE_ASSIST_HEADERS["X-Goog-Api-Client"]);
   headers.set("Client-Metadata", CODE_ASSIST_HEADERS["Client-Metadata"]);
   /**

package/src/plugin/request.test.ts

@@ -25,6 +25,7 @@ describe("request helpers", () => {
       headers: {
         "Content-Type": "application/json",
         "x-api-key": "should-be-removed",
+        "x-goog-api-key": "should-also-be-removed",
       },
       body: JSON.stringify({
         contents: [{ role: "user", parts: [{ text: "hi" }] }],
@@ -43,6 +44,9 @@ describe("request helpers", () => {
     const headers = new Headers(result.init.headers);
     expect(headers.get("Authorization")).toBe("Bearer token-123");
     expect(headers.get("x-api-key")).toBeNull();
+    expect(headers.get("x-goog-api-key")).toBeNull();
+    expect(headers.get("User-Agent")).toContain("GeminiCLI/");
+    expect(headers.get("User-Agent")).toContain("/gemini-3-flash-preview ");
     expect(headers.get("Accept")).toBe("text/event-stream");
     expect(headers.get("x-activity-request-id")).toBeTruthy();
 

package/src/plugin/user-agent.test.ts

@@ -0,0 +1,50 @@
+import { afterEach, describe, expect, it } from "bun:test";
+
+import { GEMINI_CLI_VERSION } from "./gemini-cli-version";
+import { buildGeminiCliUserAgent, getGeminiCliVersion, userAgentInternals } from "./user-agent";
+
+const originalNpmPackageVersion = process.env.npm_package_version;
+const originalExplicitVersion = process.env.OPENCODE_GEMINI_CLI_VERSION;
+
+describe("user-agent", () => {
+  afterEach(() => {
+    if (originalNpmPackageVersion === undefined) {
+      delete process.env.npm_package_version;
+    } else {
+      process.env.npm_package_version = originalNpmPackageVersion;
+    }
+    if (originalExplicitVersion === undefined) {
+      delete process.env.OPENCODE_GEMINI_CLI_VERSION;
+    } else {
+      process.env.OPENCODE_GEMINI_CLI_VERSION = originalExplicitVersion;
+    }
+    userAgentInternals.resetCache();
+  });
+
+  it("prefers OPENCODE_GEMINI_CLI_VERSION when available", () => {
+    process.env.OPENCODE_GEMINI_CLI_VERSION = "8.8.8-explicit";
+    process.env.npm_package_version = "9.9.9-test";
+    userAgentInternals.resetCache();
+
+    expect(getGeminiCliVersion()).toBe("8.8.8-explicit");
+    expect(buildGeminiCliUserAgent("gemini-3-flash-preview")).toContain("/8.8.8-explicit/");
+  });
+
+  it("prefers synced GEMINI_CLI_VERSION over npm_package_version", () => {
+    delete process.env.OPENCODE_GEMINI_CLI_VERSION;
+    process.env.npm_package_version = "9.9.9-test";
+    userAgentInternals.resetCache();
+
+    expect(getGeminiCliVersion()).toBe(GEMINI_CLI_VERSION);
+  });
+
+  it("builds a GeminiCLI-style user agent", () => {
+    delete process.env.OPENCODE_GEMINI_CLI_VERSION;
+    delete process.env.npm_package_version;
+    userAgentInternals.resetCache();
+
+    const userAgent = buildGeminiCliUserAgent("gemini-3-flash-preview");
+    expect(userAgent).toContain("GeminiCLI/");
+    expect(userAgent).toContain(`/gemini-3-flash-preview `);
+  });
+});

package/src/plugin/user-agent.ts

@@ -0,0 +1,76 @@
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { GEMINI_CLI_VERSION } from "./gemini-cli-version";
+
+const GEMINI_CLI_UA_NAME = "GeminiCLI";
+const GEMINI_CLI_DEFAULT_MODEL = "gemini-code-assist";
+
+let cachedGeminiCliVersion: string | undefined;
+
+/**
+ * Resolves plugin version for User-Agent:
+ * 1) explicit override (`OPENCODE_GEMINI_CLI_VERSION`)
+ * 2) synced Gemini CLI version file (`src/plugin/gemini-cli-version.ts`)
+ * 3) package-manager runtime env (`npm_package_version`)
+ * 4) local package.json next to the plugin sources
+ * 5) cwd package.json as final fallback
+ */
+export function getGeminiCliVersion(): string {
+  if (cachedGeminiCliVersion) {
+    return cachedGeminiCliVersion;
+  }
+
+  const explicitVersion = process.env.OPENCODE_GEMINI_CLI_VERSION?.trim();
+  if (explicitVersion) {
+    cachedGeminiCliVersion = explicitVersion;
+    return cachedGeminiCliVersion;
+  }
+
+  if (GEMINI_CLI_VERSION.trim()) {
+    cachedGeminiCliVersion = GEMINI_CLI_VERSION.trim();
+    return cachedGeminiCliVersion;
+  }
+
+  const envVersion = process.env.npm_package_version?.trim();
+  if (envVersion) {
+    cachedGeminiCliVersion = envVersion;
+    return cachedGeminiCliVersion;
+  }
+
+  const moduleDir = dirname(fileURLToPath(import.meta.url));
+  const candidatePaths = [
+    join(moduleDir, "../../package.json"),
+    join(moduleDir, "../package.json"),
+    join(process.cwd(), "package.json"),
+  ];
+
+  for (const packagePath of candidatePaths) {
+    try {
+      const parsed = JSON.parse(readFileSync(packagePath, "utf8")) as { version?: unknown };
+      if (typeof parsed.version === "string" && parsed.version.trim()) {
+        cachedGeminiCliVersion = parsed.version.trim();
+        return cachedGeminiCliVersion;
+      }
+    } catch {
+      continue;
+    }
+  }
+
+  cachedGeminiCliVersion = "0.0.0";
+  return cachedGeminiCliVersion;
+}
+
+/**
+ * Builds a Gemini CLI-style User-Agent string.
+ */
+export function buildGeminiCliUserAgent(model?: string): string {
+  const modelSegment = model?.trim() || GEMINI_CLI_DEFAULT_MODEL;
+  return `${GEMINI_CLI_UA_NAME}/${getGeminiCliVersion()}/${modelSegment} (${process.platform}; ${process.arch})`;
+}
+
+export const userAgentInternals = {
+  resetCache() {
+    cachedGeminiCliVersion = undefined;
+  },
+};