opencode-studio-server 1.12.13 → 1.12.14

package/index.js

@@ -1406,22 +1406,6 @@ app.get('/api/auth/providers', (req, res) => {
 });
 
 app.get('/api/auth', (req, res) => {
-    importCurrentGoogleAuthToPool();
-    syncAntigravityPool();
-    const authCfg = loadAuthConfig() || {};
-    const studio = loadStudioConfig();
-    const ac = studio.activeProfiles || {};
-    const credentials = [];
-    const activePlugin = studio.activeGooglePlugin;
-    
-    // DEBUG LOGGING
-    console.log('--- Auth Debug ---');
-    console.log('Active Google Plugin:', activePlugin);
-    console.log('Found keys in authCfg:', Object.keys(authCfg));
-    if (authCfg.google) console.log('Google Auth found!');
-    if (authCfg['google.antigravity']) console.log('google.antigravity found!');
-    if (authCfg['google.gemini']) console.log('google.gemini found!');
-    
     const providers = [
         { id: 'google', name: 'Google', type: 'oauth' },
         { id: 'anthropic', name: 'Anthropic', type: 'api' },
@@ -1436,6 +1420,15 @@ app.get('/api/auth', (req, res) => {
         { id: 'azure', name: 'Azure OpenAI', type: 'api' }
     ];
 
+    providers.forEach(p => importCurrentAuthToPool(p.id));
+    syncAntigravityPool();
+
+    const authCfg = loadAuthConfig() || {};
+    const studio = loadStudioConfig();
+    const ac = studio.activeProfiles || {};
+    const credentials = [];
+    const activePlugin = studio.activeGooglePlugin;
+
     const opencodeCfg = loadConfig();
     const currentPlugins = opencodeCfg?.plugin || [];
     
@@ -1483,13 +1476,15 @@ app.get('/api/auth', (req, res) => {
 });
 
 app.get('/api/auth/profiles', (req, res) => {
+    const providers = ['google', 'anthropic', 'openai', 'xai', 'openrouter', 'together', 'mistral', 'deepseek', 'amazon-bedrock', 'azure', 'github-copilot'];
+    providers.forEach(p => importCurrentAuthToPool(p));
     syncAntigravityPool();
+    
     const authCfg = loadAuthConfig() || {};
     const studio = loadStudioConfig();
     const ac = studio.activeProfiles || {};
     const activePlugin = studio.activeGooglePlugin;
     const profiles = {};
-    const providers = ['google', 'anthropic', 'openai', 'xai', 'openrouter', 'together', 'mistral', 'deepseek', 'amazon-bedrock', 'azure', 'github-copilot'];
     
     providers.forEach(p => {
         const saved = listAuthProfiles(p, activePlugin);
@@ -1882,6 +1877,78 @@ function listAntigravityAccounts() {
     }));
 }
 
+function decodeJWT(token) {
+    try {
+        const parts = token.split('.');
+        if (parts.length !== 3) return null;
+        const payload = Buffer.from(parts[1], 'base64').toString('utf8');
+        return JSON.parse(payload);
+    } catch {
+        return null;
+    }
+}
+
+function importCurrentAuthToPool(provider) {
+    if (provider === 'google') {
+        return importCurrentGoogleAuthToPool();
+    }
+
+    const authCfg = loadAuthConfig();
+    if (!authCfg || !authCfg[provider]) return;
+
+    const creds = authCfg[provider];
+    let email = creds.email;
+
+    if (!email && provider === 'openai' && creds.access) {
+        const decoded = decodeJWT(creds.access);
+        if (decoded && decoded['https://api.openai.com/profile']?.email) {
+            email = decoded['https://api.openai.com/profile'].email;
+        }
+    }
+
+    const name = email || creds.accountId || creds.id || `profile-${Date.now()}`;
+    const profileDir = path.join(AUTH_PROFILES_DIR, provider);
+    if (!fs.existsSync(profileDir)) fs.mkdirSync(profileDir, { recursive: true });
+
+    const profilePath = path.join(profileDir, `${name}.json`);
+
+    let shouldSync = true;
+    if (fs.existsSync(profilePath)) {
+        try {
+            const current = JSON.parse(fs.readFileSync(profilePath, 'utf8'));
+            if (JSON.stringify(current) === JSON.stringify(creds)) {
+                shouldSync = false;
+            }
+        } catch {
+        }
+    }
+
+    if (shouldSync) {
+        console.log(`[Auth] Syncing ${provider} login for ${name} to pool.`);
+        atomicWriteFileSync(profilePath, JSON.stringify(creds, null, 2));
+
+        const metadata = loadPoolMetadata();
+        if (!metadata[provider]) metadata[provider] = {};
+        
+        metadata[provider][name] = {
+            ...(metadata[provider][name] || {}),
+            email: email || null,
+            createdAt: metadata[provider][name]?.createdAt || Date.now(),
+            lastUsed: Date.now(),
+            usageCount: metadata[provider][name]?.usageCount || 0,
+            imported: true
+        };
+        savePoolMetadata(metadata);
+
+        const studio = loadStudioConfig();
+        if (!studio.activeProfiles) studio.activeProfiles = {};
+        if (studio.activeProfiles[provider] !== name) {
+            studio.activeProfiles[provider] = name;
+            saveStudioConfig(studio);
+        }
+    }
+}
+
 function importCurrentGoogleAuthToPool() {
     const studio = loadStudioConfig();
     // Only applies if Antigravity is active
@@ -1982,70 +2049,6 @@ function syncAntigravityPool() {
     savePoolMetadata(metadata);
 }
 
-function importExistingAuth() {
-    const authCfg = loadAuthConfig();
-    if (!authCfg) return;
-
-    const studio = loadStudioConfig();
-    const activeProfiles = studio.activeProfiles || {};
-    let changed = false;
-
-    // Standard providers to check
-    const providers = ['google', 'openai', 'anthropic', 'xai', 'openrouter', 'github-copilot', 'mistral', 'deepseek', 'amazon-bedrock', 'azure'];
-
-    providers.forEach(provider => {
-        if (!authCfg[provider]) return; // No creds for this provider
-
-        // Determine namespace
-        // For auto-import, we target the standard 'google' namespace unless antigravity plugin is active?
-        // Actually, auth.json 'google' key usually means Gemini/Vertex standard auth.
-        const namespace = provider === 'google' && studio.activeGooglePlugin === 'antigravity' 
-            ? 'google.antigravity' 
-            : (provider === 'google' ? 'google.gemini' : provider);
-
-        const profileDir = path.join(AUTH_PROFILES_DIR, namespace);
-        
-        // If we already have an active profile for this provider, skip import
-        if (activeProfiles[provider]) return;
-
-        // If directory exists and has files, check if empty
-        if (fs.existsSync(profileDir) && fs.readdirSync(profileDir).filter(f => f.endsWith('.json')).length > 0) {
-            return;
-        }
-
-        // Import!
-        if (!fs.existsSync(profileDir)) fs.mkdirSync(profileDir, { recursive: true });
-        
-        const email = authCfg[provider].email || null;
-        const name = email || `imported-${Date.now()}`;
-        const profilePath = path.join(profileDir, `${name}.json`);
-        
-        console.log(`[AutoImport] Importing existing ${provider} credentials as ${name}`);
-        atomicWriteFileSync(profilePath, JSON.stringify(authCfg[provider], null, 2));
-        
-        // Set as active
-        if (!studio.activeProfiles) studio.activeProfiles = {};
-        studio.activeProfiles[provider] = name;
-        changed = true;
-
-        // Update metadata
-        const metadata = loadPoolMetadata();
-        if (!metadata[namespace]) metadata[namespace] = {};
-        metadata[namespace][name] = {
-            email: email,
-            createdAt: Date.now(),
-            lastUsed: Date.now(),
-            usageCount: 0,
-            imported: true
-        };
-        savePoolMetadata(metadata);
-    });
-
-    if (changed) {
-        saveStudioConfig(studio);
-    }
-}
-
 function getAccountStatus(meta, now) {
     if (!meta) return 'ready';
     if (meta.cooldownUntil && meta.cooldownUntil > now) return 'cooldown';
@@ -3035,8 +3038,7 @@ app.post('/api/presets/:id/apply', (req, res) => {
 
 // Start watcher on server start
 function startServer() {
-    // setupLogWatcher(); // Disabled as per user request (manual switching only)
-    importExistingAuth();
+    ['google', 'anthropic', 'openai', 'xai', 'openrouter', 'together', 'mistral', 'deepseek', 'amazon-bedrock', 'azure', 'github-copilot'].forEach(p => importCurrentAuthToPool(p));
     app.listen(PORT, () => console.log(`Server running at http://localhost:${PORT}`));
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-studio-server",
-  "version": "1.12.13",
+  "version": "1.12.14",
   "description": "Backend server for OpenCode Studio - manages opencode configurations",
   "main": "index.js",
   "bin": {