scai 0.1.70 → 0.1.72

package/dist/modelSetup.js

@@ -3,15 +3,17 @@ import * as readline from 'readline';
 import * as fs from 'fs';
 import * as path from 'path';
 import chalk from 'chalk';
+import { platform } from 'os';
 import { getDbForRepo } from './db/client.js';
 import { readConfig, writeConfig } from './config.js';
 import { CONFIG_PATH } from './constants.js';
-import { platform } from 'os';
 // Constants
 const MODEL_PORT = 11434;
 const REQUIRED_MODELS = ['llama3', 'mistral'];
 const OLLAMA_URL = 'https://ollama.com/download';
 const isYesMode = process.argv.includes('--yes') || process.env.SCAI_YES === '1';
+let ollamaChecked = false;
+let ollamaAvailable = false;
 // 🧠 Auto init config/db if missing
 export async function autoInitIfNeeded() {
     const cfg = readConfig();
@@ -28,73 +30,96 @@ export async function autoInitIfNeeded() {
         }
     }
 }
-// 🗨 Prompt user
+// 🗨 Prompt user with 10-second timeout
 function promptUser(question) {
     if (isYesMode)
         return Promise.resolve('y');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => rl.question(question, (a) => {
-        rl.close();
-        resolve(a.trim());
-    }));
+    return new Promise((resolve) => {
+        const timer = setTimeout(() => {
+            rl.close();
+            resolve('');
+        }, 10000); // 10 second timeout
+        rl.question(question, (answer) => {
+            clearTimeout(timer);
+            rl.close();
+            resolve(answer.trim());
+        });
+    });
 }
-// 🚀 Ensure Ollama server is running
-async function ensureOllamaRunning() {
+// 🧭 Cross-platform browser opener
+function openBrowser(url) {
+    const command = platform() === 'win32'
+        ? `start ${url}`
+        : platform() === 'darwin'
+            ? `open ${url}`
+            : `xdg-open ${url}`;
+    try {
+        execSync(command, { stdio: 'ignore' });
+    }
+    catch {
+        console.log(chalk.yellow('🔗 Please manually open:'), url);
+    }
+}
+// 🌐 Check if Ollama is running
+async function isOllamaRunning() {
     try {
         const res = await fetch(`http://localhost:${MODEL_PORT}`);
-        if (res.ok) {
-            console.log(chalk.green('✅ Result:') + ` Ollama is already running on port ${MODEL_PORT}.`);
-            return;
-        }
+        return res.ok;
     }
     catch {
-        console.log(chalk.yellow('⚙️  Challenge:') + ' Ollama is not running. Attempting to start it...');
+        return false;
+    }
+}
+// 🚀 Ensure Ollama server is running
+async function ensureOllamaRunning() {
+    if (ollamaChecked)
+        return;
+    ollamaChecked = true;
+    if (await isOllamaRunning()) {
+        console.log(chalk.green('✅ Ollama is already running.'));
+        ollamaAvailable = true;
+        return;
     }
-    console.log(chalk.yellow('⚙️  Challenge:') + ` Ollama does not appear to be running on port ${MODEL_PORT}.\n` +
-        chalk.yellow('🚀 Action:') + ' Attempting to start Ollama in the background...');
+    console.log(chalk.yellow('⚙️  Ollama is not running. Attempting to start it...'));
+    let ollamaStarted = false;
     try {
         const child = spawn('ollama', ['serve'], {
             detached: true,
             stdio: 'ignore',
             windowsHide: true,
         });
-        child.on('error', async (err) => {
-            if (err.code === 'ENOENT') {
-                console.log(chalk.red('❌ Ollama is not installed or not in PATH.'));
-                console.log(chalk.yellow(`📦 Ollama is required to run local AI models.\n`));
-                console.log(chalk.yellow(`🔗 Download it here: ${OLLAMA_URL}`));
-                const answer = await promptUser('🌐 Would you like to open the download page in your browser? (y/N): ');
-                if (answer.toLowerCase() === 'y') {
-                    openBrowser(OLLAMA_URL);
-                }
-                process.exit(1);
-            }
-            else {
-                console.error(chalk.red('❌ Failed to start Ollama process:'), err);
-                process.exit(1);
-            }
-        });
         child.unref();
-        await new Promise((res) => setTimeout(res, 3000));
-        console.log(chalk.green('✅ Result:') + ' Ollama started successfully.');
+        await new Promise((res) => setTimeout(res, 10000));
+        if (await isOllamaRunning()) {
+            console.log(chalk.green('✅ Ollama started successfully.'));
+            ollamaAvailable = true;
+            return;
+        }
     }
     catch (err) {
-        console.error(chalk.red('❌ Unexpected error while trying to start Ollama:'), err);
-        process.exit(1);
+        if (err.code !== 'ENOENT') {
+            console.log(chalk.red('❌ Unexpected error starting Ollama.'));
+            process.exit(1);
+        }
     }
-}
-// 🧭 Cross-platform browser opener
-function openBrowser(url) {
-    const command = platform() === 'win32'
-        ? `start ${url}`
-        : platform() === 'darwin'
-            ? `open ${url}`
-            : `xdg-open ${url}`;
-    try {
-        execSync(command, { stdio: 'ignore' });
+    // If we get here, Ollama likely isn't installed
+    console.log(chalk.red('❌ Ollama is not installed or not in PATH.'));
+    console.log(chalk.yellow(`📦 Ollama is required to run local AI models.`));
+    const answer = await promptUser('🌐 Would you like to open the download page in your browser? (y/N): ');
+    if (answer.toLowerCase() === 'y') {
+        openBrowser(OLLAMA_URL);
     }
-    catch (err) {
-        console.error(chalk.red('❌ Could not open browser. Please visit:'), url);
+    console.log(chalk.yellow('⏳ Waiting for you to install Ollama and press Enter to continue...'));
+    await promptUser('👉 Press Enter once Ollama is installed and ready: ');
+    // Retry once
+    if (await isOllamaRunning()) {
+        console.log(chalk.green('✅ Ollama detected. Continuing...'));
+        ollamaAvailable = true;
+    }
+    else {
+        console.log(chalk.red('❌ Ollama still not detected. Please check your installation.'));
+        process.exit(1);
     }
 }
 // 🧰 List installed models
@@ -106,13 +131,14 @@ async function getInstalledModels() {
             .map((line) => line.split(/\s+/)[0].split(':')[0])
             .filter((model) => REQUIRED_MODELS.includes(model));
     }
-    catch (err) {
-        console.error(chalk.red('❌ Could not fetch installed models:'), err);
+    catch {
         return [];
     }
 }
 // 📥 Download missing models
 async function ensureModelsDownloaded() {
+    if (!ollamaAvailable)
+        return;
     const installed = await getInstalledModels();
     const missing = REQUIRED_MODELS.filter((m) => !installed.includes(m));
     if (!missing.length) {
@@ -131,8 +157,8 @@ async function ensureModelsDownloaded() {
             execSync(`ollama pull ${model}`, { stdio: 'inherit' });
             console.log(chalk.green(`✅ Pulled ${model}`));
         }
-        catch (err) {
-            console.error(chalk.red(`❌ Failed to pull ${model}:`), err);
+        catch {
+            console.log(chalk.red(`❌ Failed to pull ${model}.`));
             process.exit(1);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scai",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "type": "module",
   "bin": {
     "scai": "./dist/index.js"