codesearch-mcp 0.0.2-alpha → 0.0.4-alpha

package/dist/src/setup.js

@@ -41,7 +41,7 @@ const os = __importStar(require("os"));
 const child_process_1 = require("child_process");
 const CONFIG_DIR = path.join(os.homedir(), '.config', 'codesearch-mcp');
 const CONFIG_FILE = path.join(CONFIG_DIR, '.env');
-const DOCKER_COMPOSE_SRC = path.join(__dirname, '..', 'docker', 'docker-compose.yml');
+const DOCKER_COMPOSE_SRC = path.join(__dirname, '..', '..', 'docker', 'docker-compose.yml');
 const DOCKER_COMPOSE_DST = path.join(CONFIG_DIR, 'docker-compose.yml');
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -50,6 +50,11 @@ async function prompt(rl, label, defaultVal) {
     const answer = await ask(rl, `${label} (${defaultVal}): `);
     return answer.trim() || defaultVal;
 }
+function expandHome(p) {
+    if (p.startsWith('~/') || 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)
@@ -58,6 +63,51 @@ function writeEnv(vars) {
     fs.writeFileSync(CONFIG_FILE, content, { mode: 0o600 });
     console.log(`\nConfig saved to ${CONFIG_FILE}`);
 }
+async function waitForDb(host, port, user, pass, db, maxWaitSec = 60) {
+    const { Client } = await Promise.resolve().then(() => __importStar(require('pg')));
+    const deadline = Date.now() + maxWaitSec * 1000;
+    process.stdout.write('Waiting for PostgreSQL to be ready');
+    while (Date.now() < deadline) {
+        try {
+            const client = new Client({ host, port, user, password: pass, database: db, connectionTimeoutMillis: 2000 });
+            await client.connect();
+            await client.end();
+            console.log(' ready.');
+            return;
+        }
+        catch {
+            process.stdout.write('.');
+            await new Promise(r => setTimeout(r, 2000));
+        }
+    }
+    console.error('\nPostgreSQL did not become ready in time.');
+    process.exit(1);
+}
+async function waitForOllama(host, maxWaitSec = 60) {
+    const deadline = Date.now() + maxWaitSec * 1000;
+    process.stdout.write('Waiting for Ollama to be ready');
+    while (Date.now() < deadline) {
+        try {
+            const http = await Promise.resolve().then(() => __importStar(require('http')));
+            await new Promise((resolve, reject) => {
+                const req = http.get(`${host}/api/tags`, res => {
+                    res.resume();
+                    res.statusCode === 200 ? resolve() : reject(new Error(`status ${res.statusCode}`));
+                });
+                req.on('error', reject);
+                req.setTimeout(2000, () => { req.destroy(); reject(new Error('timeout')); });
+            });
+            console.log(' ready.');
+            return;
+        }
+        catch {
+            process.stdout.write('.');
+            await new Promise(r => setTimeout(r, 2000));
+        }
+    }
+    console.error('\nOllama did not become ready in time.');
+    process.exit(1);
+}
 async function checkRemoteDb(host, port, user, pass, db) {
     try {
         const { Client } = await Promise.resolve().then(() => __importStar(require('pg')));
@@ -71,7 +121,7 @@ async function checkRemoteDb(host, port, user, pass, db) {
         return false;
     }
 }
-async function setupLocalDocker(rl) {
+async function setupLocalDocker(ollamaHost) {
     console.log('\nCopying docker-compose.yml to', DOCKER_COMPOSE_DST);
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
     fs.copyFileSync(DOCKER_COMPOSE_SRC, DOCKER_COMPOSE_DST);
@@ -81,8 +131,8 @@ async function setupLocalDocker(rl) {
         console.error('Failed to start Docker containers. Make sure Docker is running.');
         process.exit(1);
     }
-    console.log('\nWaiting for Ollama to be ready...');
-    await new Promise(r => setTimeout(r, 5000));
+    await waitForDb('localhost', 5433, 'dev', 'dev', 'rag');
+    await waitForOllama(ollamaHost);
     console.log('Pulling bge-m3 model (this may take a while)...');
     (0, child_process_1.spawnSync)('docker', ['exec', 'codesearch-mcp-ollama-1', 'ollama', 'pull', 'bge-m3'], { stdio: 'inherit' });
     return {
@@ -118,12 +168,14 @@ async function runSetup() {
     console.log('=== codesearch-mcp setup ===\n');
     const dbChoice = await ask(rl, 'Database type:\n  1. Local Docker (auto-start)\n  2. Remote (Supabase, Railway, self-hosted)\n\nEnter choice (1): ');
     const useDocker = (dbChoice.trim() || '1') === '1';
-    const dbVars = useDocker
-        ? await setupLocalDocker(rl)
-        : await setupRemoteDb(rl);
-    const workspaceRoot = await prompt(rl, 'Workspace root path', path.join(os.homedir(), 'Projects'));
+    const defaultWorkspace = path.join(os.homedir(), 'Projects');
+    const workspaceInput = await ask(rl, `\nWorkspace root — directory that contains all your projects\n  Example: ${os.homedir()}/WebstormProjects\n  Path (${defaultWorkspace}): `);
+    const workspaceRoot = expandHome(workspaceInput.trim() || defaultWorkspace);
     const ollamaHost = await prompt(rl, 'Ollama API URL', 'http://localhost:11434');
     const ollamaModel = await prompt(rl, 'Embedding model', 'bge-m3');
+    const dbVars = useDocker
+        ? await setupLocalDocker(ollamaHost)
+        : await setupRemoteDb(rl);
     writeEnv({
         ...dbVars,
         WORKSPACE_ROOT: workspaceRoot,
@@ -132,7 +184,6 @@ async function runSetup() {
     });
     rl.close();
     console.log('\nInitializing database schema...');
-    // Re-apply env from the file we just wrote so initDbWithSchema picks up the new values
     const dotenv = await Promise.resolve().then(() => __importStar(require('dotenv')));
     dotenv.config({ path: CONFIG_FILE, override: true });
     const { initDbWithSchema } = await Promise.resolve().then(() => __importStar(require('./db')));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codesearch-mcp",
-  "version": "0.0.2-alpha",
+  "version": "0.0.4-alpha",
   "description": "Local semantic codebase search via MCP — indexes projects into pgvector, exposes search to Claude",
   "main": "dist/app.js",
   "bin": {