scai 0.1.150 → 0.1.152

package/dist/agents/collectAnalysisEvidenceStep.js

@@ -3,31 +3,31 @@ import fs from "fs";
 import { generate } from "../lib/generate.js";
 import { cleanupModule } from "../pipeline/modules/cleanupModule.js";
 import { logInputOutput } from "../utils/promptLogHelper.js";
-import { MODULE_STEP_INDENTATION } from "../constants.js";
 export const collectAnalysisEvidenceStep = {
     name: "collectAnalysisEvidence",
     description: "Evidence-first, deterministic analysis over candidate source files. Builds fileAnalysis only.",
     groups: ["analysis"],
     run: async (input) => {
-        var _a, _b, _c;
+        var _a;
         const query = input.query ?? "";
         const context = input.context;
         if (!context?.analysis) {
             throw new Error("[collectAnalysisEvidence] context.analysis is required.");
         }
-        (_a = context.analysis).fileAnalysis ?? (_a.fileAnalysis = {});
-        (_b = context.analysis).requiresClarification ?? (_b.requiresClarification = false);
+        context.analysis.fileAnalysis = context.analysis.fileAnalysis ?? {};
         const intentCategory = context.analysis.intent?.intentCategory ?? "other";
         // ───────────── Guard ─────────────
         if (!["refactorTask", "codingTask", "writing"].includes(intentCategory)) {
             console.log(`[collectAnalysisEvidence] Skipping file scan because intentCategory=${intentCategory}`);
             return {
                 query,
-                data: { fileAnalysis: context.analysis.fileAnalysis },
+                data: {
+                    fileAnalysis: context.analysis.fileAnalysis
+                }
             };
         }
         // --------------------------------------------------
-        // Collect candidate paths
+        // Collect candidate paths (old selectRelevantSources behavior)
         // --------------------------------------------------
         const candidatePaths = [
             ...(context.analysis.focus?.relevantFiles ?? []),
@@ -41,20 +41,6 @@ export const collectAnalysisEvidenceStep = {
         }
         const filesWithEvidence = [];
         // --------------------------------------------------
-        // Pre-extract query signals
-        // --------------------------------------------------
-        const quotedRegex = /['"`](.+?)['"`]/g;
-        const quotedTargets = [];
-        let m;
-        while ((m = quotedRegex.exec(query)) !== null) {
-            quotedTargets.push(m[1]);
-        }
-        const identifierRegex = /\b([A-Za-z_][A-Za-z0-9_]*)\b/g;
-        const queryIdentifiers = new Set();
-        while ((m = identifierRegex.exec(query)) !== null) {
-            queryIdentifiers.add(m[1]);
-        }
-        // --------------------------------------------------
         // Deterministic evidence collection
         // --------------------------------------------------
         for (const path of uniquePaths) {
@@ -67,107 +53,75 @@ export const collectAnalysisEvidenceStep = {
                 continue;
             }
             const lines = code.split("\n");
-            const evidence = [];
-            let literalHits = 0;
-            let identifierHits = 0;
-            let structuralHits = 0;
+            const evidenceItems = [];
+            const sentenceMatches = [];
+            // Heuristic: quoted strings in query
+            const sentenceRegex = /['"`](.+?)['"`]/g;
+            const targetSentences = [];
+            let match;
+            while ((match = sentenceRegex.exec(query)) !== null) {
+                targetSentences.push(match[1]);
+            }
+            // Line-by-line scan
             lines.forEach((line, index) => {
-                const lineNo = index + 1;
-                // ───── Literal evidence ─────
-                for (const target of quotedTargets) {
+                for (const target of targetSentences) {
                     if (line.includes(target)) {
-                        literalHits++;
-                        evidence.push({
-                            type: "literal",
-                            claim: `Exact quoted text found: "${target}"`,
+                        evidenceItems.push({
+                            claim: `Line contains the target sentence: "${target}"`,
                             excerpt: line,
-                            span: { startLine: lineNo, endLine: lineNo },
+                            span: { startLine: index + 1, endLine: index + 1 },
                             confidence: 1,
                         });
+                        sentenceMatches.push(line);
                     }
                 }
-                // ───── Identifier evidence ─────
-                for (const ident of queryIdentifiers) {
-                    if (ident.length > 2 &&
-                        line.includes(ident) &&
-                        !quotedTargets.includes(ident)) {
-                        identifierHits++;
-                        evidence.push({
-                            type: "identifier",
-                            claim: `Identifier "${ident}" appears in file`,
-                            excerpt: line,
-                            span: { startLine: lineNo, endLine: lineNo },
-                            confidence: 0.6,
-                        });
-                    }
-                }
-                // ───── Anchored structural evidence ─────
-                if (line.match(/^#{1,6}\s+/) || // markdown headers
-                    line.match(/^(export\s+)?(function|class)\s+/) ||
-                    line.match(/^module\.exports\b/)) {
-                    structuralHits++;
-                    evidence.push({
-                        type: "anchoredStructural",
-                        claim: "Top-level structural anchor detected",
-                        excerpt: line,
-                        span: { startLine: lineNo, endLine: lineNo },
-                        confidence: 0.4,
-                    });
-                }
             });
-            const isRelevant = evidence.length > 0;
+            const isRelevant = evidenceItems.length > 0;
             const shouldModify = determineShouldModify(intentCategory, isRelevant);
-            const scope = determineScope(evidence.length, intentCategory, isRelevant);
-            if (isRelevant)
+            const scope = determineScope(evidenceItems.length, intentCategory, isRelevant);
+            if (isRelevant) {
                 filesWithEvidence.push(path);
-            // ───────────── Clarification heuristic ─────────────
-            const requiresClarification = literalHits === 0 &&
-                identifierHits === 0 &&
-                structuralHits > 0 &&
-                ["refactorTask", "codingTask"].includes(intentCategory);
-            if (requiresClarification) {
-                context.analysis.requiresClarification = true;
             }
             const fileAnalysis = {
                 intent: isRelevant ? "relevant" : "irrelevant",
                 relevance: isRelevant
-                    ? `Evidence found (literal=${literalHits}, identifier=${identifierHits}, structural=${structuralHits}).`
-                    : "No evidence found in file.",
+                    ? `${evidenceItems.length} candidate item(s) relevant to the query.`
+                    : "No matching lines found in the file.",
                 role: "primary",
                 action: {
                     isRelevant,
-                    shouldModify,
+                    shouldModify
                 },
                 proposedChanges: {
                     summary: isRelevant
-                        ? "File contains evidence relevant to the query."
+                        ? "File contains elements that should be modified according to the query."
                         : "No changes required.",
                     scope,
-                    rationale: requiresClarification
-                        ? "Query is broad and only structural anchors were found. User clarification recommended."
+                    targets: sentenceMatches,
+                    rationale: isRelevant
+                        ? "Detected sentence(s) in file matching the query."
                         : undefined,
                 },
                 risks: [],
-                evidence,
-                requiresClarification,
+                evidence: evidenceItems,
             };
-            // ───── Optional LLM rationale (non-authoritative) ─────
-            if (isRelevant && !requiresClarification) {
+            // Optional LLM rationale (non-authoritative)
+            if (isRelevant) {
                 try {
                     const prompt = `
-Provide a concise rationale (1–2 sentences) explaining why this file is relevant.
+Provide a concise rationale (1–2 sentences) explaining why the identified lines in this file are relevant to the user's query.
 
 Query:
 "${query}"
 
 File:
 ${path}
+
+Lines:
+${sentenceMatches.join("\n")}
           `.trim();
                     const response = await generate({ content: prompt, query });
-                    const cleaned = await cleanupModule.run({
-                        query,
-                        content: response.data,
-                    });
+                    const cleaned = await cleanupModule.run({ query, content: response.data });
                     if (typeof cleaned.data === "string") {
                         fileAnalysis.proposedChanges.rationale = cleaned.data;
                     }
@@ -176,25 +130,34 @@ ${path}
                     console.warn(`[collectAnalysisEvidence] Rationale enrichment failed for ${path}`);
                 }
             }
+            // Persist analysis only
             context.analysis.fileAnalysis[path] = {
                 ...context.analysis.fileAnalysis[path],
                 ...fileAnalysis,
             };
         }
-        // ───────────── Focus update ─────────────
+        // ───────────── Conditional relevance update ─────────────
+        // Only update focus.relevantFiles if at least one file has evidence
         if (filesWithEvidence.length > 0) {
-            (_c = context.analysis).focus ?? (_c.focus = { relevantFiles: [] });
+            (_a = context.analysis).focus ?? (_a.focus = { relevantFiles: [] });
             context.analysis.focus.relevantFiles = filesWithEvidence;
+            // Mark others as irrelevant
+            for (const path of uniquePaths) {
+                if (!filesWithEvidence.includes(path)) {
+                    context.analysis.fileAnalysis[path] = {
+                        ...context.analysis.fileAnalysis[path],
+                        intent: "irrelevant",
+                        action: { ...context.analysis.fileAnalysis[path]?.action, isRelevant: false }
+                    };
+                }
+            }
         }
         const output = {
             query,
-            data: { fileAnalysis: context.analysis.fileAnalysis },
+            data: {
+                fileAnalysis: context.analysis.fileAnalysis,
+            },
         };
-        // ───────────── Clarification note (agent-visible) ─────────────
-        if (context.analysis.requiresClarification) {
-            console.warn(`${MODULE_STEP_INDENTATION}[collectAnalysisEvidence] Clarification required: query is underspecified. ` +
-                `Only structural anchors were found; no literal or identifier evidence.`);
-        }
         logInputOutput("collectAnalysisEvidence", "output", output.data);
         return output;
     },
@@ -208,9 +171,19 @@ function determineShouldModify(intentCategory, isRelevant) {
 function determineScope(evidenceCount, intentCategory, isRelevant) {
     if (!isRelevant)
         return "none";
+    let scope = "minor";
     if (evidenceCount <= 2)
-        return "minor";
-    if (evidenceCount <= 5)
-        return "moderate";
-    return "major";
+        scope = "minor";
+    else if (evidenceCount <= 5)
+        scope = "moderate";
+    else
+        scope = "major";
+    // Intent bump
+    if (["refactorTask", "codingTask"].includes(intentCategory)) {
+        if (scope === "minor" && evidenceCount > 1)
+            scope = "moderate";
+        if (scope === "moderate" && evidenceCount > 4)
+            scope = "major";
+    }
+    return scope;
 }

package/package.json

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