scai 0.1.115 → 0.1.117

package/dist/modelSetup.js

@@ -11,6 +11,7 @@ import { CONFIG_PATH } from './constants.js';
 const MODEL_PORT = 11434;
 const REQUIRED_MODELS = ['llama3:8b'];
 const OLLAMA_URL = 'https://ollama.com/download';
+const VSCODE_URL = 'https://code.visualstudio.com/download';
 const isYesMode = process.argv.includes('--yes') || process.env.SCAI_YES === '1';
 let ollamaChecked = false;
 let ollamaAvailable = false;
@@ -38,7 +39,7 @@ function promptUser(question, timeout = 20000) {
     return new Promise((resolve) => {
         const timer = setTimeout(() => {
             rl.close();
-            resolve(''); // treat empty as "continue"
+            resolve('');
         }, timeout);
         rl.question(question, (answer) => {
             clearTimeout(timer);
@@ -89,7 +90,7 @@ async function ensureOllamaRunning() {
             windowsHide: true,
         });
         child.unref();
-        await new Promise((res) => setTimeout(res, 10000)); // give more time
+        await new Promise((res) => setTimeout(res, 10000));
         if (await isOllamaRunning()) {
             console.log(chalk.green('✅ Ollama started successfully.'));
             ollamaAvailable = true;
@@ -102,13 +103,11 @@ async function ensureOllamaRunning() {
             process.exit(1);
         }
     }
-    // Ollama not detected; prompt user but allow continuing
     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(`🌐 Recommended model: ${REQUIRED_MODELS.join(', ')}\nOpen download page in browser? (y/N): `);
-    if (answer.toLowerCase() === 'y') {
+    if (answer.toLowerCase() === 'y')
         openBrowser(OLLAMA_URL);
-    }
     await promptUser('⏳ Press Enter once Ollama is installed or to continue without it: ');
     if (await isOllamaRunning()) {
         console.log(chalk.green('✅ Ollama detected. Continuing...'));
@@ -116,7 +115,7 @@ async function ensureOllamaRunning() {
     }
     else {
         console.log(chalk.yellow('⚠️  Ollama not running. Models will not be available until installed.'));
-        ollamaAvailable = false; // continue anyway
+        ollamaAvailable = false;
     }
 }
 // 🧰 List installed models
@@ -159,9 +158,49 @@ async function ensureModelsDownloaded() {
         }
     }
 }
+// 🌟 Check if VSCode CLI is available
+async function isVSCodeAvailable() {
+    try {
+        execSync('code --version', { stdio: 'ignore' });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// ⚡ Ensure VSCode CLI is installed
+async function ensureVSCodeInstalled() {
+    if (await isVSCodeAvailable()) {
+        console.log(chalk.green('✅ VSCode CLI is available.'));
+        return;
+    }
+    console.log(chalk.red('❌ VSCode CLI not found.'));
+    const answer = await promptUser('Do you want to open the VSCode download page? (y/N): ');
+    if (answer.toLowerCase() === 'y')
+        openBrowser(VSCODE_URL);
+    await promptUser('VSCode CLI was not found. If you want to use VSCode features, please install it manually. ' +
+        'Once installed, press Enter to continue. If you prefer to skip VSCode, just press Enter to continue without it: ');
+    if (await isVSCodeAvailable()) {
+        console.log(chalk.green('✅ VSCode CLI detected. Continuing...'));
+    }
+    else {
+        console.log(chalk.yellow('⚠️ VSCode CLI still not found. Some features may be disabled.'));
+    }
+}
 // 🏁 Main bootstrap logic
 export async function bootstrap() {
     await autoInitIfNeeded();
     await ensureOllamaRunning();
     await ensureModelsDownloaded();
+    await ensureVSCodeInstalled();
+}
+// 🔗 Helper: open file or diff in VSCode
+export function openInVSCode(filePath, options) {
+    const args = options?.diffWith ? ['--diff', options.diffWith, filePath] : [filePath];
+    try {
+        spawn('code', args, { stdio: 'inherit' });
+    }
+    catch {
+        console.log(chalk.red('❌ Failed to launch VSCode CLI. Make sure it is installed and in PATH.'));
+    }
 }

package/dist/pipeline/modules/cleanupModule.js

@@ -104,6 +104,26 @@ export const cleanupModule = {
                     break;
             }
         }
-        return { content: jsonLines.join('\n').trim() };
+        let finalContent = jsonLines.join('\n').trim();
+        // --- VALIDATE JSON ---
+        try {
+            JSON.parse(finalContent);
+            return { content: finalContent };
+        }
+        catch (err) {
+            console.warn(chalk.yellow(`[cleanupModule] Initial JSON.parse failed:`), chalk.red(err instanceof Error ? err.message : err));
+            // Attempt simple cleanup: remove trailing commas before } or ]
+            finalContent = finalContent.replace(/,\s*([}\]])/g, '$1');
+            try {
+                JSON.parse(finalContent);
+                console.log(chalk.green(`[cleanupModule] Fixed JSON by removing trailing commas.`));
+                return { content: finalContent };
+            }
+            catch (err2) {
+                console.error(chalk.red(`[cleanupModule] JSON still invalid after cleanup:`), chalk.yellow(err2 instanceof Error ? err2.message : err2));
+                // Return best-effort content even if invalid, so downstream can log/debug
+                return { content: finalContent };
+            }
+        }
     }
 };