mrmd-server 0.1.19 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrmd-server",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "HTTP server for mrmd - run mrmd in any browser, access from anywhere",
   "type": "module",
   "main": "src/index.js",

package/src/ai-service.js

@@ -3,12 +3,15 @@
  *
  * The AI server is shared across all sessions (stateless).
  * It's started once on first request and kept running.
+ *
+ * API keys are passed as environment variables to the AI server process
+ * because dspy/litellm reads them from env vars.
  */
 
 import { spawn, execSync } from 'child_process';
 import net from 'net';
 import path from 'path';
-import { existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import os from 'os';
 
 // AI server singleton
@@ -75,11 +78,54 @@ function findUv() {
   return null;
 }
 
+/**
+ * Load API keys from settings file
+ */
+function loadApiKeysFromSettings() {
+  const settingsPath = path.join(os.homedir(), '.mrmd', 'settings.json');
+  try {
+    if (existsSync(settingsPath)) {
+      const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
+      return settings.apiKeys || {};
+    }
+  } catch (e) {
+    console.warn('[ai] Failed to load API keys from settings:', e.message);
+  }
+  return {};
+}
+
+/**
+ * Build environment variables for AI server from API keys
+ */
+function buildEnvFromApiKeys(apiKeys) {
+  const env = { ...process.env };
+
+  // Map settings keys to litellm environment variable names
+  const envMapping = {
+    anthropic: 'ANTHROPIC_API_KEY',
+    openai: 'OPENAI_API_KEY',
+    groq: 'GROQ_API_KEY',
+    gemini: 'GEMINI_API_KEY',
+    openrouter: 'OPENROUTER_API_KEY',
+  };
+
+  for (const [provider, envVar] of Object.entries(envMapping)) {
+    if (apiKeys[provider]) {
+      env[envVar] = apiKeys[provider];
+      console.log(`[ai] Setting ${envVar} from settings`);
+    }
+  }
+
+  return env;
+}
+
 /**
  * Ensure AI server is running
+ * @param {Object} options
+ * @param {Object} [options.apiKeys] - API keys to pass as env vars (optional, will load from settings if not provided)
  * Returns { port, url, success } or { error, success: false }
  */
-export async function ensureAiServer() {
+export async function ensureAiServer(options = {}) {
   // Already running
   if (aiServer) {
     return {
@@ -103,6 +149,10 @@ export async function ensureAiServer() {
       };
     }
 
+    // Load API keys - from options or settings file
+    const apiKeys = options.apiKeys || loadApiKeysFromSettings();
+    const env = buildEnvFromApiKeys(apiKeys);
+
     const port = await findFreePort();
     console.log(`[ai] Starting mrmd-ai on port ${port}...`);
 
@@ -113,6 +163,7 @@ export async function ensureAiServer() {
       '--port', port.toString(),
     ], {
       stdio: ['pipe', 'pipe', 'pipe'],
+      env, // Pass API keys as environment variables
     });
 
     proc.stdout.on('data', (d) => console.log('[ai]', d.toString().trim()));
@@ -182,3 +233,12 @@ export function stopAiServer() {
     startPromise = null;
   }
 }
+
+/**
+ * Restart AI server with new API keys
+ * Call this when API keys change in settings
+ */
+export async function restartAiServer(apiKeys) {
+  stopAiServer();
+  return ensureAiServer({ apiKeys });
+}

package/src/api/system.js

@@ -10,7 +10,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import { existsSync } from 'fs';
 import { spawn, execSync } from 'child_process';
-import { ensureAiServer, getAiServer } from '../ai-service.js';
+import { ensureAiServer, getAiServer, restartAiServer } from '../ai-service.js';
 
 /**
  * Create system routes
@@ -210,6 +210,23 @@ export function createSystemRoutes(ctx) {
     res.json(getAiServer());
   });
 
+  /**
+   * POST /api/system/ai/restart
+   * Restart AI server with new API keys
+   * Call this after changing API keys in settings
+   */
+  router.post('/ai/restart', async (req, res) => {
+    try {
+      const { apiKeys } = req.body;
+      console.log('[system:ai:restart] Restarting AI server with new API keys');
+      const result = await restartAiServer(apiKeys);
+      res.json(result);
+    } catch (err) {
+      console.error('[system:ai:restart]', err);
+      res.status(500).json({ success: false, error: err.message });
+    }
+  });
+
   /**
    * POST /api/system/discover-venvs
    * Discover virtual environments