fraim-hub 2.0.256 → 2.0.258

package/dist/src/ai-hub/custom-employees.js

@@ -32,7 +32,7 @@ function layerEmployeeReadDirs(layer) {
 }
 /** The single writable employees directory for a layer. */
 function layerEmployeeWriteDir(layer) {
-    return path_1.default.join((0, pack_home_1.resolvePackHome)(layer).root, EMPLOYEES_SUBDIR);
+    return path_1.default.join((0, pack_home_1.resolvePackHome)(layer).contentRoot, EMPLOYEES_SUBDIR);
 }
 function readEmployeesFromDir(dir, scope) {
     if (!fs_1.default.existsSync(dir))

package/dist/src/ai-hub/hosts.js

@@ -35,6 +35,7 @@ const managed_agent_paths_1 = require("../cli/utils/managed-agent-paths");
 const mcp_config_generator_1 = require("../cli/setup/mcp-config-generator");
 const agent_token_prices_1 = require("../local-mcp-server/agent-token-prices");
 const configured_agents_1 = require("./configured-agents");
+const pack_home_1 = require("../cli/utils/pack-home");
 // Parse a single line of host stdout looking for a seekMentoring tool-use
 // signal. Returns null if the line does not contain one. Supports both
 // hosts FRAIM ships against today:
@@ -1084,10 +1085,10 @@ function transformHeadlessFraimMessage(message, kind) {
 }
 function machineLevelStorageGuard(jobId) {
     const normalized = jobId.toLowerCase();
-    const userFraim = path_1.default.join(os_1.default.homedir(), '.fraim');
     if (normalized === 'manager-agreements') {
-        const managerContext = path_1.default.join(userFraim, 'personalized-employee', 'context', 'manager_context.md');
-        const managerRules = path_1.default.join(userFraim, 'personalized-employee', 'rules', 'manager_rules.md');
+        const managerContentRoot = (0, pack_home_1.resolvePackHome)('manager').contentRoot;
+        const managerContext = path_1.default.join(managerContentRoot, 'context', 'manager_context.md');
+        const managerRules = path_1.default.join(managerContentRoot, 'rules', 'manager_rules.md');
         return [
             'Storage scope guardrail:',
             '- Manager agreements artifacts are machine-level, not repo-level.',

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.256",
+  "version": "2.0.258",
   "description": "FRAIM Hub local companion package.",
   "bin": {
     "fraim-hub": "bin/fraim-hub.js",
@@ -163,7 +163,7 @@
     "electron": "^41.2.2",
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
-    "fraim": "2.0.256",
+    "fraim": "2.0.258",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/script.js

@@ -15276,6 +15276,31 @@ function openInlineCreateEmployee(options) {
   roleField.appendChild(roleInput);
   body.appendChild(roleField);
 
+  // Scope picker — Issue #1067: let the manager choose where the employee lives.
+  const scopeField = document.createElement('div');
+  scopeField.className = 'ipe-card-field';
+  const scopeLabel = document.createElement('div');
+  scopeLabel.className = 'ipe-card-label';
+  scopeLabel.textContent = 'Visibility';
+  const scopeSelect = document.createElement('select');
+  scopeSelect.name = 'scope';
+  scopeSelect.setAttribute('aria-label', 'Employee visibility');
+  const scopeOptions = [
+    { value: 'project', label: 'This project' },
+    { value: 'manager', label: 'Yours (all projects)' },
+    { value: 'org', label: 'Everyone' },
+  ];
+  for (const opt of scopeOptions) {
+    const el = document.createElement('option');
+    el.value = opt.value;
+    el.textContent = opt.label;
+    scopeSelect.appendChild(el);
+  }
+  scopeSelect.value = (isEdit && editEmployee.scope) ? editEmployee.scope : 'project';
+  scopeField.appendChild(scopeLabel);
+  scopeField.appendChild(scopeSelect);
+  body.appendChild(scopeField);
+
   // Job picker — searchable list matching the command palette style.
   const selectedJobIds = new Set(isEdit && Array.isArray(editEmployee.jobIds) ? editEmployee.jobIds : []);
   const jobsField = document.createElement('div');
@@ -15392,6 +15417,7 @@ function openInlineCreateEmployee(options) {
         role: roleInput.value.trim() || undefined,
         icon: { kind: 'generated', value: displayName },
         jobIds: pickedJobIds,
+        scope: scopeSelect.value || 'project',
       };
       const resp = await fetch(isEdit
         ? '/api/ai-hub/custom-employees/' + encodeURIComponent(editEmployee.key)
@@ -15459,4 +15485,7 @@ if (typeof window !== 'undefined') {
   // Issue #866 R4: let the suite drive the same onboarding-settled refresh the
   // poll paths call, to assert the project view refreshes live without a restart.
   window.onProjectOnboardingSettled = onProjectOnboardingSettled;
+  // Issue #1067: let the suite trigger the create-employee form so scope picker
+  // tests can assert the rendered controls without depending on click coordinates.
+  window.openInlineCreateEmployee = openInlineCreateEmployee;
 }