scai 0.1.66 → 0.1.68

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');
@@ -81,10 +82,15 @@ export async function runAskCommand(query) {
     try {
         code = fs.readFileSync(filepath, 'utf-8');
         const topFileId = topFile.id;
-        topFunctions = allFunctionsMap[topFileId]?.map(fn => ({
-            name: fn.name,
-            content: fn.content
-        })) || [];
+        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);
@@ -96,10 +102,15 @@ export async function runAskCommand(query) {
         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
-        })) || [];
+        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,
@@ -115,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,
@@ -124,6 +137,8 @@ export async function runAskCommand(query) {
         projectFileTree: fileTree || undefined,
         fileFunctions,
     });
+    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))

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,33 +1,75 @@
-export function buildContextualPrompt({ baseInstruction, code, summary, functions, relatedFiles, projectFileTree }) {
+// 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
+}
+export function buildContextualPrompt({ baseInstruction, code, summary, functions, relatedFiles, projectFileTree, }) {
     const parts = [baseInstruction];
     if (summary) {
         parts.push(`📄 File Summary:\n${summary}`);
     }
     if (functions?.length) {
-        // 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
+            .join('\n\n');
         parts.push(`🔧 Functions:\n${formattedFunctions}`);
     }
     else {
-        console.log(`🔧 No functions found `);
+        console.log(chalk.gray(`[buildContextualPrompt]`) +
+            chalk.yellow(` ⚠️ No functions found in top file.`));
     }
     if (relatedFiles?.length) {
-        // 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
+                .join('\n\n');
             return `• ${f.path}: ${f.summary}\n${relatedFunctions}`;
         })
-            .join('\n\n'); // Adds a line break between related files
+            .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
+    // 🔵 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`));
+    // 📄 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/package.json

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