fraim 2.0.263 → 2.0.264

package/dist/src/local-mcp-server/learning-context-builder.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CATEGORY_TO_FILETYPE = exports.BRAIN_LEARNING_FILETYPE_TO_REGION = exports.LEARNING_PRIORITIES = void 0;
 exports.learningEntryHeadingRegex = learningEntryHeadingRegex;
+exports.getScoreThreshold = getScoreThreshold;
 exports.computeEffectiveScore = computeEffectiveScore;
 exports.mergeLearningEntriesAcrossTiers = mergeLearningEntriesAcrossTiers;
 exports.buildLearningContextSection = buildLearningContextSection;
@@ -1195,9 +1196,14 @@ function listDomainLearningFiles(dir, prefix, fileType) {
     return out;
 }
 // Parse the `## [P-…] Title` entries (and their body prose) out of one learning
-// file. Score/Last seen/Recurrences metadata lines are dropped — the Hub shows
-// the human-readable learning, not the bookkeeping.
-function parseLearningEntries(filePath, displayPath, category, level, domain = 'global', tier) {
+// file. Score metadata (Last seen / Recurrences) is captured to compute the
+// effective decayed score and the injected flag; those bookkeeping lines are
+// still excluded from the rendered body.
+//
+// threshold: entries with score >= threshold (or in a non-gated category) are
+//   marked injected:true. Callers that don't need scoring pass Infinity so
+//   all entries are injected.
+function parseLearningEntries(filePath, displayPath, category, level, domain = 'global', tier, threshold = DEFAULT_THRESHOLD) {
     if (!(0, fs_1.existsSync)(filePath))
         return [];
     let content;
@@ -1207,23 +1213,52 @@ function parseLearningEntries(filePath, displayPath, category, level, domain = '
     catch {
         return [];
     }
+    const fileType = exports.CATEGORY_TO_FILETYPE[category];
+    // preferences and manager-coaching are threshold-free — always injected.
+    const isScoreGated = fileType === 'mistake-patterns' || fileType === 'validated-patterns';
     const out = [];
     let current = null;
     let bodyLines = [];
+    // Scoring metadata for the current entry.
+    let curLastSeen = null;
+    let curRecurrences = 1;
     const flush = () => {
         if (current) {
             current.body = bodyLines.join('\n').replace(/\n{3,}/g, '\n\n').trim();
+            if (isScoreGated) {
+                if (curLastSeen !== null) {
+                    const s = computeEffectiveScore(current.severity, curLastSeen, curRecurrences, fileType);
+                    current.score = s;
+                    current.injected = s >= threshold;
+                }
+                else {
+                    current.score = null;
+                    // No date metadata: treat as fresh / always inject.
+                    current.injected = true;
+                }
+            }
+            else {
+                current.score = null;
+                current.injected = true;
+            }
             out.push(current);
         }
         current = null;
         bodyLines = [];
+        curLastSeen = null;
+        curRecurrences = 1;
     };
     const headingRe = learningEntryHeadingRegex();
     for (const line of content.split(/\r?\n/)) {
         const header = line.match(headingRe);
         if (header) {
             flush();
-            const entry = { severity: header[1], title: header[2].trim(), body: '', source: displayPath, category, level, domain };
+            const entry = {
+                severity: header[1],
+                title: header[2].trim(),
+                body: '', source: displayPath, category, level, domain,
+                score: null, injected: true,
+            };
             if (tier !== undefined)
                 entry.tier = tier;
             current = entry;
@@ -1235,10 +1270,19 @@ function parseLearningEntries(filePath, displayPath, category, level, domain = '
             flush();
             continue;
         }
-        // Drop the bookkeeping lines — the Hub shows the human-readable learning,
-        // not the scoring metadata.
         const t = line.trim();
-        if (/^\*\*(Score|Last seen|Recurrences|Technical trace|Users|First synthesized)\*\*:/i.test(t))
+        // Capture scoring metadata but exclude from body.
+        const lastSeenMatch = t.match(/^\*\*Last seen\*\*:\s*(.+)/i);
+        if (lastSeenMatch) {
+            curLastSeen = lastSeenMatch[1].trim();
+            continue;
+        }
+        const recurrencesMatch = t.match(/^\*\*Recurrences\*\*:\s*(\d+)/i);
+        if (recurrencesMatch) {
+            curRecurrences = parseInt(recurrencesMatch[1], 10) || 1;
+            continue;
+        }
+        if (/^\*\*(Score|Technical trace|Users|First synthesized)\*\*:/i.test(t))
             continue;
         if (/^(First|Last) synthesized:/i.test(t))
             continue;
@@ -1247,44 +1291,85 @@ function parseLearningEntries(filePath, displayPath, category, level, domain = '
     flush();
     return out;
 }
-function levelDir(roots, level) {
-    if (level === 'machine') {
-        // Issue #1070: use the configured manager home, not the portable authoring base.
-        // For single-machine backends managerHomeBase == globalPersonalBase (no change).
-        return { dir: roots.managerHomeBase, displayBase: roots.managerHomeDisplayBase.replace(/\/$/, '') };
-    }
-    return { dir: roots.repoLearningsBase, displayBase: REPO_LEARNINGS_REL };
-}
 function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine') {
     const roots = getLearningRoots(workspaceRoot);
+    const threshold = getScoreThreshold(workspaceRoot);
     const out = [];
+    // Helper: parse + merge a list of tier paths for one file family.
+    // ResolvedLearningTier uses 'manager' to mean machine-level personal; map it to 'machine'.
+    const tierLevel = (t) => t.level === 'manager' ? 'machine' : t.level;
+    const parseTiers = (tiers, cat, tierVal, domainVal) => mergeLearningEntriesAcrossTiers(tiers.map((t) => ({
+        entries: parseLearningEntries(t.path, t.displayPath, cat, tierLevel(t), domainVal ?? 'global', tierVal, threshold),
+    })));
     if (scope === 'org') {
         for (const cat of ['avoid', 'preference', 'repeat', 'coaching']) {
             const fileType = exports.CATEGORY_TO_FILETYPE[cat];
             const f = `org-${fileType}.md`;
-            out.push(...parseLearningEntries((0, path_1.join)(roots.repoLearningsBase, f), `${REPO_LEARNINGS_REL}/${f}`, cat, 'org'));
-            // #806: domain-scoped org learnings alongside the flat global file.
-            for (const { fileName, domain } of listDomainLearningFiles(roots.repoLearningsBase, 'org', fileType)) {
-                out.push(...parseLearningEntries((0, path_1.join)(roots.repoLearningsBase, fileName), `${REPO_LEARNINGS_REL}/${fileName}`, cat, 'org', domain));
+            // org pack home first, repo-local override second; repo-local wins on title collision.
+            out.push(...parseTiers(resolveOrgLearningFileTiers(roots.repoLearningsBase, f), cat));
+            // #806: domain-scoped org learnings — union from both locations.
+            const allDomainFiles = [
+                ...listDomainLearningFiles(roots.repoLearningsBase, 'org', fileType).map((d) => ({ ...d, base: roots.repoLearningsBase })),
+                ...listDomainLearningFiles((0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings'), 'org', fileType)
+                    .map((d) => ({ ...d, base: (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings') })),
+            ];
+            const seenDomainFile = new Set();
+            for (const { fileName, domain, base } of allDomainFiles) {
+                if (seenDomainFile.has(fileName))
+                    continue;
+                seenDomainFile.add(fileName);
+                const domainTiers = resolveOrgLearningFileTiers(roots.repoLearningsBase, fileName);
+                if (domainTiers.length === 0) {
+                    out.push(...parseLearningEntries((0, path_1.join)(base, fileName), `${REPO_LEARNINGS_REL}/${fileName}`, cat, 'org', domain, undefined, threshold));
+                }
+                else {
+                    out.push(...parseTiers(domainTiers, cat, undefined, domain));
+                }
             }
         }
         return out;
     }
+    // manager + reverse: use the same three-tier resolution as buildLearningContextSection.
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
-    const { dir, displayBase } = levelDir(roots, level);
     const cats = scope === 'reverse' ? ['coaching'] : ['avoid', 'preference', 'repeat'];
+    if (level === 'project') {
+        // Project level: repo-local only (single tier, no merge needed).
+        for (const cat of cats) {
+            const fileType = exports.CATEGORY_TO_FILETYPE[cat];
+            const f = `${resolvedUserId}-${fileType}.md`;
+            out.push(...parseLearningEntries((0, path_1.join)(roots.repoLearningsBase, f), `${REPO_LEARNINGS_REL}/${f}`, cat, 'project', 'global', 'hot', threshold));
+            const coldF = `${resolvedUserId}-${fileType}${COLD_FILE_SUFFIX}.md`;
+            if ((0, fs_1.existsSync)((0, path_1.join)(roots.repoLearningsBase, coldF))) {
+                out.push(...parseLearningEntries((0, path_1.join)(roots.repoLearningsBase, coldF), `${REPO_LEARNINGS_REL}/${coldF}`, cat, 'project', 'global', 'cold', threshold));
+            }
+            for (const { fileName, domain } of listDomainLearningFiles(roots.repoLearningsBase, resolvedUserId, fileType)) {
+                out.push(...parseLearningEntries((0, path_1.join)(roots.repoLearningsBase, fileName), `${REPO_LEARNINGS_REL}/${fileName}`, cat, 'project', domain, 'hot', threshold));
+            }
+        }
+        return out;
+    }
+    // machine level: all three personal tiers (managerCacheBase, globalPersonalBase, repoLearningsBase).
+    // Cold siblings are read from each tier that has the hot file.
     for (const cat of cats) {
         const fileType = exports.CATEGORY_TO_FILETYPE[cat];
         const f = `${resolvedUserId}-${fileType}.md`;
-        out.push(...parseLearningEntries((0, path_1.join)(dir, f), `${displayBase}/${f}`, cat, level, 'global', 'hot'));
-        // Cold sibling — only read when it exists alongside the hot file (#861).
+        const tiers = resolvePersonalLearningFileTiers(roots.repoLearningsBase, roots.managerCacheBase, roots.managerCacheDisplayBase, roots.globalPersonalBase, roots.globalPersonalDisplayBase, f);
+        out.push(...parseTiers(tiers, cat, 'hot'));
+        // Cold sibling from each tier that has the hot file.
         const coldF = `${resolvedUserId}-${fileType}${COLD_FILE_SUFFIX}.md`;
-        if ((0, fs_1.existsSync)((0, path_1.join)(dir, coldF))) {
-            out.push(...parseLearningEntries((0, path_1.join)(dir, coldF), `${displayBase}/${coldF}`, cat, level, 'global', 'cold'));
-        }
-        // #806: domain-scoped personal learnings alongside the flat global file.
-        for (const { fileName, domain } of listDomainLearningFiles(dir, resolvedUserId, fileType)) {
-            out.push(...parseLearningEntries((0, path_1.join)(dir, fileName), `${displayBase}/${fileName}`, cat, level, domain, 'hot'));
+        const coldTiers = resolvePersonalLearningFileTiers(roots.repoLearningsBase, roots.managerCacheBase, roots.managerCacheDisplayBase, roots.globalPersonalBase, roots.globalPersonalDisplayBase, coldF);
+        out.push(...parseTiers(coldTiers, cat, 'cold'));
+        // #806: domain files from managerHomeBase and repo base.
+        const domainDirs = [roots.globalPersonalBase, roots.managerCacheBase, roots.repoLearningsBase];
+        const seenDomain = new Set();
+        for (const dir of domainDirs) {
+            for (const { fileName, domain } of listDomainLearningFiles(dir, resolvedUserId, fileType)) {
+                if (seenDomain.has(fileName))
+                    continue;
+                seenDomain.add(fileName);
+                const domTiers = resolvePersonalLearningFileTiers(roots.repoLearningsBase, roots.managerCacheBase, roots.managerCacheDisplayBase, roots.globalPersonalBase, roots.globalPersonalDisplayBase, fileName);
+                out.push(...parseTiers(domTiers, cat, 'hot', domain));
+            }
         }
     }
     return out;
@@ -1292,8 +1377,12 @@ function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine')
 function resolveLearningFilePath(workspaceRoot, userId, ref) {
     const roots = getLearningRoots(workspaceRoot);
     const fileType = exports.CATEGORY_TO_FILETYPE[ref.category];
-    if (ref.scope === 'org')
-        return (0, path_1.join)(roots.repoLearningsBase, `org-${fileType}.md`);
+    if (ref.scope === 'org') {
+        // Write org entries to the org pack home — same location share-with-others uses.
+        // The Hub read path already merges pack home + repo-local, so edits land where
+        // the agent reads them without needing a repo commit.
+        return (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings', `org-${fileType}.md`);
+    }
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
     // Issue #1070: for the 'machine' level use the configured manager home.
     const base = ref.level === 'project' ? roots.repoLearningsBase : roots.managerHomeBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.263",
+  "version": "2.0.264",
   "description": "FRAIM core CLI and MCP package.",
   "main": "index.js",
   "bin": {