fraim 2.0.360-next.0 → 2.0.360-next.2

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CATEGORY_TO_FILETYPE = exports.BRAIN_LEARNING_FILETYPE_TO_REGION = exports.TEAM_CONTEXT_RELATIVE_PATHS = exports.generateLearningEntryId = exports.learningEntryIdLineRegex = exports.learningEntryHeadingRegex = exports.LEARNING_ENTRY_ID_REGEX = exports.LEARNING_PRIORITIES = exports.DEFAULT_THRESHOLD = void 0;
+exports.storedLearningDomains = storedLearningDomains;
 exports.getScoreThreshold = getScoreThreshold;
 exports.computeEffectiveScore = computeEffectiveScore;
 exports.getLearningInputHomes = getLearningInputHomes;
@@ -40,6 +41,13 @@ const brand_store_1 = require("../core/brand-store");
 // cache, which silently returned nothing once that cache stopped existing.
 const pack_home_1 = require("../cli/utils/pack-home");
 const learning_domains_1 = require("../config/learning-domains");
+const entry_authoring_1 = require("../../registry/scripts/learning/entry-authoring");
+/** Catalog-backed allowlist for existing files, including retired storage identities. */
+function storedLearningDomains(effectiveCatalog) {
+    const configured = effectiveCatalog?.schemaVersion === 2 && effectiveCatalog.domains && typeof effectiveCatalog.domains === 'object'
+        ? Object.keys(effectiveCatalog.domains).filter(domain => /^[a-z][a-z-]*$/.test(domain) && !['global', 'constructor', 'prototype'].includes(domain)) : [];
+    return [...new Set([...learning_domains_1.STORED_LEARNING_DOMAINS, ...configured])];
+}
 const REPO_LEARNINGS_REL = (0, project_fraim_paths_1.getWorkspaceFraimDisplayPath)('personalized-employee/learnings').replace(/\/$/, '');
 /**
  * The score at or above which an entry is injected. Exported so a test asserts
@@ -535,7 +543,7 @@ const CONTEXT_CATEGORIES = {
     validated: { ft: 'validated-patterns', label: '(all entries)' },
 };
 /** Resolve the files listed in injected context, in delivery order. */
