codesearch-mcp 0.0.15-alpha → 0.0.17-alpha

package/dist/src/setup.js

@@ -40,11 +40,14 @@ const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const child_process_1 = require("child_process");
 const constants_1 = require("./constants");
-const CONFIG_DIR = path.join(os.homedir(), '.config', 'codesearch-mcp');
-const DEFAULT_LOG_DIR = path.join(CONFIG_DIR, 'logs');
-const CONFIG_FILE = path.join(CONFIG_DIR, '.env');
-const DOCKER_COMPOSE_SRC = path.join(__dirname, '..', '..', 'docker', 'docker-compose.yml');
-const DOCKER_COMPOSE_DST = path.join(CONFIG_DIR, 'docker-compose.yml');
+const config_store_1 = require("./config-store");
+const config_1 = require("./config");
+const DEFAULT_LOG_DIR = path.join(config_store_1.CONFIG_DIR, 'logs');
+const _projectRoot = fs.existsSync(path.join(__dirname, '..', 'package.json'))
+    ? path.join(__dirname, '..')
+    : path.join(__dirname, '..', '..');
+const DOCKER_COMPOSE_SRC = path.join(_projectRoot, 'docker', 'docker-compose.yml');
+const DOCKER_COMPOSE_DST = path.join(config_store_1.CONFIG_DIR, 'docker-compose.yml');
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
 }
@@ -57,14 +60,6 @@ function expandHome(p) {
         return path.join(os.homedir(), p.slice(2));
     return p;
 }
-function writeEnv(vars) {
-    fs.mkdirSync(CONFIG_DIR, { recursive: true });
-    const content = Object.entries(vars)
-        .map(([k, v]) => `${k}=${v}`)
-        .join('\n') + '\n';
-    fs.writeFileSync(CONFIG_FILE, content, { mode: 0o600 });
-    console.log(`\nConfig saved to ${CONFIG_FILE}`);
-}
 async function waitForDb(host, port, user, pass, db, maxWaitSec = 60, logger, steps) {
     const { Client } = await Promise.resolve().then(() => __importStar(require('pg')));
     const deadline = Date.now() + maxWaitSec * 1000;
@@ -129,7 +124,7 @@ async function checkRemoteDb(host, port, user, pass, db, logger, steps) {
         return false;
     }
 }
