@duckcodeailabs/dql-agent 1.7.0 → 1.7.2

package/dist/metadata/catalog.js

@@ -224,7 +224,12 @@ export async function buildLocalContextPack(projectRoot, request) {
             buildFollowUpSearchQuery(request.question, followUp),
             ...questionPlan.searchQueries,
         ]);
-        const scopeObjects = (rows) => filterMetadataObjectsByDomainContext(rows, request.domainContext);
+        const areaObjects = filterMetadataObjectsByDomainContext(catalog.listObjects({ objectTypes: ['model_area'], limit: 500 }), request.domainContext);
+        const focusedArea = resolveFocusedModelArea(request.domainContext, request.question, areaObjects);
+        const effectiveDomainContext = focusedArea && request.domainContext
+            ? { ...request.domainContext, modelAreaId: focusedArea.id }
+            : request.domainContext;
+        const scopeObjects = (rows) => filterMetadataObjectsByDomainContext(rows, effectiveDomainContext);
         // Skill guidance is injected only through selectContextPackSkills below.
         // Leaving it in generic FTS results would bypass status/domain/area/exclusion
         // eligibility simply because a word in its body matched the question.
@@ -240,10 +245,11 @@ export async function buildLocalContextPack(projectRoot, request) {
         const exact = exactCandidate && retrievalObjects([exactCandidate]).length > 0 ? exactCandidate : null;
         const ranked = rankMetadataObjects({
             rows: retrievalObjects(mergeObjects(exact
-                ? [exact, ...followUpSourceObjects, ...followUpObjects, ...searchRows, ...schemaShapeObjects, ...runtimeObjects, ...runtimeValueObjects, ...selectedObjects, ...priorSeedObjects]
-                : [...followUpSourceObjects, ...followUpObjects, ...searchRows, ...schemaShapeObjects, ...runtimeObjects, ...runtimeValueObjects, ...selectedObjects, ...priorSeedObjects])),
+                ? [exact, ...(focusedArea ? [focusedArea.object] : []), ...followUpSourceObjects, ...followUpObjects, ...searchRows, ...schemaShapeObjects, ...runtimeObjects, ...runtimeValueObjects, ...selectedObjects, ...priorSeedObjects]
+                : [...(focusedArea ? [focusedArea.object] : []), ...followUpSourceObjects, ...followUpObjects, ...searchRows, ...schemaShapeObjects, ...runtimeObjects, ...runtimeValueObjects, ...selectedObjects, ...priorSeedObjects])),
             question: searchQueries.join(' '),
             questionPlan,
+            modelAreaId: focusedArea?.id,
             limit: request.limit ?? 80,
         });
         // Advisory 'contextual' carry: the prior turn's block competes on rank (it is
@@ -260,6 +266,7 @@ export async function buildLocalContextPack(projectRoot, request) {
             rows: retrievalObjects(mergeObjects([...followUpSourceObjects, ...followUpObjects, ...selected, ...graphObjects, ...schemaShapeObjects, ...runtimeObjects, ...runtimeValueObjects, ...selectedObjects])),
             question: searchQueries.join(' '),
             questionPlan,
+            modelAreaId: focusedArea?.id,
             limit: request.limit ?? 120,
         }).selected;
         const sqlParentObjects = sqlParentObjectsForSelectedColumns(rankedObjects, mergeObjects([...graphObjects, ...runtimeObjects]), questionPlan);
@@ -273,7 +280,7 @@ export async function buildLocalContextPack(projectRoot, request) {
         // Skills are selected from the catalog snapshot with the same hard domain,
         // area, status, and exclusion gates as the loader. They are not left to FTS
         // chance or re-read from disk after the snapshot has been fingerprinted.
-        const selectedSkills = selectContextPackSkills(catalog.listObjects({ objectTypes: ['skill'], limit: 500 }), request.question, request.domainContext);
+        const selectedSkills = selectContextPackSkills(catalog.listObjects({ objectTypes: ['skill'], limit: 500 }), request.question, effectiveDomainContext);
         const selectedSkillObjects = selectedSkills.map((item) => item.object);
         const objects = fullCatalogObjects
             ? mergeObjects([...rankedObjects, ...sqlParentObjects, ...fullCatalogObjects, ...selectedSkillObjects])
@@ -309,6 +316,7 @@ export async function buildLocalContextPack(projectRoot, request) {
             rows: retrievalObjects(mergeObjects([...searchRows, ...schemaShapeObjects, ...objects])),
             question: searchQueries.join(' '),
             questionPlan,
+            modelAreaId: focusedArea?.id,
             limit: request.limit ?? 120,
         });
         const conflicts = buildCandidateConflicts(reranked.ranked);
