fraim 2.0.362-next.4 → 2.0.362

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

@@ -2,6 +2,7 @@
 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.learningDomainsForWorkspace = learningDomainsForWorkspace;
 exports.getScoreThreshold = getScoreThreshold;
 exports.computeEffectiveScore = computeEffectiveScore;
 exports.getLearningInputHomes = getLearningInputHomes;
@@ -42,12 +43,14 @@ const brand_store_1 = require("../core/brand-store");
 // cache, which silently returned nothing once that cache stopped existing.
 const pack_home_2 = require("../cli/utils/pack-home");
 const learning_domains_1 = require("../config/learning-domains");
+const folders_1 = require("../../registry/scripts/domains/folders");
 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])];
+/** Stored names stay readable; local job folders extend current domains. */
+function storedLearningDomains(effectiveDomains = []) {
+    return [...new Set([...learning_domains_1.STORED_LEARNING_DOMAINS, ...effectiveDomains.filter(folders_1.isSafeDomainId)])];
+}
+function learningDomainsForWorkspace(workspaceRoot) {
+    return [...new Set([...learning_domains_1.LEARNING_DOMAINS, ...(0, folders_1.discoverJobDomains)((0, path_1.join)(workspaceRoot, 'registry'), (0, project_fraim_paths_1.getUserFraimDirPath)(), (0, path_1.join)((0, project_fraim_paths_1.getWorkspaceFraimDir)(workspaceRoot), 'personalized-employee'), (0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false }).contentRoot, (0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot)])];
 }
 const REPO_LEARNINGS_REL = (0, project_fraim_paths_1.getWorkspaceFraimDisplayPath)('personalized-employee/learnings').replace(/\/$/, '');
 /**
@@ -546,7 +549,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, effectiveCatalog) {
+function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJob, domain, effectiveDomains) {
     // 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
@@ -590,7 +593,7 @@ function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJo
                     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);
+                        selected = (0, entry_authoring_1.selectStoredLearningEntries)(content, storageDomain, activeDomain ?? 'global', includeGlobal, effectiveDomains);
                     else if (!includeGlobal)
                         continue;
                 }
@@ -619,7 +622,7 @@ function resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJo
             for (const key of cats.domain) {
                 if (sessionCats.includes(key))
                     push(domainFiles, key, tiersFor(CONTEXT_CATEGORIES[key].ft), 'global', false);
-                for (const storageDomain of storedLearningDomains(effectiveCatalog)) {
+                for (const storageDomain of storedLearningDomains(effectiveDomains)) {
                     push(domainFiles, key, tiersFor(CONTEXT_CATEGORIES[key].ft, storageDomain), storageDomain);
                 }
             }
@@ -630,10 +633,10 @@ 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, effectiveCatalog) {
+function buildLearningContextSection(workspaceRoot, userId, forJob, domain, effectiveDomains) {
     const roots = getLearningRoots(workspaceRoot);
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
-    const resolved = resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJob, domain, effectiveCatalog);
+    const resolved = resolveContextLearningFiles(workspaceRoot, resolvedUserId, roots, forJob, domain, effectiveDomains);
     const multiTier = resolved.multiTier;
     const toListed = (f) => ({
         displayPath: f.displayPath,
@@ -1068,7 +1071,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, effectiveCatalog) {
+function countPreservedLearnings(workspaceRoot, userId, effectiveDomains) {
     const roots = getLearningRoots(workspaceRoot);
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
     // Distinct entry titles across every level holding this company family, so a
@@ -1120,7 +1123,7 @@ function countPreservedLearnings(workspaceRoot, userId, effectiveCatalog) {
     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 storedLearningDomains(effectiveCatalog)) {
+    for (const domain of storedLearningDomains(effectiveDomains)) {
         for (const ft of ORG_TYPES)
             organization += countOrgFamily(`org-${domain}-${ft}.md`);
         for (const ft of PERSONAL_WORK_TYPES) {
@@ -1331,11 +1334,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, effectiveCatalog) {
+function listDomainLearningFiles(dir, prefix, fileType, effectiveDomains) {
     if (!(0, fs_1.existsSync)(dir))
         return [];
     const out = [];
-    for (const domain of storedLearningDomains(effectiveCatalog)) {
+    for (const domain of storedLearningDomains(effectiveDomains)) {
         const fileName = `${prefix}-${domain}-${fileType}.md`;
         if ((0, fs_1.existsSync)((0, path_1.join)(dir, fileName)))
             out.push({ fileName, domain });
@@ -1550,7 +1553,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', effectiveCatalog) {
+function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine', effectiveDomains) {
     const roots = getLearningRoots(workspaceRoot);
     const usageStats = resolveUsageStats();
     // Only the human library reads these observations. An unavailable store must
@@ -1599,8 +1602,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, effectiveCatalog).map((d) => ({ ...d, base: roots.repoLearningsBase })),
-                ...listDomainLearningFiles((0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings'), 'org', fileType, effectiveCatalog)
+                ...listDomainLearningFiles(roots.repoLearningsBase, 'org', fileType, effectiveDomains).map((d) => ({ ...d, base: roots.repoLearningsBase })),
+                ...listDomainLearningFiles((0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings'), 'org', fileType, effectiveDomains)
                     .map((d) => ({ ...d, base: (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings') })),
             ];
             const seenDomainFile = new Set();
@@ -1624,7 +1627,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', ...storedLearningDomains(effectiveCatalog)]) {
+        for (const domain of ['global', ...storedLearningDomains(effectiveDomains)]) {
             const domainPart = domain === 'global' ? '' : `-${domain}`;
             for (const storageTier of ['hot', 'cold']) {
                 const suffix = storageTier === 'cold' ? COLD_FILE_SUFFIX : '';
@@ -1641,39 +1644,39 @@ function isGlobalDomain(domain) {
     return !domain || domain === 'global';
 }
 /** Normalize a caller-supplied domain to one of the known domains, or 'global'. */
