lantern-connect 0.1.3 → 0.2.1

package/README.md

@@ -23,9 +23,6 @@ lantern-connect
 
 # Local development with ngrok
 lantern-connect --mcp-url https://your-ngrok-url.ngrok-free.dev/mcp
-
-# Custom Lantern instance
-lantern-connect --lantern-url https://your-lantern.com --mcp-url https://api.your-lantern.com/mcp
 ```
 
 ## Options
@@ -33,14 +30,13 @@ lantern-connect --lantern-url https://your-lantern.com --mcp-url https://api.you
 | Option | Description | Default |
 |--------|-------------|---------|
 | `--mcp-url <url>` | MCP server URL | `https://mcp.onlantern.com/mcp` |
-| `--lantern-url <url>` | Lantern web URL for authentication | `https://onlantern.com` |
 | `--help, -h` | Show help message | |
 
 ## What it does
 
 1. **Detects** installed AI tools (Claude Desktop, Claude Code, Gemini CLI, Cursor)
-2. **Authenticates** with your Lantern account via browser
-3. **Configures** each detected tool to connect to Lantern's MCP server
+2. **Configures** each detected tool to connect to Lantern's MCP server
+3. **Each tool authenticates** with Lantern on first use (via OAuth)
 
 ## Supported Tools
 
@@ -54,7 +50,7 @@ lantern-connect --lantern-url https://your-lantern.com --mcp-url https://api.you
 ## After Installation
 
 1. **Fully quit and reopen** your AI tools (Cmd+Q on macOS)
-2. **Claude Desktop only:** Go to Settings → Connectors → click "lantern" to authenticate
+2. **Authenticate** when prompted by each tool on first use
 3. Start using Lantern:
    - Say "save to lantern" to export a conversation
    - Say "list my lantern conversations" to see your library
@@ -63,16 +59,15 @@ lantern-connect --lantern-url https://your-lantern.com --mcp-url https://api.you
 ## Local Development
 
 ```bash
-# Start your local Lantern backend and frontend
+# Start your local Lantern backend and MCP server
 cd lantern && npm run dev
-cd lantern/frontend && npm run dev
 
-# Start ngrok to expose backend (required for Claude Desktop)
-ngrok http 3001
+# Start ngrok to expose MCP server (required for Claude Desktop)
+ngrok http 3002
 
 # Run the CLI with your ngrok URL
 cd lantern-connect
-node bin/lantern-connect.js --mcp-url https://your-ngrok-url.ngrok-free.dev/mcp --lantern-url http://localhost:3000
+node bin/lantern-connect.js --mcp-url https://your-ngrok-url.ngrok-free.dev/mcp
 ```
 
 ## Resetting / Uninstall

package/bin/lantern-reset.js

@@ -1,91 +1,12 @@
 #!/usr/bin/env node
 
