fraim 2.0.248 → 2.0.249

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

@@ -26,6 +26,10 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const project_fraim_paths_1 = require("../core/utils/project-fraim-paths");
 const brand_store_1 = require("../core/brand-store");
+// Issue #1043 round 2: org and manager content lives at one home named by
+// config. These reads used to hardcode the removed ~/.fraim/{org,manager}
+// 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 REPO_LEARNINGS_REL = (0, project_fraim_paths_1.getWorkspaceFraimDisplayPath)('personalized-employee/learnings').replace(/\/$/, '');
 const DEFAULT_THRESHOLD = 3.0;
@@ -48,11 +52,28 @@ exports.LEARNING_PRIORITIES = ['P-CRITICAL', 'P-HIGH', 'P-MED', 'P-LOW'];
 function learningEntryHeadingRegex(flags = '') {
     return new RegExp(`^#{2,}\\s+\\[(${exports.LEARNING_PRIORITIES.join('|')})\\]\\s*(.*)$`, flags);
 }
+/**
+ * The manager location that is NOT the portable authoring base.
+ *
+ * Issue #1043 round 2: when a synced backend is configured, the manager home is
+ * that backend location and it is a genuinely distinct place from the portable
+ * base. When nothing is synced, the home IS the portable base, so returning it
+ * here would list one file as two tiers and raise a bogus collision note. In
+ * that case return the historical path, which simply does not exist and
+ * therefore contributes no tier, matching the behavior before round 2.
+ */
+function managerSecondaryLearningsBase() {
+    const home = (0, pack_home_1.resolvePackHome)('manager');
+    if (home.synced)
+        return (0, path_1.join)(home.root, 'learnings');
+    // pack-home-exempt: deliberate historical secondary location, see above.
+    return (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'manager', 'learnings');
+}
 function getLearningRoots(workspaceRoot) {
     return {
         globalPersonalBase: (0, project_fraim_paths_1.getConfiguredPortableLearningsDir)(workspaceRoot),
         globalPersonalDisplayBase: (0, project_fraim_paths_1.getConfiguredPortableLearningsDisplayPath)(workspaceRoot),
-        managerCacheBase: (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'manager', 'learnings'),
+        managerCacheBase: managerSecondaryLearningsBase(),
         managerCacheDisplayBase: (0, project_fraim_paths_1.getUserFraimDisplayPath)('manager/learnings'),
         repoLearningsBase: (0, project_fraim_paths_1.getWorkspaceLearningsDir)(workspaceRoot)
     };
@@ -385,7 +406,7 @@ function resolveOrgLearningFile(repoLearningsBase, fileName) {
     if ((0, fs_1.existsSync)(repoPath)) {
         return { present: true, path: repoPath, displayPath: `${REPO_LEARNINGS_REL}/${fileName}` };
     }
-    const cachePath = (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org', 'learnings', fileName);
+    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').root, 'learnings', fileName);
     if ((0, fs_1.existsSync)(cachePath)) {
         return { present: true, path: cachePath, displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`org/learnings/${fileName}`) };
     }
@@ -398,7 +419,7 @@ function resolveOrgLearningFile(repoLearningsBase, fileName) {
  */
 function resolveOrgLearningFileTiers(repoLearningsBase, fileName) {
     const tiers = [];
-    const cachePath = (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org', 'learnings', fileName);
+    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').root, 'learnings', fileName);
     if ((0, fs_1.existsSync)(cachePath)) {
         tiers.push({
             level: 'org',
@@ -603,7 +624,7 @@ function resolveOrgContextFile(workspaceRoot, relativePath, orgCacheEligible = t
             };
         }
         if (orgCacheEligible) {
-            const cachePath = (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org', relativePath);
+            const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').root, relativePath);
             if ((0, fs_1.existsSync)(cachePath)) {
                 return {
                     present: true,
@@ -612,7 +633,7 @@ function resolveOrgContextFile(workspaceRoot, relativePath, orgCacheEligible = t
             }
         }
         if (!orgCacheEligible) {
-            const managerCachePath = (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'manager', relativePath);
+            const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').root, relativePath);
             if ((0, fs_1.existsSync)(managerCachePath)) {
                 return {
                     present: true,
@@ -774,7 +795,7 @@ function resolveTeamContextFile(workspaceRoot, key) {
     // destination (R5.1), so writePath stays empty and the caller must route
     // edits through the org backend's propose-and-approve flow.
     if (key === 'org' || key === 'orgRules') {
-        const cachePath = (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org', relativePath);
+        const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').root, relativePath);
         if ((0, fs_1.existsSync)(cachePath)) {
             return {
                 present: true,
@@ -787,7 +808,7 @@ function resolveTeamContextFile(workspaceRoot, key) {
         }
     }
     if (key === 'manager' || key === 'managerRules') {
-        const managerCachePath = (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'manager', relativePath);
+        const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').root, relativePath);
         if ((0, fs_1.existsSync)(managerCachePath)) {
             return {
                 present: true,
@@ -824,7 +845,7 @@ function resolveTeamContextFile(workspaceRoot, key) {
 function orgBrandCandidateDirs(workspaceRoot) {
     return [
         (0, path_1.join)((0, project_fraim_paths_1.getWorkspaceFraimDir)(workspaceRoot), 'personalized-employee', 'context'),
-        (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org', 'context'),
+        (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').root, 'context'),
         (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'personalized-employee', 'context'),
     ];
 }

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

@@ -60,6 +60,7 @@ const crypto_1 = require("crypto");
 const axios_1 = __importDefault(require("axios"));
 const provider_utils_1 = require("../core/utils/provider-utils");
 const object_utils_1 = require("../core/utils/object-utils");
+const pack_home_1 = require("../cli/utils/pack-home");
 const local_registry_resolver_1 = require("../core/utils/local-registry-resolver");
 const ai_mentor_1 = require("../core/ai-mentor");
 const quality_evidence_1 = require("../core/quality-evidence");
@@ -794,8 +795,8 @@ class FraimLocalMCPServer {
         if (this.orgCacheRefreshInFlight)
             return;
         this.orgCacheRefreshInFlight = true;
-        void Promise.resolve().then(() => __importStar(require('../cli/utils/org-pack-sync'))).then(async ({ getOrgCacheAgeHours, syncOrgCache }) => {
-            const ageHours = getOrgCacheAgeHours();
+        void Promise.resolve().then(() => __importStar(require('../cli/utils/org-pack-sync'))).then(async ({ getOrgSyncAgeHours, syncOrgCache }) => {
+            const ageHours = getOrgSyncAgeHours();
             if (ageHours !== null && ageHours < 24)
                 return;
             const outcome = await syncOrgCache();
@@ -820,8 +821,8 @@ class FraimLocalMCPServer {
         if (this.managerCacheRefreshInFlight)
             return;
         this.managerCacheRefreshInFlight = true;
-        void Promise.resolve().then(() => __importStar(require('../cli/utils/manager-pack-sync'))).then(async ({ getManagerCacheAgeHours, syncManagerCache }) => {
-            const ageHours = getManagerCacheAgeHours();
+        void Promise.resolve().then(() => __importStar(require('../cli/utils/manager-pack-sync'))).then(async ({ getManagerSyncAgeHours, syncManagerCache }) => {
+            const ageHours = getManagerSyncAgeHours();
             if (ageHours !== null && ageHours < 24)
                 return;
             const outcome = await syncManagerCache();
@@ -1588,6 +1589,10 @@ class FraimLocalMCPServer {
             // 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').root,
+                orgCacheRoot: (0, pack_home_1.resolvePackHome)('org').root,
                 remoteContentResolver: async (_path) => {
                     throw new Error('No project root available');
                 },
@@ -1604,6 +1609,9 @@ class FraimLocalMCPServer {
             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').root,
+                orgCacheRoot: (0, pack_home_1.resolvePackHome)('org').root,
                 shouldFilter: (content) => this.isStub(content),
                 remoteContentResolver: async (path) => {
                     // Fetch parent content from remote for inheritance

package/package.json

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