fraim 2.0.256 → 2.0.258

package/dist/src/cli/commands/sync.js

@@ -243,7 +243,7 @@ const runSync = async (options) => {
                     console.log(chalk_1.default.yellow(`  ${rel}`));
                 if (stranded.length > 10)
                     console.log(chalk_1.default.yellow(`  ...and ${stranded.length - 10} more`));
-                console.log(chalk_1.default.yellow(`Move them into ${home.root} to make them live again. Nothing was deleted.`));
+                console.log(chalk_1.default.yellow(`Move them into ${home.contentRoot} to make them live again. Nothing was deleted.`));
             }
         }
         catch { /* reporting must never fail a sync */ }
@@ -287,7 +287,7 @@ const runSync = async (options) => {
                     console.log(chalk_1.default.yellow(`  ${rel}`));
                 if (stranded.length > 10)
                     console.log(chalk_1.default.yellow(`  ...and ${stranded.length - 10} more`));
-                console.log(chalk_1.default.yellow(`Move them into ${home.root} to make them live again. Nothing was deleted.`));
+                console.log(chalk_1.default.yellow(`Move them into ${home.contentRoot} to make them live again. Nothing was deleted.`));
             }
         }
         catch { /* reporting must never fail a sync */ }

package/dist/src/cli/utils/manager-pack-sync.js

