opencode-gemini-auth 1.4.6 → 1.4.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-gemini-auth",
   "module": "index.ts",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "author": "jenslys",
   "repository": "https://github.com/jenslys/opencode-gemini-auth",
   "files": [
@@ -22,7 +22,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@opencode-ai/plugin": "^1.2.10",
+    "@opencode-ai/plugin": "^1.2.20",
     "@openauthjs/openauth": "^0.4.3"
   }
 }

package/src/plugin/oauth-authorize.ts

@@ -4,13 +4,16 @@ import { authorizeGemini, exchangeGeminiWithVerifier } from "../gemini/oauth";
 import type { GeminiTokenExchangeResult } from "../gemini/oauth";
 import { isGeminiDebugEnabled, logGeminiDebugMessage } from "./debug";
 import { resolveProjectContextFromAccessToken } from "./project";
+import { resolveConfiguredProjectId } from "./provider";
 import { startOAuthListener, type OAuthListener } from "./server";
 import type { OAuthAuthDetails } from "./types";
 
 /**
  * Builds the OAuth authorize callback used by plugin auth methods.
  */
-export function createOAuthAuthorizeMethod(): () => Promise<{
+export function createOAuthAuthorizeMethod(options?: {
+  getConfiguredProjectId?: () => string | undefined;
+}): () => Promise<{
   url: string;
   instructions: string;
   method: string;
@@ -24,12 +27,9 @@ export function createOAuthAuthorizeMethod(): () => Promise<{
         return result;
       }
 
-      const projectFromEnv = process.env.OPENCODE_GEMINI_PROJECT_ID?.trim() ?? "";
-      const googleProjectFromEnv =
-        process.env.GOOGLE_CLOUD_PROJECT?.trim() ??
-        process.env.GOOGLE_CLOUD_PROJECT_ID?.trim() ??
-        "";
-      const configuredProjectId = projectFromEnv || googleProjectFromEnv || undefined;
+      const configuredProjectId = resolveConfiguredProjectId({
+        configProjectId: options?.getConfiguredProjectId?.(),
+      });
 
       try {
         const authSnapshot = {

package/src/plugin/project.test.ts

@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, mock } from "bun:test";
 
+import { formatRefreshParts } from "./auth";
 import { resolveProjectContextFromAccessToken } from "./project";
 import type { OAuthAuthDetails } from "./types";
 
@@ -109,4 +110,28 @@ describe("resolveProjectContextFromAccessToken", () => {
       resolveProjectContextFromAccessToken(baseAuth, baseAuth.access ?? ""),
     ).rejects.toThrow("Google Gemini requires a Google Cloud project");
   });
+
+  it("prefers a configured project id over a persisted managed project id", async () => {
+    const authWithManagedProject: OAuthAuthDetails = {
+      ...baseAuth,
+      refresh: formatRefreshParts({
+        refreshToken: "refresh-token",
+        managedProjectId: "managed-project",
+      }),
+    };
+
+    const fetchMock = mock(async () => {
+      throw new Error("should not fetch project context when a configured project id exists");
+    });
+    (globalThis as { fetch: typeof fetch }).fetch = fetchMock as unknown as typeof fetch;
+
+    const result = await resolveProjectContextFromAccessToken(
+      authWithManagedProject,
+      authWithManagedProject.access ?? "",
+      "configured-project",
+    );
+
+    expect(result.effectiveProjectId).toBe("configured-project");
+    expect(fetchMock.mock.calls.length).toBe(0);
+  });
 });

package/src/plugin/provider.test.ts

@@ -0,0 +1,59 @@
+import { describe, expect, it } from "bun:test";
+import type { Config } from "@opencode-ai/sdk";
+
+import { resolveConfiguredProjectId, resolveConfiguredProjectIdFromConfig } from "./provider";
+import type { Provider } from "./types";
+
+describe("resolveConfiguredProjectId", () => {
+  it("reads project id from provider options", () => {
+    const provider = {
+      id: "google",
+      name: "Google",
+      source: "config",
+      env: [],
+      options: {
+        projectId: "  provider-project  ",
+      },
+      models: {},
+    } satisfies Provider;
+
+    expect(
+      resolveConfiguredProjectId({
+        provider,
+        env: {},
+      }),
+    ).toBe("provider-project");
+  });
+
+  it("falls back to the top-level config project id when provider options are unavailable", () => {
+    const config = {
+      provider: {
+        google: {
+          options: {
+            projectId: "config-project",
+          },
+        },
+      },
+    } satisfies Config;
+
+    expect(resolveConfiguredProjectIdFromConfig(config)).toBe("config-project");
+    expect(
+      resolveConfiguredProjectId({
+        config,
+        env: {},
+      }),
+    ).toBe("config-project");
+  });
+
+  it("prefers OPENCODE_GEMINI_PROJECT_ID over config and google cloud env vars", () => {
+    expect(
+      resolveConfiguredProjectId({
+        configProjectId: "config-project",
+        env: {
+          OPENCODE_GEMINI_PROJECT_ID: "opencode-project",
+          GOOGLE_CLOUD_PROJECT: "google-project",
+        },
+      }),
+    ).toBe("opencode-project");
+  });
+});

