opencode-gemini-cli-oauth 1.1.13 → 1.1.14

package/dist/index.d.ts

@@ -8,8 +8,7 @@
  *
  * Main entry point for the plugin
  */
-export { GeminiCLIOAuthPlugin, metadata } from './plugin.js';
-export type { OAuthCredentials, GoogleAccount, AccountPoolEntry, AccountPool, PluginConfig, } from './types.js';
+export { default } from './plugin.js';
 export { oauth } from './auth/oauth.js';
 export { accountManager } from './auth/account-manager.js';
 export { StorageManager } from './storage/storage.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AAGH,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAG7D,YAAY,EACV,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,WAAW,EACX,YAAY,GACb,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAGtC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -8,8 +8,8 @@
  *
  * Main entry point for the plugin
  */
-// Named export for OpenCode (following Antigravity pattern)
-export { GeminiCLIOAuthPlugin, metadata } from './plugin.js';
+// Default export for OpenCode (Factory Function Pattern)
+export { default } from './plugin.js';
 // Export utilities for advanced usage
 export { oauth } from './auth/oauth.js';
 export { accountManager } from './auth/account-manager.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AAEH,4DAA4D;AAC5D,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAW7D,sCAAsC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AAEH,yDAAyD;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,sCAAsC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/plugin.d.ts

@@ -6,20 +6,15 @@
 import type { PluginContext } from './types.js';
 /**
  * OpenCode Plugin for Gemini CLI OAuth Authentication
+ * Refactored based on Architectural Analysis (Factory Function Pattern)
  */
