opencode-studio-server 1.0.7 → 1.0.10

package/index.js

@@ -56,9 +56,34 @@ const HOME_DIR = os.homedir();
 const STUDIO_CONFIG_PATH = path.join(HOME_DIR, '.config', 'opencode-studio', 'studio.json');
 const PENDING_ACTION_PATH = path.join(HOME_DIR, '.config', 'opencode-studio', 'pending-action.json');
 
-let pendingActionMemory = null;
-
-function loadPendingAction() {
+let pendingActionMemory = null;
+
+function loadStudioConfig() {
+    if (!fs.existsSync(STUDIO_CONFIG_PATH)) {
+        return {};
+    }
+    try {
+        return JSON.parse(fs.readFileSync(STUDIO_CONFIG_PATH, 'utf8'));
+    } catch {
+        return {};
+    }
+}
+
+function saveStudioConfig(config) {
+    try {
+        const dir = path.dirname(STUDIO_CONFIG_PATH);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        fs.writeFileSync(STUDIO_CONFIG_PATH, JSON.stringify(config, null, 2), 'utf8');
+        return true;
+    } catch (err) {
+        console.error('Failed to save studio config:', err);
+        return false;
+    }
+}
+
+function loadPendingAction() {
     if (pendingActionMemory) return pendingActionMemory;
     
     if (fs.existsSync(PENDING_ACTION_PATH)) {
@@ -94,53 +119,38 @@ const AUTH_CANDIDATE_PATHS = [
     path.join(process.env.APPDATA || '', 'opencode', 'auth.json'),
 ];
 
-const CANDIDATE_PATHS = [
-    path.join(HOME_DIR, '.config', 'opencode'),
-    path.join(HOME_DIR, '.opencode'),
-    path.join(process.env.APPDATA || '', 'opencode'),
-    path.join(process.env.LOCALAPPDATA || '', 'opencode'),
-    path.join(HOME_DIR, 'AppData', 'Roaming', 'opencode'),
-    path.join(HOME_DIR, 'AppData', 'Local', 'opencode'),
-];
-
-function detectConfigDir() {
-    for (const candidate of CANDIDATE_PATHS) {
-        const configFile = path.join(candidate, 'opencode.json');
-        if (fs.existsSync(configFile)) {
-            return candidate;
-        }
-    }
-    return null;
-}
-
-function loadStudioConfig() {
-    if (fs.existsSync(STUDIO_CONFIG_PATH)) {
-        try {
-            return JSON.parse(fs.readFileSync(STUDIO_CONFIG_PATH, 'utf8'));
-        } catch {
-            return { disabledSkills: [], disabledPlugins: [] };
-        }
-    }
-    return { disabledSkills: [], disabledPlugins: [] };
-}
-
-function saveStudioConfig(config) {
-    const dir = path.dirname(STUDIO_CONFIG_PATH);
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-    }
-    fs.writeFileSync(STUDIO_CONFIG_PATH, JSON.stringify(config, null, 2), 'utf8');
-}
-
-function getConfigDir() {
-    const studioConfig = loadStudioConfig();
-    if (studioConfig.configPath && fs.existsSync(studioConfig.configPath)) {
-        return studioConfig.configPath;
-    }
-    return detectConfigDir();
-}
-
-function getPaths() {
+const CANDIDATE_PATHS = [
+    path.join(HOME_DIR, '.config', 'opencode'),
+    path.join(HOME_DIR, '.opencode'),
+    path.join(process.env.APPDATA || '', 'opencode'),
+    path.join(process.env.LOCALAPPDATA || '', 'opencode'),
+];
+
+function getConfigDir() {
+    for (const candidate of CANDIDATE_PATHS) {
+        if (fs.existsSync(candidate)) {
+            return candidate;
+        }
+    }
+    return null;
+}
+
+const PROVIDER_DISPLAY_NAMES = {
+    'github-copilot': 'GitHub Copilot',
+    'google': 'Google AI',
+    'anthropic': 'Anthropic',
+    'openai': 'OpenAI',
+    'xai': 'xAI',
+    'groq': 'Groq',
+    'together': 'Together AI',
+    'mistral': 'Mistral',
+    'deepseek': 'DeepSeek',
+    'openrouter': 'OpenRouter',
+    'amazon-bedrock': 'Amazon Bedrock',
+    'azure': 'Azure OpenAI',
+};
+
+function getPaths() {
     const configDir = getConfigDir();
     if (!configDir) return null;
     return {
@@ -761,14 +771,17 @@ app.post('/api/restore', (req, res) => {
 });
 
 // Auth endpoints
-function getAuthFile() {
-    for (const candidate of AUTH_CANDIDATE_PATHS) {
-        if (fs.existsSync(candidate)) {
-            return candidate;
-        }
-    }
-    return null;
-}
+function getAuthFile() {
+    console.log('Searching for auth file in:', AUTH_CANDIDATE_PATHS);
+    for (const candidate of AUTH_CANDIDATE_PATHS) {
+        if (fs.existsSync(candidate)) {
+            console.log('Found auth file at:', candidate);
+            return candidate;
+        }
+    }
+    console.log('No auth file found');
+    return null;
+}
 
 function loadAuthConfig() {
     const authFile = getAuthFile();
@@ -793,22 +806,7 @@ function saveAuthConfig(config) {
     }
 }
 
-const PROVIDER_DISPLAY_NAMES = {
-    'github-copilot': 'GitHub Copilot',
-    'google': 'Google',
-    'google-gemini-oauth': 'Google Gemini (OAuth)',
-    'anthropic': 'Anthropic',
-    'openai': 'OpenAI',
-    'zai': 'Z.AI',
-    'xai': 'xAI',
-    'groq': 'Groq',
-    'together': 'Together AI',
-    'mistral': 'Mistral',
-    'deepseek': 'DeepSeek',
-    'openrouter': 'OpenRouter',
-    'amazon-bedrock': 'Amazon Bedrock',
-    'azure': 'Azure OpenAI',
-};
+
 
 app.get('/api/auth', (req, res) => {
     const authConfig = loadAuthConfig();
@@ -852,7 +850,6 @@ app.get('/api/auth', (req, res) => {
 
 app.post('/api/auth/login', (req, res) => {
     // opencode auth login is interactive and requires a terminal
-    // Open a new terminal window with the command
     const isWindows = process.platform === 'win32';
     const isMac = process.platform === 'darwin';
     
@@ -865,7 +862,7 @@ app.post('/api/auth/login', (req, res) => {
         command = 'x-terminal-emulator -e "opencode auth login" || gnome-terminal -- opencode auth login || xterm -e "opencode auth login"';
     }
     
-    exec(command, (err) => {
+    exec(command, { shell: true }, (err) => {
         if (err) console.error('Failed to open terminal:', err);
     });
     
@@ -992,6 +989,7 @@ function setActiveProfile(provider, profileName) {
     saveStudioConfig(studioConfig);
 }
 
+function verifyActiveProfile(p, n, c) { if (!n || !c) return false; const d = loadAuthProfile(p, n); if (!d) return false; return JSON.stringify(d) === JSON.stringify(c); }
 app.get('/api/auth/profiles', (req, res) => {
     ensureAuthProfilesDir();
     const activeProfiles = getActiveProfiles();
@@ -1003,7 +1001,7 @@ app.get('/api/auth/profiles', (req, res) => {
         const providerProfiles = listAuthProfiles(provider);
         profiles[provider] = {
             profiles: providerProfiles,
-            active: activeProfiles[provider] || null,
+            active: (activeProfiles[provider] && verifyActiveProfile(provider, activeProfiles[provider], authConfig[provider])) ? activeProfiles[provider] : null,
             hasCurrentAuth: !!authConfig[provider],
         };
     });
@@ -1019,7 +1017,7 @@ app.get('/api/auth/profiles/:provider', (req, res) => {
     
     res.json({
         profiles: providerProfiles,
-        active: activeProfiles[provider] || null,
+        active: (activeProfiles[provider] && verifyActiveProfile(provider, activeProfiles[provider], authConfig[provider])) ? activeProfiles[provider] : null,
         hasCurrentAuth: !!authConfig[provider],
     });
 });

package/package.json

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