fraim 2.0.261 → 2.0.263

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

@@ -230,15 +230,15 @@ const runSync = async (options) => {
         else if (outcome.status === 'absent') {
             console.log(chalk_1.default.yellow(`Org context not synced: ${outcome.error}`));
         }
-        // Issue #1043 round 2: the home is the only read location, so anything
-        // still sitting at the old standard path is invisible to FRAIM. Say so;
-        // silently orphaning a manager's work is worse than a noisy sync.
+        // Migrate stranded content from the legacy standard path to contentRoot,
+        // then report any files that still could not be moved.
         try {
-            const { findStrandedLegacyContent, resolvePackHome } = await Promise.resolve().then(() => __importStar(require('../utils/pack-home')));
+            const { migrateStrandedContent, findStrandedLegacyContent, resolvePackHome } = await Promise.resolve().then(() => __importStar(require('../utils/pack-home')));
+            migrateStrandedContent('org');
             const stranded = findStrandedLegacyContent('org');
             if (stranded.length > 0) {
                 const home = resolvePackHome('org');
-                console.log(chalk_1.default.yellow(`${stranded.length} org file(s) are not in your org home and are no longer read:`));
+                console.log(chalk_1.default.yellow(`${stranded.length} org file(s) could not be migrated to your org home and are no longer read:`));
                 for (const rel of stranded.slice(0, 10))
                     console.log(chalk_1.default.yellow(`  ${rel}`));
                 if (stranded.length > 10)
@@ -274,15 +274,15 @@ const runSync = async (options) => {
         else if (outcome.status === 'absent') {
             console.log(chalk_1.default.yellow(`Manager context not synced: ${outcome.error}`));
         }
-        // Issue #1043 round 2: the home is the only read location, so anything
-        // still sitting at the old standard path is invisible to FRAIM. Say so;
-        // silently orphaning a manager's work is worse than a noisy sync.
+        // Migrate stranded content from the legacy standard path to contentRoot,
+        // then report any files that still could not be moved.
         try {
-            const { findStrandedLegacyContent, resolvePackHome } = await Promise.resolve().then(() => __importStar(require('../utils/pack-home')));
+            const { migrateStrandedContent, findStrandedLegacyContent, resolvePackHome } = await Promise.resolve().then(() => __importStar(require('../utils/pack-home')));
+            migrateStrandedContent('manager');
             const stranded = findStrandedLegacyContent('manager');
             if (stranded.length > 0) {
                 const home = resolvePackHome('manager');
-                console.log(chalk_1.default.yellow(`${stranded.length} manager file(s) are not in your manager home and are no longer read:`));
+                console.log(chalk_1.default.yellow(`${stranded.length} manager file(s) could not be migrated to your manager home and are no longer read:`));
                 for (const rel of stranded.slice(0, 10))
                     console.log(chalk_1.default.yellow(`  ${rel}`));
                 if (stranded.length > 10)

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

@@ -224,6 +224,12 @@ async function syncManagerCache(options) {
             const clone = (0, pack_home_1.ensurePackClone)(managerStorage.gitUrl, home.root);
             if (clone.sha === null)
                 throw new Error(clone.offlineReason ?? 'Pack clone unavailable.');
+            // When a clone exists but the remote was unreachable, offlineReason is
+            // set and the SHA is the last cached value. Return stale so callers
+            // know the content is potentially out of date (R4.3).
+            if (clone.offlineReason) {
+                return failureOutcome(new Error(clone.offlineReason));
+            }
             const metadata = {
                 version: clone.sha,
                 backend: 'git',

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

@@ -275,6 +275,12 @@ async function syncOrgCache(options) {
             const clone = (0, pack_home_1.ensurePackClone)(organization.gitUrl, home.root);
             if (clone.sha === null)
                 throw new Error(clone.offlineReason ?? 'Pack clone unavailable.');
+            // When a clone exists but the remote was unreachable, offlineReason is
+            // set and the SHA is the last cached value. Return stale so callers
+            // know the content is potentially out of date (R4.3).
+            if (clone.offlineReason) {
+                return failureOutcome(new Error(clone.offlineReason));
+            }
             const metadata = {
                 version: clone.sha,
                 backend: 'git',

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

@@ -7,6 +7,7 @@ exports.packsDir = packsDir;
 exports.defaultCloneDir = defaultCloneDir;
 exports.resolvePackHome = resolvePackHome;
 exports.packReadRoots = packReadRoots;
+exports.migrateStrandedContent = migrateStrandedContent;
 exports.findStrandedLegacyContent = findStrandedLegacyContent;
 exports.gitUrlHasUserinfo = gitUrlHasUserinfo;
 exports.ensurePackClone = ensurePackClone;
@@ -172,6 +173,78 @@ function resolvePackHome(layer) {
 function packReadRoots(layer) {
     return [resolvePackHome(layer).contentRoot];
 }
+/**
+ * Auto-migrate content stranded at the legacy standard path to the configured
+ * contentRoot. Runs at most once per process per (layer + contentRoot) pair.
+ * Never throws: migration failures are silently skipped.
+ *
+ * Applies when a synced backend (local-folder, git, fraim-cloud) is configured
+ * and the legacy standard path differs from contentRoot. Each file is moved
+ * with renameSync; on a cross-device rename (e.g. ~/.fraim → OneDrive) it
+ * falls back to copyFileSync + unlinkSync. Files already present in contentRoot
+ * are never overwritten — contentRoot is always authoritative.
+ */
+const _migratedStrandedLayers = new Set();
+function migrateStrandedContent(layer) {
+    const home = resolvePackHome(layer);
+    const key = `${layer}:${home.contentRoot}`;
+    if (_migratedStrandedLayers.has(key))
+        return;
+    _migratedStrandedLayers.add(key);
+    const legacyContentRoot = home.legacyRoot ? path_1.default.join(home.legacyRoot, 'personalized-employee') : null;
+    if (!legacyContentRoot || legacyContentRoot === home.contentRoot)
+        return;
+    if (!fs_1.default.existsSync(legacyContentRoot))
+        return;
+    try {
+        const walk = (absDir, relDir) => {
+            let entries;
+            try {
+                entries = fs_1.default.readdirSync(absDir, { withFileTypes: true });
+            }
+            catch {
+                return;
+            }
+            for (const entry of entries) {
+                const rel = relDir ? `${relDir}/${entry.name}` : entry.name;
+                const src = path_1.default.join(absDir, entry.name);
+                const dst = path_1.default.join(home.contentRoot, rel);
+                if (entry.isDirectory()) {
+                    walk(src, rel);
+                    continue;
+                }
+                if (!entry.isFile())
+                    continue;
+                if (fs_1.default.existsSync(dst))
+                    continue;
+                try {
+                    fs_1.default.mkdirSync(path_1.default.dirname(dst), { recursive: true });
+                    fs_1.default.renameSync(src, dst);
+                }
+                catch {
+                    try {
+                        fs_1.default.copyFileSync(src, dst);
+                        fs_1.default.unlinkSync(src);
+                    }
+                    catch { /* leave source intact */ }
+                }
+            }
+        };
+        walk(legacyContentRoot, '');
+        // Clean up empty dirs left behind (best-effort).
+        for (const dir of ORG_CONTENT_DIRS) {
+            try {
+                fs_1.default.rmdirSync(path_1.default.join(legacyContentRoot, dir));
+            }
+            catch { /* not empty — fine */ }
+        }
+        try {
+            fs_1.default.rmdirSync(legacyContentRoot);
+        }
+        catch { /* not empty — fine */ }
+    }
+    catch { /* migration is best-effort; never fail a sync over it */ }
+}
 /**
  * Content sitting at the standard local path that the configured home does not
  * hold. Since the home is the single read location, this content is stranded:

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

@@ -72,11 +72,18 @@ function managerSecondaryLearningsBase() {
 function getLearningRoots(workspaceRoot) {
     const managerHome = (0, pack_home_1.resolvePackHome)('manager');
     const managerHomeBase = (0, path_1.join)(managerHome.contentRoot, 'learnings');
+    const managerCacheBase = managerSecondaryLearningsBase();
+    // Derive the display base from the actual cache path relative to ~/.fraim so
+    // the display string always matches the filesystem path (fixed by #1043r2).
+    const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
+    const managerCacheDisplayBase = managerCacheBase.startsWith(fraimDir)
+        ? (0, project_fraim_paths_1.getUserFraimDisplayPath)(managerCacheBase.slice(fraimDir.length).replace(/\\/g, '/').replace(/^\//, ''))
+        : managerCacheBase.replace(/\\/g, '/');
     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'),
+        managerCacheBase,
+        managerCacheDisplayBase,
         managerHomeBase,
         managerHomeDisplayBase: managerHomeBase.replace(/\\/g, '/'),
         repoLearningsBase: (0, project_fraim_paths_1.getWorkspaceLearningsDir)(workspaceRoot)
@@ -637,11 +644,20 @@ function resolveOrgContextFile(workspaceRoot, relativePath, orgCacheEligible = t
             }
         }
         if (!orgCacheEligible) {
-            const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').contentRoot, relativePath);
+            const managerHome = (0, pack_home_1.resolvePackHome)('manager');
+            const managerCachePath = (0, path_1.join)(managerHome.contentRoot, relativePath);
             if ((0, fs_1.existsSync)(managerCachePath)) {
+                // Derive the display path relative to ~/.fraim. For the standard
+                // single-machine backend contentRoot is ~/.fraim/personalized-employee
+                // so the display path is ~/.fraim/personalized-employee/... For a
+                // synced backend it may be elsewhere (e.g. ~/.fraim/packs/manager-repo).
+                const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
+                const relToFraim = managerCachePath.startsWith(fraimDir)
+                    ? managerCachePath.slice(fraimDir.length).replace(/\\/g, '/').replace(/^\//, '')
+                    : `personalized-employee/${relativePath}`;
                 return {
                     present: true,
-                    displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`manager/${relativePath}`)
+                    displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(relToFraim)
                 };
             }
         }
@@ -812,13 +828,18 @@ function resolveTeamContextFile(workspaceRoot, key) {
         }
     }
     if (key === 'manager' || key === 'managerRules') {
-        const managerCachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').contentRoot, relativePath);
+        const managerHome = (0, pack_home_1.resolvePackHome)('manager');
+        const managerCachePath = (0, path_1.join)(managerHome.contentRoot, relativePath);
         if ((0, fs_1.existsSync)(managerCachePath)) {
+            const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
+            const relToFraim = managerCachePath.startsWith(fraimDir)
+                ? managerCachePath.slice(fraimDir.length).replace(/\\/g, '/').replace(/^\//, '')
+                : `personalized-employee/${relativePath}`;
             return {
                 present: true,
                 readPath: managerCachePath,
                 writePath: '',
-                displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`manager/${relativePath}`),
+                displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(relToFraim),
                 scope,
                 managedByManagerSync: true
             };

package/package.json

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