-export declare const GeminiCLIOAuthPlugin: ({ client, directory }: PluginContext) => Promise<{
+export default function loadPlugin(context: PluginContext): Promise<{
     auth: {
         provider: string;
-        /**
-         * Auth loader - returns object with apiKey and fetch function
-         */
         loader: (getAuth: any, provider: string) => Promise<{
             apiKey: string;
-            fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
+            fetch: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
         }>;
-        /**
-         * Auth methods
-         */
         methods: {
             label: string;
             type: string;
@@ -40,13 +35,4 @@ export declare const GeminiCLIOAuthPlugin: ({ client, directory }: PluginContext
         }[];
     };
 }>;
-export declare const metadata: {
-    name: string;
-    version: string;
-    description: string;
-    author: string;
-    compatibleWith: {
-        opencode: string;
-    };
-};
 //# 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;;;;GAIG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAc,MAAM,YAAY,CAAC;AAK5D;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAU,uBAAuB,aAAa;;;QAOzE;;WAEG;0BACqB,GAAG,YAAY,MAAM;;yBAKtB,WAAW,GAAG,GAAG,SAAS,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;;QAgChF;;WAEG;;;;;;;;;;;;;;;;;;;;EA6BR,CAAC;AAEF,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,EAAE,MAAM,YAAY,CAAC;AAEhD;;;GAGG;AACH,wBAA8B,UAAU,CAAC,OAAO,EAAE,aAAa;;;0BA4DjC,GAAG,YAAY,MAAM;;2BAlDV,WAAW,GAAG,GAAG,SAAS,WAAW,KAAG,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;GAkFjG"}

package/dist/plugin.js

@@ -4,53 +4,68 @@
  * SPDX-License-Identifier: MIT
  */
 import { oauth } from './auth/oauth.js';
-// No instantiation needed
-// const oauthManager = new OAuthManager(); 
 /**
  * OpenCode Plugin for Gemini CLI OAuth Authentication
+ * Refactored based on Architectural Analysis (Factory Function Pattern)
  */
-export const GeminiCLIOAuthPlugin = async ({ client, directory }) => {
-    console.log('🚀 Loading Gemini CLI OAuth plugin (v1.1.13)...');
+export default async function loadPlugin(context) {
+    console.log('🚀 Loading Gemini CLI OAuth plugin (v1.1.14)...');
+    // 1. Capture original fetcher (Middleware pattern)
+    // Fallback to global fetch if context.client.fetch is not available
+    const nextFetch = (context.client && context.client.fetch)
+        ? context.client.fetch.bind(context.client)
+        : globalThis.fetch.bind(globalThis);
+    // 2. Define the interceptor
+    const interceptedFetch = async (input, init) => {
+        const urlStr = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;
+        // Filter: Only intercept Gemini API requests
+        if (!urlStr.includes('generativelanguage.googleapis.com')) {
+            return nextFetch(input, init);
+        }
+        try {
+            // 3. Auth Check & Token Retrieval
+            // This handles token refresh automatically via our functional module
+            const token = await oauth.getAccessToken();
+            // 4. Clone init to avoid mutation side-effects
+            const newInit = { ...init };
+            const headers = new Headers(newInit.headers);
+            // 5. Inject Header
+            headers.set('Authorization', `Bearer ${token}`);
+            newInit.headers = headers;
+            // Remove API key query param if present (cleanup)
+            let targetInput = input;
+            if (typeof input === 'string' && input.includes('key=')) {
+                const urlObj = new URL(input);
+                urlObj.searchParams.delete('key');
+                targetInput = urlObj.toString();
+            }
+            else if (input instanceof URL && input.searchParams.has('key')) {
+                const urlObj = new URL(input.toString());
+                urlObj.searchParams.delete('key');
+                targetInput = urlObj;
+            }
+            // 6. Forward to original fetcher
+            return nextFetch(targetInput, newInit);
+        }
+        catch (error) {
+            console.error('❌ [Gemini OAuth] Token error:', error);
+            // Fallback: try request without auth injection (will likely fail 401/403 but preserves flow)
+            return nextFetch(input, init);
+        }
+    };
+    // 7. Return the plugin instance with the auth loader structure
+    // The runtime expects an object that provides the auth strategy
     return {
         auth: {
             provider: 'gemini-cli-oauth',
-            /**
-             * Auth loader - returns object with apiKey and fetch function
-             */
+            // The loader itself is a factory that returns the strategy implementation
             loader: async (getAuth, provider) => {
+                console.log(`🔌 Initializing auth strategy for ${provider}`);
                 return {
                     apiKey: 'gemini-cli-oauth-placeholder',
-                    // Inline fetch definition
-                    async fetch(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 using functional module
-                            const token = await oauth.getAccessToken();
-                            // Inject Authorization header
-                            const headers = new Headers(init === null || init === void 0 ? void 0 : init.headers);
-                            headers.set('Authorization', `Bearer ${token}`);
-                            // Remove API key from URL if present
-                            const urlObj = new URL(urlStr);
-                            urlObj.searchParams.delete('key');
-                            return fetch(urlObj.toString(), {
-                                ...init,
-                                headers
-                            });
-                        }
-                        catch (error) {
-                            console.error('❌ [Gemini OAuth] Token error:', error);
-                            return fetch(input, init);
-                        }
-                    }
+                    fetch: interceptedFetch
                 };
             },
-            /**
-             * Auth methods
-             */
             methods: [
                 {
                     label: "Google Account (via Gemini CLI)",
@@ -68,25 +83,13 @@ export const GeminiCLIOAuthPlugin = async ({ client, directory }) => {
                                     }
                                 }
                                 catch (_a) { }
-                                return {
-                                    type: "failed",
-                                    error: "Authentication failed. Run 'opencode-gemini-setup'."
-                                };
+                                return { type: "failed", error: "Run 'opencode-gemini-setup' first." };
                             }
                         };
                     }
                 }
             ]
-        },
+        }
     };
-};
-export const metadata = {
-    name: 'opencode-gemini-cli-oauth',
-    version: '1.1.8',
-    description: 'Use Gemini CLI OAuth credentials in OpenCode',
-    author: 'Yusuf',
-    compatibleWith: {
-        opencode: '^1.0.0',
-    },
-};
+}
 //# sourceMappingURL=plugin.js.map

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}

package/package.json

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