opencode-gemini-cli-oauth 1.1.5 → 1.1.6

package/dist/plugin.d.ts

@@ -2,38 +2,27 @@
  * @license
  * Copyright 2025 Yusuf
  * SPDX-License-Identifier: MIT
- *
- * OpenCode Plugin for Gemini CLI OAuth Authentication
- *
- * This plugin enables OpenCode to use Google account OAuth credentials
- * from Gemini CLI, allowing access to Gemini models without API keys.
- *
- * Features:
- * - Reuses Gemini CLI OAuth credentials (~/.gemini/oauth_creds.json)
- * - Multi-account support with automatic rotation
- * - Automatic token refresh
- * - Rate limit handling with account switching
- * - Compatible with existing Antigravity plugin
  */
-import type { PluginContext, AuthLoader } from './types.js';
+import type { PluginContext } from './types.js';
+/**
+ * Custom fetch implementation with OAuth token injection
+ */
+declare function authenticatedFetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
 /**
- * OpenCode plugin export
+ * OpenCode Plugin for Gemini CLI OAuth Authentication
  */
 export default function GeminiCLIOAuthPlugin({ client, directory }: PluginContext): Promise<{
     auth: {
-        /**
-         * Auth provider for "gemini-cli-oauth" provider
-         */
         provider: string;
         /**
-         * Auth loader - returns fetch function with OAuth token injection
+         * Auth loader - must return an object with `apiKey` and `fetch` function
          */
-        loader: AuthLoader;
+        loader: (getAuth: any, provider: string) => Promise<{
+            apiKey: string;
+            fetch: typeof authenticatedFetch;
+        }>;
     };
 }>;
-/**
- * Plugin metadata
- */
 export declare const metadata: {
     name: string;
     version: string;
@@ -43,4 +32,5 @@ export declare const metadata: {
         opencode: string;
     };
 };
+export {};
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE5D;;GAEG;AACH,wBAA8B,oBAAoB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,aAAa;;QAUjF;;WAEG;;QAGH;;WAEG;gBAiBG,UAAU;;GAGrB;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;;;;CAQpB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAc,MAAM,YAAY,CAAC;AAK5D;;GAEG;AACH,iBAAe,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6BjG;AAED;;GAEG;AACH,wBAA8B,oBAAoB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,aAAa;;;QAmBjF;;WAEG;0BACqB,GAAG,YAAY,MAAM;;;;;GASlD;AAED,eAAO,MAAM,QAAQ;;;;;;;;CAQpB,CAAC"}

package/dist/plugin.js

@@ -2,61 +2,76 @@
  * @license
  * Copyright 2025 Yusuf
  * SPDX-License-Identifier: MIT
- *
- * OpenCode Plugin for Gemini CLI OAuth Authentication
- *
- * This plugin enables OpenCode to use Google account OAuth credentials
- * from Gemini CLI, allowing access to Gemini models without API keys.
- *
- * Features:
- * - Reuses Gemini CLI OAuth credentials (~/.gemini/oauth_creds.json)
- * - Multi-account support with automatic rotation
- * - Automatic token refresh
- * - Rate limit handling with account switching
- * - Compatible with existing Antigravity plugin
  */
