scai 0.1.41 → 0.1.43

package/dist/commands/AskCmd.js

@@ -1,9 +1,16 @@
-import readline from 'readline';
+import fs from 'fs';
 import path from 'path';
-import { searchFiles, queryFiles } from "../db/fileIndex.js";
-import { sanitizeQueryForFts } from "../utils/sanitizeQuery.js";
-import { generate } from "../lib/generate.js";
+import readline from 'readline';
+import { searchFiles, queryFiles } from '../db/fileIndex.js';
+import { sanitizeQueryForFts } from '../utils/sanitizeQuery.js';
+import { generate } from '../lib/generate.js';
+import { buildContextualPrompt } from '../utils/buildContextualPrompt.js';
+import { generateFileTree } from '../utils/fileTree.js';
+import { log } from '../utils/log.js';
+import { PROMPT_LOG_PATH, SCAI_HOME, INDEX_DIR } from '../constants.js';
+const MAX_RELATED_FILES = 5;
 export async function runAskCommand(query) {
+    // 🧠 Prompt the user if no query is passed
     if (!query) {
         query = await promptOnce('🧠 Ask your question:\n> ');
     }
@@ -12,21 +19,32 @@ export async function runAskCommand(query) {
         console.error('❌ No question provided.\n👉 Usage: scai ask "your question"');
         return;
     }
+    console.log(`📁 Using index root: ${INDEX_DIR}`);
     console.log(`🔍 Searching for: "${query}"\n`);
+    // 🧠 Step 1: Semantic + fallback search
     const start = Date.now();
-    const semanticResults = await searchFiles(query, 5);
+    const semanticResults = await searchFiles(query, MAX_RELATED_FILES);
     const duration = Date.now() - start;
     console.log(`⏱️ searchFiles took ${duration}ms and returned ${semanticResults.length} result(s)`);
-    // Also run fallback keyword search
+    // 🔍 Log raw semantic results
+    console.log('🔍 Raw semantic search results:');
+    semanticResults.forEach((file, i) => {
+        console.log(`  ${i + 1}. 📄 Path: ${file.path} | Score: ${file.score?.toFixed(3) ?? 'n/a'}`);
+    });
     const safeQuery = sanitizeQueryForFts(query);
     const fallbackResults = queryFiles(safeQuery, 10);
-    // Merge semantic and fallback results
+    // 🔍 Log raw keyword fallback results
+    console.log('\n🔍 Raw fallback keyword (FTS) search results:');
+    fallbackResults.forEach((file, i) => {
+        console.log(`  ${i + 1}. 📄 Path: ${file.path}`);
+    });
+    // 🧠 Step 2: Merge results
     const seen = new Set();
     const combinedResults = [];
     for (const file of semanticResults) {
         const resolved = path.resolve(file.path);
         seen.add(resolved);
-        combinedResults.push(file); // Already scored
+        combinedResults.push(file);
     }
     for (const file of fallbackResults) {
         const resolved = path.resolve(file.path);
@@ -35,7 +53,7 @@ export async function runAskCommand(query) {
             combinedResults.push({
                 path: file.path,
                 summary: file.summary,
-                score: 0.0, // fallback score
+                score: 0.0,
             });
         }
     }
@@ -46,26 +64,52 @@ export async function runAskCommand(query) {
         });
     }
     else {
-        console.log('⚠️ No similar files found. Asking the model for context only...');
+        console.log('⚠️ No similar files found. Asking the model using question only...');
     }