-async function setupLocalDocker(ollamaHost, dbPort, dbUser, dbPass, logger, steps) {
+async function startDockerContainers(ollamaHost, dbPort, dbUser, dbPass, logger, steps) {
     console.log('\nWriting docker-compose.yml to', DOCKER_COMPOSE_DST);
     const yamlQuote = (s) => `"${s.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
     let composeContent = fs.readFileSync(DOCKER_COMPOSE_SRC, 'utf-8');
@@ -137,57 +132,29 @@ async function setupLocalDocker(ollamaHost, dbPort, dbUser, dbPass, logger, step
         .replace('POSTGRES_USER: dev', `POSTGRES_USER: ${yamlQuote(dbUser)}`)
         .replace('POSTGRES_PASSWORD: dev', `POSTGRES_PASSWORD: ${yamlQuote(dbPass)}`)
         .replace('"5433:5432"', `"${dbPort}:5432"`);
-    fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    fs.mkdirSync(config_store_1.CONFIG_DIR, { recursive: true });
     fs.writeFileSync(DOCKER_COMPOSE_DST, composeContent, 'utf-8');
     console.log('\nStarting Docker containers...');
     const upResult = (0, child_process_1.spawnSync)('docker', ['compose', '-f', DOCKER_COMPOSE_DST, 'up', '-d'], { stdio: 'inherit' });
     if (upResult.status !== 0) {
         const reason = 'Failed to start Docker containers. Make sure Docker is running.';
         console.error(reason);
-        logger?.error('setupLocalDocker: docker startup failed', { reason, steps });
+        logger?.error('startDockerContainers: docker startup failed', { reason, steps });
         process.exit(1);
     }
     await waitForDb('localhost', parseInt(dbPort), dbUser, dbPass, 'postgres', 60, logger, steps);
     await waitForOllama(ollamaHost, 60, logger, steps);
-    // Resolve the ollama container ID via compose — compose project name (and thus the
-    // default container name) depends on the parent directory, so hardcoding it breaks when
-    // users install via npm -g or move the compose file around.
     const ollamaId = (0, child_process_1.spawnSync)('docker', ['compose', '-f', DOCKER_COMPOSE_DST, 'ps', '-q', 'ollama'], { encoding: 'utf-8' })
         .stdout?.trim();
     if (!ollamaId) {
         const reason = 'Could not resolve ollama container ID from compose. Pull the model manually:';
         console.error(reason);
         console.error(`  docker exec <ollama-container> ollama pull ${constants_1.DEFAULT_EMBED_MODEL}`);
-        logger?.error('setupLocalDocker: ollama container not found', { reason, steps });
+        logger?.error('startDockerContainers: ollama container not found', { reason, steps });
         process.exit(1);
     }
     console.log(`Pulling ${constants_1.DEFAULT_EMBED_MODEL} model (this may take a while)...`);
     (0, child_process_1.spawnSync)('docker', ['exec', ollamaId, 'ollama', 'pull', constants_1.DEFAULT_EMBED_MODEL], { stdio: 'inherit' });
-    return { DB_HOST: 'localhost', DB_PORT: dbPort, DB_USER: dbUser, DB_PASS: dbPass };
-}
-async function setupRemoteDb(rl, logger, steps, logStep) {
-    const lp = async (label, def) => {
-        const answer = await prompt(rl, label, def);
-        logStep?.(label, answer);
-        return answer;
-    };
-    let vars = {};
-    while (true) {
-        vars.DB_HOST = await lp('DB host', 'localhost');
-        vars.DB_PORT = await lp('DB port', '5432');
-        vars.DB_USER = await lp('DB user', 'postgres');
-        vars.DB_PASS = await lp('DB password', '');
-        console.log('\nTesting connection...');
-        const ok = await checkRemoteDb(vars.DB_HOST, vars.DB_PORT, vars.DB_USER, vars.DB_PASS, 'postgres', logger, steps);
-        if (ok) {
-            console.log('Connection successful.');
-            break;
-        }
-        const retry = await ask(rl, 'Retry? (y/n): ');
-        if (retry.trim().toLowerCase() !== 'y')
-            break;
-    }
-    return vars;
 }
 async function runSetup(logger) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -210,14 +177,12 @@ async function runSetup(logger) {
     };
     console.log('=== codesearch-mcp setup ===');
     console.log('Press Enter to keep the default value shown in parentheses.\n');
-    const dbChoice = await loggedAsk('Infrastructure:\n  1. Local Docker (auto-start PostgreSQL + Ollama)\n  2. Remote (Supabase, Railway, self-hosted DB + local Ollama)\n\nEnter choice (1): ');
-    const useDocker = (dbChoice.trim() || '1') === '1';
     const workspaceExample = (() => {
         const candidates = ['Projects', 'projects', 'workspace', 'code', 'Code', 'dev', 'Development'];
         const found = candidates.find(d => fs.existsSync(path.join(os.homedir(), d)));
         return path.join(os.homedir(), found ?? 'projects');
     })();
-    console.log(`\nWorkspace root — full path to the directory that contains all your projects`);
+    console.log(`Workspace root — full path to the directory that contains all your projects`);
     console.log(`  (e.g. ${workspaceExample})`);
     let workspaceInput;
     do {
@@ -227,12 +192,39 @@ async function runSetup(logger) {
     } while (!workspaceInput.trim());
     const workspaceRoot = expandHome(workspaceInput.trim());
     const ollamaHost = await loggedPrompt('Ollama API URL', 'http://localhost:11434');
-    const dbVars = useDocker
-        ? await setupLocalDocker(ollamaHost, await loggedPrompt('DB port', '5433'), await loggedPrompt('DB user', 'dev'), await loggedPrompt('DB password', 'dev'), logger, steps)
-        : await setupRemoteDb(rl, logger, steps, logStep);
+    console.log('\n--- Database ---');
+    const dbHost = await loggedPrompt('DB host', 'localhost');
+    const dbPort = await loggedPrompt('DB port', '5433');
+    const dbUser = await loggedPrompt('DB user', 'dev');
+    const dbPass = await loggedPrompt('DB password', 'dev');
+    process.stdout.write('\nTesting connection...');
+    const alreadyConnected = await checkRemoteDb(dbHost, dbPort, dbUser, dbPass, 'postgres', logger, steps);
+    if (alreadyConnected)
+        console.log('  Database is already reachable.');
+    const dockerDefault = alreadyConnected ? 'n' : 'y';
+    const startDockerRaw = await loggedAsk(`Start Docker containers automatically? (y/n) (${dockerDefault}): `);
+    const startDocker = (startDockerRaw.trim().toLowerCase() || dockerDefault) === 'y';
+    if (startDocker) {
+        await startDockerContainers(ollamaHost, dbPort, dbUser, dbPass, logger, steps);
+    }
+    else if (!alreadyConnected) {
+        while (true) {
+            console.log('\nTesting connection...');
+            const ok = await checkRemoteDb(dbHost, dbPort, dbUser, dbPass, 'postgres', logger, steps);
+            if (ok) {
+                console.log('Connection successful.');
+                break;
+            }
+            const retry = await ask(rl, 'Retry? (y/n): ');
+            if (retry.trim().toLowerCase() !== 'y')
+                break;
+        }
+    }
+    const dbVars = { host: dbHost, port: parseInt(dbPort, 10), user: dbUser, password: dbPass };
     console.log('\n--- Logging ---');
     console.log('  error  — failures only (recommended)');
     console.log('  warn   — + recoverable issues');
+    console.log('  info   — + general progress messages');
     console.log('  debug  — full diagnostic output (verbose)');
     const validLevels = ['error', 'warn', 'info', 'debug'];
     let logLevel;
@@ -243,22 +235,25 @@ async function runSetup(logger) {
     } while (!validLevels.includes(logLevel));
     const logDirInput = await loggedAsk(`Log dir (leave blank for default: ${DEFAULT_LOG_DIR}, or "false" to disable): `);
     const logDir = logDirInput.trim();
-    const envVars = {
-        ...dbVars,
-        WORKSPACE_ROOT: workspaceRoot,
-        OLLAMA_HOST: ollamaHost,
-        LOG_LEVEL: logLevel,
+    const cfg = {
+        db: {
+            host: dbVars.host,
+            port: dbVars.port,
+            user: dbVars.user,
+            password: dbVars.password,
+        },
+        ollama: { host: ollamaHost },
+        logging: { level: logLevel },
+        workspaceRoot,
     };
     if (logDir)
-        envVars['LOG_DIR'] = logDir;
-    writeEnv(envVars);
+        cfg.logging.dir = logDir;
+    (0, config_store_1.writeConfigJson)(cfg);
+    console.log(`\nConfig saved to ${config_store_1.CONFIG_FILE}`);
     rl.close();
     console.log('\nInitializing database schema...');
-    const dotenv = await Promise.resolve().then(() => __importStar(require('dotenv')));
-    dotenv.config({ path: CONFIG_FILE, override: true });
-    const { config } = await Promise.resolve().then(() => __importStar(require('./config')));
     const { DatabaseService } = await Promise.resolve().then(() => __importStar(require('./services/DatabaseService')));
-    const dbService = new DatabaseService(config);
+    const dbService = new DatabaseService(new config_1.Config());
     let initError = null;
     try {
         await dbService.initDbWithSchema();

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "codesearch-mcp",
-  "version": "0.0.15-alpha",
+  "version": "0.0.17-alpha",
   "description": "Local semantic codebase search via MCP — indexes projects into pgvector, exposes search to Claude",
   "license": "MIT",
   "main": "dist/app.js",
   "bin": {
     "rag-index": "dist/app.js",
     "rag-mcp": "dist/app.js",
-    "rag-setup": "dist/app.js"
+    "rag-setup": "dist/app.js",
+    "rag-config": "dist/app.js"
   },
   "files": [
     "dist/",
@@ -33,15 +34,13 @@
     "@langchain/textsplitters": "^1.0.1",
     "@modelcontextprotocol/sdk": "^1.0.0",
     "cli-progress": "^3.12.0",
-    "dotenv": "^17.4.2",
+    "drizzle-orm": "^0.45.2",
     "ignore": "^7.0.5",
     "ollama": "^0.5.0",
     "pg": "^8.13.0",
     "pino": "^10.3.1",
     "pino-roll": "^4.0.0",
-    "reflect-metadata": "^0.2.2",
     "ts-morph": "^28.0.0",
-    "typeorm": "^0.3.20",
     "zod": "^4.3.6"
   },
   "devDependencies": {