@@ -40,7 +40,7 @@ const MANAGER_PACK_DIRS = ['context', 'rules', 'learnings', 'jobs', 'skills', 't
  * point at, so this now resolves the one place the layer lives.
  */
 function getManagerHomeDir() {
-    return (0, pack_home_1.resolvePackHome)('manager').root;
+    return (0, pack_home_1.resolvePackHome)('manager').contentRoot;
 }
 /**
  * Where sync provenance is recorded.

package/dist/src/cli/utils/manager-publish.js

@@ -43,16 +43,18 @@ async function publishManagerArtifacts(artifacts, opts) {
         }
     }
     if (managerStorage.backend === 'local-folder') {
-        const localPath = managerStorage.localPath;
+        // Write into contentRoot (localPath/personalized-employee/) so the read
+        // side (packReadRoots -> contentRoot) sees the file immediately.
+        const contentRoot = (0, pack_home_1.resolvePackHome)('manager').contentRoot;
         const writtenPaths = [];
         for (const artifact of artifacts) {
-            const result = (0, local_folder_sync_1.writeLocalFolderFile)(localPath, artifact.relativePath, artifact.content);
+            const result = (0, local_folder_sync_1.writeLocalFolderFile)(contentRoot, artifact.relativePath, artifact.content);
             if (result.skipped) {
                 throw new Error(`Skipped writing '${artifact.relativePath}' to local folder: ${result.reason} Re-sync before publishing.`);
             }
-            writtenPaths.push(path_1.default.join(localPath, artifact.relativePath));
+            writtenPaths.push(path_1.default.join(contentRoot, artifact.relativePath));
         }
-        const deletedPaths = (0, local_folder_sync_1.removeLocalFolderFiles)(localPath, deletions, artifacts.map((a) => a.relativePath));
+        const deletedPaths = (0, local_folder_sync_1.removeLocalFolderFiles)(contentRoot, deletions, artifacts.map((a) => a.relativePath));
         return { backend: 'local-folder', writtenPaths, deletedPaths };
     }
     if (managerStorage.backend === 'fraim-cloud') {

package/dist/src/cli/utils/org-pack-sync.js

@@ -80,7 +80,7 @@ function isSafeOrgCapabilityPackPath(relativePath) {
  * point at, so this now resolves the one place the layer lives.
  */
 function getOrgHomeDir() {
-    return (0, pack_home_1.resolvePackHome)('org').root;
+    return (0, pack_home_1.resolvePackHome)('org').contentRoot;
 }
 /**
  * Where sync provenance is recorded.

package/dist/src/cli/utils/org-publish.js

@@ -78,16 +78,18 @@ async function publishOrgArtifacts(artifacts, opts) {
             throw new Error(`Invalid org-pack deletion path '${rel}'.`);
     }
     if (organization.backend === 'local-folder') {
-        const localPath = organization.localPath;
+        // Write into contentRoot (localPath/personalized-employee/) so the read
+        // side (packReadRoots -> contentRoot) sees the file immediately.
+        const contentRoot = (0, pack_home_1.resolvePackHome)('org').contentRoot;
         const writtenPaths = [];
         for (const a of artifacts) {
-            const result = (0, local_folder_sync_1.writeLocalFolderFile)(localPath, a.relativePath, a.content);
+            const result = (0, local_folder_sync_1.writeLocalFolderFile)(contentRoot, a.relativePath, a.content);
             if (result.skipped) {
                 throw new Error(`Skipped writing '${a.relativePath}' to local folder: ${result.reason} Re-sync before publishing.`);
             }
-            writtenPaths.push(path_1.default.join(localPath, a.relativePath));
+            writtenPaths.push(path_1.default.join(contentRoot, a.relativePath));
         }
-        const deletedPaths = (0, local_folder_sync_1.removeLocalFolderFiles)(localPath, deletions, artifacts.map((a) => a.relativePath));
+        const deletedPaths = (0, local_folder_sync_1.removeLocalFolderFiles)(contentRoot, deletions, artifacts.map((a) => a.relativePath));
         return { backend: 'local-folder', writtenPaths, deletedPaths };
     }
     if (organization.backend === 'fraim-cloud') {

package/dist/src/cli/utils/pack-home.js

@@ -50,18 +50,52 @@ function packsDir() {
     return path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'packs');
 }
 /**
- * The standard local home, used when the layer is not synced anywhere.
+ * The standard local home root (the pack repo root), used when the layer is not
+ * synced anywhere.
  *
- * Both layers keep their historical paths so existing machines need no
- * migration. Inventing a new location here would orphan content that is
- * already on disk: `~/.fraim/org/` has always been where org content lives,
- * and `~/.fraim/personalized-employee/` is where a manager authors.
+ * For manager: `~/.fraim/` — capability content lives at
+ * `~/.fraim/personalized-employee/`, matching the project-level layout exactly.
+ * The historical on-disk path (`~/.fraim/personalized-employee/{stuff}`) is
+ * preserved via `contentRoot = join(root, 'personalized-employee')`.
+ *
+ * For org: `~/.fraim/org/` — capability content lives at
+ * `~/.fraim/org/personalized-employee/`. New installs land here automatically;
+ * existing installs with flat content at `~/.fraim/org/{stuff}` are migrated by
+ * `migrateOrgFlatContent`.
  */
 function standardHome(layer) {
     if (layer === 'manager')
-        return path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'personalized-employee');
+        return (0, project_fraim_paths_1.getUserFraimDirPath)();
     return path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org');
 }
