fraim 2.0.348 → 2.0.349

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

@@ -50,6 +50,7 @@ class LocalRegistryResolver {
     constructor(options) {
         this.workspaceRoot = options.workspaceRoot;
         this.effectiveFraimDir = options.effectiveFraimDir;
+        this.userLevelOnly = options.userLevelOnly ?? false;
         this.remoteContentResolver = options.remoteContentResolver;
         this.parser = new inheritance_parser_1.InheritanceParser(options.maxDepth);
         this.shouldFilter = options.shouldFilter;
@@ -87,7 +88,14 @@ class LocalRegistryResolver {
      * Check if a local override exists for the given path
      */
     hasLocalOverride(path) {
-        return (0, fs_1.existsSync)(this.getOverridePath(path));
+        return !this.userLevelOnly && (0, fs_1.existsSync)(this.getOverridePath(path));
+    }
+    /** Whether an effective personalized layer should replace a remote baseline response. */
+    hasPersonalizedOverride(path) {
+        return this.hasLocalOverride(path)
+            || this.readManagerLocalOverlayFile(path) !== null
+            || this.readManagerOverlayFile(path) !== null
+            || this.readOrgOverlayFile(path) !== null;
     }
     /**
      * Find the actual relative path for a registry item by searching subdirectories.
@@ -108,11 +116,11 @@ class LocalRegistryResolver {
             // `jobs/<category>/<name>.md`, so the job was reported not found even
             // though the file existed.
             const searchRoots = [
-                this.getFraimPath('personalized-employee', dir),
+                ...(!this.userLevelOnly ? [this.getFraimPath('personalized-employee', dir)] : []),
                 (0, path_1.join)(this.managerLocalRoot, dir),
                 (0, path_1.join)(this.managerCacheRoot, dir),
                 (0, path_1.join)(this.orgCacheRoot, dir),
-                (0, path_1.join)(this.workspaceRoot, 'registry', dir),
+                ...(!this.userLevelOnly ? [(0, path_1.join)(this.workspaceRoot, 'registry', dir)] : []),
                 // Installed projects discover categorized capabilities in machine catalogs.
                 this.getSyncedCatalogRoot('ai-employee', dir),
                 ...(type !== 'skills' ? [this.getSyncedCatalogRoot('ai-manager', dir)] : []),
@@ -326,6 +334,8 @@ class LocalRegistryResolver {
         }
     }
     readWorkspaceRegistryFile(path) {
+        if (this.userLevelOnly)
+            return null;
         const normalizedPath = path.replace(/\\/g, '/').replace(/^\/+/, '');
         const registryRoot = (0, path_1.join)(this.workspaceRoot, 'registry');
         const registryPath = (0, path_1.join)(registryRoot, ...normalizedPath.split('/'));

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

@@ -1535,6 +1535,7 @@ function readRejectedProposals(workspaceRoot, userId) {
         return [];
     const out = [];
     const seen = new Set();
+    const projectOwnerPath = (0, owner_identity_1.ownerPath)((0, project_fraim_paths_1.getWorkspaceFraimDir)(workspaceRoot));
     const headingRe = /^## (Rejected|Superseded): (.+)$/m;
     const reasonRe = /^Reason: (.+)$/m;
     const revisitRe = /^Revisit when: (.+)$/m;
@@ -1567,7 +1568,9 @@ function readRejectedProposals(workspaceRoot, userId) {
             let proposal = {};
             if (json) {
                 try {
-                    proposal = JSON.parse(json[1]);
+                    const parsed = JSON.parse(json[1]);
+                    if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
+                        proposal = parsed;
                 }
                 catch {
                     // Keep the human-readable half; the JSON only enriches it.
@@ -1576,12 +1579,24 @@ function readRejectedProposals(workspaceRoot, userId) {
             const decision = (proposal.decision || {});
             const content = (proposal.content || {});
             const trace = (content.trace || {});
+            let targetOwner;
+            try {
+                const owner = proposal.target?.owner;
+                (0, owner_identity_1.validateOwner)(owner);
+                targetOwner = { level: owner.level, path: owner.path };
+            }
+            catch {
+                // Older/damaged targets remain visible as unknown; never infer
+                // their project from the shared history file's location.
+            }
+            if (targetOwner?.level === 'Project' && targetOwner.path !== projectOwnerPath)
+                continue;
             const claimKey = typeof proposal.claimKey === 'string' && proposal.claimKey
                 ? proposal.claimKey
                 : parts[1] || heading[2];
             // The same claim can appear in more than one configured base. The first
             // base supplies display metadata for that same recorded decision.
-            const key = `${claimKey}:${String(decision.at || '')}`;
+            const key = JSON.stringify([claimKey, String(decision.at || ''), targetOwner?.level, targetOwner?.path]);
             if (seen.has(key))
                 continue;
             seen.add(key);
@@ -1596,6 +1611,7 @@ function readRejectedProposals(workspaceRoot, userId) {
                 rejectedAt: typeof decision.at === 'string' ? decision.at : '',
                 ...(typeof trace.recurrences === 'number' ? { recurrencesAtRejection: trace.recurrences } : {}),
                 displayPath,
+                ...(targetOwner ? { targetOwner } : {}),
             });
         }
     }

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

@@ -1657,8 +1657,7 @@ class FraimLocalMCPServer {
         if (request.method !== 'tools/call' || typeof toolName !== 'string') {
             return this.processResponseWithHydration(response, requestSessionId);
         }
-        const projectRoot = this.findProjectRoot();
-        const resolver = projectRoot ? this.getRegistryResolver(requestSessionId) : null;
+        const resolver = this.getRegistryResolver(requestSessionId);
         let finalizedResponse = response;
         // 1. Resolve top-level override if this tool maps to a specific file.
         if (resolver) {
@@ -1670,14 +1669,14 @@ class FraimLocalMCPServer {
             else if (toolName === 'get_fraim_job')
                 registryPath = await resolver.findRegistryPath('jobs', args.job);
             if (registryPath) {
-                const localOverride = resolver.hasLocalOverride(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) {
                     try {
-                        // personalized-employee/ takes priority; when remote fails, resolver falls back to synced/cached content
+                        // Every configured personalized layer takes priority over the remote baseline.
                         const resolved = await resolver.resolveFile(registryPath).catch(() => null);
                         if (resolved?.content) {
                             const newResponse = {
@@ -1990,75 +1989,60 @@ class FraimLocalMCPServer {
         const { getEffectiveFraimDir } = require('../core/utils/project-fraim-paths');
         const effectiveFraimDir = projectRoot
             ? getEffectiveFraimDir(projectRoot)
-            : getEffectiveFraimDir(process.cwd());
+            : (0, project_fraim_paths_1.getUserFraimDirPath)();
         if (effectiveFraimDir) {
             this.log(`📂 Effective FRAIM dir: ${effectiveFraimDir}`);
         }
-        if (!projectRoot && !effectiveFraimDir) {
-            this.log('⚠️ No project root or user-level FRAIM found, override resolution disabled');
-            // Return a resolver that always falls back to remote
-            return new local_registry_resolver_1.LocalRegistryResolver({
-                workspaceRoot: process.cwd(),
-                // Issue #1043 round 2: overlay roots are the layers' homes. There is no
-                // separate cache to point at any more.
-                managerCacheRoot: (0, pack_home_1.resolvePackHome)('manager').contentRoot,
-                orgCacheRoot: (0, pack_home_1.resolvePackHome)('org').contentRoot,
-                remoteContentResolver: async (_path) => {
-                    throw new Error('No project root available');
-                },
-                shouldFilter: (content) => this.isStub(content)
-            });
-        }
-        else {
-            // Determine if we need effectiveFraimDir override.
-            // If the effective dir is user-level (~/.fraim/), it's NOT under projectRoot/fraim/,
-            // so we pass it as effectiveFraimDir to bypass the getWorkspaceFraimPath logic.
-            const workspaceRoot = projectRoot || process.cwd();
-            const projectFraimDir = projectRoot ? (0, path_1.join)(projectRoot, 'fraim') : '';
-            const needsEffectiveDirOverride = effectiveFraimDir && effectiveFraimDir !== projectFraimDir;
-            return new local_registry_resolver_1.LocalRegistryResolver({
-                workspaceRoot,
-                ...(needsEffectiveDirOverride ? { effectiveFraimDir } : {}),
-                // Issue #1043 round 2: overlay roots are the layers' homes.
-                managerCacheRoot: (0, pack_home_1.resolvePackHome)('manager').contentRoot,
-                orgCacheRoot: (0, pack_home_1.resolvePackHome)('org').contentRoot,
-                shouldFilter: (content) => this.isStub(content),
-                remoteContentResolver: async (path) => {
-                    // Fetch parent content from remote for inheritance
-                    this.log(`🔄 Remote content resolver: fetching ${path}`);
-                    this.log(`🔄 Fetching raw file content: ${path}`);
-                    const request = {
-                        jsonrpc: '2.0',
-                        id: (0, crypto_1.randomUUID)(),
-                        method: 'tools/call',
-                        params: {
-                            name: 'get_fraim_file',
-                            arguments: {
-                                path,
-                                raw: true
-                            }
+        // Determine if we need effectiveFraimDir override.
+        // If the effective dir is user-level (~/.fraim/), it's NOT under projectRoot/fraim/,
+        // so we pass it as effectiveFraimDir to bypass the getWorkspaceFraimPath logic.
+        const workspaceRoot = projectRoot || (0, project_fraim_paths_1.getUserFraimDirPath)();
+        const projectFraimDir = projectRoot ? (0, path_1.join)(projectRoot, 'fraim') : '';
+        const needsEffectiveDirOverride = effectiveFraimDir && effectiveFraimDir !== projectFraimDir;
+        return new local_registry_resolver_1.LocalRegistryResolver({
+            workspaceRoot,
+            userLevelOnly: !projectRoot,
+            ...(needsEffectiveDirOverride ? { effectiveFraimDir } : {}),
+            // Issue #1043 round 2: overlay roots are the layers' homes.
+            managerLocalRoot: (0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false }).contentRoot,
+            managerCacheRoot: (0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false }).contentRoot,
+            orgCacheRoot: (0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot,
+            shouldFilter: (content) => this.isStub(content),
+            remoteContentResolver: async (path) => {
+                // Fetch parent content from remote for inheritance
+                this.log(`🔄 Remote content resolver: fetching ${path}`);
+                this.log(`🔄 Fetching raw file content: ${path}`);
+                const request = {
+                    jsonrpc: '2.0',
+                    id: (0, crypto_1.randomUUID)(),
+                    method: 'tools/call',
+                    params: {
+                        name: 'get_fraim_file',
+                        arguments: {
+                            path,
+                            raw: true
                         }
-                    };
-                    this.applyRequestSessionId(request, requestSessionId);
-                    const response = await this._doProxyToRemote(request);
-                    if (response.error) {
-                        this.logError(`❌ Remote content resolver failed: ${response.error.message}`);
-                        throw new Error(`Failed to fetch parent: ${response.error.message}`);
                     }
-                    // Extract content from MCP response format
-                    if (response.result?.content && Array.isArray(response.result.content)) {
-                        const textContent = response.result.content.find((c) => c.type === 'text');
-                        if (textContent?.text) {
-                            this.log(`✅ Remote content resolver: fetched ${textContent.text.length} chars`);
-                            return textContent.text;
-                        }
+                };
+                this.applyRequestSessionId(request, requestSessionId);
+                const response = await this._doProxyToRemote(request);
+                if (response.error) {
+                    this.logError(`❌ Remote content resolver failed: ${response.error.message}`);
+                    throw new Error(`Failed to fetch parent: ${response.error.message}`);
+                }
+                // Extract content from MCP response format
+                if (response.result?.content && Array.isArray(response.result.content)) {
+                    const textContent = response.result.content.find((c) => c.type === 'text');
+                    if (textContent?.text) {
+                        this.log(`✅ Remote content resolver: fetched ${textContent.text.length} chars`);
+                        return textContent.text;
                     }
-                    this.logError(`❌ Remote content resolver: no content in response for ${path}`);
-                    this.logError(`Response: ${JSON.stringify(response, null, 2)}`);
-                    throw new Error(`No content in remote response for ${path}`);
                 }
-            });
-        }
+                this.logError(`❌ Remote content resolver: no content in response for ${path}`);
+                this.logError(`Response: ${JSON.stringify(response, null, 2)}`);
+                throw new Error(`No content in remote response for ${path}`);
+            }
+        });
     }
     /**
      * Check if content is a "stub" indicating local version should be ignored.

package/dist/src/mcp/tool-schemas.js

@@ -201,6 +201,7 @@ Example:
             description: `Get a specific skill, rule, or reference file from the FRAIM registry by path.
 
 For running FRAIM jobs, use get_fraim_job instead — do NOT call get_fraim_file for job execution.
+For read-only diagnosis or delivery verification, use get_fraim_file({ path: "jobs/<category>/<job>.md", raw: true }). This does not start a job; the local proxy resolves effective overrides, inheritance, includes, and template values.
 
 Examples:
 - get_fraim_file({ path: "skills/communication/active-listening.md" })
@@ -226,7 +227,7 @@ Examples:
             name: 'get_fraim_job',
             description: `Execute a named FRAIM job after explicit FRAIM activation. Call this tool whenever the user asks to run, start, or execute a named FRAIM job. Returns phased instructions — follow each phase and call seekMentoring to advance phases.
 
-Do NOT use get_fraim_file to load job content. Always use get_fraim_job for job execution.
+Use this tool to start job execution, not to inspect candidate jobs. Read-only inspection uses get_fraim_file with the catalog job path and raw: true.
 
 Examples:
 - get_fraim_job({ job: "feature-specification" })

package/package.json

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