-function normalizeLearningDomain(domain, effectiveCatalog) {
+function normalizeLearningDomain(domain, effectiveDomains) {
     if (isGlobalDomain(domain))
         return 'global';
-    const found = storedLearningDomains(effectiveCatalog).find((d) => d === domain);
+    const found = storedLearningDomains(effectiveDomains).find((d) => d === domain);
     return found ?? 'global';
 }
-function learningFileName(userId, fileType, domain, effectiveCatalog) {
+function learningFileName(userId, fileType, domain, effectiveDomains) {
     // 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, effectiveCatalog);
+    const safe = normalizeLearningDomain(domain, effectiveDomains);
     return safe === 'global' ? `${userId}-${fileType}.md` : `${userId}-${safe}-${fileType}.md`;
 }
-function resolveLearningFilePath(workspaceRoot, userId, ref, effectiveCatalog) {
+function resolveLearningFilePath(workspaceRoot, userId, ref, effectiveDomains) {
     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_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', learningFileName('org', fileType, ref.domain, effectiveCatalog));
+        return (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', learningFileName('org', fileType, ref.domain, effectiveDomains));
     }
     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, effectiveCatalog));
+    return (0, path_1.join)(base, learningFileName(resolvedUserId, fileType, ref.domain, effectiveDomains));
 }
 function titleCaseFromFileType(fileType) {
     return fileType.split('-').map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(' ');
 }
-function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload, effectiveCatalog) {
-    const filePath = resolveLearningFilePath(workspaceRoot, userId, ref, effectiveCatalog);
+function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload, effectiveDomains) {
+    const filePath = resolveLearningFilePath(workspaceRoot, userId, ref, effectiveDomains);
     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/) : [];
@@ -1687,9 +1690,9 @@ function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload, e
     };
     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;
+        const version = 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.');
+            throw new Error('Cannot record a learning domain decision: check the stored provenance version.');
         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()));
@@ -1702,7 +1705,7 @@ function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload, e
         const sev = (payload.severity || 'P-MED');
         const title = (payload.title || '').trim() || 'Untitled learning';
         const suppliedLines = String(payload.body || '').trim().split(/\r?\n/);