-import { createRequestInterceptor } from './auth/request-interceptor.js';
+import { OAuthManager } from './auth/oauth.js';
+// Instantiate manager once
+const oauthManager = new OAuthManager();
 /**
- * OpenCode plugin export
+ * Custom fetch implementation with OAuth token injection
+ */
+async function authenticatedFetch(input, init) {
+    const urlStr = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;
+    // Only intercept Gemini API requests
+    if (!urlStr.includes('generativelanguage.googleapis.com')) {
+        return fetch(input, init);
+    }
+    try {
+        // Get OAuth token
+        const token = await oauthManager.getAccessToken();
+        // Inject Authorization header
+        const headers = new Headers(init?.headers);
+        headers.set('Authorization', `Bearer ${token}`);
+        // Remove API key from URL if present (OAuth doesn't need it)
+        const urlObj = new URL(urlStr);
+        urlObj.searchParams.delete('key');
+        return fetch(urlObj.toString(), {
+            ...init,
+            headers
+        });
+    }
+    catch (error) {
+        console.error('❌ [Gemini OAuth] Token error:', error);
+        // Fallback to original request (might fail with 403, but better than crashing)
+        return fetch(input, init);
+    }
+}
+/**
+ * OpenCode Plugin for Gemini CLI OAuth Authentication
  */
 export default async function GeminiCLIOAuthPlugin({ client, directory }) {
-    console.log('🚀 Loading Gemini CLI OAuth plugin...');
-    // Create request interceptor with OAuth token injection
-    const interceptor = await createRequestInterceptor();
-    console.log('✅ Gemini CLI OAuth plugin loaded successfully');
+    console.log('🚀 Loading Gemini CLI OAuth plugin (v1.1.6)...');
+    // Verify credentials on load (optional, just for logging)
+    try {
+        const valid = await oauthManager.verifyCredentials();
+        if (valid) {
+            console.log('✅ Gemini CLI OAuth credentials verified');
+        }
+        else {
+            console.warn('⚠️  Gemini CLI OAuth credentials missing or invalid. Run: opencode-gemini-setup');
+        }
+    }
+    catch (e) {
+        // Ignore init errors
+    }
     return {
         auth: {
-            /**
-             * Auth provider for "gemini-cli-oauth" provider
-             */
             provider: 'gemini-cli-oauth',
             /**
-             * Auth loader - returns fetch function with OAuth token injection
+             * Auth loader - must return an object with `apiKey` and `fetch` function
              */
-            loader: (async (getAuth, provider) => {
-                // Only intercept requests for "gemini-cli-oauth" provider
-                if (provider !== 'gemini-cli-oauth') {
-                    return {
-                        apiKey: '',
-                        fetch: fetch,
-                    };
-                }
+            loader: async (getAuth, provider) => {
+                // Return explicit object structure
                 return {
-                    // Dummy API key (OAuth doesn't need it)
-                    apiKey: 'gemini-cli-oauth',
-                    // Custom fetch with OAuth token injection
-                    fetch: interceptor.fetch,
+                    apiKey: 'gemini-cli-oauth-placeholder', // Must not be empty string for some checks
+                    fetch: authenticatedFetch
                 };
-            }),
+            }
         },
     };
 }
-/**
- * Plugin metadata
- */
 export const metadata = {
     name: 'opencode-gemini-cli-oauth',
-    version: '1.0.0',
+    version: '1.1.6',
     description: 'Use Gemini CLI OAuth credentials in OpenCode',
     author: 'Yusuf',
     compatibleWith: {

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAiB;IACrF,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IAErD,wDAAwD;IACxD,MAAM,WAAW,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAErD,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAE7D,OAAO;QACL,IAAI,EAAE;YACJ;;eAEG;YACH,QAAQ,EAAE,kBAAkB;YAE5B;;eAEG;YACH,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;gBACnC,0DAA0D;gBAC1D,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;oBACpC,OAAO;wBACL,MAAM,EAAE,EAAE;wBACV,KAAK,EAAE,KAAK;qBACb,CAAC;gBACJ,CAAC;gBAED,OAAO;oBACL,wCAAwC;oBACxC,MAAM,EAAE,kBAAkB;oBAE1B,0CAA0C;oBAC1C,KAAK,EAAE,WAAW,CAAC,KAAK;iBACzB,CAAC;YACJ,CAAC,CAAe;SACjB;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,8CAA8C;IAC3D,MAAM,EAAE,OAAO;IACf,cAAc,EAAE;QACd,QAAQ,EAAE,QAAQ;KACnB;CACF,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,2BAA2B;AAC3B,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;AAExC;;GAEG;AACH,KAAK,UAAU,kBAAkB,CAAC,KAAwB,EAAE,IAAkB;IAC5E,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IAEjG,qCAAqC;IACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mCAAmC,CAAC,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC;QACH,kBAAkB;QAClB,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAElD,8BAA8B;QAC9B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;QAEhD,6DAA6D;QAC7D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAElC,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;YAC9B,GAAG,IAAI;YACP,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;QACtD,+EAA+E;QAC/E,OAAO,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAiB;IACrF,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;IAE9D,0DAA0D;IAC1D,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,iBAAiB,EAAE,CAAC;QACrD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,qBAAqB;IACvB,CAAC;IAED,OAAO;QACL,IAAI,EAAE;YACJ,QAAQ,EAAE,kBAAkB;YAE5B;;eAEG;YACH,MAAM,EAAE,KAAK,EAAE,OAAY,EAAE,QAAgB,EAAE,EAAE;gBAC/C,mCAAmC;gBACnC,OAAO;oBACL,MAAM,EAAE,8BAA8B,EAAE,2CAA2C;oBACnF,KAAK,EAAE,kBAAkB;iBAC1B,CAAC;YACJ,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,8CAA8C;IAC3D,MAAM,EAAE,OAAO;IACf,cAAc,EAAE;QACd,QAAQ,EAAE,QAAQ;KACnB;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-gemini-cli-oauth",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "OpenCode plugin for Gemini CLI OAuth authentication - use Google account quota without API keys",
   "type": "module",
   "main": "dist/index-minimal.js",