scai 0.1.64 → 0.1.66

package/README.md

@@ -350,7 +350,7 @@ You can run it in two ways:
 1. **Inline question**
 
    ```bash
-   scai ask "How does mapcontrol work?"
+   scai ask "How does the controller work?"
    ```
 
 2. **Interactive prompt**
@@ -363,7 +363,7 @@ You can run it in two ways:
    , then type your question when prompted:
 
    ```
-   > How does mapcontrol work?
+   > How does the controller work?
    ```
 
    </br>

package/dist/commands/AskCmd.js

@@ -33,7 +33,7 @@ export async function runAskCommand(query) {
     fallbackResults.forEach((file, i) => {
         console.log(`  ${i + 1}. 🔎 Fallback Match: ${file.path}`);
     });
-    // 🟩 STEP 2: Merge results (de-duplicate by full resolved path)
+    // 🟩 STEP 2: Merge results
     const seen = new Set();
     const combinedResults = [];
     for (const file of semanticResults) {
@@ -71,33 +71,39 @@ export async function runAskCommand(query) {
     let code = '';
     let topSummary = topFile.summary || '(No summary available)';
     let topFunctions = [];
-    // Truncate summary if needed
-    if (topSummary) {
-        topSummary = topSummary.split('\n').slice(0, MAX_SUMMARY_LINES).join('\n');
-    }
+    const fileFunctions = {};
+    // Truncate summary
+    topSummary = topSummary.split('\n').slice(0, MAX_SUMMARY_LINES).join('\n');
     const allFileIds = combinedResults
         .map(file => file.id)
         .filter((id) => typeof id === 'number');
-    const allFunctionsMap = getFunctionsForFiles(allFileIds);
+    const allFunctionsMap = getFunctionsForFiles(allFileIds); // Record<number, Function[]>
     try {
         code = fs.readFileSync(filepath, 'utf-8');
         const topFileId = topFile.id;
-        topFunctions = allFunctionsMap[topFileId]?.map(fn => fn.name) || [];
+        topFunctions = allFunctionsMap[topFileId]?.map(fn => ({
+            name: fn.name,
+            content: fn.content
+        })) || [];
     }
     catch (err) {
         console.warn(`⚠️ Failed to read or analyze top file (${filepath}):`, err);
     }
-    // 🟩 STEP 5: Build relatedFiles with functions
+    // 🟩 STEP 5: Build relatedFiles with functions and fileFunctions
     const relatedFiles = combinedResults.slice(0, RELATED_FILES_LIMIT).map(file => {
         const fileId = file.id;
         let summary = file.summary || '(No summary available)';
         if (summary) {
             summary = summary.split('\n').slice(0, MAX_SUMMARY_LINES).join('\n');
         }
+        const functions = allFunctionsMap[fileId]?.map(fn => ({
+            name: fn.name,
+            content: fn.content || '(No content available)', // Assuming content is available
+        })) || [];
         return {
             path: file.path,
             summary,
-            functions: allFunctionsMap[fileId]?.map(fn => fn.name) || [],
+            functions,
         };
     });
     // 🟩 STEP 6: Generate file tree
@@ -116,8 +122,9 @@ export async function runAskCommand(query) {
         functions: topFunctions,
         relatedFiles,
         projectFileTree: fileTree || undefined,
+        fileFunctions,
     });
-    // 🟩 STEP 8: Save prompt for trace/debug
+    // 🟩 STEP 8: Save prompt
     try {
         if (!fs.existsSync(SCAI_HOME))
             fs.mkdirSync(SCAI_HOME, { recursive: true });
@@ -144,7 +151,7 @@ export async function runAskCommand(query) {
 // 🟩 Helper: Prompt once
 function promptOnce(promptText) {
     return new Promise(resolve => {
-        console.log(promptText); // Instead of putting it *in* rl.question
+        console.log(promptText);
         const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,

package/dist/db/fileIndex.js

@@ -3,77 +3,46 @@ import path from 'path';
 import { generateEmbedding } from '../lib/generateEmbedding.js';
 import { sanitizeQueryForFts } from '../utils/sanitizeQuery.js';
 import * as sqlTemplates from './sqlTemplates.js';
-import { stringSimilarity } from 'string-similarity-js';
 import { CANDIDATE_LIMIT } from '../constants.js';
 import { getDbForRepo } from './client.js';
-/**
- * 📄 Index a single file into the database.
- *
- * - Normalizes the file path to prevent OS-specific path bugs.
- * - Stores metadata like summary, type, lastModified, etc.
- * - Sets `embedding` to null initially — computed later.
- */
+import { scoreFiles } from '../fileRules/scoreFiles.js'; // 👈 NEW
 export function indexFile(filePath, summary, type) {
     const stats = fs.statSync(filePath);
     const lastModified = stats.mtime.toISOString();
     const indexedAt = new Date().toISOString();
     const normalizedPath = path.normalize(filePath).replace(/\\/g, '/');
-    const fileName = path.basename(normalizedPath); // Extracting the filename
-    // Insert into files table
+    const fileName = path.basename(normalizedPath);
     const db = getDbForRepo();
     db.prepare(sqlTemplates.upsertFileTemplate).run({
         path: normalizedPath,
-        filename: fileName, // Pass filename
+        filename: fileName,
         summary,
         type,
         lastModified,
         indexedAt,
         embedding: null
     });
-    // Insert into files_fts table for full-text search, including filename
     db.prepare(`
-  INSERT OR REPLACE INTO files_fts (rowid, filename, summary, path)
-  VALUES ((SELECT id FROM files WHERE path = :path), :filename, :summary, :path)
-`).run({
+    INSERT OR REPLACE INTO files_fts (rowid, filename, summary, path)
+    VALUES ((SELECT id FROM files WHERE path = :path), :filename, :summary, :path)
+  `).run({
         path: normalizedPath,
         filename: fileName,
-        summary: summary,
+        summary,
     });
     console.log(`📄 Indexed: ${normalizedPath}`);
 }
-/**
- * 🔍 FTS5 keyword-based search using SQLite's full-text index.
- *
- * Use this when you want:
- * - A simple keyword search.
- * - Fast fallback search that doesn't rely on embeddings.
- *
- * Returns a full `FileRow[]` (all known metadata, but no similarity score).
- */
 export function queryFiles(safeQuery, limit = 10) {
     console.log(`Executing search query: ${safeQuery}`);
     const db = getDbForRepo();
-    const results = db.prepare(`
+    return db.prepare(`
     SELECT f.id, f.path, f.filename, f.summary, f.type, f.last_modified, f.indexed_at
     FROM files f
     JOIN files_fts fts ON f.id = fts.rowid
     WHERE fts.files_fts MATCH ?
     LIMIT ?
   `).all(safeQuery, limit);
-    return results;
 }
-/**
- * 🧠 Combined semantic + FTS search (Hybrid).
- *
- * 1. Convert user query to embedding vector using OpenAI / Ollama etc.
- * 2. Perform a keyword-based FTS match to limit candidates.
- * 3. For each candidate, compute cosine similarity between query + file embedding.
- * 4. Blend the BM25 score and cosine similarity to produce a final score.
- * 5. Return top K most relevant results.
- *
- * ⚠️ This returns a **lighter-weight type** than `FileRow` — doesn't include id, timestamps, etc.
- * Use a wrapper type like `SearchResultWithScore` in calling code if you need both.
- */
 export async function searchFiles(query, topK = 5) {
     console.log(`🧠 Searching for query: "${query}"`);
     const embedding = await generateEmbedding(query);
@@ -93,70 +62,11 @@ export async function searchFiles(query, topK = 5) {
     LIMIT ?
   `).all(safeQuery, CANDIDATE_LIMIT);
     console.log(`FTS search returned ${ftsResults.length} results`);
-    if (ftsResults.length === 0) {
+    if (ftsResults.length === 0)
         return [];
-    }
-    const bm25Min = Math.min(...ftsResults.map(r => r.bm25Score));
-    const bm25Max = Math.max(...ftsResults.map(r => r.bm25Score));
-    const scored = ftsResults.map(result => {
-        let sim = 0;
-        let finalScore = 0;
-        const normalizedBm25 = 1 - ((result.bm25Score - bm25Min) / (bm25Max - bm25Min + 1e-5));
-        if (result.embedding) {
-            try {
-                const vector = JSON.parse(result.embedding);
-                sim = cosineSimilarity(embedding, vector);
-            }
-            catch (err) {
-                console.error(`❌ Failed to parse embedding for ${result.path}:`, err);
-            }
-        }
-        const terms = query.toLowerCase().split(/\s+/);
-        const path = result.path.toLowerCase();
-        const summary = (result.summary || '').toLowerCase();
-        let termMatches = 0;
-        for (const term of terms) {
-            if (path.includes(term) || summary.includes(term)) {
-                termMatches += 1;
-            }
-        }
-        const matchRatio = termMatches / terms.length;
-        const termBoost = matchRatio >= 1 ? 1.0 : matchRatio >= 0.5 ? 0.5 : 0;
-        // 🧠 Final score with hybrid weighting (BM25 + Embedding + Term Boost)
-        finalScore = 0.4 * normalizedBm25 + 0.4 * sim + 0.2 * termBoost;
-        // ✅ Fuzzy score using string-similarity-js
-        const fuzzyScore = stringSimilarity(query.toLowerCase(), `${path} ${summary}`);
-        finalScore += fuzzyScore * 10;
-        return {
-            id: result.id,
-            path: result.path,
-            summary: result.summary,
-            score: finalScore,
-            sim,
-            bm25: result.bm25Score,
-        };
-    });
-    const sorted = scored
-        .sort((a, b) => b.score - a.score)
-        .slice(0, topK);
-    console.log(`Returning top ${topK} results based on combined score`);
-    return sorted;
-}
-/**
- * 🔢 Cosine similarity between two vectors.
- */
-function cosineSimilarity(a, b) {
-    const dot = a.reduce((sum, ai, i) => sum + ai * b[i], 0);
-    const magA = Math.sqrt(a.reduce((sum, ai) => sum + ai * ai, 0));
-    const magB = Math.sqrt(b.reduce((sum, bi) => sum + bi * bi, 0));
-    return dot / (magA * magB);
+    const scored = scoreFiles(query, embedding, ftsResults);
+    return scored.slice(0, topK);
 }
-/**
- * 🧠 Get all extracted functions for a given list of file IDs.
- *
- * - Used in `askCmd.ts` to fetch code snippets from relevant files.
- * - Grouped by file_id.
- */
 export function getFunctionsForFiles(fileIds) {
     if (!fileIds.length)
         return {};

package/dist/fileRules/scoreFiles.js

@@ -0,0 +1,71 @@
+import { stringSimilarity } from 'string-similarity-js';
+export function scoreFiles(query, embedding, candidates) {
+    const terms = query.toLowerCase().split(/\s+/);
+    const bm25Min = Math.min(...candidates.map(r => r.bm25Score));
+    const bm25Max = Math.max(...candidates.map(r => r.bm25Score));
+    return candidates.map(result => {
+        let finalScore = 0;
+        let sim = 0;
+        const path = result.path.toLowerCase();
+        const filename = result.filename.toLowerCase();
+        const summary = (result.summary || '').toLowerCase();
+        // 🎯 Normalize BM25
+        const normalizedBm25 = 1 - ((result.bm25Score - bm25Min) / (bm25Max - bm25Min + 1e-5));
+        // 🧠 Embedding similarity
+        if (result.embedding) {
+            try {
+                const vector = JSON.parse(result.embedding);
+                sim = cosineSimilarity(embedding, vector);
+            }
+            catch {
+                sim = 0;
+            }
+        }
+        // 🧩 Match ratio
+        let matchRatio = 0;
+        let matchedTerms = 0;
+        for (const term of terms) {
+            if (path.includes(term) || summary.includes(term))
+                matchedTerms++;
+        }
+        matchRatio = matchedTerms / terms.length;
+        const termBoost = matchRatio >= 1 ? 1.0 : matchRatio >= 0.5 ? 0.5 : 0;
+        // 🪜 Path heuristics
+        const isHtml = path.endsWith('.html');
+        const isSrc = path.includes('/src/') || path.includes('/controls/');
+        const isDoc = path.includes('/docs/') || path.includes('/mvndist/');
+        const isExactMatch = filename === `${terms[0]}.js`;
+        let weight = 1;
+        if (isHtml)
+            weight *= 0.85;
+        if (isDoc)
+            weight *= 0.8;
+        if (isSrc)
+            weight *= 1.2;
+        if (isExactMatch)
+            weight *= 1.5;
+        // 🧪 Fuzzy score
+        const fuzzyScore = stringSimilarity(query, `${path} ${summary}`);
+        // 🧮 Final composite score
+        finalScore =
+            (0.4 * normalizedBm25) +
+                (0.4 * sim) +
+                (0.2 * termBoost) +
+                (fuzzyScore * 0.5); // scale fuzzy match moderately
+        finalScore *= weight;
+        return {
+            id: result.id,
+            path: result.path,
+            summary: result.summary,
+            score: finalScore,
+            sim,
+            bm25: result.bm25Score,
+        };
+    }).sort((a, b) => b.score - a.score);
+}
+function cosineSimilarity(a, b) {
+    const dot = a.reduce((sum, ai, i) => sum + ai * b[i], 0);
+    const magA = Math.sqrt(a.reduce((sum, ai) => sum + ai * ai, 0));
+    const magB = Math.sqrt(b.reduce((sum, bi) => sum + bi * bi, 0));
+    return dot / (magA * magB);
+}

package/dist/utils/buildContextualPrompt.js

@@ -4,13 +4,26 @@ export function buildContextualPrompt({ baseInstruction, code, summary, function
         parts.push(`📄 File Summary:\n${summary}`);
     }
     if (functions?.length) {
-        parts.push(`🔧 Functions:\n${functions.join(', ')}`);
+        // Display each function's name and content
+        const formattedFunctions = functions
+            .map(fn => `• ${fn.name}:\n${fn.content}`)
+            .join('\n\n'); // Adds a line break between each function
+        parts.push(`🔧 Functions:\n${formattedFunctions}`);
+    }
+    else {
+        console.log(`🔧 No functions found `);
     }
     if (relatedFiles?.length) {
-        const formatted = relatedFiles
-            .map(f => `• ${f.path}: ${f.summary}`)
-            .join('\n');
-        parts.push(`📚 Related Files:\n${formatted}`);
+        // Include functions from related files
+        const formattedRelatedFiles = relatedFiles
+            .map(f => {
+            const relatedFunctions = f.functions
+                .map(fn => `  • ${fn.name}:\n    ${fn.content}`)
+                .join('\n\n'); // Adds a line break between related file functions
+            return `• ${f.path}: ${f.summary}\n${relatedFunctions}`;
+        })
+            .join('\n\n'); // Adds a line break between related files
+        parts.push(`📚 Related Files:\n${formattedRelatedFiles}`);
     }
     if (projectFileTree) {
         parts.push(`📁 Project File Structure:\n\`\`\`\n${projectFileTree.trim()}\n\`\`\``);

package/package.json

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