+/**
+ * Auto-migrate flat org content (pre-#1070 layout: `~/.fraim/org/{stuff}`)
+ * to the uniform subdir layout (`~/.fraim/org/personalized-employee/{stuff}`).
+ * Runs at most once per process per orgRoot path (guarded by a Set).
+ * Never throws: migration failures are silently skipped.
+ */
+const _migratedOrgRoots = new Set();
+const ORG_CONTENT_DIRS = ['context', 'rules', 'learnings', 'jobs', 'skills', 'templates', 'employees'];
+function migrateOrgFlatContent(orgRoot) {
+    if (_migratedOrgRoots.has(orgRoot))
+        return;
+    _migratedOrgRoots.add(orgRoot);
+    const dest = path_1.default.join(orgRoot, 'personalized-employee');
+    try {
+        for (const dir of ORG_CONTENT_DIRS) {
+            const src = path_1.default.join(orgRoot, dir);
+            if (!fs_1.default.existsSync(src))
+                continue;
+            // Skip if already under personalized-employee.
+            const destDir = path_1.default.join(dest, dir);
+            if (fs_1.default.existsSync(destDir))
+                continue;
+            fs_1.default.mkdirSync(dest, { recursive: true });
+            fs_1.default.renameSync(src, destDir);
+        }
+    }
+    catch { /* migration is best-effort; never fail a read over it */ }
+}
 /**
  * Where the cloud backend materializes. Also the historical path for each
  * layer, so switching to or from `fraim-cloud` does not relocate anything.
@@ -81,57 +115,52 @@ function defaultCloneDir(layer) {
 function resolvePackHome(layer) {
     const config = (0, user_config_1.getLayerBackend)(layer);
     const standard = standardHome(layer);
+    const make = (root, extra) => {
+        if (layer === 'org')
+            migrateOrgFlatContent(root);
+        return { layer, root, contentRoot: path_1.default.join(root, 'personalized-employee'), ...extra };
+    };
     if (!config || config.backend === 'single-machine') {
-        return {
-            layer,
+        return make(standard, {
             backend: config?.backend ?? 'single-machine',
-            root: standard,
             synced: false,
             requiresPublish: false,
-        };
+        });
     }
     if (config.backend === 'local-folder' && config.localPath) {
-        return {
-            layer,
+        return make(absolutize(config.localPath), {
             backend: 'local-folder',
-            root: absolutize(config.localPath),
             synced: true,
             // The sync client replicates the write; there is nothing further to do.
             requiresPublish: false,
             legacyRoot: standard,
-        };
+        });
     }
     if (config.backend === 'git' && config.gitUrl) {
-        return {
-            layer,
+        return make(config.localPath ? absolutize(config.localPath) : defaultCloneDir(layer), {
             backend: 'git',
-            root: config.localPath ? absolutize(config.localPath) : defaultCloneDir(layer),
             synced: true,
             requiresPublish: true,
             gitUrl: config.gitUrl,
             legacyRoot: standard,
-        };
+        });
     }
     if (config.backend === 'fraim-cloud') {
-        return {
-            layer,
+        return make(cloudHome(layer), {
             backend: 'fraim-cloud',
-            root: cloudHome(layer),
             synced: true,
             requiresPublish: true,
             legacyRoot: standard,
-        };
+        });
     }
     // A backend named but missing its required pointer (git without gitUrl,
     // local-folder without localPath). Fall back to the standard home rather
     // than inventing a location.
-    return {
-        layer,
+    return make(standard, {
         backend: config.backend,
-        root: standard,
         synced: false,
         requiresPublish: false,
-    };
+    });
 }
 /**
  * Where to read this layer from. Exactly one directory: the home.
@@ -141,7 +170,7 @@ function resolvePackHome(layer) {
  * entry again, the single-place invariant has been lost.
  */
 function packReadRoots(layer) {
-    return [resolvePackHome(layer).root];
+    return [resolvePackHome(layer).contentRoot];
 }
 /**
  * Content sitting at the standard local path that the configured home does not
@@ -155,9 +184,12 @@ function packReadRoots(layer) {
  */
 function findStrandedLegacyContent(layer) {
     const home = resolvePackHome(layer);
-    if (!home.legacyRoot || home.legacyRoot === home.root)
+    // legacyRoot is the old standard home root; stranded content is content that
+    // exists at the old location but not in the new contentRoot.
+    const legacyContentRoot = home.legacyRoot ? path_1.default.join(home.legacyRoot, 'personalized-employee') : null;
+    if (!legacyContentRoot || legacyContentRoot === home.contentRoot)
         return [];
-    if (!fs_1.default.existsSync(home.legacyRoot))
+    if (!fs_1.default.existsSync(legacyContentRoot))
         return [];
     const stranded = [];
     const walk = (absDir, relDir) => {
@@ -173,11 +205,11 @@ function findStrandedLegacyContent(layer) {
             const abs = path_1.default.join(absDir, entry.name);
             if (entry.isDirectory())
                 walk(abs, rel);
-            else if (entry.isFile() && !fs_1.default.existsSync(path_1.default.join(home.root, rel)))
+            else if (entry.isFile() && !fs_1.default.existsSync(path_1.default.join(home.contentRoot, rel)))
                 stranded.push(rel);
         }
     };
-    walk(home.legacyRoot, '');
+    walk(legacyContentRoot, '');
     return stranded.sort();
 }
 const ALLOWED_GIT_URL = /^(https?:\/\/|ssh:\/\/|git:\/\/|file:\/\/|[\w.-]+@[\w.-]+:)/;

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

