ropilot 0.1.34 → 0.1.36

package/lib/proxy.js

@@ -35,7 +35,7 @@ function sendError(id, code, message) {
 }
 
 /**
- * Forward request to edge server
+ * Forward request to edge server with friendly error messages
  */
 async function forwardToEdge(apiKey, request) {
   const url = `${EDGE_URL}/mcp/${apiKey}`;
@@ -49,37 +49,91 @@ async function forwardToEdge(apiKey, request) {
       body: JSON.stringify(request)
     });
 
+    if (response.status === 401 || response.status === 403) {
+      throw new Error('[ROPILOT] API key is invalid. Tell the user to follow these steps: 1. Log into the Ropilot dashboard at https://ropilot.ai 2. Copy their API key 3. Run "npx ropilot init" in this directory and paste the key');
+    }
+    if (response.status === 402) {
+      throw new Error('[ROPILOT] No credits remaining. Tell the user to upgrade their plan at https://ropilot.ai');
+    }
     if (!response.ok) {
       const text = await response.text();
-      throw new Error(`Edge server error: ${response.status} ${text}`);
+      throw new Error(`[ROPILOT] Server error (${response.status}). Tell the user to try again later.`);
     }
 
     return await response.json();
   } catch (err) {
-    throw new Error(`Failed to connect to edge server: ${err.message}`);
+    if (err.message.startsWith('[ROPILOT]')) {
+      throw err;  // Re-throw our friendly errors
+    }
+    throw new Error(`[ROPILOT] Cannot reach server. Tell the user to check their internet connection and try again.`);
   }
 }
 
 /**
- * Handle MCP initialize request - forward to edge to get instructions
+ * Handle MCP initialize request
+ * Always succeed so Claude doesn't mark server as failed
+ * Errors will surface when tools are actually called
  */
 async function handleInitialize(apiKey, request) {
-  const edgeResponse = await forwardToEdge(apiKey, request);
-  return edgeResponse;
+  try {
+    const edgeResponse = await forwardToEdge(apiKey, request);
+    return edgeResponse;
+  } catch (err) {
+    // Return a minimal valid response so MCP connects
+    // The error will surface when user tries to use tools
+    return {
+      jsonrpc: '2.0',
+      id: request.id,
+      result: {
+        protocolVersion: '2024-11-05',
+        capabilities: { tools: {} },
+        serverInfo: { name: 'ropilot', version: '1.0.0' }
+      }
+    };
+  }
 }
 
+// Cache the error from initialize for showing in tools
+let cachedKeyError = null;
+
 /**
  * Handle MCP tools/list request
+ * If key is invalid, return a helper tool that explains the error
  */
 async function handleToolsList(apiKey, request) {
-  // Forward to edge to get actual tool list
-  return await forwardToEdge(apiKey, request);
+  try {
+    return await forwardToEdge(apiKey, request);
+  } catch (err) {
+    cachedKeyError = err.message;
+    // Return a single tool that explains the error when called
+    return {
+      jsonrpc: '2.0',
+      id: request.id,
+      result: {
+        tools: [{
+          name: 'ropilot_status',
+          description: err.message,
+          inputSchema: { type: 'object', properties: {} }
+        }]
+      }
+    };
+  }
 }
 
 /**
  * Handle MCP tools/call request
  */
 async function handleToolsCall(apiKey, request) {
+  // If we have a cached error and user is calling our status tool, return the error
+  if (cachedKeyError && request.params?.name === 'ropilot_status') {
+    return {
+      jsonrpc: '2.0',
+      id: request.id,
+      result: {
+        content: [{ type: 'text', text: cachedKeyError }]
+      }
+    };
+  }
   // Forward to edge
   return await forwardToEdge(apiKey, request);
 }
@@ -177,43 +231,6 @@ async function checkPluginUpdate() {
   }
 }
 
-// Cached key validation result
-let keyValidationError = null;
-
-/**
- * Validate API key with edge server (cached)
- */
-async function validateApiKey(apiKey) {
-  if (keyValidationError !== null) return keyValidationError;
-
-  try {
-    const url = `${EDGE_URL}/mcp/${apiKey}`;
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        jsonrpc: '2.0',
-        id: 0,
-        method: 'initialize',
-        params: { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'validate', version: '1.0.0' } }
-      })
-    });
-
-    if (response.status === 401 || response.status === 403) {
-      keyValidationError = '[ROPILOT] API key is invalid. Tell the user to follow these steps: 1. Log into the Ropilot dashboard at https://ropilot.ai 2. Copy their API key 3. Run "npx ropilot init" in this directory and paste the key';
-    } else if (response.status === 402) {
-      keyValidationError = '[ROPILOT] No credits remaining. Tell the user to upgrade their plan at https://ropilot.ai';
-    } else if (!response.ok) {
-      keyValidationError = `[ROPILOT] Server error (${response.status}). Tell the user to try again later.`;
-    }
-  } catch (err) {
-    // Network error - don't cache, might be temporary
-    return `[ROPILOT] Cannot reach server. Tell the user to check their internet connection and try again.`;
-  }
-
-  return keyValidationError;
-}
-
 /**
  * Run the stdio MCP server
  */
@@ -300,31 +317,6 @@ export async function serve() {
  */
 async function handleRequest(apiKey, request) {
   try {
-    // For initialize, we respond locally first, then validate in background
-    if (request.method === 'initialize') {
-      // Validate key in background (caches result for later requests)
-      validateApiKey(apiKey);
-
-      // Return a basic initialize response so MCP connects
-      sendResponse({
-        jsonrpc: '2.0',
-        id: request.id,
-        result: {
-          protocolVersion: '2024-11-05',
-          capabilities: { tools: {} },
-          serverInfo: { name: 'ropilot', version: '1.0.0' }
-        }
-      });
-      return;
-    }
-
-    // For other requests, check if key is valid first
-    const keyError = await validateApiKey(apiKey);
-    if (keyError) {
-      sendError(request.id, -32000, keyError);
-      return;
-    }
-
     const response = await processRequest(apiKey, request);
     if (response) {
       sendResponse(response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ropilot",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "AI-powered Roblox development assistant - MCP CLI",
   "author": "whut",
   "license": "MIT",