@axhub/genie 0.2.8 → 0.2.10

package/server/routes/auth.js

@@ -2,16 +2,16 @@ import express from 'express';
 import bcrypt from 'bcrypt';
 import { userDb } from '../database/db.js';
 import { generateToken, authenticateToken } from '../middleware/auth.js';
+import { isLoopbackRequest } from '../lan-access/core.js';
 
 const router = express.Router();
 
 // Check auth status and setup requirements
 router.get('/status', async (req, res) => {
   try {
-    const hasUsers = await userDb.hasUsers();
-    res.json({ 
-      needsSetup: !hasUsers,
-      isAuthenticated: false // Will be overridden by frontend if token exists
+    res.json({
+      needsSetup: false,
+      isAuthenticated: false
     });
   } catch (error) {
     console.error('Auth status error:', error);
@@ -19,6 +19,26 @@ router.get('/status', async (req, res) => {
   }
 });
 
+router.post('/bootstrap', async (req, res) => {
+  try {
+    if (!isLoopbackRequest(req)) {
+      return res.status(403).json({ error: 'Bootstrap is only available from a local address' });
+    }
+
+    const user = userDb.ensureDefaultUser();
+    const token = generateToken(user);
+
+    res.json({
+      success: true,
+      user,
+      token
+    });
+  } catch (error) {
+    console.error('Bootstrap auth error:', error);
+    res.status(500).json({ error: 'Failed to bootstrap local access' });
+  }
+});
+
 // User registration (setup) - only allowed if no users exist
 router.post('/register', async (req, res) => {
   try {

package/server/routes/cli-auth.js

@@ -274,42 +274,37 @@ async function checkClaudeCredentials() {
 }
 
 
+function decodeJwtPayload(token) {
+  const parts = String(token || '').split('.');
+  if (parts.length < 2) {
+    return null;
+  }
+
+  try {
+    return JSON.parse(Buffer.from(parts[1], 'base64url').toString('utf8'));
+  } catch {
+    return null;
+  }
+}
+
 async function checkCodexCredentials() {
   try {
     const authPath = path.join(os.homedir(), '.codex', 'auth.json');
     const content = await fs.readFile(authPath, 'utf8');
     const auth = JSON.parse(content);
+    const tokens = auth?.tokens && typeof auth.tokens === 'object' ? auth.tokens : {};
+    const idToken = typeof tokens.id_token === 'string' ? tokens.id_token : '';
+    const accessToken = typeof tokens.access_token === 'string' ? tokens.access_token : '';
 
-    // Tokens are nested under 'tokens' key
-    const tokens = auth.tokens || {};
-
-    // Check for valid tokens (id_token or access_token)
-    if (tokens.id_token || tokens.access_token) {
-      // Try to extract email from id_token JWT payload
-      let email = 'Authenticated';
-      if (tokens.id_token) {
-        try {
-          // JWT is base64url encoded: header.payload.signature
-          const parts = tokens.id_token.split('.');
-          if (parts.length >= 2) {
-            // Decode the payload (second part)
-            const payload = JSON.parse(Buffer.from(parts[1], 'base64url').toString('utf8'));
-            email = payload.email || payload.user || 'Authenticated';
-          }
-        } catch {
-          // If JWT decoding fails, use fallback
-          email = 'Authenticated';
-        }
-      }
-
+    if (idToken || accessToken) {
+      const payload = decodeJwtPayload(idToken);
       return {
         authenticated: true,
-        email
+        email: payload?.email || payload?.user || 'Authenticated'
       };
     }
 
-    // Also check for OPENAI_API_KEY as fallback auth method
-    if (auth.OPENAI_API_KEY) {
+    if (typeof auth?.OPENAI_API_KEY === 'string' && auth.OPENAI_API_KEY.trim()) {
       return {
         authenticated: true,
         email: 'API Key Auth'
@@ -329,6 +324,7 @@ async function checkCodexCredentials() {
         error: 'Codex not configured'
       };
     }
+
     return {
       authenticated: false,
       email: null,

package/server/routes/codex.js

@@ -1,344 +1,130 @@
 import express from 'express';
 import { promises as fs } from 'fs';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import TOML from '@iarna/toml';
-import { getCodexSessions, getCodexSessionMessages, deleteCodexSession } from '../projects.js';
-import { spawnCommand } from '../utils/spawnCommand.js';
+import {
+  deleteCodexSession,
+  getCodexSessionMessages,
+  getCodexSessions
+} from '../projects.js';
 
 const router = express.Router();
+const CODEX_CONFIG_PATH = path.join(os.homedir(), '.codex', 'config.toml');
 
-function createCliResponder(res) {
-  let responded = false;
-  return (status, payload) => {
-    if (responded || res.headersSent) {
-      return;
-    }
-    responded = true;
-    res.status(status).json(payload);
-  };
+function toInteger(value, fallback) {
+  const parsed = Number.parseInt(String(value ?? ''), 10);
+  return Number.isFinite(parsed) ? parsed : fallback;
 }
 
-router.get('/config', async (req, res) => {
+async function readCodexTomlConfig() {
   try {
-    const configPath = path.join(os.homedir(), '.codex', 'config.toml');
-    const content = await fs.readFile(configPath, 'utf8');
-    const config = TOML.parse(content);
-
-    res.json({
-      success: true,
-      config: {
-        model: config.model || null,
-        mcpServers: config.mcp_servers || {},
-        approvalMode: config.approval_mode || 'suggest'
-      }
-    });
+    const raw = await fs.readFile(CODEX_CONFIG_PATH, 'utf8');
+    return {
+      exists: true,
+      config: TOML.parse(raw)
+    };
   } catch (error) {
     if (error.code === 'ENOENT') {
-      res.json({
-        success: true,
-        config: {
-          model: null,
-          mcpServers: {},
-          approvalMode: 'suggest'
-        }
-      });
-    } else {
-      console.error('Error reading Codex config:', error);
-      res.status(500).json({ success: false, error: error.message });
-    }
-  }
-});
-
-router.get('/sessions', async (req, res) => {
-  try {
-    const { projectPath } = req.query;
-
-    if (!projectPath) {
-      return res.status(400).json({ success: false, error: 'projectPath query parameter required' });
+      return {
+        exists: false,
+        config: {}
+      };
     }
 
-    const sessions = await getCodexSessions(projectPath);
-    res.json({ success: true, sessions });
-  } catch (error) {
-    console.error('Error fetching Codex sessions:', error);
-    res.status(500).json({ success: false, error: error.message });
-  }
-});
-
-router.get('/sessions/:sessionId/messages', async (req, res) => {
-  try {
-    const { sessionId } = req.params;
-    const { limit, offset } = req.query;
-
-    const result = await getCodexSessionMessages(
-      sessionId,
-      limit ? parseInt(limit, 10) : null,
-      offset ? parseInt(offset, 10) : 0
-    );
-
-    res.json({ success: true, ...result });
-  } catch (error) {
-    console.error('Error fetching Codex session messages:', error);
-    res.status(500).json({ success: false, error: error.message });
-  }
-});
-
-router.delete('/sessions/:sessionId', async (req, res) => {
-  try {
-    const { sessionId } = req.params;
-    await deleteCodexSession(sessionId);
-    res.json({ success: true });
-  } catch (error) {
-    console.error(`Error deleting Codex session ${req.params.sessionId}:`, error);
-    res.status(500).json({ success: false, error: error.message });
+    throw error;
   }
-});
+}
 
-// MCP Server Management Routes
+function summarizeCodexConfig(config, exists) {
+  const collaborationMode = config?.collaboration_mode;
+
+  return {
+    configPath: CODEX_CONFIG_PATH,
+    exists,
+    model: typeof config?.model === 'string' ? config.model : null,
+    approvalMode: typeof config?.approval_mode === 'string' ? config.approval_mode : 'suggest',
+    sandboxMode: typeof config?.sandbox_mode === 'string' ? config.sandbox_mode : null,
+    fullAutoErrorMode: typeof config?.full_auto_error_mode === 'string' ? config.full_auto_error_mode : null,
+    preferredAgent: typeof collaborationMode?.model === 'string' ? collaborationMode.model : null
+  };
+}
 
-router.get('/mcp/cli/list', async (req, res) => {
+router.get('/config', async (_req, res) => {
   try {
-    const respond = createCliResponder(res);
-    const proc = spawnCommand('codex', ['mcp', 'list'], { stdio: ['pipe', 'pipe', 'pipe'] });
-
-    let stdout = '';
-    let stderr = '';
-
-    proc.stdout?.on('data', (data) => { stdout += data.toString(); });
-    proc.stderr?.on('data', (data) => { stderr += data.toString(); });
-
-    proc.on('close', (code) => {
-      if (code === 0) {
-        respond(200, { success: true, output: stdout, servers: parseCodexListOutput(stdout) });
-      } else {
-        respond(500, { error: 'Codex CLI command failed', details: stderr || `Exited with code ${code}` });
-      }
-    });
-
-    proc.on('error', (error) => {
-      const isMissing = error?.code === 'ENOENT';
-      respond(isMissing ? 503 : 500, {
-        error: isMissing ? 'Codex CLI not installed' : 'Failed to run Codex CLI',
-        details: error.message,
-        code: error.code
-      });
+    const { exists, config } = await readCodexTomlConfig();
+    res.json({
+      success: true,
+      config: summarizeCodexConfig(config, exists)
     });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to list MCP servers', details: error.message });
+    console.error('Error reading Codex config:', error);
+    res.status(500).json({
+      success: false,
+      error: error.message
+    });
   }
 });
 
-router.post('/mcp/cli/add', async (req, res) => {
-  try {
-    const { name, command, args = [], env = {} } = req.body;
-
-    if (!name || !command) {
-      return res.status(400).json({ error: 'name and command are required' });
-    }
-
-    // Build: codex mcp add <name> [-e KEY=VAL]... -- <command> [args...]
-    let cliArgs = ['mcp', 'add', name];
-
-    Object.entries(env).forEach(([key, value]) => {
-      cliArgs.push('-e', `${key}=${value}`);
-    });
-
-    cliArgs.push('--', command);
-
-    if (args && args.length > 0) {
-      cliArgs.push(...args);
-    }
-
-    const respond = createCliResponder(res);
-    const proc = spawnCommand('codex', cliArgs, { stdio: ['pipe', 'pipe', 'pipe'] });
-
-    let stdout = '';
-    let stderr = '';
-
-    proc.stdout?.on('data', (data) => { stdout += data.toString(); });
-    proc.stderr?.on('data', (data) => { stderr += data.toString(); });
-
-    proc.on('close', (code) => {
-      if (code === 0) {
-        respond(200, { success: true, output: stdout, message: `MCP server "${name}" added successfully` });
-      } else {
-        respond(400, { error: 'Codex CLI command failed', details: stderr || `Exited with code ${code}` });
-      }
-    });
+router.get('/sessions', async (req, res) => {
+  const projectPath = String(req.query.projectPath || '').trim();
 
-    proc.on('error', (error) => {
-      const isMissing = error?.code === 'ENOENT';
-      respond(isMissing ? 503 : 500, {
-        error: isMissing ? 'Codex CLI not installed' : 'Failed to run Codex CLI',
-        details: error.message,
-        code: error.code
-      });
+  if (!projectPath) {
+    return res.status(400).json({
+      success: false,
+      error: 'projectPath query parameter required'
     });
-  } catch (error) {
-    res.status(500).json({ error: 'Failed to add MCP server', details: error.message });
   }
-});
 
-router.delete('/mcp/cli/remove/:name', async (req, res) => {
   try {
-    const { name } = req.params;
-
-    const respond = createCliResponder(res);
-    const proc = spawnCommand('codex', ['mcp', 'remove', name], { stdio: ['pipe', 'pipe', 'pipe'] });
-
-    let stdout = '';
-    let stderr = '';
-
-    proc.stdout?.on('data', (data) => { stdout += data.toString(); });
-    proc.stderr?.on('data', (data) => { stderr += data.toString(); });
-
-    proc.on('close', (code) => {
-      if (code === 0) {
-        respond(200, { success: true, output: stdout, message: `MCP server "${name}" removed successfully` });
-      } else {
-        respond(400, { error: 'Codex CLI command failed', details: stderr || `Exited with code ${code}` });
-      }
-    });
-
-    proc.on('error', (error) => {
-      const isMissing = error?.code === 'ENOENT';
-      respond(isMissing ? 503 : 500, {
-        error: isMissing ? 'Codex CLI not installed' : 'Failed to run Codex CLI',
-        details: error.message,
-        code: error.code
-      });
+    const limit = toInteger(req.query.limit, 5);
+    const sessions = await getCodexSessions(projectPath, { limit });
+    res.json({
+      success: true,
+      sessions
     });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to remove MCP server', details: error.message });
+    console.error('Error fetching Codex sessions:', error);
+    res.status(500).json({
+      success: false,
+      error: error.message
+    });
   }
 });
 
-router.get('/mcp/cli/get/:name', async (req, res) => {
+router.get('/sessions/:sessionId/messages', async (req, res) => {
   try {
-    const { name } = req.params;
+    const sessionId = String(req.params.sessionId || '').trim();
+    const limit = req.query.limit == null ? null : toInteger(req.query.limit, null);
+    const offset = toInteger(req.query.offset, 0);
+    const payload = await getCodexSessionMessages(sessionId, limit, offset);
 
-    const respond = createCliResponder(res);
-    const proc = spawnCommand('codex', ['mcp', 'get', name], { stdio: ['pipe', 'pipe', 'pipe'] });
-
-    let stdout = '';
-    let stderr = '';
-
-    proc.stdout?.on('data', (data) => { stdout += data.toString(); });
-    proc.stderr?.on('data', (data) => { stderr += data.toString(); });
-
-    proc.on('close', (code) => {
-      if (code === 0) {
-        respond(200, { success: true, output: stdout, server: parseCodexGetOutput(stdout) });
-      } else {
-        respond(404, { error: 'Codex CLI command failed', details: stderr || `Exited with code ${code}` });
-      }
-    });
-
-    proc.on('error', (error) => {
-      const isMissing = error?.code === 'ENOENT';
-      respond(isMissing ? 503 : 500, {
-        error: isMissing ? 'Codex CLI not installed' : 'Failed to run Codex CLI',
-        details: error.message,
-        code: error.code
-      });
+    res.json({
+      success: true,
+      ...payload
     });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to get MCP server details', details: error.message });
+    console.error('Error fetching Codex session messages:', error);
+    res.status(500).json({
+      success: false,
+      error: error.message
+    });
   }
 });
 
-router.get('/mcp/config/read', async (req, res) => {
+router.delete('/sessions/:sessionId', async (req, res) => {
   try {
-    const configPath = path.join(os.homedir(), '.codex', 'config.toml');
-
-    let configData = null;
-
-    try {
-      const fileContent = await fs.readFile(configPath, 'utf8');
-      configData = TOML.parse(fileContent);
-    } catch (error) {
-      // Config file doesn't exist
-    }
-
-    if (!configData) {
-      return res.json({ success: true, configPath, servers: [] });    }
-
-    const servers = [];
-
-    if (configData.mcp_servers && typeof configData.mcp_servers === 'object') {
-      for (const [name, config] of Object.entries(configData.mcp_servers)) {
-        servers.push({
-          id: name,
-          name: name,
-          type: 'stdio',
-          scope: 'user',
-          config: {
-            command: config.command || '',
-            args: config.args || [],
-            env: config.env || {}
-          },
-          raw: config
-        });
-      }
-    }
-
-    res.json({ success: true, configPath, servers });
+    await deleteCodexSession(req.params.sessionId);
+    res.json({
+      success: true
+    });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to read Codex configuration', details: error.message });
+    console.error(`Error deleting Codex session ${req.params.sessionId}:`, error);
+    res.status(500).json({
+      success: false,
+      error: error.message
+    });
   }
 });
 
-function parseCodexListOutput(output) {
-  const servers = [];
-  const lines = output.split('\n').filter(line => line.trim());
-
-  for (const line of lines) {
-    if (line.includes(':')) {
-      const colonIndex = line.indexOf(':');
-      const name = line.substring(0, colonIndex).trim();
-
-      if (!name) continue;
-
-      const rest = line.substring(colonIndex + 1).trim();
-      let description = rest;
-      let status = 'unknown';
-
-      if (rest.includes('✓') || rest.includes('✗')) {
-        const statusMatch = rest.match(/(.*?)\s*-\s*([✓✗].*)$/);
-        if (statusMatch) {
-          description = statusMatch[1].trim();
-          status = statusMatch[2].includes('✓') ? 'connected' : 'failed';
-        }
-      }
-
-      servers.push({ name, type: 'stdio', status, description });
-    }
-  }
-
-  return servers;
-}
-
-function parseCodexGetOutput(output) {
-  try {
-    const jsonMatch = output.match(/\{[\s\S]*\}/);
-    if (jsonMatch) {
-      return JSON.parse(jsonMatch[0]);
-    }
-
-    const server = { raw_output: output };
-    const lines = output.split('\n');
-
-    for (const line of lines) {
-      if (line.includes('Name:')) server.name = line.split(':')[1]?.trim();
-      else if (line.includes('Type:')) server.type = line.split(':')[1]?.trim();
-      else if (line.includes('Command:')) server.command = line.split(':')[1]?.trim();
-    }
-
-    return server;
-  } catch (error) {
-    return { raw_output: output, parse_error: error.message };
-  }
-}
-
 export default router;