@@ -53,12 +53,13 @@ class LocalRegistryResolver {
         this.remoteContentResolver = options.remoteContentResolver;
         this.parser = new inheritance_parser_1.InheritanceParser(options.maxDepth);
         this.shouldFilter = options.shouldFilter;
-        // Issue #1002: default the manager's writable home to ~/.fraim/personalized-employee/
+        // Issue #1002: default the manager's writable home to the configured contentRoot.
+        // contentRoot = join(resolvePackHome('manager').root, 'personalized-employee') for all backends.
         this.managerLocalRoot = options.managerLocalRoot ?? (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'personalized-employee');
-        // Issue #869: default manager cache root to ~/.fraim/manager/
-        this.managerCacheRoot = options.managerCacheRoot ?? (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'manager');
-        // Issue #869 Phase 2: default org cache root to ~/.fraim/org/
-        this.orgCacheRoot = options.orgCacheRoot ?? (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org');
+        // Issue #869 / #1070: default overlay roots to contentRoot (not the pack git root).
+        this.managerCacheRoot = options.managerCacheRoot ?? (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'personalized-employee');
+        // Issue #869 Phase 2 / #1070: org contentRoot = ~/.fraim/org/personalized-employee/
+        this.orgCacheRoot = options.orgCacheRoot ?? (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'org', 'personalized-employee');
     }
     /**
      * Get a path within the effective FRAIM directory.

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

@@ -65,16 +65,20 @@ function learningEntryHeadingRegex(flags = '') {
 function managerSecondaryLearningsBase() {
     const home = (0, pack_home_1.resolvePackHome)('manager');
     if (home.synced)
-        return (0, path_1.join)(home.root, 'learnings');
+        return (0, path_1.join)(home.contentRoot, '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) {
+    const managerHome = (0, pack_home_1.resolvePackHome)('manager');
+    const managerHomeBase = (0, path_1.join)(managerHome.contentRoot, 'learnings');
     return {
         globalPersonalBase: (0, project_fraim_paths_1.getConfiguredPortableLearningsDir)(workspaceRoot),
         globalPersonalDisplayBase: (0, project_fraim_paths_1.getConfiguredPortableLearningsDisplayPath)(workspaceRoot),
         managerCacheBase: managerSecondaryLearningsBase(),
         managerCacheDisplayBase: (0, project_fraim_paths_1.getUserFraimDisplayPath)('manager/learnings'),
+        managerHomeBase,
+        managerHomeDisplayBase: managerHomeBase.replace(/\\/g, '/'),
         repoLearningsBase: (0, project_fraim_paths_1.getWorkspaceLearningsDir)(workspaceRoot)
     };
 }
@@ -406,7 +410,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, pack_home_1.resolvePackHome)('org').root, 'learnings', fileName);
+    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings', fileName);
     if ((0, fs_1.existsSync)(cachePath)) {
         return { present: true, path: cachePath, displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`org/learnings/${fileName}`) };
     }
@@ -419,7 +423,7 @@ function resolveOrgLearningFile(repoLearningsBase, fileName) {
  */
 function resolveOrgLearningFileTiers(repoLearningsBase, fileName) {
     const tiers = [];
-    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').root, 'learnings', fileName);
+    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings', fileName);
     if ((0, fs_1.existsSync)(cachePath)) {
         tiers.push({
             level: 'org',
@@ -624,7 +628,7 @@ function resolveOrgContextFile(workspaceRoot, relativePath, orgCacheEligible = t
             };
         }
         if (orgCacheEligible) {
-            const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').root, relativePath);
+            const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, relativePath);
             if ((0, fs_1.existsSync)(cachePath)) {
                 return {
                     present: true,
@@ -633,7 +637,7 @@ function resolveOrgContextFile(workspaceRoot, relativePath, orgCacheEligible = t
             }
         }
         if (!orgCacheEligible) {
-            const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').root, relativePath);
+            const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').contentRoot, relativePath);
             if ((0, fs_1.existsSync)(managerCachePath)) {
                 return {
                     present: true,
@@ -795,7 +799,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, pack_home_1.resolvePackHome)('org').root, relativePath);
+        const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, relativePath);
         if ((0, fs_1.existsSync)(cachePath)) {
             return {
                 present: true,
@@ -808,7 +812,7 @@ function resolveTeamContextFile(workspaceRoot, key) {
         }
     }
     if (key === 'manager' || key === 'managerRules') {
-        const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').root, relativePath);
+        const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').contentRoot, relativePath);
         if ((0, fs_1.existsSync)(managerCachePath)) {
             return {
                 present: true,
@@ -845,7 +849,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, pack_home_1.resolvePackHome)('org').root, 'context'),
+        (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'context'),
         (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'personalized-employee', 'context'),
     ];
 }
@@ -1224,7 +1228,9 @@ function parseLearningEntries(filePath, displayPath, category, level, domain = '
 }
 function levelDir(roots, level) {
     if (level === 'machine') {
-        return { dir: roots.globalPersonalBase, displayBase: roots.globalPersonalDisplayBase.replace(/\/$/, '') };
+        // Issue #1070: use the configured manager home, not the portable authoring base.
+        // For single-machine backends managerHomeBase == globalPersonalBase (no change).
+        return { dir: roots.managerHomeBase, displayBase: roots.managerHomeDisplayBase.replace(/\/$/, '') };
     }
     return { dir: roots.repoLearningsBase, displayBase: REPO_LEARNINGS_REL };
 }
@@ -1268,7 +1274,8 @@ function resolveLearningFilePath(workspaceRoot, userId, ref) {
     if (ref.scope === 'org')
         return (0, path_1.join)(roots.repoLearningsBase, `org-${fileType}.md`);
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
-    const base = ref.level === 'project' ? roots.repoLearningsBase : roots.globalPersonalBase;
+    // 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, `${resolvedUserId}-${fileType}.md`);
 }
 function titleCaseFromFileType(fileType) {

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

@@ -1591,8 +1591,8 @@ class FraimLocalMCPServer {
                 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,
+                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');
                 },
@@ -1610,8 +1610,8 @@ class FraimLocalMCPServer {
                 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,
+                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
@@ -2234,11 +2234,10 @@ class FraimLocalMCPServer {
                         // from every project, so omitting it here made it invisible in the
                         // one place the manager looks to find out what their employee can do.
                         // Lowest precedence first, so a project job of the same name wins.
-                        const { getUserFraimDirPath } = require('../core/utils/project-fraim-paths');
-                        const userFraimDir = getUserFraimDirPath();
+                        const { resolvePackHome: _resolvePackHome } = require('../cli/utils/pack-home');
+                        const managerJobsDir = (0, path_1.join)(_resolvePackHome('manager').contentRoot, 'jobs');
                         const jobDirsByLevel = [
-                            { dir: (0, path_1.join)(userFraimDir, 'manager', 'jobs'), level: 'manager' },
-                            { dir: (0, path_1.join)(userFraimDir, 'personalized-employee', 'jobs'), level: 'manager' },
+                            { dir: managerJobsDir, level: 'manager' },
                             ...(projectRoot
                                 ? [{ dir: (0, path_1.join)(projectRoot, 'fraim', 'personalized-employee', 'jobs'), level: 'project' }]
                                 : []),

package/package.json

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