fraim 2.0.359-next.0 → 2.0.359-next.2

package/dist/src/config/persona-capability-bundles.js

@@ -90,7 +90,7 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
         personaKey: 'gautam',
         bundleId: 'persona-gautam-core',
         catalogMetadata: buildCatalogMetadata('gautam', ['analyze-revenue-system', 'build-gtm-motion', 'domain-registration-research']),
-        protectedJobs: ['marketing-strategy-definition', 'product-launch-management', 'evangelist-content-development', 'funnel-analysis', 'growth-loop-design', 'analyze-revenue-system', 'design-gtm-system', 'build-gtm-motion', 'build-gtm-stack', 'plan-gtm-team', 'marketing-content-creation', 'ppc-campaign-management', 'paid-social-strategy', 'ad-performance-analysis', 'tracking-and-attribution-setup', 'developer-advocacy', 'seo-strategy', 'marketing-analytics-review', 'linkedin-company-page-setup', 'x-account-setup', 'domain-registration-research', 'social-engagement-campaign', 'thought-leadership-engagement', 'promo-video-creation', 'linkedin-carousel-from-deck', 'notebooklm-content-generation'],
+        protectedJobs: ['marketing-strategy-definition', 'product-launch-management', 'evangelist-content-development', 'funnel-analysis', 'growth-loop-design', 'analyze-revenue-system', 'design-gtm-system', 'build-gtm-motion', 'build-gtm-stack', 'plan-gtm-team', 'marketing-content-creation', 'ppc-campaign-management', 'paid-social-strategy', 'ad-performance-analysis', 'tracking-and-attribution-setup', 'developer-advocacy', 'seo-strategy', 'aeo-strategy', 'marketing-analytics-review', 'linkedin-company-page-setup', 'x-account-setup', 'domain-registration-research', 'social-engagement-campaign', 'thought-leadership-engagement', 'promo-video-creation', 'linkedin-carousel-from-deck', 'notebooklm-content-generation'],
         protectedAliases: ['gtm', 'marketing'],
         defaultHireMode: 'job',
         lockCopy: 'Hire GauTaM to unlock go-to-market and paid media work for this request.'
@@ -278,6 +278,7 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
         catalogMetadata: buildCatalogMetadata('aida', ['create-ai-agent', 'author-ai-evals', 'enable-web-mcp']),
         protectedJobs: [
             'create-ai-agent',
+            'aeo-optimization',
             'author-ai-evals',
             'enable-web-mcp',
             'evaluate-ai-agent',
@@ -287,7 +288,7 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
         ],
         protectedAliases: ['ai-engineering', 'agent-engineering', 'ai-agents'],
         defaultHireMode: 'job',
-        lockCopy: 'Hire AIDa to unlock AI agent design, MCP enablement, eval authoring, and agent evaluation work for this request.'
+        lockCopy: 'Hire AIDa to unlock AI agent design, MCP enablement, evals, and answer-engine optimization for this request.'
     }
 };
 const PROTECTED_JOB_TO_PERSONA = new Map();

package/dist/src/config/persona-hiring.js

@@ -24,7 +24,7 @@ exports.PERSONA_HIRE_CATALOG = {
         role: 'AI Developer',
         emoji: '\u{1F9E0}',
         gradient: 'linear-gradient(135deg, #4f46e5 0%, #06b6d4 50%, #10b981 100%)',
-        blurb: 'Designs production AI agents, connects them to tools and data, and proves their behavior with evals before deployment.',
+        blurb: 'Builds and evaluates production AI agents, connects tools and data, and implements tested answer-engine optimization for websites.',
         jobPriceCents: 1290, // placeholder — product owner approval required before launch
         fulltimePriceCents: 5990, // placeholder — product owner approval required before launch
     },
@@ -96,7 +96,7 @@ exports.PERSONA_HIRE_CATALOG = {
         role: 'GTM & Marketing Manager',
         emoji: '📣',
         gradient: 'linear-gradient(135deg, #f97316 0%, #f59e0b 100%)',
-        blurb: 'Defines marketing strategy, ships content, runs launches, and owns the brand voice in market.',
+        blurb: 'Defines marketing and answer-engine visibility strategy, ships content, runs launches, and owns the brand voice in market.',
         jobPriceCents: 890,
         fulltimePriceCents: 4990,
     },

