scai 0.1.42 → 0.1.44

package/dist/commands/AskCmd.js

@@ -67,10 +67,12 @@ export async function runAskCommand(query) {
         console.log('⚠️ No similar files found. Asking the model using question only...');
     }
     // 🧠 Step 3: Build metadata for prompt
-    const relatedFiles = combinedResults.slice(0, MAX_RELATED_FILES).map(file => ({
+    const relatedFiles = combinedResults.slice(0, MAX_RELATED_FILES).map((file, index) => ({
         path: file.path,
-        summary: file.summary || '(No summary available)',
+        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
@@ -78,17 +80,18 @@ export async function runAskCommand(query) {
     catch (e) {
         console.warn('⚠️ Failed to generate file tree:', e);
     }
-    const prompt = buildContextualPrompt({
+    // Now we can build the prompt with summaries included for each file
+    const promptContent = buildContextualPrompt({
         baseInstruction: query,
         code: '', // No specific code selected
-        relatedFiles,
+        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, prompt, 'utf-8');
+        fs.writeFileSync(PROMPT_LOG_PATH, promptContent, 'utf-8');
         log(`📝 Prompt saved to ${PROMPT_LOG_PATH}`);
     }
     catch (err) {
@@ -97,9 +100,15 @@ export async function runAskCommand(query) {
     // 🧠 Step 5: Call the model
     try {
         console.log('🤖 Asking the model...');
+        // Create a more structured PromptInput object
         const input = {
-            content: prompt,
-            filepath: '',
+            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}`);

package/dist/daemon/daemonWorker.js

@@ -1,27 +1,45 @@
-import fsSync from 'fs';
-import { LOG_PATH, PID_PATH, SCAI_HOME } from '../constants.js';
+import { db } from '../db/client.js';
+import { runDaemonBatch } from './daemonBatch.js'; // assuming this function is already defined
 import { log } from '../utils/log.js';
-import { runDaemonBatch } from '../daemon/daemonBatch.js'; // ✅ now from utils
-const SLEEP_MS = 30 * 1000;
-const IDLE_SLEEP_MS = 4 * SLEEP_MS;
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
+// Time between each batch in milliseconds
+const SLEEP_MS = 2000; // Adjust as needed
+const IDLE_SLEEP_MS = 5000; // Adjust as needed
+// Check if there are any files left to process
+async function isQueueEmpty() {
+    // Query the database for the count of files with certain processing statuses
+    const row = db.prepare(`
+    SELECT COUNT(*) AS count
+    FROM files
+    WHERE processing_status IN ('unprocessed')
+  `).get();
+    // Cast the row to an object that has a `count` property of type number
+    const castRow = row;
+    // Check if the casted `row` has a valid `count` property (number)
+    if (typeof castRow.count !== 'number') {
+        console.error('Error: Invalid count value in the database query result.');
+        return true; // Assume queue is empty if the count is invalid
+    }
+    // Return true if count is 0, otherwise false
+    return castRow.count === 0;
 }
-async function runDaemonScheduler() {
-    fsSync.mkdirSync(SCAI_HOME, { recursive: true });
-    fsSync.writeFileSync(PID_PATH, process.pid.toString(), 'utf-8');
-    fsSync.appendFileSync(LOG_PATH, `\n\n🧠 Daemon started at ${new Date().toISOString()} — PID ${process.pid}\n`);
-    let cycles = 0;
+export async function daemonWorker() {
     while (true) {
+        // Execute a batch job
         const didWork = await runDaemonBatch();
-        cycles++;
-        if (cycles % 20 === 0) {
-            log(`🌀 Still running. Cycles: ${cycles}`);
+        if (!didWork) {
+            // Check if the queue is empty after a batch job
+            const queueEmpty = await isQueueEmpty();
+            if (queueEmpty) {
+                // If no files are left to process, stop the daemon
+                log("✅ No more work left. Stopping daemon.");
+                break;
+            }
         }
+        // Sleep for a set amount of time before checking again
         await sleep(didWork ? SLEEP_MS : IDLE_SLEEP_MS);
     }
 }
-runDaemonScheduler().catch(err => {
-    log(`❌ Daemon crashed: ${err instanceof Error ? err.message : String(err)}`);
-    process.exit(1);
-});
+// Sleep function to control how often the worker checks
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}

package/dist/db/functionExtractors/extractFromJs.js

@@ -1,14 +1,22 @@
 import { parse } from 'acorn';
-import { simple as walkSimple } from 'acorn-walk';
+import { ancestor as walkAncestor } from 'acorn-walk';
 import { generateEmbedding } from '../../lib/generateEmbedding.js';
 import { db } from '../client.js';
 import path from 'path';
 import { log } from '../../utils/log.js';
-/**
- * Parses a JavaScript/TypeScript file, extracts all top-level functions,
- * generates embeddings, and indexes both the functions and any calls made
- * within each function into the database.
- */
+function getFunctionName(node, parent, fileName) {
+    if (node.id?.name)
+        return node.id.name;
+    if (parent?.type === 'VariableDeclarator' && parent.id?.name)
+        return parent.id.name;
+    if (parent?.type === 'Property' && parent.key?.name)
+        return parent.key.name;
+    if (parent?.type === 'AssignmentExpression' && parent.left?.name)
+        return parent.left.name;
+    if (parent?.type === 'MethodDefinition' && parent.key?.name)
+        return parent.key.name;
+    return `${fileName}:<anon>`;
+}
 export async function extractFromJS(filePath, content, fileId) {
     const ast = parse(content, {
         ecmaVersion: 'latest',
@@ -16,27 +24,36 @@ export async function extractFromJS(filePath, content, fileId) {
         locations: true,
     });
     const functions = [];
-    walkSimple(ast, {
-        FunctionDeclaration(node) {
-            const name = node.id?.name || `${path.basename(filePath)}:<anon>`;
-            const start_line = node?.loc?.start.line ?? -1;
-            const end_line = node?.loc?.end.line ?? -1;
-            const body = content.slice(node.start, node.end);
-            functions.push({ name, start_line, end_line, body });
+    walkAncestor(ast, {
+        FunctionDeclaration(node, ancestors) {
+            const parent = ancestors[ancestors.length - 2];
+            const name = getFunctionName(node, parent, path.basename(filePath));
+            functions.push({
+                name,
+                start_line: node.loc?.start.line ?? -1,
+                end_line: node.loc?.end.line ?? -1,
+                body: content.slice(node.start, node.end),
+            });
         },
-        FunctionExpression(node) {
-            const name = `${path.basename(filePath)}:<anon>`;
-            const start_line = node?.loc?.start.line ?? -1;
-            const end_line = node?.loc?.end.line ?? -1;
-            const body = content.slice(node.start, node.end);
-            functions.push({ name, start_line, end_line, body });
+        FunctionExpression(node, ancestors) {
+            const parent = ancestors[ancestors.length - 2];
+            const name = getFunctionName(node, parent, path.basename(filePath));
+            functions.push({
+                name,
+                start_line: node.loc?.start.line ?? -1,
+                end_line: node.loc?.end.line ?? -1,
+                body: content.slice(node.start, node.end),
+            });
         },
-        ArrowFunctionExpression(node) {
-            const name = `${path.basename(filePath)}:<anon>`;
-            const start_line = node?.loc?.start.line ?? -1;
-            const end_line = node?.loc?.end.line ?? -1;
-            const body = content.slice(node.start, node.end);
-            functions.push({ name, start_line, end_line, body });
+        ArrowFunctionExpression(node, ancestors) {
+            const parent = ancestors[ancestors.length - 2];
+            const name = getFunctionName(node, parent, path.basename(filePath));
+            functions.push({
+                name,
+                start_line: node.loc?.start.line ?? -1,
+                end_line: node.loc?.end.line ?? -1,
+                body: content.slice(node.start, node.end),
+            });
         },
     });
     if (functions.length === 0) {
@@ -62,15 +79,15 @@ export async function extractFromJS(filePath, content, fileId) {
             lang: 'js'
         });
         const callerId = result.lastInsertRowid;
-        const fnAst = parse(content, {
+        const fnAst = parse(fn.body, {
             ecmaVersion: 'latest',
             sourceType: 'module',
             locations: true,
         });
         const calls = [];
-        walkSimple(fnAst, {
+        walkAncestor(fnAst, {
             CallExpression(node) {
-                if (node.callee.type === 'Identifier' && node.callee.name) {
+                if (node.callee?.type === 'Identifier' && node.callee.name) {
                     calls.push({ calleeName: node.callee.name });
                 }
             }
@@ -86,7 +103,6 @@ export async function extractFromJS(filePath, content, fileId) {
         }
         log(`📌 Indexed function: ${fn.name} with ${calls.length} calls`);
     }
-    // ✅ Mark as extracted using new processing_status column
     db.prepare(`
     UPDATE files 
     SET processing_status = 'extracted'

package/package.json

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