@@ -363,6 +371,8 @@ export async function buildLocalContextPack(projectRoot, request) {
             hintConflicts: hintResult.conflicts,
             retrievalDiagnostics: {
                 strategy: usedFullCatalog ? 'full_catalog' : 'sqlite_fts',
+                focusedModelAreaId: focusedArea?.id,
+                modelAreaSource: focusedArea?.source,
                 selectedObjects: objects.length,
                 selectedEvidence: reranked.ranked.slice(0, 20).map((item) => ({
                     objectKey: item.row.objectKey,
@@ -1218,6 +1228,7 @@ function manifestDiagnosticToMetadataDiagnostic(diagnostic) {
 }
 function objectFromKGNode(node) {
     const payload = {
+        ...(node.payload ?? {}),
         kgNodeId: node.nodeId,
         tags: node.tags ?? [],
         examples: node.examples ?? [],
@@ -4761,12 +4772,13 @@ function rankMetadataObjects(args) {
     const scored = mergeObjects(args.rows).map((row) => {
         const baseScore = scoreMetadataObject(row, terms);
         const planScore = args.questionPlan ? scoreMetadataObjectWithAnalysisPlan(row, args.questionPlan) : { score: 0, reasons: [] };
-        const score = Number((baseScore + planScore.score).toFixed(3));
+        const areaScore = modelAreaAffinityScore(row, args.modelAreaId);
+        const score = Number((baseScore + planScore.score + areaScore).toFixed(3));
         return {
             row,
             rank: 0,
             score,
-            reason: selectionReason(row, score, planScore.reasons),
+            reason: selectionReason(row, score, areaScore > 0 ? [...planScore.reasons, 'focused Model Area match'] : planScore.reasons),
             priorityTier: priorityTier(row),
         };
     });
@@ -4793,6 +4805,17 @@ function rankMetadataObjects(args) {
         })),
     };
 }
+function modelAreaAffinityScore(row, modelAreaId) {
+    if (!modelAreaId)
+        return 0;
+    const qualifiedId = stringValue(row.payload?.qualifiedId);
+    const areaId = stringValue(row.payload?.areaId);
+    if (row.objectType === 'model_area' && qualifiedId === modelAreaId)
+        return 48;
+    if (areaId === modelAreaId)
+        return 30;
+    return 0;
+}
 function selectRankedMetadataObjects(ranked, limit) {
     if (ranked.length <= limit)
         return ranked;
@@ -4903,6 +4926,32 @@ function reasonForObject(row) {
         return 'Published consumption context';
     return 'Relevant project metadata';
 }
+function resolveFocusedModelArea(context, question, areaObjects) {
+    if (!context?.activeDomain)
+        return undefined;
+    const candidates = areaObjects.filter((object) => object.objectType === 'model_area' && object.domain === context.activeDomain);
+    if (context.modelAreaId) {
+        const object = candidates.find((candidate) => stringValue(candidate.payload?.qualifiedId) === context.modelAreaId);
+        return object ? { id: context.modelAreaId, object, source: 'explicit' } : undefined;
+    }
+    const terms = tokenize(question);
+    if (terms.length === 0)
+        return undefined;
+    const ranked = candidates.map((object) => {
+        const searchable = [
+            object.name,
+            object.description ?? '',
+            ...metadataStringArray(object.payload?.intentExamples),
+        ].join(' ');
+        return { object, score: scoreText(searchable, terms) };
+    }).sort((a, b) => b.score - a.score || a.object.name.localeCompare(b.object.name));
+    const first = ranked[0];
+    const second = ranked[1];
+    if (!first || first.score < 1 || (second && first.score === second.score))
+        return undefined;
+    const id = stringValue(first.object.payload?.qualifiedId);
+    return id ? { id, object: first.object, source: 'inferred' } : undefined;
+}
 function filterMetadataObjectsByDomainContext(rows, context) {
     if (!context?.activeDomain)
         return rows;