lexic-mcp 0.1.12 → 0.1.13

package/dist/index.js

@@ -31,7 +31,7 @@ import { logger } from './utils/logger.js';
 import { getTriggers } from './utils/trigger-cache.js';
 import { getDomains } from './utils/domain-cache.js';
 import { buildDescription } from './utils/description-builder.js';
-import { startBrowserOAuthFlow, getCredentials, hasValidCredentials, clearAllCredentials, removeCredentials, listStoredProjects, BrowserOAuthError } from './auth/index.js';
+import { startBrowserOAuthFlow, getCredentials, hasValidCredentials, hasExpiredCredentials, clearAllCredentials, removeCredentials, listStoredProjects, getDefaultProject, getValidToken, tryDiscoverAuthConfig, BrowserOAuthError } from './auth/index.js';
 import * as readline from 'readline';
 // ============================================================================
 // TOOL REGISTRATION
@@ -92,15 +92,113 @@ async function registerTools(lexicClient, triggers, domains) {
     return tools;
 }
 // ============================================================================
-// STDIO TRANSPORT (PAT Authentication)
+// STDIO TRANSPORT (OAuth or PAT Authentication)
 // ============================================================================
 async function runStdioServer() {
-    // Load legacy config for backward compatibility
-    const config = loadConfig();
-    logger.setLevel(config.logLevel);
+    // Set log level from environment
+    const logLevel = process.env.LOG_LEVEL || 'info';
+    logger.setLevel(logLevel);
     logger.info('Starting Lexic MCP Server (stdio transport)');
-    // Initialize Lexic client with PAT
-    const lexicClient = createLexicClient(config);
+    let lexicClient;
+    const apiUrl = process.env.LEXIC_API_URL || 'https://app.lexic.io/api';
+    // Check for OAuth credentials first
+    const defaultProject = getDefaultProject();
+    const isValid = defaultProject ? hasValidCredentials(defaultProject) : false;
+    const isExpired = defaultProject ? hasExpiredCredentials(defaultProject) : false;
+    const hasOAuth = defaultProject && (isValid || isExpired);
+    logger.debug('OAuth credential check', {
+        defaultProject,
+        hasValidCredentials: isValid,
+        hasExpiredCredentials: isExpired,
+        hasOAuth
+    });
+    if (hasOAuth && defaultProject) {
+        logger.info('Using OAuth authentication');
+        // Get auth config for token refresh
+        const authConfig = await tryDiscoverAuthConfig();
+        if (!authConfig) {
+            logger.error('Failed to discover auth config for OAuth');
+            process.exit(1);
+        }
+        logger.debug('Auth config discovered', {
+            supabaseUrl: authConfig.supabaseUrl,
+            matchesDefaultProject: authConfig.supabaseUrl === defaultProject
+        });
+        // Get valid token (may refresh if expired)
+        // Use defaultProject for credential lookup since that's where they're stored
+        // Use authConfig.supabaseAnonKey for token refresh (needed for Supabase auth)
+        const accessToken = await getValidToken({
+            supabaseUrl: defaultProject,
+            supabaseAnonKey: authConfig.supabaseAnonKey
+        });
+        // Warn if there's a URL mismatch (shouldn't happen normally)
+        if (authConfig.supabaseUrl !== defaultProject) {
+            logger.warn('Supabase URL mismatch between discovery and stored credentials', {
+                discoveredUrl: authConfig.supabaseUrl,
+                storedUrl: defaultProject
+            });
+        }
+        logger.debug('Token retrieval result', {
+            hasToken: !!accessToken,
+            tokenLength: accessToken?.length
+        });
+        if (!accessToken) {
+            logger.error('Failed to get valid OAuth token. Please run: lexic-mcp login');
+            process.exit(1);
+        }
+        // Create client with OAuth
+        lexicClient = createLexicClientWithAuth({
+            apiUrl,
+            auth: {
+                type: 'oauth',
+                token: accessToken
+            }
+        });
+        // Log OAuth user info
+        const credentials = getCredentials(defaultProject);
+        if (credentials?.email) {
+            logger.info('Authenticated as', { email: credentials.email });
+        }
+        // For OAuth, we trust the local token validation
+        // The API will validate on each request
+        logger.info('Connected to Lexic (OAuth mode)');
+    }
+    else if (process.env.LEXIC_PAT) {
+        // Fall back to PAT authentication
+        logger.info('Using PAT authentication');
+        const config = loadConfig();
+        lexicClient = createLexicClient(config);
+        // Validate connection and log PAT expiration
+        const validation = await lexicClient.validateConnection();
+        if (!validation.valid) {
+            logger.error('Failed to connect to Lexic', { error: validation.error });
+            process.exit(1);
+        }
+        // Log PAT expiration info
+        if (validation.expiresAt) {
+            const now = new Date();
+            const daysUntilExpiry = Math.ceil((validation.expiresAt.getTime() - now.getTime()) / (1000 * 60 * 60 * 24));
+            const expiresAt = validation.expiresAt.toISOString();
+            const dayLabel = daysUntilExpiry === 1 ? 'day' : 'days';
+            switch (true) {
+                case daysUntilExpiry <= 0:
+                    logger.error('PAT has expired', { expiresAt });
+                    break;
+                case daysUntilExpiry <= 3:
+                    logger.warn(`PAT expires in ${daysUntilExpiry} ${dayLabel}`, { expiresAt });
+                    break;
+                case daysUntilExpiry <= 7:
+                    logger.info(`PAT expires in ${daysUntilExpiry} ${dayLabel}`, { expiresAt });
+                    break;
+            }
+        }
+    }
+    else {
+        // No authentication available
+        logger.error('No authentication found. Please run: lexic-mcp login');
+        logger.error('Or set LEXIC_PAT environment variable');
+        process.exit(1);
+    }
     // Validate connection
     const validation = await lexicClient.validateConnection();
     if (!validation.valid) {
@@ -111,24 +209,6 @@ async function runStdioServer() {
         lexiconId: validation.lexiconId,
         isUserScoped: validation.isUserScoped
     });
-    // Log PAT expiration info (ascending thresholds: 0 -> 3 -> 7)
-    if (validation.expiresAt) {
-        const now = new Date();
-        const daysUntilExpiry = Math.ceil((validation.expiresAt.getTime() - now.getTime()) / (1000 * 60 * 60 * 24));
-        const expiresAt = validation.expiresAt.toISOString();
-        const dayLabel = daysUntilExpiry === 1 ? 'day' : 'days';
-        switch (true) {
-            case daysUntilExpiry <= 0:
-                logger.error('PAT has expired', { expiresAt });
-                break;
-            case daysUntilExpiry <= 3:
-                logger.warn(`PAT expires in ${daysUntilExpiry} ${dayLabel}`, { expiresAt });
-                break;
-            case daysUntilExpiry <= 7:
-                logger.info(`PAT expires in ${daysUntilExpiry} ${dayLabel}`, { expiresAt });
-                break;
-        }
-    }
     // Load domains and triggers
     const { domains, triggers } = await loadConfiguration(lexicClient);
     // Register tools

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lexic-mcp",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "MCP server connecting Claude Code to Lexic knowledge management",
   "type": "module",
   "main": "dist/index.js",