-    // Aggregate summaries
-    let allSummaries = '';
-    for (const file of combinedResults) {
-        if (!file?.summary) {
-            console.warn(`⚠️ No summary available for file: ${file?.path}`);
-            continue;
-        }
-        console.log(`📝 Using stored summary for: ${file.path}`);
-        allSummaries += `\n${file.summary}`;
+    // 🧠 Step 3: Build metadata for prompt
+    const relatedFiles = combinedResults.slice(0, MAX_RELATED_FILES).map((file, index) => ({
+        path: file.path,
+        summary: file.summary || '(No summary available)', // Ensure summary is included
+    }));
+    // Get the top-ranked file (the first one in the sorted results)
+    const topRankedFile = combinedResults[0]; // The most relevant file
+    let fileTree = '';
+    try {
+        fileTree = generateFileTree(INDEX_DIR, 2); // Limit depth
+    }
+    catch (e) {
+        console.warn('⚠️ Failed to generate file tree:', e);
+    }
+    // Now we can build the prompt with summaries included for each file
+    const promptContent = buildContextualPrompt({
+        baseInstruction: query,
+        code: '', // No specific code selected
+        relatedFiles, // This now includes both path and summary for each file
+        projectFileTree: fileTree || undefined,
+    });
+    // 🧠 Step 4: Log prompt to file
+    try {
+        if (!fs.existsSync(SCAI_HOME))
+            fs.mkdirSync(SCAI_HOME, { recursive: true });
+        fs.writeFileSync(PROMPT_LOG_PATH, promptContent, 'utf-8');
+        log(`📝 Prompt saved to ${PROMPT_LOG_PATH}`);
+    }
+    catch (err) {
+        log('❌ Failed to write prompt log:', err);
     }
-    const input = {
-        content: allSummaries ? `${query}\n\n${allSummaries}` : query,
-        filepath: '',
-    };
+    // 🧠 Step 5: Call the model
     try {
-        console.log(allSummaries.trim()
-            ? '🧠 Summaries found, sending them to the model for synthesis...'
-            : '⚠️ No summaries found. Asking the model for context only...');
+        console.log('🤖 Asking the model...');
+        // Create a more structured PromptInput object
+        const input = {
+            content: query, // Main instruction (the query)
+            filepath: topRankedFile?.path || '', // Include the path of the top-ranked file
+            metadata: {
+                summary: topRankedFile?.summary || '', // Add summary of the top-ranked file
+                relatedFiles: relatedFiles, // Pass related files as part of metadata
+            },
+            projectFileTree: fileTree || '' // Include file structure in metadata
+        };
         const modelResponse = await generate(input, 'llama3');
         console.log(`\n📝 Model response:\n${modelResponse.content}`);
     }
@@ -77,7 +121,7 @@ function promptOnce(promptText) {
     return new Promise(resolve => {
         const rl = readline.createInterface({
             input: process.stdin,
-            output: process.stdout
+            output: process.stdout,
         });
         rl.question(promptText, answer => {
             rl.close();

package/dist/constants.js

@@ -26,6 +26,11 @@ export const CONFIG_PATH = path.join(SCAI_HOME, 'config.json');
  * ~/.scai/daemon.log
  */
 export const LOG_PATH = path.join(SCAI_HOME, 'daemon.log');
+/**
+ * Path to the last prompt sent to the model:
+ * ~/.scai/prompt.log
+ */
+export const PROMPT_LOG_PATH = path.join(SCAI_HOME, 'prompt.log');
 /**
  * Get the active index directory.
  *

package/dist/utils/buildContextualPrompt.js

@@ -0,0 +1,20 @@
+export function buildContextualPrompt({ baseInstruction, code, summary, functions, relatedFiles, projectFileTree }) {
+    const parts = [baseInstruction];
+    if (summary) {
+        parts.push(`📄 File Summary:\n${summary}`);
+    }
+    if (functions?.length) {
+        parts.push(`🔧 Functions:\n${functions.join(', ')}`);
+    }
+    if (relatedFiles?.length) {
+        const formatted = relatedFiles
+            .map(f => `• ${f.path}: ${f.summary}`)
+            .join('\n');
+        parts.push(`📚 Related Files:\n${formatted}`);
+    }
+    if (projectFileTree) {
+        parts.push(`📁 Project File Structure:\n\`\`\`\n${projectFileTree.trim()}\n\`\`\``);
+    }
+    parts.push(`\n--- CODE START ---\n${code}\n--- CODE END ---`);
+    return parts.join('\n\n');
+}

package/dist/utils/fileTree.js

@@ -0,0 +1,30 @@
+import fs from 'fs';
+import path from 'path';
+const IGNORED_DIRS = new Set([
+    'node_modules', 'dist', '.git', '.vscode', 'coverage', 'build', 'out', 'logs', 'tmp'
+]);
+export function generateFileTree(dir, maxDepth = 3, currentDepth = 0, prefix = '') {
+    if (currentDepth > maxDepth)
+        return '';
+    let output = '';
+    const items = fs.readdirSync(dir, { withFileTypes: true })
+        .filter(item => !IGNORED_DIRS.has(item.name))
+        .sort((a, b) => {
+        // Directories first
+        if (a.isDirectory() && !b.isDirectory())
+            return -1;
+        if (!a.isDirectory() && b.isDirectory())
+            return 1;
+        return a.name.localeCompare(b.name);
+    });
+    for (const [i, item] of items.entries()) {
+        const isLast = i === items.length - 1;
+        const connector = isLast ? '└── ' : '├── ';
+        const childPrefix = prefix + (isLast ? '    ' : '│   ');
+        output += `${prefix}${connector}${item.name}\n`;
+        if (item.isDirectory()) {
+            output += generateFileTree(path.join(dir, item.name), maxDepth, currentDepth + 1, childPrefix);
+        }
+    }
+    return output;
+}

package/package.json

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