-import { existsSync, readFileSync, writeFileSync } from 'fs'
-import { homedir, platform } from 'os'
-import { join } from 'path'
-import { execSync } from 'child_process'
-
-function expandHome(path) {
-  if (path.startsWith('~')) {
-    return join(homedir(), path.slice(1))
-  }
-  return path
-}
-
-function getClaudeDesktopConfigPath() {
-  const os = platform()
-  if (os === 'darwin') {
-    return expandHome('~/Library/Application Support/Claude/claude_desktop_config.json')
-  } else if (os === 'win32') {
-    return join(process.env.APPDATA || '', 'Claude', 'claude_desktop_config.json')
-  } else {
-    return expandHome('~/.config/Claude/claude_desktop_config.json')
-  }
-}
-
-function removeFromJsonConfig(configPath, name) {
-  if (!existsSync(configPath)) {
-    return { found: false, reason: 'config file not found' }
-  }
-
-  try {
-    const content = readFileSync(configPath, 'utf-8')
-    const config = JSON.parse(content)
-
-    if (!config.mcpServers || !config.mcpServers[name]) {
-      return { found: false, reason: 'lantern not configured' }
-    }
-
-    delete config.mcpServers[name]
-    writeFileSync(configPath, JSON.stringify(config, null, 2))
-    return { found: true }
-  } catch (err) {
-    return { found: false, reason: err.message }
-  }
-}
-
-function clearGeminiOAuthCache(serverName) {
-  const cachePath = expandHome('~/.gemini/mcp-oauth-tokens.json')
-  if (!existsSync(cachePath)) {
-    return { cleared: false }
-  }
-
-  try {
-    const content = readFileSync(cachePath, 'utf-8')
-    const tokens = JSON.parse(content)
-
-    if (!Array.isArray(tokens)) {
-      return { cleared: false }
-    }
-
-    const filtered = tokens.filter(t => t.serverName !== serverName)
-    if (filtered.length === tokens.length) {
-      return { cleared: false }
-    }
-
-    writeFileSync(cachePath, JSON.stringify(filtered, null, 2))
-    return { cleared: true }
-  } catch (err) {
-    return { cleared: false }
-  }
-}
-
-function removeClaudeCode() {
-  try {
-    execSync('claude mcp remove lantern', { stdio: 'pipe' })
-    return { found: true }
-  } catch (err) {
-    const stderr = err.stderr?.toString() || ''
-    if (stderr.includes('not found') || stderr.includes('does not exist')) {
-      return { found: false, reason: 'lantern not configured' }
-    }
-    // If claude CLI doesn't exist
-    if (err.message.includes('ENOENT') || err.message.includes('not found')) {
-      return { found: false, reason: 'claude CLI not installed' }
-    }
-    return { found: false, reason: err.message }
-  }
-}
+import {
+  expandHome,
+  getClaudeDesktopConfigPath,
+  removeFromJsonConfig,
+  clearGeminiOAuthCache,
+  removeClaudeCode,
+} from '../src/reset.js'
 
 async function main() {
   console.log('')
@@ -100,11 +21,11 @@ async function main() {
   // Claude Desktop
   const claudeDesktopPath = getClaudeDesktopConfigPath()
   const claudeDesktopResult = removeFromJsonConfig(claudeDesktopPath, 'lantern')
-  results.push({ name: 'Claude Desktop', ...claudeDesktopResult })
+  results.push({ name: 'Claude Desktop', ...claudeDesktopResult, reason: 'not configured' })
 
   // Claude Code
   const claudeCodeResult = removeClaudeCode()
-  results.push({ name: 'Claude Code', ...claudeCodeResult })
+  results.push({ name: 'Claude Code', ...claudeCodeResult, reason: 'not configured' })
 
   // Gemini CLI
   const geminiPath = expandHome('~/.gemini/settings.json')
@@ -113,12 +34,12 @@ async function main() {
   if (geminiOAuthResult.cleared) {
     geminiResult.oauthCleared = true
   }
-  results.push({ name: 'Gemini CLI', ...geminiResult })
+  results.push({ name: 'Gemini CLI', ...geminiResult, reason: 'not configured' })
 
   // Cursor
   const cursorPath = expandHome('~/.cursor/mcp.json')
   const cursorResult = removeFromJsonConfig(cursorPath, 'lantern')
-  results.push({ name: 'Cursor', ...cursorResult })
+  results.push({ name: 'Cursor', ...cursorResult, reason: 'not configured' })
 
   // Print results
   let anyRemoved = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lantern-connect",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "description": "CLI installer to connect AI tools (Claude, Gemini, Cursor) to Lantern",
   "type": "module",
   "bin": {
@@ -34,7 +34,5 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "dependencies": {
-    "open": "^10.1.0"
-  }
+  "dependencies": {}
 }

package/src/index.js

@@ -1,9 +1,11 @@
 import { detectTools, hasAnyTools } from './detect.js'
-import { authenticate } from './auth.js'
 import { configureClaudeDesktop } from './configure/claude-desktop.js'
 import { configureClaudeCode } from './configure/claude-code.js'
 import { configureGeminiCli } from './configure/gemini-cli.js'
 import { configureCursor } from './configure/cursor.js'
+import { resetAll } from './reset.js'
+
+const DEFAULT_MCP_URL = 'https://mcp.onlantern.com/mcp'
 
 const configurators = {
   claudeDesktop: configureClaudeDesktop,
@@ -15,24 +17,19 @@ const configurators = {
 function parseArgs() {
   const args = process.argv.slice(2)
   const options = {
-    mcpUrl: null,
-    lanternUrl: null,
+    mcpUrl: DEFAULT_MCP_URL,
   }
 
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--mcp-url' && args[i + 1]) {
       options.mcpUrl = args[i + 1]
       i++
-    } else if (args[i] === '--lantern-url' && args[i + 1]) {
-      options.lanternUrl = args[i + 1]
-      i++
     } else if (args[i] === '--help' || args[i] === '-h') {
       console.log(`
   Usage: lantern-connect [options]
 
   Options:
     --mcp-url <url>      MCP server URL (default: https://mcp.onlantern.com/mcp)
-    --lantern-url <url>  Lantern web URL (default: https://onlantern.com)
     --help, -h           Show this help message
 `)
       process.exit(0)
@@ -76,23 +73,9 @@ export async function main() {
     process.exit(1)
   }
 
-  // Step 2: Authenticate
-  console.log('  🔐 Authenticating with Lantern...')
-
-  let authResult
-  try {
-    authResult = await authenticate({
-      lanternUrl: options.lanternUrl,
-      mcpUrl: options.mcpUrl,
-    })
-  } catch (err) {
-    console.log('')
-    console.log(`  ❌ Authentication failed: ${err.message}`)
-    console.log('')
-    process.exit(1)
-  }
-
-  console.log(`     ✓ Logged in as ${authResult.email}`)
+  // Step 2: Reset existing configs and OAuth caches
+  console.log('  🧹 Cleaning up old configs...')
+  resetAll()
   console.log('')
 
   // Step 3: Configure each detected tool
@@ -109,7 +92,7 @@ export async function main() {
     if (!configurator) continue
 
     try {
-      const result = configurator(authResult.mcpUrl)
+      const result = configurator(options.mcpUrl)
       configured.push({ name: tool.name, path: result })
       console.log(`     ✓ ${tool.name}`)
     } catch (err) {
@@ -126,14 +109,8 @@ export async function main() {
     console.log('')
     console.log('  Next steps:')
     console.log('    1. Fully quit and reopen your AI tools (Cmd+Q on macOS)')
-
-    // Check if Claude Desktop was configured
-    if (detected.claudeDesktop?.found) {
-      console.log('    2. In Claude Desktop: Settings → Connectors → click "lantern" to authenticate')
-      console.log('    3. Say "save to lantern" to export a conversation')
-    } else {
-      console.log('    2. Say "save to lantern" to export a conversation')
-    }
+    console.log('    2. Each tool will prompt you to authenticate on first use')
+    console.log('    3. Say "save to lantern" to export a conversation')
     console.log('')
   }
 

package/src/reset.js

@@ -0,0 +1,123 @@
+import { existsSync, readFileSync, writeFileSync } from 'fs'
+import { homedir, platform } from 'os'
+import { join } from 'path'
+import { execSync } from 'child_process'
+
+function expandHome(path) {
+  if (path.startsWith('~')) {
+    return join(homedir(), path.slice(1))
+  }
+  return path
+}
+
+function getClaudeDesktopConfigPath() {
+  const os = platform()
+  if (os === 'darwin') {
+    return expandHome('~/Library/Application Support/Claude/claude_desktop_config.json')
+  } else if (os === 'win32') {
+    return join(process.env.APPDATA || '', 'Claude', 'claude_desktop_config.json')
+  } else {
+    return expandHome('~/.config/Claude/claude_desktop_config.json')
+  }
+}
+
+function removeFromJsonConfig(configPath, name) {
+  if (!existsSync(configPath)) {
+    return { found: false }
+  }
+
+  try {
+    const content = readFileSync(configPath, 'utf-8')
+    const config = JSON.parse(content)
+
+    if (!config.mcpServers || !config.mcpServers[name]) {
+      return { found: false }
+    }
+
+    delete config.mcpServers[name]
+    writeFileSync(configPath, JSON.stringify(config, null, 2))
+    return { found: true }
+  } catch (err) {
+    return { found: false }
+  }
+}
+
+function clearGeminiOAuthCache(serverName) {
+  const cachePath = expandHome('~/.gemini/mcp-oauth-tokens.json')
+  if (!existsSync(cachePath)) {
+    return { cleared: false }
+  }
+
+  try {
+    const content = readFileSync(cachePath, 'utf-8')
+    const tokens = JSON.parse(content)
+
+    if (!Array.isArray(tokens)) {
+      return { cleared: false }
+    }
+
+    const filtered = tokens.filter(t => t.serverName !== serverName)
+    if (filtered.length === tokens.length) {
+      return { cleared: false }
+    }
+
+    writeFileSync(cachePath, JSON.stringify(filtered, null, 2))
+    return { cleared: true }
+  } catch (err) {
+    return { cleared: false }
+  }
+}
+
+function removeClaudeCode() {
+  try {
+    execSync('claude mcp remove lantern', { stdio: 'pipe' })
+    return { found: true }
+  } catch (err) {
+    return { found: false }
+  }
+}
+
+/**
+ * Reset all Lantern configs and OAuth caches silently
+ * Returns true if anything was reset
+ */
+export function resetAll() {
+  let anyReset = false
+
+  // Claude Desktop
+  const claudeDesktopPath = getClaudeDesktopConfigPath()
+  if (removeFromJsonConfig(claudeDesktopPath, 'lantern').found) {
+    anyReset = true
+  }
+
+  // Claude Code
+  if (removeClaudeCode().found) {
+    anyReset = true
+  }
+
+  // Gemini CLI
+  const geminiPath = expandHome('~/.gemini/settings.json')
+  if (removeFromJsonConfig(geminiPath, 'lantern').found) {
+    anyReset = true
+  }
+  if (clearGeminiOAuthCache('lantern').cleared) {
+    anyReset = true
+  }
+
+  // Cursor
+  const cursorPath = expandHome('~/.cursor/mcp.json')
+  if (removeFromJsonConfig(cursorPath, 'lantern').found) {
+    anyReset = true
+  }
+
+  return anyReset
+}
+
+// Export individual functions for lantern-reset CLI
+export {
+  expandHome,
+  getClaudeDesktopConfigPath,
+  removeFromJsonConfig,
+  clearGeminiOAuthCache,
+  removeClaudeCode,
+}

package/src/auth.js

@@ -1,171 +0,0 @@
-import { createServer } from 'http'
-import { URL } from 'url'
-import open from 'open'
-
-const CALLBACK_PORT = 8765
-const DEFAULT_LANTERN_URL = process.env.LANTERN_URL || 'https://onlantern.com'
-const DEFAULT_MCP_URL = process.env.MCP_URL || 'https://mcp.onlantern.com/mcp'
-
-function createSuccessHtml(email) {
-  return `
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <title>Lantern Connected</title>
-  <style>
-    body {
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-height: 100vh;
-      margin: 0;
-      background: #0a0a0a;
-      color: #fafafa;
-    }
-    .container {
-      text-align: center;
-      padding: 2rem;
-    }
-    .icon {
-      font-size: 4rem;
-      margin-bottom: 1rem;
-    }
-    h1 {
-      font-size: 1.5rem;
-      margin-bottom: 0.5rem;
-    }
-    p {
-      color: #a1a1aa;
-      margin-bottom: 1.5rem;
-    }
-    .close-note {
-      font-size: 0.875rem;
-      color: #71717a;
-    }
-  </style>
-</head>
-<body>
-  <div class="container">
-    <div class="icon">✓</div>
-    <h1>Connected to Lantern</h1>
-    <p>Logged in as ${email}</p>
-    <p class="close-note">You can close this window and return to your terminal.</p>
-  </div>
-</body>
-</html>
-`
-}
-
-function createErrorHtml(message) {
-  return `
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <title>Lantern - Error</title>
-  <style>
-    body {
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-height: 100vh;
-      margin: 0;
-      background: #0a0a0a;
-      color: #fafafa;
-    }
-    .container {
-      text-align: center;
-      padding: 2rem;
-    }
-    .icon {
-      font-size: 4rem;
-      margin-bottom: 1rem;
-    }
-    h1 {
-      font-size: 1.5rem;
-      margin-bottom: 0.5rem;
-      color: #ef4444;
-    }
-    p {
-      color: #a1a1aa;
-    }
-  </style>
-</head>
-<body>
-  <div class="container">
-    <div class="icon">✗</div>
-    <h1>Connection Failed</h1>
-    <p>${message}</p>
-  </div>
-</body>
-</html>
-`
-}
-
-export async function authenticate(options = {}) {
-  const lanternUrl = options.lanternUrl || DEFAULT_LANTERN_URL
-  const mcpUrlOverride = options.mcpUrl || DEFAULT_MCP_URL
-
-  return new Promise((resolve, reject) => {
-    const server = createServer((req, res) => {
-      const url = new URL(req.url, `http://localhost:${CALLBACK_PORT}`)
-
-      if (url.pathname === '/callback') {
-        const token = url.searchParams.get('token')
-        const mcpUrl = url.searchParams.get('mcp_url') || mcpUrlOverride
-        const email = url.searchParams.get('email')
-        const error = url.searchParams.get('error')
-
-        if (error) {
-          res.writeHead(200, { 'Content-Type': 'text/html' })
-          res.end(createErrorHtml(error))
-          server.close()
-          reject(new Error(error))
-          return
-        }
-
-        if (!token) {
-          res.writeHead(200, { 'Content-Type': 'text/html' })
-          res.end(createErrorHtml('Missing token'))
-          server.close()
-          reject(new Error('Missing token in callback'))
-          return
-        }
-
-        res.writeHead(200, { 'Content-Type': 'text/html' })
-        res.end(createSuccessHtml(email || 'unknown'))
-
-        server.close()
-        resolve({ token, mcpUrl, email })
-      } else {
-        res.writeHead(404)
-        res.end('Not found')
-      }
-    })
-
-    server.listen(CALLBACK_PORT, '127.0.0.1', () => {
-      const authUrl = new URL(`${lanternUrl}/auth/cli`)
-      authUrl.searchParams.set('callback_port', CALLBACK_PORT)
-      authUrl.searchParams.set('mcp_url', mcpUrlOverride)
-      console.log(`   Opening browser...`)
-      open(authUrl.toString())
-    })
-
-    server.on('error', (err) => {
-      if (err.code === 'EADDRINUSE') {
-        reject(new Error(`Port ${CALLBACK_PORT} is already in use. Please close any other lantern-connect instances.`))
-      } else {
-        reject(err)
-      }
-    })
-
-    // Timeout after 5 minutes
-    setTimeout(() => {
-      server.close()
-      reject(new Error('Authentication timed out. Please try again.'))
-    }, 5 * 60 * 1000)
-  })
-}