package/dist/src/core/utils/inheritance-parser.js

@@ -115,7 +115,7 @@ class InheritanceParser {
                     // Fetch parent content
                     let parentContent;
                     try {
-                        parentContent = await options.fetchParent(sanitizedExtends);
+                        parentContent = await options.fetchParent(sanitizedExtends, currentPath);
                     }
                     catch (error) {
                         throw new InheritanceError(`Failed to fetch extended parent content: ${sanitizedExtends}. ${error.message}`, sanitizedExtends);
@@ -151,7 +151,7 @@ class InheritanceParser {
             // Fetch parent content
             let parentContent;
             try {
-                parentContent = await options.fetchParent(sanitized);
+                parentContent = await options.fetchParent(sanitized, currentPath);
             }
             catch (error) {
                 throw new InheritanceError(`Failed to fetch parent content: ${sanitized}. ${error.message}`, sanitized);
@@ -249,11 +249,21 @@ class InheritanceParser {
      */
     parse(content) {
         const imports = this.extractImports(content);
-        const hasExtends = /^---\r?\n[\s\S]*?"extends":\s*"[^"]+"[\s\S]*?\r?\n---/m.test(content);
+        const metadataMatch = content.match(/^---\r?\n([\s\S]+?)\r?\n---/);
+        if (metadataMatch) {
+            try {
+                const parent = JSON.parse(metadataMatch[1]).extends;
+                if (typeof parent === 'string' && parent && !imports.includes(parent))
+                    imports.unshift(parent);
+            }
+            catch {
+                // Invalid/non-JSON frontmatter has no executable extends directive.
+            }
+        }
         return {
             content,
             imports,
-            hasImports: imports.length > 0 || hasExtends
+            hasImports: imports.length > 0
         };
     }
     normalizeImportRef(path) {

package/dist/src/core/utils/local-registry-resolver.js

@@ -102,7 +102,7 @@ class LocalRegistryResolver {
      * Returns '{type}/{category}/{name}.md' or '{type}/{name}.md'.
      */
     async findRegistryPath(type, name) {
-        const baseName = `${name}.md`;
+        const baseName = `${name.split(/[\\/]/).pop()}.md`;
         const searchDirs = [type];
         for (const dir of searchDirs) {
             // Check literal path first
@@ -126,7 +126,9 @@ class LocalRegistryResolver {
                 ...(type !== 'skills' ? [this.getSyncedCatalogRoot('ai-manager', dir)] : []),
             ];
             for (const root of searchRoots) {
-                const found = this.searchFileRecursively(root, baseName);
+                const namedPath = (0, path_1.join)(root, `${name}.md`);
+                const contained = (0, path_1.resolve)(namedPath).startsWith((0, path_1.resolve)(root) + path_1.sep);
+                const found = contained && (0, fs_1.existsSync)(namedPath) ? namedPath : this.searchFileRecursively(root, baseName);
                 if (!found)
                     continue;
                 const syncedRole = ['ai-employee', 'ai-manager'].find(role => root === this.getSyncedCatalogRoot(role, dir));
@@ -415,7 +417,7 @@ class LocalRegistryResolver {
     /**
      * Resolve inheritance in local override content
      */
-    async resolveInheritance(content, currentPath) {
+    async resolveInheritance(content, currentPath, personalized = true) {
         // Check if content has imports
         const parseResult = this.parser.parse(content);
         if (!parseResult.hasImports) {
@@ -423,13 +425,14 @@ class LocalRegistryResolver {
         }
         // Resolve inheritance
         try {
+            const personalizedPaths = new Set(personalized ? [this.normalizeRegistryPath(currentPath)] : []);
             const resolved = await this.parser.resolve(content, currentPath, {
-                fetchParent: async (path) => {
+                fetchParent: async (path, requestingPath = currentPath) => {
                     const normalized = this.normalizeRegistryPath(path);
-                    const normalizedCurrent = this.normalizeRegistryPath(currentPath);
+                    const normalizedCurrent = this.normalizeRegistryPath(requestingPath);
                     // If the import points back to the current file, skip local resolution and fetch
                     // from the next layer (remote/global) instead.
-                    if (this.areEquivalentRegistryPaths(normalized, normalizedCurrent)) {
+                    if (personalizedPaths.has(normalizedCurrent) && this.areEquivalentRegistryPaths(normalized, normalizedCurrent)) {
                         return this.fetchRemoteWithFallback(normalizedCurrent, normalized);
                     }
                     // Otherwise, resolve through the normal local-first path.
@@ -449,17 +452,21 @@ class LocalRegistryResolver {
                                 }
                             }
                         }
-                        const res = await this.resolveFile(targetPath, {
+                        // Fetch the selected layer's raw parent. The parser owns recursion,
+                        // including its visited set and depth limit; restarting resolveFile
+                        // here loses both guards for multi-file inheritance cycles.
+                        const res = await this.resolveFileInternal(targetPath, {
                             includeMetadata: false,
                             stripMcpHeader: true
-                        });
+                        }, false);
+                        if (res.personalized)
+                            personalizedPaths.add(normalized);
                         return res.content;
                     }
                     catch (error) {
                         throw error;
                     }
-                },
-                maxDepth: 5
+                }
             });
             return {
                 content: resolved,
@@ -497,8 +504,25 @@ class LocalRegistryResolver {
      * @returns Resolved file with metadata
      */
     async resolveFile(path, options = {}) {
+        return this.resolveFileInternal(path, options, true);
+    }
+    async resolveFileInternal(path, options, applyInheritance) {
         const includeMetadata = options.includeMetadata ?? true;
         const stripMcpHeader = options.stripMcpHeader ?? false;
+        const resolveContent = (content, personalized = true) => applyInheritance
+            ? this.resolveInheritance(content, path, personalized)
+            : Promise.resolve({ content, imports: [] });
+        const baselineResult = async (rawContent, source) => {
+            const content = stripMcpHeader ? this.stripMcpHeader(rawContent) : rawContent;
+            const resolved = await resolveContent(content, false);
+            return {
+                content: resolved.content,
+                source,
+                personalized: false,
+                inherited: resolved.imports.length > 0,
+                imports: resolved.imports.length > 0 ? resolved.imports : undefined
+            };
+        };
         // Check for local override
         if (!this.hasLocalOverride(path)) {
             // Issue #1002: the manager's writable home (precedence 2 — above the
@@ -509,7 +533,7 @@ class LocalRegistryResolver {
                 // Issue #1867: apply inheritance so an extends-based override merges with its parent.
                 let resolvedManagerLocal;
                 try {
-                    resolvedManagerLocal = await this.resolveInheritance(managerLocalContent, path);
+                    resolvedManagerLocal = await resolveContent(managerLocalContent);
                 }
                 catch {
                     resolvedManagerLocal = { content: managerLocalContent, imports: [] };
@@ -529,7 +553,7 @@ class LocalRegistryResolver {
                 // Issue #1867: apply inheritance so an extends-based override merges with its parent.
                 let resolvedManagerOverlay;
                 try {
-                    resolvedManagerOverlay = await this.resolveInheritance(managerOverlayContent, path);
+                    resolvedManagerOverlay = await resolveContent(managerOverlayContent);
                 }
                 catch {
                     resolvedManagerOverlay = { content: managerOverlayContent, imports: [] };
@@ -549,7 +573,7 @@ class LocalRegistryResolver {
                 // Issue #1867: apply inheritance so an extends-based override merges with its parent.
                 let resolvedOrgOverlay;
                 try {
-                    resolvedOrgOverlay = await this.resolveInheritance(orgOverlayContent, path);
+                    resolvedOrgOverlay = await resolveContent(orgOverlayContent);
                 }
                 catch {
                     resolvedOrgOverlay = { content: orgOverlayContent, imports: [] };
@@ -566,32 +590,16 @@ class LocalRegistryResolver {
             const syncedLocalContent = this.readSyncedLocalFile(path);
             if (syncedLocalContent !== null) {
                 // Synced machine baseline, not personalized.
-                return {
-                    content: syncedLocalContent,
-                    source: 'local',
-                    personalized: false,
-                    inherited: false
-                };
+                return baselineResult(syncedLocalContent, 'local');
             }
             const workspaceRegistryContent = this.readWorkspaceRegistryFile(path);
             if (workspaceRegistryContent !== null) {
-                return {
-                    content: workspaceRegistryContent,
-                    source: 'local',
-                    personalized: false,
-                    inherited: false
-                };
+                return baselineResult(workspaceRegistryContent, 'local');
             }
             // No useful override or synced content, fetch from remote
             try {
                 const rawContent = await this.fetchRemoteWithFallback(path);
-                const content = stripMcpHeader ? this.stripMcpHeader(rawContent) : rawContent;
-                return {
-                    content,
-                    source: 'remote',
-                    personalized: false,
-                    inherited: false
-                };
+                return await baselineResult(rawContent, 'remote');
             }
             catch (error) {
                 throw new Error(`Failed to fetch from remote: ${path}. ${error.message}`);
@@ -610,28 +618,16 @@ class LocalRegistryResolver {
             // If local read fails, fall back to remote
             console.warn(`Local override read failed, falling back to remote: ${path}`);
             const rawContent = await this.fetchRemoteWithFallback(path);
-            const content = stripMcpHeader ? this.stripMcpHeader(rawContent) : rawContent;
-            return {
-                content,
-                source: 'remote',
-                personalized: false,
-                inherited: false
-            };
+            return baselineResult(rawContent, 'remote');
         }
         // Resolve inheritance
         let resolved;
         try {
-            resolved = await this.resolveInheritance(localContent, path);
+            resolved = await resolveContent(localContent);
         }
         catch (error) {
             const rawContent = await this.fetchRemoteWithFallback(path);
-            const content = stripMcpHeader ? this.stripMcpHeader(rawContent) : rawContent;
-            return {
-                content,
-                source: 'remote',
-                personalized: false,
-                inherited: false
-            };
+            return baselineResult(rawContent, 'remote');
         }
         // Build result — a local override hit means this came from the
         // personalized-employee layer (the manager taught/customized it).

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

@@ -9,6 +9,7 @@ const path_1 = require("path");
 const crypto_1 = __importDefault(require("crypto"));
 const stub_generator_1 = require("../core/utils/stub-generator");
 const job_parser_1 = require("../core/utils/job-parser");
+const inheritance_parser_1 = require("../core/utils/inheritance-parser");
 const pack_home_1 = require("../cli/utils/pack-home");
 class RegistryService {
     constructor() {
@@ -600,18 +601,38 @@ class RegistryService {
         if (!metadata)
             return null;
         try {
-            return (0, fs_1.readFileSync)(metadata.fullPath, 'utf8');
+            return await this.resolveContent(metadata);
         }
-        catch (e) {
+        catch (error) {
+            if (error instanceof inheritance_parser_1.InheritanceError)
+                throw error;
             return null;
         }
     }
+    /** Resolve shipped inheritance before parsing jobs or expanding includes. */
+    async resolveContent(metadata) {
+        const content = (0, fs_1.readFileSync)(metadata.fullPath, 'utf8');
+        const parser = new inheritance_parser_1.InheritanceParser();
+        if (!parser.parse(content).hasImports)
+            return content;
+        return parser.resolve(content, metadata.path, {
+            fetchParent: async (parentPath) => {
+                const parent = this.findFileByPath(parentPath);
+                if (!parent)
+                    throw new Error(`Inherited registry file not found: ${parentPath}`);
+                // Leave recursion to InheritanceParser so cycles and depth are
+                // checked across the entire chain, rather than per fetch.
+                return (0, fs_1.readFileSync)(parent.fullPath, 'utf8');
+            }
+        });
+    }
     async getJob(name) {
         const allMatches = Array.from(this.fileIndex.values()).filter(f => f.name === name && f.type === 'job');
         if (allMatches.length === 0)
             return null;
         const metadata = allMatches.find(f => !f.isStub) || allMatches[0];
-        const def = job_parser_1.JobParser.parse(metadata.fullPath);
+        const content = await this.resolveContent(metadata);
+        const def = job_parser_1.JobParser.parseContent(content, name, metadata.fullPath);
         if (def && !def.metadata.type) {
             def.metadata.type = 'job';
         }

package/package.json

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