scai 0.1.67 → 0.1.69

package/dist/commands/AskCmd.js

@@ -127,7 +127,6 @@ export async function runAskCommand(query) {
     }
     // 🟩 STEP 7: Build prompt
     console.log(chalk.blueBright('\n📦 Building contextual prompt...'));
-    console.log(chalk.gray(`[runAskCommand] Calling buildContextualPrompt()`));
     const promptContent = buildContextualPrompt({
         baseInstruction: query,
         code,

package/dist/modelSetup.js

@@ -3,26 +3,26 @@ import * as readline from 'readline';
 import * as fs from 'fs';
 import * as path from 'path';
 import chalk from 'chalk';
-import { getDbForRepo } from './db/client.js'; // Ensure this function works correctly
+import { getDbForRepo } from './db/client.js';
 import { readConfig, writeConfig } from './config.js';
 import { CONFIG_PATH } from './constants.js';
 // Constants
 const MODEL_PORT = 11434;
-const REQUIRED_MODELS = ['llama3', 'mistral']; // Expand as needed
+const REQUIRED_MODELS = ['llama3', 'mistral'];
 const isYesMode = process.argv.includes('--yes') || process.env.SCAI_YES === '1';
 // 🧠 Auto init config/db if missing
 export async function autoInitIfNeeded() {
     const cfg = readConfig();
     if (!fs.existsSync(CONFIG_PATH)) {
         console.log(chalk.green('🛠️  Config not found. Initializing...'));
-        writeConfig({}); // This will create config.json with defaults
+        writeConfig({});
     }
     const activeRepo = cfg.activeRepo && cfg.repos[cfg.activeRepo];
     if (activeRepo) {
         const dbPath = path.join(activeRepo.indexDir, 'scai.db');
         if (!fs.existsSync(dbPath)) {
             console.log(chalk.green('📦 DB not found. Initializing...'));
-            getDbForRepo(); // This creates the DB
+            getDbForRepo();
         }
     }
 }
@@ -31,14 +31,15 @@ async function ensureOllamaRunning() {
     try {
         const res = await fetch(`http://localhost:${MODEL_PORT}`);
         if (res.ok) {
-            console.log('✅ Ollama is already running.');
+            console.log(chalk.green('✅ Result:') + ` Ollama is already running on port ${MODEL_PORT}.`);
             return;
         }
     }
-    catch {
-        // Continue to spawn below
+    catch (err) {
+        console.log(chalk.yellow('⚙️  Challenge:') + ' Ollama is not running. Attempting to start it...');
     }
-    console.log(chalk.yellow('⚙️  Ollama is not running. Starting it in the background...'));
+    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...');
     try {
         const child = spawn('ollama', ['serve'], {
             detached: true,
@@ -47,10 +48,10 @@ async function ensureOllamaRunning() {
         });
         child.unref();
         await new Promise((res) => setTimeout(res, 3000));
-        console.log('✅ Ollama started.');
+        console.log(chalk.green('✅ Result:') + ' Ollama started successfully.');
     }
     catch (err) {
-        console.error('❌ Failed to start Ollama:', err);
+        console.error(chalk.red('❌ Failed:') + ' Could not start Ollama process.', err);
         process.exit(1);
     }
 }
@@ -64,7 +65,7 @@ async function getInstalledModels() {
             .filter((model) => REQUIRED_MODELS.includes(model));
     }
     catch (err) {
-        console.error('❌ Could not fetch installed models:', err);
+        console.error(chalk.red('❌ Could not fetch installed models:'), err);
         return [];
     }
 }
@@ -83,13 +84,13 @@ async function ensureModelsDownloaded() {
     const installed = await getInstalledModels();
     const missing = REQUIRED_MODELS.filter((m) => !installed.includes(m));
     if (!missing.length) {
-        console.log('✅ All required models are installed.');
+        console.log(chalk.green('✅ All required models are installed.'));
         return;
     }
     console.log(chalk.yellow(`📦 Missing models: ${missing.join(', ')}`));
     const answer = await promptUser('⬇️  Do you want to download them now? (y/N): ');
     if (answer.toLowerCase() !== 'y') {
-        console.log('🚫 Aborting due to missing models.');
+        console.log(chalk.red('🚫 Aborting due to missing models.'));
         process.exit(1);
     }
     for (const model of missing) {
@@ -99,7 +100,7 @@ async function ensureModelsDownloaded() {
             console.log(chalk.green(`✅ Pulled ${model}`));
         }
         catch (err) {
-            console.error(`❌ Failed to pull ${model}:`, err);
+            console.error(chalk.red(`❌ Failed to pull ${model}:`), err);
             process.exit(1);
         }
     }

package/dist/utils/buildContextualPrompt.js

@@ -1,5 +1,6 @@
 // File: src/utils/buildContextualPrompt.ts
 import chalk from 'chalk';
+import path from 'path';
 function estimateTokenCount(text) {
     return Math.round(text.length / 4); // simple heuristic approximation
 }
@@ -15,8 +16,7 @@ export function buildContextualPrompt({ baseInstruction, code, summary, function
         parts.push(`🔧 Functions:\n${formattedFunctions}`);
     }
     else {
-        console.log(chalk.gray(`[buildContextualPrompt]`) +
-            chalk.yellow(` ⚠️ No functions found in top file.`));
+        console.log(chalk.yellow(` ⚠️ No functions found in top rated file.`));
     }
     if (relatedFiles?.length) {
         const formattedRelatedFiles = relatedFiles
@@ -36,21 +36,39 @@ export function buildContextualPrompt({ baseInstruction, code, summary, function
     const prompt = parts.join('\n\n');
     const tokenEstimate = estimateTokenCount(prompt);
     // 🔵 Colorized diagnostic output
+    // 🔵 Colorized diagnostic output
     const header = chalk.bgBlue.white.bold(' [SCAI] Prompt Overview ');
     const labelColor = chalk.cyan;
     const contentColor = chalk.gray;
     console.log('\n' + header);
     console.log(labelColor('🔢 Token Estimate:'), contentColor(`${tokenEstimate.toLocaleString()} tokens`));
-    console.log(labelColor('🧩 Prompt Sections:'));
-    console.log(contentColor([
-        summary ? '📄 Summary' : null,
-        functions?.length ? '🔧 Functions' : null,
-        relatedFiles?.length ? '📚 Related Files' : null,
-        projectFileTree ? '📁 File Tree' : null,
-        '📦 Code',
-    ]
-        .filter(Boolean)
-        .join(', ')));
+    // 📄 Summary
+    if (summary) {
+        console.log(labelColor('📄 Summary:'), contentColor(`${estimateTokenCount(summary).toLocaleString()} tokens`));
+    }
+    // 🔧 Functions
+    if (functions?.length) {
+        const fnCount = functions.length;
+        const fnTokens = functions.reduce((sum, f) => sum + estimateTokenCount(f.content), 0);
+        console.log(labelColor(`🔧 Functions (${fnCount}):`), contentColor(`${fnTokens.toLocaleString()} tokens`));
+    }
+    // 📚 Related Files
+    if (relatedFiles?.length) {
+        const relCount = relatedFiles.length;
+        const relTokens = relatedFiles.reduce((sum, f) => sum + estimateTokenCount(f.summary), 0);
+        console.log(labelColor(`📚 Related Files (${relCount}):`), contentColor(`${relTokens.toLocaleString()} tokens`));
+        // Optional: Show top 3 file names
+        const fileList = relatedFiles.slice(0, 3).map(f => `- ${path.basename(f.path)}`).join('\n');
+        if (fileList)
+            console.log(contentColor(fileList + (relCount > 3 ? `\n  ...+${relCount - 3} more` : '')));
+    }
+    // 📁 File Tree
+    if (projectFileTree) {
+        console.log(labelColor('📁 File Tree:'), contentColor(`${estimateTokenCount(projectFileTree).toLocaleString()} tokens`));
+    }
+    // 📦 Code Section
+    console.log(labelColor('📦 Code:'), contentColor(`${estimateTokenCount(prompt).toLocaleString()} tokens`));
+    // 📌 Key
     console.log(labelColor('🔍 Key:'), contentColor('[buildContextualPrompt]\n'));
     return prompt;
 }

package/dist/utils/fileTree.js

@@ -1,17 +1,38 @@
 import fs from 'fs';
 import path from 'path';
 import { getIndexDir } from '../constants.js';
-export function generateFocusedFileTree(focusPath, maxDepth = 2) {
+/**
+ * Generate a reduced file tree centered around the focus path, including nearby sibling folders.
+ */
+export function generateFocusedFileTree(focusPath, maxDepth = 2, siblingWindow = 2) {
     const absoluteFocus = path.resolve(focusPath);
-    const parentDir = path.dirname(absoluteFocus);
+    const fileOrDir = fs.statSync(absoluteFocus);
+    const targetDir = fileOrDir.isDirectory()
+        ? absoluteFocus
+        : path.dirname(absoluteFocus);
+    const parentDir = path.dirname(targetDir);
     const indexDir = getIndexDir();
-    const relativeTitle = path.relative(indexDir, parentDir).replace(/\\/g, '/');
-    const tree = generateFileTree(parentDir, maxDepth, absoluteFocus);
-    return `📂 ${relativeTitle || '.'}\n${tree}`;
+    const siblings = fs
+        .readdirSync(parentDir, { withFileTypes: true })
+        .filter(entry => entry.isDirectory())
+        .sort((a, b) => a.name.localeCompare(b.name));
+    const focusIndex = siblings.findIndex(entry => path.resolve(path.join(parentDir, entry.name)) === path.resolve(targetDir));
+    const start = Math.max(0, focusIndex - siblingWindow);
+    const end = Math.min(siblings.length, focusIndex + siblingWindow + 1);
+    const nearbySiblings = siblings.slice(start, end);
+    const relativeTitle = path.relative(indexDir, parentDir).replace(/\\/g, '/') || '.';
+    let output = `📂 ${relativeTitle}\n`;
+    nearbySiblings.forEach(entry => {
+        const siblingPath = path.join(parentDir, entry.name);
+        const isFocusDir = path.resolve(siblingPath) === path.resolve(targetDir);
+        const tree = generateFileTree(siblingPath, maxDepth - 1, isFocusDir ? absoluteFocus : undefined, '│   ');
+        output += `${isFocusDir ? '➡️ ' : ''}${entry.name}/\n${tree}`;
+    });
+    return output;
 }
 function generateFileTree(dir, depth, highlightPath, prefix = '') {
     if (depth < 0)
-        return ''; // Stop at maxDepth
+        return '';
     let output = '';
     const entries = fs.readdirSync(dir, { withFileTypes: true });
     const sorted = entries.sort((a, b) => Number(b.isDirectory()) - Number(a.isDirectory()));
@@ -20,13 +41,11 @@ function generateFileTree(dir, depth, highlightPath, prefix = '') {
         const connector = isLast ? '└── ' : '├── ';
         const fullPath = path.join(dir, entry.name);
         const isHighlighted = highlightPath && path.resolve(fullPath) === path.resolve(highlightPath);
-        // If it is a directory, recurse and reduce depth
         if (entry.isDirectory()) {
             output += `${prefix}${connector}${entry.name}/\n`;
             output += generateFileTree(fullPath, depth - 1, highlightPath, prefix + (isLast ? '    ' : '│   '));
         }
         else {
-            // Highlight the file if it matches the focusPath
             const name = isHighlighted ? `➡️ ${entry.name}` : entry.name;
             output += `${prefix}${connector}${name}\n`;
         }

package/dist/utils/summarizer.js

@@ -1,10 +1,16 @@
-import { wrapText } from "./textWrapper.js";
-// src/utils/summarizer.ts
+import columnify from 'columnify';
 export function summarizeCode(summaryText) {
-    // Get the terminal width (default to 80 if not available)
     const terminalWidth = process.stdout.columns || 80;
-    // Use two-thirds of the terminal width for the wrapping
-    const twoThirdsTerminalWidth = Math.floor((terminalWidth * 2) / 3);
-    // Wrap the summary output to fit within two-thirds of the terminal width
-    return wrapText(summaryText, twoThirdsTerminalWidth);
+    // You can control wrapping here
+    const formatted = columnify([{ Summary: summaryText }], {
+        columnSplitter: '  ',
+        maxLineWidth: terminalWidth,
+        config: {
+            Summary: {
+                maxWidth: Math.floor((terminalWidth * 2) / 3), // Use 2/3 width like before
+                align: "left",
+            },
+        },
+    });
+    return formatted;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scai",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "type": "module",
   "bin": {
     "scai": "./dist/index.js"
@@ -41,6 +41,7 @@
     "acorn-walk": "^8.3.2",
     "better-sqlite3": "^12.1.1",
     "chalk": "^5.4.1",
+    "columnify": "^1.6.0",
     "commander": "^11.0.0",
     "fast-glob": "^3.3.3",
     "proper-lockfile": "^4.1.2",
@@ -49,6 +50,7 @@
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
+    "@types/columnify": "^1.5.4",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.1.0",
     "@types/proper-lockfile": "^4.1.4",

package/dist/utils/textWrapper.js

@@ -1,26 +0,0 @@
-export function wrapText(text, maxWidth) {
-    const words = text.split(' ');
-    let wrappedText = '';
-    let currentLine = '';
-    words.forEach(word => {
-        // If the word is longer than the maxWidth, break it up into multiple lines
-        if (word.length > maxWidth) {
-            // Break the word into smaller chunks
-            while (word.length > maxWidth) {
-                wrappedText += word.slice(0, maxWidth) + '\n';
-                word = word.slice(maxWidth);
-            }
-        }
-        // Check if adding the word would exceed the max width
-        if ((currentLine + word).length > maxWidth) {
-            wrappedText += currentLine + '\n'; // Add the current line and start a new one
-            currentLine = word + ' '; // Start the new line with the current word
-        }
-        else {
-            currentLine += word + ' '; // Add the word to the current line
-        }
-    });
-    // Append the last line if any
-    wrappedText += currentLine.trim(); // trim() to remove the extra space at the end
-    return wrappedText;
-}