-function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJob, domain) {
+function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJob, domain, effectiveCatalog) {
     // Domain axis (issue #806) plus the connect/job single-injection contract (issue
     // #860). Session startup stays broad enough for stable preferences plus L0, while
     // job contexts add the remaining global categories and may append the current job's
@@ -569,11 +577,25 @@ function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJo
     const collect = (cats, tiersFor, fallbackLevel) => {
         const globalFiles = [];
         const domainFiles = [];
-        const push = (into, key, tiers) => {
+        const push = (into, key, tiers, storageDomain = 'global', includeGlobal = true) => {
             if (tiers.length > 1)
                 multiTier = true;
             const meta = CONTEXT_CATEGORIES[key];
             for (const tier of tiers) {
+                let selected;
+                try {
+                    const content = (0, fs_1.readFileSync)(tier.path, 'utf8');
+                    const explicitProvenance = /^\*\*(?:Domain|Originating job)\*\*:/m.test(content);
+                    if (storageDomain !== 'global' || explicitProvenance)
+                        selected = (0, entry_authoring_1.selectStoredLearningEntries)(content, storageDomain, activeDomain ?? 'global', includeGlobal, effectiveCatalog);
+                    else if (!includeGlobal)
+                        continue;
+                }
+                catch {
+                    selected = { entries: [], unresolved: 1 };
+                }
+                if (selected && !selected.entries.length && !selected.unresolved)
+                    continue;
                 into.push({
                     path: tier.path,
                     displayPath: tier.displayPath,
@@ -581,6 +603,7 @@ function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJo
                     label: meta.label,
                     isCoach: key === 'coach',
                     level: tier.level ?? fallbackLevel,
+                    ...(selected ? { selectedEntries: selected.entries, unresolved: selected.unresolved } : {}),
                 });
                 if (key === 'coach')
                     coachPresent = true;
@@ -591,7 +614,11 @@ function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJo
         }
         if (activeDomain) {
             for (const key of cats.domain) {
-                push(domainFiles, key, tiersFor(CONTEXT_CATEGORIES[key].ft, activeDomain));
+                if (sessionCats.includes(key))
+                    push(domainFiles, key, tiersFor(CONTEXT_CATEGORIES[key].ft), 'global', false);
+                for (const storageDomain of storedLearningDomains(effectiveCatalog)) {
+                    push(domainFiles, key, tiersFor(CONTEXT_CATEGORIES[key].ft, storageDomain), storageDomain);
+                }
             }
         }
         return [...globalFiles, ...domainFiles];
@@ -600,16 +627,28 @@ function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJo
     const l1 = collect({ global: l1GlobalCats, domain: l1DomainCats }, (ft, dom) => resolvePersonalLearningFileTiers(roots.repoLearningsBase, roots.managerCacheBase, roots.managerCacheDisplayBase, roots.globalPersonalBase, roots.globalPersonalDisplayBase, dom ? `${resolvedUserId}-${dom}-${ft}.md` : `${resolvedUserId}-${ft}.md`), 'manager');
     return { l2, l1, multiTier, coachPresent };
 }
-function buildLearningContextSection(workspaceRoot, userId, forJob, domain) {
+function buildLearningContextSection(workspaceRoot, userId, forJob, domain, effectiveCatalog) {
     const roots = getLearningRoots(workspaceRoot);
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
-    const resolved = resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJob, domain);
+    const resolved = resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJob, domain, effectiveCatalog);
     const multiTier = resolved.multiTier;
     const toListed = (f) => ({
         displayPath: f.displayPath,
         label: f.label,
         isCoach: f.isCoach,
+        selectedEntries: f.selectedEntries,
+        unresolved: f.unresolved,
     });
+    const renderLearningFile = (f) => {
+        if (!f.selectedEntries)
+            return `\`${f.displayPath}\`  ${f.label}\n`;
+        let result = '';
+        if (f.selectedEntries.length)
+            result += `Selected entries from \`${f.displayPath}\` ${f.isCoach ? '(manager-facing feedback)' : ''}:\n${f.selectedEntries.join('\n\n')}\n`;
+        if (f.unresolved)
+            result += `needs-domain: ${f.unresolved} historical entr${f.unresolved === 1 ? 'y' : 'ies'} in \`${f.displayPath}\` require original job provenance or an explicit manager domain decision. Retained for review; not standing guidance.\n`;
+        return result;
+    };
     const l2Files = resolved.l2.map(toListed);
     const l1Files = resolved.l1.map(toListed);
     const pendingL0Sources = collectPendingL0SourceFiles(workspaceRoot, userId.trim(), roots);
@@ -628,13 +667,13 @@ function buildLearningContextSection(workspaceRoot, userId, forJob, domain) {
     if (hasL2) {
         section += '### L2 - Org patterns\n';
         for (const f of l2Files)
-            section += `\`${f.displayPath}\`  ${f.label}\n`;
+            section += renderLearningFile(f);
         section += '\n';
     }
     if (hasL1) {
         section += '### L1 - Your patterns\n';
         for (const f of l1Files)
-            section += `\`${f.displayPath}\`  ${f.label}\n`;
+            section += renderLearningFile(f);
         section += '\n';
     }
     if (l0CoachingCount > 0 || l0RetroCount > 0) {
@@ -662,7 +701,7 @@ function buildLearningContextSection(workspaceRoot, userId, forJob, domain) {
     const coachPresent = resolved.coachPresent;
     if (forJob) {
         if (hasL2 || hasL1) {
-            section += 'Read the listed synthesized learning files before continuing, then apply the relevant patterns and preferences in this job.\n';
+            section += 'Read the listed global learning files before continuing and apply the selected domain entries shown above. Source paths for selected or needs-domain entries are provenance, not instructions to load the whole file. Do not apply omitted or unresolved entries.\n';
             if (multiTier) {
                 section += 'A family listed at more than one level is combined, not replaced. Stable IDs identify lessons; equal titles do not establish identity. Conflicting copies require explicit reconciliation: do not choose a revision by scope, timestamp, count, or title. Preserve approved decisions and useful refinements; unresolved conflicting claims are not authority for action.\n';
             }
@@ -672,7 +711,7 @@ function buildLearningContextSection(workspaceRoot, userId, forJob, domain) {
         }
     }
     else if (hasL2 || hasL1) {
-        section += 'Read the listed synthesized learning files before continuing, then use this synthesized learning context throughout the session.\n';
+        section += 'Read the listed synthesized learning files before continuing, then use this synthesized learning context throughout the session. Selected entry source paths are provenance; do not read omitted entries or apply needs-domain material.\n';
         if (multiTier) {
             section += 'A family listed at more than one level is combined, not replaced. Stable IDs identify lessons; equal titles do not establish identity. Conflicting copies require explicit reconciliation: do not choose a revision by scope, timestamp, count, or title. Preserve approved decisions and useful refinements; unresolved conflicting claims are not authority for action.\n';
         }
@@ -1034,7 +1073,7 @@ function readLearningEntryTitles(filePath) {
  * manager-coaching entries that field used to hold, so the tile labelled
  * "Manager" reports the level rather than a category.
  */
-function countPreservedLearnings(workspaceRoot, userId) {
+function countPreservedLearnings(workspaceRoot, userId, effectiveCatalog) {
     const roots = getLearningRoots(workspaceRoot);
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
     // Distinct entry titles across every level holding this company family, so a
@@ -1086,7 +1125,7 @@ function countPreservedLearnings(workspaceRoot, userId) {
     let reverseMentoring = coachByLevel.manager + coachByLevel.project;
     // #806: domain-scoped files fold into the same per-level counts so the Brain
     // reconciles with what the loader injects for a job.
-    for (const domain of learning_domains_1.LEARNING_DOMAINS) {
+    for (const domain of storedLearningDomains(effectiveCatalog)) {
         for (const ft of ORG_TYPES)
             organization += countOrgFamily(`org-${domain}-${ft}.md`);
         for (const ft of PERSONAL_WORK_TYPES) {
@@ -1297,11 +1336,11 @@ const FILETYPE_TO_CATEGORY = {
  * #806) present in a directory, in a deterministic domain order. Used by the Hub
  * read/count paths so domain learnings appear alongside the flat global files.
  */
-function listDomainLearningFiles(dir, prefix, fileType) {
+function listDomainLearningFiles(dir, prefix, fileType, effectiveCatalog) {
     if (!(0, fs_1.existsSync)(dir))
         return [];
     const out = [];
-    for (const domain of learning_domains_1.LEARNING_DOMAINS) {
+    for (const domain of storedLearningDomains(effectiveCatalog)) {
         const fileName = `${prefix}-${domain}-${fileType}.md`;
         if ((0, fs_1.existsSync)((0, path_1.join)(dir, fileName)))
             out.push({ fileName, domain });
@@ -1404,7 +1443,7 @@ function parseLearningEntries(filePath, displayPath, category, level, domain = '
         }
         // `Id` is listed here as well as matched above so a malformed id line is still
         // treated as bookkeeping rather than leaking into the displayed lesson.
-        if (/^\*\*(Id|Score|Technical trace|Users|First synthesized)\*\*:/i.test(t))
+        if (/^\*\*(Id|Score|Technical trace|Users|First recorded|First synthesized|Originating job|Sources|Domain|Domain basis|Domain history)\*\*:/i.test(t))
             continue;
         if (/^(First|Last) synthesized:/i.test(t))
             continue;
@@ -1516,7 +1555,7 @@ function readRejectedProposals(workspaceRoot, userId) {
     // Newest first: the manager is most often checking what they just said no to.
     return out.sort((a, b) => String(b.rejectedAt).localeCompare(String(a.rejectedAt)));
 }
-function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine') {
+function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine', effectiveCatalog) {
     const roots = getLearningRoots(workspaceRoot);
     const usageStats = resolveUsageStats();
     // Only the human library reads these observations. An unavailable store must
@@ -1565,8 +1604,8 @@ function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine')
             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', { migrateLegacy: false }).contentRoot, 'learnings'), 'org', fileType)
+                ...listDomainLearningFiles(roots.repoLearningsBase, 'org', fileType, effectiveCatalog).map((d) => ({ ...d, base: roots.repoLearningsBase })),
+                ...listDomainLearningFiles((0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings'), 'org', fileType, effectiveCatalog)
                     .map((d) => ({ ...d, base: (0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings') })),
             ];
             const seenDomainFile = new Set();
@@ -1590,7 +1629,7 @@ function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine')
     const cats = scope === 'reverse' ? ['coaching'] : ['avoid', 'preference', 'repeat'];
     for (const cat of cats) {
         const fileType = exports.CATEGORY_TO_FILETYPE[cat];
-        for (const domain of ['global', ...learning_domains_1.LEARNING_DOMAINS]) {
+        for (const domain of ['global', ...storedLearningDomains(effectiveCatalog)]) {
             const domainPart = domain === 'global' ? '' : `-${domain}`;
             for (const storageTier of ['hot', 'cold']) {
                 const suffix = storageTier === 'cold' ? COLD_FILE_SUFFIX : '';
@@ -1607,39 +1646,39 @@ function isGlobalDomain(domain) {
     return !domain || domain === 'global';
 }
 /** Normalize a caller-supplied domain to one of the known domains, or 'global'. */
-function normalizeLearningDomain(domain) {
+function normalizeLearningDomain(domain, effectiveCatalog) {
     if (isGlobalDomain(domain))
         return 'global';
-    const found = learning_domains_1.LEARNING_DOMAINS.find((d) => d === domain);
+    const found = storedLearningDomains(effectiveCatalog).find((d) => d === domain);
     return found ?? 'global';
 }
-function learningFileName(userId, fileType, domain) {
+function learningFileName(userId, fileType, domain, effectiveCatalog) {
     // Issue #1755 / #754: normalize here rather than trusting the caller. The HTTP
     // layer already allowlists the domain, but this function builds a path and a
     // direct caller passing `../../escape` would otherwise write outside the
     // learnings root. Anything not in the known set resolves to the global file.
-    const safe = normalizeLearningDomain(domain);
+    const safe = normalizeLearningDomain(domain, effectiveCatalog);
     return safe === 'global' ? `${userId}-${fileType}.md` : `${userId}-${safe}-${fileType}.md`;
 }
-function resolveLearningFilePath(workspaceRoot, userId, ref) {
+function resolveLearningFilePath(workspaceRoot, userId, ref, effectiveCatalog) {
     const roots = getLearningRoots(workspaceRoot);
     const fileType = exports.CATEGORY_TO_FILETYPE[ref.category];
     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', { migrateLegacy: false }).contentRoot, 'learnings', learningFileName('org', fileType, ref.domain));
+        return (0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', learningFileName('org', fileType, ref.domain, effectiveCatalog));
     }
     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;
-    return (0, path_1.join)(base, learningFileName(resolvedUserId, fileType, ref.domain));
+    return (0, path_1.join)(base, learningFileName(resolvedUserId, fileType, ref.domain, effectiveCatalog));
 }
 function titleCaseFromFileType(fileType) {
     return fileType.split('-').map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(' ');
 }
-function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload) {
-    const filePath = resolveLearningFilePath(workspaceRoot, userId, ref);
+function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload, effectiveCatalog) {
+    const filePath = resolveLearningFilePath(workspaceRoot, userId, ref, effectiveCatalog);
     const existing = (0, fs_1.existsSync)(filePath) ? (0, fs_1.readFileSync)(filePath, 'utf8') : '';
     const nl = existing.includes('\r\n') ? '\r\n' : '\n';
     const lines = existing.length ? existing.split(/\r?\n/) : [];
@@ -1651,13 +1690,28 @@ function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload) {
         (0, fs_1.mkdirSync)((0, path_1.dirname)(filePath), { recursive: true });
         (0, fs_1.writeFileSync)(filePath, text.replace(/\s*$/, '') + nl, 'utf8');
     };
+    const metadataLine = /^\*\*(Id|Score|Last seen|Recurrences|Technical trace|Users|First recorded|First synthesized|Originating job|Sources|Domain|Domain basis|Domain history)\*\*:/i;
+    const setManagerDomain = (metadata, domain) => {
+        const version = effectiveCatalog?.mapVersion ?? learning_domains_1.LEARNING_DOMAIN_MAP_VERSION;
+        if (!Number.isInteger(version) || version < 1)
+            throw new Error('Cannot record a learning domain decision: restore the domain catalog first.');
+        const oldDomain = metadata.find(line => /^\*\*Domain\*\*:/i.test(line.trim()))?.trim().replace(/^\*\*Domain\*\*:\s*/i, '');
+        const oldBasis = metadata.find(line => /^\*\*Domain basis\*\*:/i.test(line.trim()))?.trim().replace(/^\*\*Domain basis\*\*:\s*/i, '');
+        const retained = metadata.filter(line => !/^\*\*(Domain|Domain basis)\*\*:/i.test(line.trim()));
+        if (oldDomain && (oldDomain !== domain || oldBasis !== `manager; map ${version}`)) {
+            retained.push(`**Domain history**: ${oldDomain}; ${oldBasis ?? 'basis not recorded'}`);
+        }
+        return [...retained, `**Domain**: ${domain}`, `**Domain basis**: manager; map ${version}`];
+    };
     if (action === 'add') {
         const sev = (payload.severity || 'P-MED');
         const title = (payload.title || '').trim() || 'Untitled learning';
-        const body = String(payload.body || '').trim();
-        const block = [`#### [${sev}] ${title}`, '', body, '', '---'].join(nl);
+        const suppliedLines = String(payload.body || '').trim().split(/\r?\n/);
+        const addDomain = normalizeLearningDomain(ref.domain, effectiveCatalog);
+        const metadata = setManagerDomain(suppliedLines.filter(line => metadataLine.test(line.trim())), addDomain);
+        const body = suppliedLines.filter(line => !metadataLine.test(line.trim())).join(nl).trim();
+        const block = [`#### [${sev}] ${title}`, '', ...metadata, '', body, '', '---'].join(nl);
         const fileType = exports.CATEGORY_TO_FILETYPE[ref.category];
-        const addDomain = normalizeLearningDomain(ref.domain);
         const preamble = existing.trim()
             ? existing.replace(/\s*$/, '')
             : `# ${ref.scope === 'org' ? 'Org ' : ''}${titleCaseFromFileType(fileType)}${addDomain === 'global' ? '' : ` (${addDomain})`}`;
@@ -1701,18 +1755,22 @@ function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload) {
         const t = l.trim();
         if (t === '---')
             continue;
-        if (/^\*\*(Id|Score|Last seen|Recurrences|Technical trace|Users|First synthesized)\*\*:/i.test(t) || /^(First|Last) synthesized:/i.test(t))
+        if (metadataLine.test(t) || /^(First|Last) synthesized:/i.test(t))
             meta.push(l);
     }
-    const body = String(payload.body !== undefined ? payload.body : '').trim();
-    const rebuilt = [`#### [${sev}] ${title}`, '', ...meta, ...(meta.length ? [''] : []), body, '', '---'];
+    const originalBody = lines.slice(start + 1, end).filter(line => line.trim() !== '---' && !metadataLine.test(line.trim()) && !/^(First|Last) synthesized:/i.test(line.trim())).join(nl).trim();
+    const body = payload.body === undefined ? originalBody : String(payload.body).split(/\r?\n/).filter(line => !metadataLine.test(line.trim())).join(nl).trim();
+    const targetDomain = payload.targetDomain === undefined ? undefined : normalizeLearningDomain(payload.targetDomain, effectiveCatalog);
+    // A normal prose edit is not authority to reclassify an ambiguous legacy entry.
+    // An explicit choice records a manager decision even when its filename is unchanged.
+    const updatedMeta = targetDomain !== undefined && targetDomain === payload.targetDomain ? setManagerDomain(meta, targetDomain) : meta;
+    const rebuilt = [`#### [${sev}] ${title}`, '', ...updatedMeta, ...(updatedMeta.length ? [''] : []), body, '', '---'];
     // Issue #1755 R2/R4: a domain change is a move between files, because the domain
     // IS the filename. Cut the rebuilt block from the source file and append it to the
     // destination, so the entry keeps its id, score and history rather than being
     // re-created as a new entry with no past.
-    const targetDomain = payload.targetDomain === undefined ? undefined : normalizeLearningDomain(payload.targetDomain);
-    if (targetDomain !== undefined && targetDomain !== normalizeLearningDomain(ref.domain)) {
-        const destPath = resolveLearningFilePath(workspaceRoot, userId, { ...ref, domain: targetDomain });
+    if (targetDomain !== undefined && targetDomain !== normalizeLearningDomain(ref.domain, effectiveCatalog)) {
+        const destPath = resolveLearningFilePath(workspaceRoot, userId, { ...ref, domain: targetDomain }, effectiveCatalog);
         const destExisting = (0, fs_1.existsSync)(destPath) ? (0, fs_1.readFileSync)(destPath, 'utf8') : '';
         const destNl = destExisting.includes('\r\n') ? '\r\n' : nl;
         const fileTypeForHeader = exports.CATEGORY_TO_FILETYPE[ref.category];

package/dist/src/local-mcp-server/stdio-server.js

@@ -1,19 +1,5 @@
 #!/usr/bin/env node
 "use strict";
-/**
- * FRAIM Local MCP Server - STDIO Version
- *
- * Proxy that:
- * 1. Accepts MCP requests via stdin/stdout
- * 2. Proxies to remote FRAIM server
- * 3. Performs template substitution:
- *    - Proxy config variables: {{proxy.config.path.to.value}}
- *    - Platform-specific actions: {{proxy.action.get_issue}}, {{proxy.action.create_pr}}, etc.
- * 4. Automatically detects and injects machine/repo info for fraim_connect
- * 5. Substitutes {{proxy.delivery.*}} templates based on user's workingStyle
- *    (PR or Conversation from ~/.fraim/config.json). Delivery phases live
- *    server-side in the workflow; the proxy just fills in mode-specific content.
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -54,6 +40,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FraimLocalMCPServer = exports.FraimTemplateEngine = void 0;
 exports.parseExecutionModeFromResponse = parseExecutionModeFromResponse;
 exports.buildExecutionModeForwardUrl = buildExecutionModeForwardUrl;
+const domain_rule_assembler_1 = require("../core/utils/domain-rule-assembler");
+/**
+ * FRAIM Local MCP Server - STDIO Version
+ *
+ * Proxy that:
+ * 1. Accepts MCP requests via stdin/stdout
+ * 2. Proxies to remote FRAIM server
+ * 3. Performs template substitution:
+ *    - Proxy config variables: {{proxy.config.path.to.value}}
+ *    - Platform-specific actions: {{proxy.action.get_issue}}, {{proxy.action.create_pr}}, etc.
+ * 4. Automatically detects and injects machine/repo info for fraim_connect
+ * 5. Substitutes {{proxy.delivery.*}} templates based on user's workingStyle
+ *    (PR or Conversation from ~/.fraim/config.json). Delivery phases live
+ *    server-side in the workflow; the proxy just fills in mode-specific content.
+ */
 const fs_1 = require("fs");
 const path_1 = require("path");
 const os_1 = require("os");
@@ -80,7 +81,7 @@ const usage_collector_js_1 = require("./usage-collector.js");
 const otlp_metrics_receiver_js_1 = require("./otlp-metrics-receiver.js");
 const token_adapter_registry_js_1 = require("./token-adapter-registry.js");
 const learning_context_builder_js_1 = require("./learning-context-builder.js");
-const learning_domains_js_1 = require("../config/learning-domains.js");
+const catalog_1 = require("../../registry/scripts/domains/catalog");
 const skill_include_dedup_js_1 = require("./skill-include-dedup.js");
 const git_utils_1 = require("../core/utils/git-utils");
 /**
@@ -1289,6 +1290,10 @@ class FraimLocalMCPServer {
      * The Hub run pointer bridges CLI and MCP session IDs, which are unrelated.
      */
     recordRecoveryState(args, sessionId, acceptedNext) {
+        // Instruction restoration is a read, including after terminal/review states.
+        // Do not rebind the original execution to the requesting transport session.
+        if (args.status === 'starting' && args.requestInstructions === true)
+            return;
         if (!sessionId || sessionId === 'unknown'
             || typeof args.jobName !== 'string' || !args.jobName
             || typeof args.currentPhase !== 'string' || !args.currentPhase
@@ -1382,6 +1387,8 @@ class FraimLocalMCPServer {
     }
     /** Called only after the response has passed every rejecting contract. */
     acceptPhaseTracking(args, sessionId, nextPhase) {
+        if (args.status === 'starting' && args.requestInstructions === true)
+            return '';
         this.recordRecoveryState(args, sessionId, { nextPhase });
         if (!sessionId || sessionId === 'unknown' || !args.jobName || !args.currentPhase) {
             return args.status === 'complete' || args.status === 'failure'
@@ -1689,6 +1696,23 @@ class FraimLocalMCPServer {
         if (request.method !== 'tools/call' || typeof toolName !== 'string') {
             return this.processResponseWithHydration(response, requestSessionId);
         }
+        // A remote catalog miss does not mean an authorized personalized file is
+        // missing. Keep this exception tied to the file lookup producer's exact
+        // error; authentication, execution and workflow rejections stay authoritative.
+        const remoteFileMissing = toolName === 'get_fraim_file'
+            && typeof args.path === 'string'
+            && response.error?.code === -32603
+            && response.error.message === `File not found: ${args.path}. Check for typos in the file name or file path.`;
+        if (response.result?.isError || response.result?.personaLock || (response.error && !remoteFileMissing))
+            return response;
+        // Connect creates the session: its response, rather than the sessionless
+        // request, authorizes dependent catalog, include and rule reads. Keep it
+        // request-local so a later rejected reconnect cannot change another call.
+        if (toolName === 'fraim_connect') {
+            const connectedSessionId = response.result?.structuredContent?.sessionId ?? response.result?.sessionId;
+            if (typeof connectedSessionId === 'string' && connectedSessionId.trim())
+                requestSessionId = connectedSessionId;
+        }
         const resolver = this.getRegistryResolver(requestSessionId);
         let finalizedResponse = response;
         // 1. Resolve top-level override if this tool maps to a specific file.
@@ -1702,20 +1726,18 @@ class FraimLocalMCPServer {
                 registryPath = await resolver.findRegistryPath('jobs', args.job);
             if (registryPath) {
                 const localOverride = resolver.hasPersonalizedOverride(registryPath);
-                const remoteFailed = Boolean(response.error);
-                if (response.error) {
-                    this.log(`[req:${requestId}] Remote error for ${registryPath}: code=${response.error.code}`);
-                }
-                if (localOverride || remoteFailed) {
+                if (localOverride || remoteFileMissing) {
                     try {
                         // Every configured personalized layer takes priority over the remote baseline.
-                        const resolved = await resolver.resolveFile(registryPath).catch(() => null);
+                        const resolved = await resolver.resolveFile(registryPath, { includeMetadata: false }).catch(() => null);
                         if (resolved?.content) {
                             const newResponse = {
                                 ...response,
                                 result: {
                                     ...response.result,
-                                    content: [{ type: 'text', text: resolved.content }]
+                                    content: response.result?.content?.length
+                                        ? response.result.content.map((block, index) => index === 0 ? { type: 'text', text: resolved.content } : block)
+                                        : [{ type: 'text', text: resolved.content }]
                                 }
                             };
                             delete newResponse.error;
@@ -1728,6 +1750,8 @@ class FraimLocalMCPServer {
                 }
             }
         }
+        if (finalizedResponse.error || finalizedResponse.result?.isError)
+            return finalizedResponse;
         // 2. Resolve includes within the content (for all registry tools)
         finalizedResponse = await this.resolveIncludesInResponse(finalizedResponse, requestSessionId, requestId);
         // 3. After fraim_connect succeeds, capture user email and inject learning context.
@@ -1768,11 +1792,13 @@ class FraimLocalMCPServer {
                 finalizedResponse.result.content[0].text = responseText;
             }
         }
+        let catalogRead;
         // 4. After get_fraim_job succeeds, inject learning context with job-focus frame.
         if (toolName === 'get_fraim_job' && !finalizedResponse.error) {
             const text = finalizedResponse.result?.content?.[0]?.text;
             if (typeof text === 'string') {
-                finalizedResponse.result.content[0].text = await this.appendJobContext(text, args.job, requestSessionId, requestId);
+                catalogRead = (0, domain_rule_assembler_1.withRuleDeliveryTimeout)(resolver.resolveFile('domains.json', { includeMetadata: false }));
+                finalizedResponse.result.content[0].text = await this.appendJobContext(text, args.job, requestSessionId, requestId, catalogRead);
             }
             // Issue #1345: forward executionMode from get_fraim_job response to Hub so
             // the chip reads from run data (no local file read, no separate endpoint needed).
@@ -1788,16 +1814,23 @@ class FraimLocalMCPServer {
                 }
             }
         }
+        finalizedResponse = await this.addRuleDelivery(request, finalizedResponse, requestSessionId, catalogRead);
         return this.processResponseWithHydration(finalizedResponse, requestSessionId);
     }
     /** Keep context delivery and offer attribution together for local and remote jobs. */
-    async appendJobContext(text, jobName, requestSessionId, requestId) {
+    async appendJobContext(text, jobName, requestSessionId, requestId, catalogRead) {
         const userEmail = this.ensureEngine().getUserEmail();
+        const workspaceRoot = this.findProjectRoot() || process.cwd();
+        let effectiveCatalog;
+        try {
+            const source = await (catalogRead ?? (0, domain_rule_assembler_1.withRuleDeliveryTimeout)(this.getRegistryResolver(requestSessionId).resolveFile('domains.json', { includeMetadata: false })));
+            effectiveCatalog = JSON.parse(source.content);
+        }
+        catch { /* Rule delivery returns the source warning; retain available global learning. */ }
         if (!userEmail)
             return text;
-        const workspaceRoot = this.findProjectRoot() || process.cwd();
-        const jobDomain = await this.resolveJobDomainForJob(jobName, requestSessionId);
-        const learningSection = (0, learning_context_builder_js_1.buildLearningContextSection)(workspaceRoot, userEmail, true, jobDomain);
+        const jobDomain = effectiveCatalog ? await this.resolveJobDomainForJob(jobName, requestSessionId, effectiveCatalog) : null;
+        const learningSection = (0, learning_context_builder_js_1.buildLearningContextSection)(workspaceRoot, userEmail, true, jobDomain, effectiveCatalog);
         const teamContextSection = (0, learning_context_builder_js_1.buildTeamContextSection)(workspaceRoot, true);
         if (learningSection || teamContextSection) {
             text += `\n\n---` + learningSection + teamContextSection;
@@ -1812,7 +1845,7 @@ class FraimLocalMCPServer {
      * context must never break a job response, and an unknown job never guesses a
      * wrong domain.
      */
-    async resolveJobDomainForJob(jobName, requestSessionId) {
+    async resolveJobDomainForJob(jobName, requestSessionId, effectiveCatalog) {
         try {
             const resolver = this.getRegistryResolver(requestSessionId);
             if (!resolver)
@@ -1820,12 +1853,9 @@ class FraimLocalMCPServer {
             const registryPath = await resolver.findRegistryPath('jobs', jobName);
             if (!registryPath)
                 return null;
-            // Read the job file so a domain it self-declares in frontmatter can override
-            // the category map (extensible for newly-taught jobs); the pure resolver
-            // owns the decision logic. Display metadata would prepend an HTML comment
-            // to personalized content, hiding its frontmatter from the domain parser.
-            const resolved = await resolver.resolveFile(registryPath, { includeMetadata: false }).catch(() => null);
-            return (0, learning_domains_js_1.resolveDomainForJob)(registryPath, resolved?.content ?? null);
+            const catalog = effectiveCatalog ?? JSON.parse((await (0, domain_rule_assembler_1.withRuleDeliveryTimeout)(resolver.resolveFile('domains.json', { includeMetadata: false }))).content);
+            const selected = (0, catalog_1.selectCatalogDomain)(catalog, registryPath);
+            return selected.selection === 'mapped' && selected.domain !== 'global' ? selected.domain : null;
         }
         catch {
             return null;
@@ -1862,7 +1892,51 @@ class FraimLocalMCPServer {
         }
         return errors;
     }
-    async finalizeLocalToolTextResponse(request, requestSessionId, requestId, text) {
+    async addRuleDelivery(request, response, sessionId, catalogRead) {
+        if (response.error || response.result?.isError || response.result?.personaLock || !response.result)
+            return response;
+        const tool = request.params?.name;
+        const args = request.params?.arguments || {};
+        let jobPath = null;
+        if (tool === 'get_fraim_job' || tool === 'seekMentoring') {
+            const context = await this.getMentor(sessionId).getRuleDeliveryContext(args.job || args.jobName);
+            if (!context)
+                return response;
+            jobPath = context.jobPath;
+            if (tool === 'seekMentoring' && !(args.status === 'starting' &&
+                (args.currentPhase === 'starting' || args.currentPhase === context.initialPhase || args.requestInstructions === true)))
+                return response;
+        }
+        else if (tool !== 'fraim_connect')
+            return response;
+        // Reuse authenticated connect policy only as the remote fallback. The
+        // ordinary resolver still checks every effective local/overlay source first.
+        const remoteFiles = new Map();
+        if (tool === 'fraim_connect') {
+            const prior = response.result.structuredContent?.ruleAssembly;
+            const block = Number.isInteger(prior?.contentBlockIndex) && prior.contentBlockIndex >= 0
+                ? response.result.content?.[prior.contentBlockIndex] : undefined;
+            const artifact = Array.isArray(prior?.artifacts) && prior.artifacts.length === 1 ? prior.artifacts[0] : undefined;
+            const prefix = '## Applicable rules\n\n### rules/constitution.md\n\n';
+            if (prior?.complete === true && prior.selection === 'connect' && prior.domain === 'global'
+                && Array.isArray(prior.warnings) && prior.warnings.length === 0
+                && artifact?.path === 'rules/constitution.md' && block?.type === 'text'
+                && typeof block.text === 'string' && block.text.startsWith(prefix)) {
+                const body = block.text.slice(prefix.length);
+                if ((0, crypto_1.createHash)('sha256').update(body).digest('hex') === artifact?.hash)
+                    remoteFiles.set(artifact.path, body);
+            }
+        }
+        const resolver = this.getRegistryResolver(sessionId, remoteFiles);
+        const result = (0, domain_rule_assembler_1.attachRuleAssembly)(response.result, await (0, domain_rule_assembler_1.assembleDomainRules)({ jobPath,
+            resolveFile: path => path === 'domains.json' && catalogRead ? catalogRead : resolver.resolveFile(path, { includeMetadata: false, stripMcpHeader: true }) }));
+        const metadata = result.structuredContent?.ruleAssembly;
+        for (const warning of metadata?.warnings ?? []) {
+            this.logError('Rule delivery warning: ' + JSON.stringify(warning));
+        }
+        return { ...response, result };
+    }
+    async finalizeLocalToolTextResponse(request, requestSessionId, requestId, text, catalogRead) {
         const response = {
             jsonrpc: '2.0',
             id: request.id,
@@ -1870,7 +1944,8 @@ class FraimLocalMCPServer {
                 content: [{ type: 'text', text }]
             }
         };
-        const withResolvedIncludes = await this.resolveIncludesInResponse(response, requestSessionId, requestId);
+        const withRules = await this.addRuleDelivery(request, response, requestSessionId, catalogRead);
+        const withResolvedIncludes = await this.resolveIncludesInResponse(withRules, requestSessionId, requestId);
         return this.processResponseWithHydration(withResolvedIncludes, requestSessionId);
     }
     rewriteProxyTokensInText(text) {
@@ -2015,7 +2090,7 @@ class FraimLocalMCPServer {
     /**
      * Initialize the LocalRegistryResolver for override resolution
      */
-    getRegistryResolver(requestSessionId) {
+    getRegistryResolver(requestSessionId, remoteFiles) {
         const projectRoot = this.findProjectRoot();
         this.log(`🔍 getRegistryResolver: projectRoot = ${projectRoot}`);
         // Determine effective FRAIM dir using shadow semantics
@@ -2042,6 +2117,8 @@ class FraimLocalMCPServer {
             orgCacheRoot: (0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot,
             shouldFilter: (content) => this.isStub(content),
             remoteContentResolver: async (path) => {
+                if (remoteFiles?.has(path))
+                    return remoteFiles.get(path);
                 // Fetch parent content from remote for inheritance
                 this.log(`🔄 Remote content resolver: fetching ${path}`);
                 this.log(`🔄 Fetching raw file content: ${path}`);
@@ -2820,8 +2897,9 @@ class FraimLocalMCPServer {
                                 responseText = `${mentor.getCompactPhaseAuthority()}\n\n${responseText}`;
                                 responseText += `\n\n---\n\n**Job ID:** \`${jobId}\`\n\n**This job has phases.** Use \`seekMentoring\` with the jobId above to get phase-specific instructions.`;
                             }
-                            responseText = await this.appendJobContext(responseText, name, requestSessionId, requestId);
-                            return await this.finalizeLocalToolTextResponse(request, requestSessionId, requestId, responseText);
+                            const catalogRead = (0, domain_rule_assembler_1.withRuleDeliveryTimeout)(this.getRegistryResolver(requestSessionId).resolveFile('domains.json', { includeMetadata: false }));
+                            responseText = await this.appendJobContext(responseText, name, requestSessionId, requestId, catalogRead);
+                            return await this.finalizeLocalToolTextResponse(request, requestSessionId, requestId, responseText, catalogRead);
                         }
                     }
                     catch (error) {
@@ -3150,6 +3228,11 @@ class FraimLocalMCPServer {
         }
         const toolName = request.params?.name;
         let args = request.params?.arguments || {};
+        if (toolName === 'seekMentoring' && args.status === 'starting' && args.requestInstructions === true) {
+            // A context read must not publish a phase-start event to execution projections.
+            this.mentoringResponseCache?.delete(request.id);
+            return;
+        }
         const requestSessionId = this.extractSessionIdFromRequest(request);
         if (toolName && requestSessionId) {
             const success = !response.error && !response.result?.isError;