-        const addDomain = normalizeLearningDomain(ref.domain, effectiveCatalog);
+        const addDomain = normalizeLearningDomain(ref.domain, effectiveDomains);
         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);
@@ -1755,7 +1758,7 @@ function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload, e
     }
     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);
+    const targetDomain = payload.targetDomain === undefined ? undefined : normalizeLearningDomain(payload.targetDomain, effectiveDomains);
     // 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;
@@ -1764,8 +1767,8 @@ function applyLearningEntryChange(workspaceRoot, userId, ref, action, payload, e
     // 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.
-    if (targetDomain !== undefined && targetDomain !== normalizeLearningDomain(ref.domain, effectiveCatalog)) {
-        const destPath = resolveLearningFilePath(workspaceRoot, userId, { ...ref, domain: targetDomain }, effectiveCatalog);
+    if (targetDomain !== undefined && targetDomain !== normalizeLearningDomain(ref.domain, effectiveDomains)) {
+        const destPath = resolveLearningFilePath(workspaceRoot, userId, { ...ref, domain: targetDomain }, effectiveDomains);
         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

@@ -81,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 catalog_1 = require("../../registry/scripts/domains/catalog");
+const folders_1 = require("../../registry/scripts/domains/folders");
 const skill_include_dedup_js_1 = require("./skill-include-dedup.js");
 const git_utils_1 = require("../core/utils/git-utils");
 /**
@@ -1820,7 +1820,7 @@ class FraimLocalMCPServer {
         // 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;
+            const connectedSessionId = response.result?._meta?.sessionId ?? response.result?.sessionId;
             if (typeof connectedSessionId === 'string' && connectedSessionId.trim())
                 requestSessionId = connectedSessionId;
         }
@@ -1903,13 +1903,11 @@ 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') {
-                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);
+                finalizedResponse.result.content[0].text = await this.appendJobContext(text, args.job, requestSessionId, requestId);
             }
             // 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).
@@ -1925,23 +1923,17 @@ class FraimLocalMCPServer {
                 }
             }
         }
-        finalizedResponse = await this.addRuleDelivery(request, finalizedResponse, requestSessionId, catalogRead);
+        finalizedResponse = await this.addRuleDelivery(request, finalizedResponse, requestSessionId);
         return this.processResponseWithHydration(finalizedResponse, requestSessionId);
     }
     /** Keep context delivery and offer attribution together for local and remote jobs. */
-    async appendJobContext(text, jobName, requestSessionId, requestId, catalogRead) {
+    async appendJobContext(text, jobName, requestSessionId, requestId) {
         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 jobDomain = effectiveCatalog ? await this.resolveJobDomainForJob(jobName, requestSessionId, effectiveCatalog) : null;
-        const learningSection = (0, learning_context_builder_js_1.buildLearningContextSection)(workspaceRoot, userEmail, true, jobDomain, effectiveCatalog);
+        const jobDomain = await this.resolveJobDomainForJob(jobName, requestSessionId);
+        const learningSection = (0, learning_context_builder_js_1.buildLearningContextSection)(workspaceRoot, userEmail, true, jobDomain, (0, learning_context_builder_js_1.learningDomainsForWorkspace)(workspaceRoot));
         const teamContextSection = (0, learning_context_builder_js_1.buildTeamContextSection)(workspaceRoot, true);
         if (learningSection || teamContextSection) {
             text += `\n\n---` + learningSection + teamContextSection;
@@ -1956,7 +1948,7 @@ class FraimLocalMCPServer {
      * context must never break a job response, and an unknown job never guesses a
      * wrong domain.
      */
-    async resolveJobDomainForJob(jobName, requestSessionId, effectiveCatalog) {
+    async resolveJobDomainForJob(jobName, requestSessionId) {
         try {
             const resolver = this.getRegistryResolver(requestSessionId);
             if (!resolver)
@@ -1964,9 +1956,7 @@ class FraimLocalMCPServer {
             const registryPath = await resolver.findRegistryPath('jobs', jobName);
             if (!registryPath)
                 return 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;
+            return (0, folders_1.jobDomainFromRegistryPath)(registryPath);
         }
         catch {
             return null;
@@ -2003,51 +1993,32 @@ class FraimLocalMCPServer {
         }
         return errors;
     }
-    async addRuleDelivery(request, response, sessionId, catalogRead) {
+    async addRuleDelivery(request, response, sessionId) {
         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') {
+            if (tool === 'seekMentoring' && !(args.status === 'starting' && args.requestInstructions === true))
+                return response;
             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 ?? []) {
+        const resolver = this.getRegistryResolver(sessionId);
+        const assembly = await (0, domain_rule_assembler_1.assembleDomainRules)({ jobPath,
+            resolveFile: path => resolver.resolveFile(path, { includeMetadata: false, stripMcpHeader: true }) });
+        const result = (0, domain_rule_assembler_1.appendRuleInstructions)(response.result, assembly);
+        for (const warning of assembly.metadata.warnings) {
             this.logError('Rule delivery warning: ' + JSON.stringify(warning));
         }
         return { ...response, result };
     }
-    async finalizeLocalToolTextResponse(request, requestSessionId, requestId, text, catalogRead) {
+    async finalizeLocalToolTextResponse(request, requestSessionId, requestId, text) {
         const response = {
             jsonrpc: '2.0',
             id: request.id,
@@ -2055,7 +2026,7 @@ class FraimLocalMCPServer {
                 content: [{ type: 'text', text }]
             }
         };
-        const withRules = await this.addRuleDelivery(request, response, requestSessionId, catalogRead);
+        const withRules = await this.addRuleDelivery(request, response, requestSessionId);
         const withResolvedIncludes = await this.resolveIncludesInResponse(withRules, requestSessionId, requestId);
         return this.processResponseWithHydration(withResolvedIncludes, requestSessionId);
     }
@@ -2201,7 +2172,7 @@ class FraimLocalMCPServer {
     /**
      * Initialize the LocalRegistryResolver for override resolution
      */
-    getRegistryResolver(requestSessionId, remoteFiles) {
+    getRegistryResolver(requestSessionId) {
         const projectRoot = this.findProjectRoot();
         this.log(`🔍 getRegistryResolver: projectRoot = ${projectRoot}`);
         // Determine effective FRAIM dir using shadow semantics
@@ -2228,8 +2199,6 @@ 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}`);
@@ -2988,7 +2957,7 @@ class FraimLocalMCPServer {
                         return acceptedResponse;
                     const acceptedReceipt = this.persistAcceptedReceipt(args, requestSessionId, tutoringResponse, request.id);
                     const phaseStartWarning = this.acceptPhaseTracking(args, requestSessionId, tutoringResponse.nextPhase, !!acceptedReceipt);
-                    acceptedResponse.result.structuredContent = { ...acceptedResponse.result.structuredContent,
+                    acceptedResponse.result._meta = { ...acceptedResponse.result._meta,
                         phaseAccepted: true, nextPhase: tutoringResponse.nextPhase, outcome: tutoringResponse.outcome,
                         workflowDigest: tutoringResponse.workflowDigest, ...(acceptedReceipt ? { acceptedReceipt } : {}) };
                     if (phaseStartWarning && acceptedResponse.result?.content?.[0]) {
@@ -3026,9 +2995,8 @@ 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.`;
                             }
-                            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);
+                            responseText = await this.appendJobContext(responseText, name, requestSessionId, requestId);
+                            return await this.finalizeLocalToolTextResponse(request, requestSessionId, requestId, responseText);
                         }
                     }
                     catch (error) {
@@ -3126,8 +3094,8 @@ class FraimLocalMCPServer {
         // Reconcile remote fallback against the same persisted local instance.
         // Only the remote's explicit accepted result can consume a start.
         if (toolName === 'seekMentoring' && !processedResponse.error && !processedResponse.result?.isError
-            && response.result?.structuredContent?.phaseAccepted === true) {
-            const metadata = response.result.structuredContent;
+            && response.result?._meta?.phaseAccepted === true) {
+            const metadata = response.result._meta;
             let acceptedReceipt;
             if (metadata.acceptedReceipt) {
                 const remote = metadata.acceptedReceipt;
@@ -3146,7 +3114,7 @@ class FraimLocalMCPServer {
                 catch (error) {
                     return { jsonrpc: '2.0', id: request.id, result: { isError: true, content: [{ type: 'text', text: `Phase acceptance failed: ${error.message}` }] } };
                 }
-                processedResponse.result.structuredContent = { ...processedResponse.result.structuredContent, ...(acceptedReceipt ? { acceptedReceipt } : {}) };
+                processedResponse.result._meta = { ...processedResponse.result._meta, ...(acceptedReceipt ? { acceptedReceipt } : {}) };
             }
             const textBlock = processedResponse.result?.content?.find((item) => item.type === 'text');
             if (textBlock) {
@@ -3385,7 +3353,7 @@ class FraimLocalMCPServer {
         const requestSessionId = this.extractSessionIdFromRequest(request);
         if (toolName && requestSessionId) {
             const success = !response.error && !response.result?.isError;
-            let acceptedPhaseResponse = success && response.result?.structuredContent?.phaseAccepted === true;
+            let acceptedPhaseResponse = success && response.result?._meta?.phaseAccepted === true;
             this.log(`📊 Collecting usage: ${toolName} (session: ${requestSessionId}, success: ${success})`);
             if (!this.repoInfo) {
                 this.detectRepoInfo();

package/dist/src/services/mcp-service.js

@@ -238,12 +238,12 @@ class McpService {
             case 'get_fraim_job':
                 if (!args.job)
                     throw new Error('Argument "job" is required for get_fraim_job');
-                return await this.handleGetJob(args.job, context.apiKey, context.userId);
+                return await this.handleGetJob(args.job, context.apiKey, context.userId, !!context.localMcpVersion && context.localMcpVersion !== 'unknown');
             case 'seekMentoring':
                 if (!args.jobName || !args.issueNumber || !args.currentPhase || !args.status) {
                     throw new Error('Arguments "jobName", "issueNumber", "currentPhase", and "status" are required for seekMentoring');
                 }
-                return await this.handleSeekMentoring(args, context.userId);
+                return await this.handleSeekMentoring(args, context.userId, !!context.localMcpVersion && context.localMcpVersion !== 'unknown');
             case 'list_fraim_jobs':
                 return await this.handleListJobs();
             case 'file_fraim_github_issue':
@@ -327,7 +327,7 @@ class McpService {
             throw new Error(`Failed to read file: ${error.message}`);
         }
     }
-    async handleGetJob(jobName, apiKey, userId) {
+    async handleGetJob(jobName, apiKey, userId, localProxy = false) {
         let effectiveUserId = userId;
         if (!effectiveUserId && apiKey) {
             try {
@@ -424,7 +424,7 @@ class McpService {
         }
         return this.addRuleDelivery({
             content: [{ type: 'text', text: response }]
-        }, jobName);
+        }, jobName, undefined, localProxy);
     }
     async handleListJobs() {
         const jobs = Array.from(this.registryService.getFileIndex().values()).filter((f) => f.type === 'job' && !f.isStub);
@@ -577,7 +577,7 @@ class McpService {
                     type: 'text',
                     text: lines.join('\n')
                 }],
-            structuredContent: {
+            _meta: {
                 sessionId,
                 userId: session.userId,
                 agent: session.agent,
@@ -585,7 +585,7 @@ class McpService {
                 repo: session.repo
             },
             sessionId: sessionId
-        });
+        }, undefined, undefined, isLocalProxyCall);
     }
     validateIssueTrackingConfig(issueTracking) {
         if (!issueTracking.provider) {
@@ -705,7 +705,7 @@ class McpService {
             }
         };
     }
-    async handleSeekMentoring(args, userId) {
+    async handleSeekMentoring(args, userId, localProxy = false) {
         const restoringInstructions = args.status === 'starting' && args.requestInstructions === true;
         const personaLock = await this.maybeBuildPersonaLockResponse(args.jobName, userId, undefined, args.status === 'starting' && !restoringInstructions);
         if (personaLock) {
@@ -900,8 +900,8 @@ class McpService {
                     type: 'text',
                     text: trackingWarning + phaseStartWarning + result.message
                 }],
-            structuredContent: { phaseAccepted: true, nextPhase: result.nextPhase, phaseStartWarning }
-        }, args.jobName, args);
+            _meta: { phaseAccepted: true, nextPhase: result.nextPhase, phaseStartWarning }
+        }, args.jobName, args, localProxy);
         if (!finalized.isError && !restoringInstructions && result.outcome && result.workflowDigest && sessionId) {
             // Remote-only execution has no trusted Hub binding. The executing local
             // proxy verifies this envelope and supplies its own launch binding.
@@ -912,25 +912,25 @@ class McpService {
                 executionEpoch: sessionId, phaseId: args.currentPhase, requestedStatus: args.status,
                 outcome: result.outcome.kind, ...(result.nextPhase ? { nextPhase: result.nextPhase } : {}), verifiedEvidenceRefs: [],
             };
-            finalized.structuredContent = { ...finalized.structuredContent, acceptedReceipt, outcome: result.outcome, workflowDigest: result.workflowDigest };
+            finalized._meta = { ...finalized._meta, acceptedReceipt, outcome: result.outcome, workflowDigest: result.workflowDigest };
         }
         return finalized;
     }
-    async addRuleDelivery(response, jobName, phaseArgs) {
-        if (response.isError || response.personaLock)
+    async addRuleDelivery(response, jobName, phaseArgs, localProxy = false) {
+        if (localProxy || response.isError || response.personaLock)
+            return response;
+        if (phaseArgs && !(phaseArgs.status === 'starting' && phaseArgs.requestInstructions === true))
             return response;
         const context = jobName ? await this.aiMentor.getRuleDeliveryContext(jobName) : null;
         if (jobName && !context)
             return response;
-        if (phaseArgs && !(phaseArgs.status === 'starting' && (phaseArgs.currentPhase === 'starting' || phaseArgs.currentPhase === context?.initialPhase || phaseArgs.requestInstructions === true)))
-            return response;
         const assembly = await (0, domain_rule_assembler_1.assembleDomainRules)({ jobPath: context?.jobPath, resolveFile: async (path) => {
                 const content = await this.registryService.getFile(path);
                 if (content === null)
                     throw new Error(`Rule source unavailable: ${path}`);
                 return { content, source: 'remote', personalized: false, inherited: false };
             } });
-        const result = (0, domain_rule_assembler_1.attachRuleAssembly)(response, assembly);
+        const result = (0, domain_rule_assembler_1.appendRuleInstructions)(response, assembly);
         for (const warning of assembly.metadata.warnings) {
             console.warn('Rule delivery warning:', JSON.stringify(warning));
         }

package/dist/src/services/registry-service.js

@@ -308,10 +308,6 @@ class RegistryService {
     }
     getSyncBundle() {
         const files = [];
-        const domainCatalog = (0, path_1.join)(this.registryPath, 'domains.json');
-        if ((0, fs_1.existsSync)(domainCatalog)) {
-            files.push({ path: 'domains.json', content: (0, fs_1.readFileSync)(domainCatalog, 'utf8'), type: 'config' });
-        }
         const allFiles = Array.from(this.fileIndex.values());
         // 1. Add job STUBS (not full jobs) from registry/stubs/jobs
         const jobStubs = allFiles.filter(f => f.type === 'job' && f.path.includes('stubs/jobs/'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.362-next.4",
+  "version": "2.0.362",
   "description": "FRAIM core CLI and MCP package.",
   "main": "index.js",
   "bin": {
@@ -9,8 +9,8 @@
   "files": [
     "dist/registry/scripts/artifact-paths.js",
     "dist/registry/scripts/learning-usage/local-runtime.js",
-    "dist/registry/domains.json",
-    "dist/registry/scripts/domains/catalog.js",
+    "dist/registry/stubs/jobs/",
+    "dist/registry/scripts/domains/folders.js",
     "dist/registry/scripts/learning/entry-format.js",
     "dist/registry/scripts/learning/completion-state.js",
     "dist/registry/scripts/learning/corpus-audit.js",