scai 0.1.65 → 0.1.67

package/dist/commands/AskCmd.js

@@ -7,7 +7,8 @@ import { generate } from '../lib/generate.js';
 import { buildContextualPrompt } from '../utils/buildContextualPrompt.js';
 import { generateFocusedFileTree } from '../utils/fileTree.js';
 import { log } from '../utils/log.js';
-import { PROMPT_LOG_PATH, SCAI_HOME, RELATED_FILES_LIMIT, MAX_SUMMARY_LINES, getIndexDir } from '../constants.js';
+import { PROMPT_LOG_PATH, SCAI_HOME, RELATED_FILES_LIMIT, MAX_SUMMARY_LINES, getIndexDir, MAX_FUNCTION_LINES } from '../constants.js';
+import chalk from 'chalk';
 export async function runAskCommand(query) {
     if (!query) {
         query = await promptOnce('💬 Ask your question:\n');
@@ -33,7 +34,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 +72,49 @@ 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 => {
+            const content = fn.content
+                ? fn.content.split('\n').slice(0, MAX_FUNCTION_LINES).join('\n')
+                : '(No content available)';
+            return {
+                name: fn.name,
+                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 => {
+            const content = fn.content
+                ? fn.content.split('\n').slice(0, MAX_FUNCTION_LINES).join('\n')
+                : '(No content available)';
+            return {
+                name: fn.name,
+                content,
+            };
+        }) || [];
         return {
             path: file.path,
             summary,
-            functions: allFunctionsMap[fileId]?.map(fn => fn.name) || [],
+            functions,
         };
     });
     // 🟩 STEP 6: Generate file tree
@@ -109,6 +126,8 @@ export async function runAskCommand(query) {
         console.warn('⚠️ Could not generate file tree:', e);
     }
     // 🟩 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,
@@ -116,8 +135,11 @@ export async function runAskCommand(query) {
         functions: topFunctions,
         relatedFiles,
         projectFileTree: fileTree || undefined,
+        fileFunctions,
     });
-    // 🟩 STEP 8: Save prompt for trace/debug
+    console.log(chalk.greenBright('✅ Prompt built successfully.'));
+    console.log(chalk.cyan(`[runAskCommand] Prompt token estimate: ~${Math.round(promptContent.length / 4)} tokens`));
+    // 🟩 STEP 8: Save prompt
     try {
         if (!fs.existsSync(SCAI_HOME))
             fs.mkdirSync(SCAI_HOME, { recursive: true });
@@ -144,7 +166,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/constants.js

@@ -61,3 +61,7 @@ export const CANDIDATE_LIMIT = 100;
  * Limit number of summary lines
  */
 export const MAX_SUMMARY_LINES = 12;
+/**
+ * Limit number of function content
+ */
+export const MAX_FUNCTION_LINES = 12;

package/dist/utils/buildContextualPrompt.js

@@ -1,20 +1,56 @@
-export function buildContextualPrompt({ baseInstruction, code, summary, functions, relatedFiles, projectFileTree }) {
+// File: src/utils/buildContextualPrompt.ts
+import chalk from 'chalk';
+function estimateTokenCount(text) {
+    return Math.round(text.length / 4); // simple heuristic approximation
+}
+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(', ')}`);
+        const formattedFunctions = functions
+            .map(fn => `• ${fn.name}:\n${fn.content}`)
+            .join('\n\n');
+        parts.push(`🔧 Functions:\n${formattedFunctions}`);
+    }
+    else {
+        console.log(chalk.gray(`[buildContextualPrompt]`) +
+            chalk.yellow(` ⚠️ No functions found in top file.`));
     }
     if (relatedFiles?.length) {
-        const formatted = relatedFiles
-            .map(f => `• ${f.path}: ${f.summary}`)
-            .join('\n');
-        parts.push(`📚 Related Files:\n${formatted}`);
+        const formattedRelatedFiles = relatedFiles
+            .map(f => {
+            const relatedFunctions = f.functions
+                .map(fn => `  • ${fn.name}:\n    ${fn.content}`)
+                .join('\n\n');
+            return `• ${f.path}: ${f.summary}\n${relatedFunctions}`;
+        })
+            .join('\n\n');
+        parts.push(`📚 Related Files:\n${formattedRelatedFiles}`);
     }
     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');
+    const prompt = parts.join('\n\n');
+    const tokenEstimate = estimateTokenCount(prompt);
+    // 🔵 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(', ')));
+    console.log(labelColor('🔍 Key:'), contentColor('[buildContextualPrompt]\n'));
+    return prompt;
 }

package/package.json

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