package/src/plugin/provider.ts

@@ -0,0 +1,55 @@
+import type { Config } from "@opencode-ai/sdk";
+
+import { GEMINI_PROVIDER_ID } from "../constants";
+import type { Provider } from "./types";
+
+interface ResolveConfiguredProjectIdInput {
+  provider?: Provider | null;
+  config?: Config | null;
+  configProjectId?: string;
+  env?: NodeJS.ProcessEnv;
+}
+
+export function resolveConfiguredProjectId(
+  input: ResolveConfiguredProjectIdInput = {},
+): string | undefined {
+  const env = input.env ?? process.env;
+
+  return (
+    normalizeProjectId(env.OPENCODE_GEMINI_PROJECT_ID) ??
+    resolveConfiguredProjectIdFromProvider(input.provider) ??
+    normalizeProjectId(input.configProjectId) ??
+    resolveConfiguredProjectIdFromConfig(input.config) ??
+    normalizeProjectId(env.GOOGLE_CLOUD_PROJECT) ??
+    normalizeProjectId(env.GOOGLE_CLOUD_PROJECT_ID)
+  );
+}
+
+export function resolveConfiguredProjectIdFromProvider(
+  provider: Provider | null | undefined,
+): string | undefined {
+  if (!provider || typeof provider !== "object") {
+    return undefined;
+  }
+  return normalizeProjectId(provider.options?.projectId);
+}
+
+export function resolveConfiguredProjectIdFromConfig(
+  config: Config | null | undefined,
+): string | undefined {
+  if (!config?.provider || typeof config.provider !== "object") {
+    return undefined;
+  }
+
+  const providerConfig = config.provider[GEMINI_PROVIDER_ID];
+  return normalizeProjectId(providerConfig?.options?.projectId);
+}
+
+function normalizeProjectId(value: unknown): string | undefined {
+  if (typeof value !== "string") {
+    return undefined;
+  }
+
+  const trimmed = value.trim();
+  return trimmed || undefined;
+}

package/src/plugin.ts

@@ -9,6 +9,7 @@ import {
 } from "./plugin/quota";
 import { isGeminiDebugEnabled, logGeminiDebugMessage, startGeminiDebugRequest } from "./plugin/debug";
 import { maybeShowGeminiCapacityToast, maybeShowGeminiTestToast } from "./plugin/notify";
+import { resolveConfiguredProjectId, resolveConfiguredProjectIdFromConfig } from "./plugin/provider";
 import {
   isGenerativeLanguageRequest,
   prepareGeminiRequest,
@@ -44,6 +45,7 @@ export const GeminiCLIOAuthPlugin = async (
   { client }: PluginContext,
 ): Promise<PluginResult> => ({
   config: async (config) => {
+    latestGeminiConfiguredProjectId = resolveConfiguredProjectIdFromConfig(config);
     config.command = config.command || {};
     config.command[GEMINI_QUOTA_COMMAND] = {
       description: "Show Gemini Code Assist quota usage",
@@ -66,7 +68,10 @@ export const GeminiCLIOAuthPlugin = async (
         return null;
       }
 
-      const configuredProjectId = resolveConfiguredProjectId(provider);
+      const configuredProjectId = resolveConfiguredProjectId({
+        provider,
+        configProjectId: latestGeminiConfiguredProjectId,
+      });
       latestGeminiConfiguredProjectId = configuredProjectId;
       normalizeProviderModelCosts(provider);
       const thinkingConfigDefaults = resolveThinkingConfigDefaults(provider);
@@ -147,7 +152,9 @@ export const GeminiCLIOAuthPlugin = async (
       {
         label: "OAuth with Google (Gemini CLI)",
         type: "oauth",
-        authorize: createOAuthAuthorizeMethod(),
+        authorize: createOAuthAuthorizeMethod({
+          getConfiguredProjectId: () => latestGeminiConfiguredProjectId,
+        }),
       },
       {
         provider: GEMINI_PROVIDER_ID,
@@ -161,24 +168,6 @@ export const GeminiCLIOAuthPlugin = async (
 export const GoogleOAuthPlugin = GeminiCLIOAuthPlugin;
 const loggedQuotaModelsByProject = new Set<string>();
 
-function resolveConfiguredProjectId(provider: Provider): string | undefined {
-  const providerOptions =
-    provider && typeof provider === "object"
-      ? ((provider as { options?: Record<string, unknown> }).options ?? undefined)
-      : undefined;
-  const projectIdFromConfig =
-    providerOptions && typeof providerOptions.projectId === "string"
-      ? providerOptions.projectId.trim()
-      : "";
-  const projectIdFromEnv = process.env.OPENCODE_GEMINI_PROJECT_ID?.trim() ?? "";
-  const googleProjectIdFromEnv =
-    process.env.GOOGLE_CLOUD_PROJECT?.trim() ??
-    process.env.GOOGLE_CLOUD_PROJECT_ID?.trim() ??
-    "";
-
-  return projectIdFromEnv || projectIdFromConfig || googleProjectIdFromEnv || undefined;
-}
-
 function normalizeProviderModelCosts(provider: Provider): void {
   if (!provider.models) {
     return;