fraim 2.0.360 → 2.0.361-next.1

package/dist/src/cli/utils/win32-cmd-spawn.js

@@ -1,10 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.quoteWindowsArgument = quoteWindowsArgument;
 exports.spawnViaCmdExe = spawnViaCmdExe;
 exports.buildCmdExeArgs = buildCmdExeArgs;
 const child_process_1 = require("child_process");
-function quoteCmdToken(s) {
-    return /[\s"&|<>^]/.test(s) ? `"${s.replace(/"/g, '""')}"` : s;
+function escapeCmd(value) { return value.replace(/([()\][%!^"`<>&|;, *?])/g, '^$1'); }
+/** Quote one argument for the Windows native CRT command-line decoder. */
+function quoteWindowsArgument(value) {
+    return `"${value.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/g, '$1$1')}"`;
+}
+/** Preserve native argv across both parsing passes of a CMD %* forwarding shim. */
+function forwardingCmdArgument(value, passes = 2) {
+    if (/^[a-zA-Z0-9_./:=+\-]+$/.test(value))
+        return value;
+    let quoted = '"';
+    let slashes = 0;
+    for (const character of value) {
+        if (character === '\\') {
+            slashes++;
+            continue;
+        }
+        quoted += '\\'.repeat(character === '"' ? slashes * 2 + 1 : slashes) + character;
+        slashes = 0;
+    }
+    quoted += '\\'.repeat(slashes * 2) + '"';
+    return passes === 1 ? escapeCmd(quoted) : escapeCmd(escapeCmd(quoted));
 }
 /**
  * Spawn a command through cmd.exe on Windows so .cmd shims resolve correctly.
@@ -12,12 +32,8 @@ function quoteCmdToken(s) {
  * containing spaces are not double-escaped by Node's CreateProcess call.
  */
 function spawnViaCmdExe(command, args, options) {
-    const comSpec = process.env.ComSpec || 'cmd.exe';
-    const tokens = [command, ...args].map(quoteCmdToken);
-    const innerCmd = tokens.join(' ');
-    const needsOuterQuote = /[\s"&|<>^]/.test(command);
-    const cmdString = needsOuterQuote ? `"${innerCmd}"` : innerCmd;
-    return (0, child_process_1.spawnSync)(comSpec, ['/d', '/s', '/c', cmdString], {
+    const invocation = buildCmdExeArgs(command, args);
+    return (0, child_process_1.spawnSync)(invocation.command, invocation.args, {
         ...options,
         windowsHide: true,
         windowsVerbatimArguments: true,
@@ -28,12 +44,9 @@ function spawnViaCmdExe(command, args, options) {
  * Returns the command, args, and a verbatim flag to set windowsVerbatimArguments: true.
  */
 function buildCmdExeArgs(command, args) {
-    const tokens = [command, ...args].map(quoteCmdToken);
-    const innerCmd = tokens.join(' ');
-    const needsOuterQuote = /[\s"&|<>^]/.test(command);
     return {
         command: process.env.ComSpec || 'cmd.exe',
-        args: ['/d', '/s', '/c', needsOuterQuote ? `"${innerCmd}"` : innerCmd],
+        args: ['/d', '/v:off', '/s', '/c', `"${[escapeCmd(command), ...args.map(arg => forwardingCmdArgument(arg, /\.(exe|com)$/i.test(command) ? 1 : 2))].join(' ')}"`],
         verbatim: true,
     };
 }

package/dist/src/first-run/server.js

@@ -143,6 +143,7 @@ class FirstRunServer {
         this.registerRoutes();
     }
     async start(port) {
+        this.sessionService.resumePendingOperations();
         await new Promise((resolve, reject) => {
             this.httpServer = this.app.listen(port, '127.0.0.1');
             this.httpServer.once('listening', () => resolve());
@@ -153,6 +154,7 @@ class FirstRunServer {
         await this.finishPromise;
     }
     async stop() {
+        this.sessionService.cancelPendingOperations();
         if (!this.httpServer) {
             return;
         }
@@ -274,13 +276,13 @@ class FirstRunServer {
                 return res.status(500).json({ error: error instanceof Error ? error.message : 'Could not trigger login.' });
             }
         });
-        this.app.post('/api/first-run/check-agent', (req, res) => {
+        this.app.post('/api/first-run/check-agent', async (req, res) => {
             try {
                 const { agentId } = req.body || {};
                 if (!agentId || typeof agentId !== 'string') {
                     return res.status(400).json({ error: 'agentId is required.' });
                 }
-                return res.json(this.sessionService.checkAgentReady(agentId));
+                return res.json(await this.sessionService.checkAgentReady(agentId));
             }
             catch (error) {
                 return res.status(500).json({ error: error instanceof Error ? error.message : 'Could not check agent.' });

package/dist/src/first-run/session-service.js

@@ -36,10 +36,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIRST_RUN_ROW_IDS = exports.FirstRunSessionService = void 0;
+exports.FIRST_RUN_ROW_IDS = exports.FirstRunSessionService = exports.runProcess = void 0;
 exports.commandVersion = commandVersion;
-exports.runProcess = runProcess;
 exports.buildFirstRunHubLaunchArgs = buildFirstRunHubLaunchArgs;
+const agent_command_probe_1 = require("../cli/utils/agent-command-probe");
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -68,24 +68,8 @@ function getFakeStateMode() {
     return 'default';
 }
 function commandVersion(command, extraBinDirs, basePath) {
-    const executable = process.platform === 'win32' ? 'cmd.exe' : command;
-    const args = process.platform === 'win32'
-        ? ['/d', '/s', '/c', `${command} --version`]
-        : ['--version'];
-    const pathValue = extraBinDirs && extraBinDirs.length > 0
-        ? (0, managed_agent_paths_1.appendBinDirsToPath)(basePath ?? process.env.PATH ?? process.env.Path, extraBinDirs)
-        : basePath;
-    const recoveredPath = (0, managed_agent_paths_1.buildRecoveredAgentPath)(pathValue ?? process.env.PATH ?? process.env.Path);
-    const env = { ...process.env, PATH: recoveredPath, Path: recoveredPath };
-    const result = (0, child_process_1.spawnSync)(executable, args, {
-        windowsHide: true,
-        encoding: 'utf8',
-        timeout: 5000,
-        env,
-    });
-    if (result.status !== 0 || result.error)
-        return null;
-    return (0, managed_agent_paths_1.versionFromProbeOutput)(result.stdout, result.stderr);
+    const supplied = extraBinDirs?.length ? (0, managed_agent_paths_1.appendBinDirsToPath)(basePath ?? process.env.PATH, extraBinDirs) : basePath;
+    return (0, agent_command_probe_1.selectAgentCommandSync)(command, { env: (0, agent_command_probe_1.agentProbeEnvironment)(supplied) })?.version ?? null;
 }
 function ensureOutputDirs() {
     fs_1.default.mkdirSync((0, script_sync_utils_1.getUserFraimDir)(), { recursive: true });
@@ -121,37 +105,7 @@ function appendInstallLog(line) {
     ensureOutputDirs();
     fs_1.default.appendFileSync(getInstallLogPath(), `[${new Date().toISOString()}] ${line}${os_1.default.EOL}`);
 }
-function runProcess(command, args, env) {
-    return new Promise((resolve, reject) => {
-        const [realCmd, realArgs] = process.platform === 'win32'
-            ? ['cmd.exe', ['/d', '/s', '/c', command, ...args]]
-            : [command, args];
-        const childEnv = { ...process.env };
-        for (const [key, value] of Object.entries(env || {})) {
-            if (value === undefined)
-                delete childEnv[key];
-            else
-                childEnv[key] = value;
-        }
-        const child = (0, child_process_1.spawn)(realCmd, realArgs, {
-            env: childEnv,
-            windowsHide: true,
-            shell: false,
-        });
-        let stdout = '';
-        let stderr = '';
-        child.stdout.on('data', (chunk) => { stdout += chunk.toString(); });
-        child.stderr.on('data', (chunk) => { stderr += chunk.toString(); });
-        child.on('error', reject);
-        child.on('close', (code) => {
-            if (code === 0) {
-                resolve({ stdout, stderr });
-                return;
-            }
-            reject(new Error(`${command} ${args.join(' ')} failed with code ${code}\n${stdout}${stderr}`.trim()));
-        });
-    });
-}
+exports.runProcess = managed_agent_install_1.runAgentInstallCommand;
 function findAgentOption(agentId) {
     return types_1.FIRST_RUN_AGENT_OPTIONS.find((option) => option.id === agentId);
 }
@@ -210,7 +164,11 @@ function buildFirstRunHubLaunchArgs() {
     return ['-y', 'fraim-hub@latest'];
 }
 class FirstRunSessionService {
+    resumePendingOperations() { if (this.operationAbort.signal.aborted)
+        this.operationAbort = new AbortController(); }
+    cancelPendingOperations() { this.operationAbort.abort(); }
     constructor(options) {
+        this.operationAbort = new AbortController();
         // Issue #646: the key may be absent when first-run is launched by the macOS
         // installer (.dmg) instead of `fraim first-run --key=…`. In that case the
         // wizard prompts the user to paste their key (see setKey / needsKey).
@@ -782,7 +740,8 @@ class FirstRunSessionService {
         }
         try {
             const systemPath = (0, managed_agent_paths_1.stripManagedAgentBinDirsFromPath)(process.env.PATH);
-            const existingVersion = commandVersion(option.launchCommand, undefined, systemPath);
+            const existingVersion = (await (0, agent_command_probe_1.selectAgentCommand)(option.launchCommand, { signal: this.operationAbort.signal }))?.version;
+            this.operationAbort.signal.throwIfAborted();
             if (existingVersion) {
                 this.setAgentInstallStatus(agentId, 'needs-sign-in', `Sign in to ${option.label} to activate it.`);
                 appendInstallLog(`agent-reused ${agentId}`);
@@ -801,10 +760,11 @@ class FirstRunSessionService {
             // already-managed, or freshly downloaded) and fold its directory into the PATH passed down,
             // so the standard attempt can actually succeed instead of silently falling through.
             const npm = await (0, managed_node_runtime_1.ensureManagedNpm)({
+                signal: this.operationAbort.signal,
                 onProgress: (message) => appendInstallLog(`managed-node: ${message}`),
             });
             const pathWithNpm = (0, managed_agent_paths_1.appendBinDirsToPath)(systemPath, [npm.binDir]);
-            const outcome = await (0, managed_agent_install_1.installManagedAgent)({ label: option.label, installPackage: option.installPackage, launchCommand: option.launchCommand }, pathWithNpm, { runProcess, commandVersion });
+            const outcome = await (0, managed_agent_install_1.installManagedAgent)({ label: option.label, installPackage: option.installPackage, launchCommand: option.launchCommand, npmPath: npm.npmPath, signal: this.operationAbort.signal }, pathWithNpm, { runProcess: exports.runProcess, commandVersion: managed_agent_install_1.verifyInstalledAgentCommand });
             this.setAgentInstallStatus(agentId, 'needs-sign-in', `Sign in to ${option.label} to activate it.`);
             appendInstallLog(outcome.outcome === 'standard' ? `agent-installed-standard ${agentId}` : `agent-installed-managed ${agentId}`);
             this.persist();
@@ -848,7 +808,7 @@ class FirstRunSessionService {
             };
         }
     }
-    checkAgentReady(agentId) {
+    async checkAgentReady(agentId) {
         const option = findAgentOption(agentId);
         if (!option) {
             return { ok: false, ready: false, message: `Unknown agent: ${agentId}` };
@@ -859,7 +819,7 @@ class FirstRunSessionService {
             this.persist();
             return { ok: true, ready: true, message: `${option.label} is ready (fake-mode).` };
         }
-        const ver = commandVersion(option.launchCommand, (0, managed_agent_paths_1.getManagedAgentBinDirs)());
+        const ver = (await (0, agent_command_probe_1.selectAgentCommand)(option.launchCommand, { signal: this.operationAbort.signal }))?.version;
         if (ver) {
             this.setAgentInstallStatus(agentId, 'ready', `${option.label} is ready.`);
             this.updateAgentSummaryRow();

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

@@ -22,6 +22,7 @@ exports.normalizeLearningDomain = normalizeLearningDomain;
 exports.applyLearningEntryChange = applyLearningEntryChange;
 exports.isTruthyFlag = isTruthyFlag;
 const artifact_paths_1 = require("../../registry/scripts/artifact-paths");
+const pack_home_1 = require("../cli/utils/pack-home");
 /**
  * LearningContextBuilder builds the learning context section for a user.
  *
@@ -39,7 +40,7 @@ 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 pack_home_2 = require("../cli/utils/pack-home");
 const learning_domains_1 = require("../config/learning-domains");
 const entry_authoring_1 = require("../../registry/scripts/learning/entry-authoring");
 /** Catalog-backed allowlist for existing files, including retired storage identities. */
@@ -87,14 +88,14 @@ Object.defineProperty(exports, "generateLearningEntryId", { enumerable: true, ge
  * therefore contributes no tier, matching the behavior before round 2.
  */
 function managerSecondaryLearningsBase() {
-    const home = (0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false });
+    const home = (0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false });
     if (home.synced)
         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', { migrateLegacy: false });
+    const managerHome = (0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false });
     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
@@ -117,7 +118,7 @@ function sameResolvedPath(a, b) {
     return (0, path_1.resolve)(a) === (0, path_1.resolve)(b);
 }
 function portablePersonalBaseIsLive(globalBase) {
-    return sameResolvedPath((0, path_1.join)((0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false }).contentRoot, 'learnings'), globalBase)
+    return sameResolvedPath((0, path_1.join)((0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false }).contentRoot, 'learnings'), globalBase)
         || !sameResolvedPath(globalBase, (0, project_fraim_paths_1.getUserFraimLearningsDir)());
 }
 function resolvePersonalLearningFile(repoBase, managerCacheBase, managerCacheDisplayBase, globalBase, globalDisplayBase, fileName) {
@@ -389,7 +390,7 @@ function readFrontmatter(content) {
 /** Configured owning homes only; discovery never provisions or infers a home. */
 function getLearningInputHomes(workspaceRoot) {
     const homes = [{ root: workspaceRoot, contentRoot: (0, path_1.dirname)((0, project_fraim_paths_1.getWorkspaceLearningsDir)(workspaceRoot)) },
-        (0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false }), (0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false })];
+        (0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false }), (0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false })];
     const seen = new Set();
     return homes.filter(home => {
         const key = (0, learning_source_record_1.normalizeLearningSourcePath)(home.root) + ':' + (0, learning_source_record_1.normalizeLearningSourcePath)(home.contentRoot);
@@ -400,7 +401,7 @@ function getLearningInputHomes(workspaceRoot) {
     });
 }
 /** Guard the physical owner boundary before reading any input bytes. */
-function readLearningSourceFile(filePath, homeRoot, contentRoot) {
+function readLearningSourceFile(filePath, homeRoot, contentRoot, configuredPaths) {
     try {
         if (!(0, fs_1.lstatSync)(filePath).isFile() || (0, fs_1.lstatSync)(filePath).isSymbolicLink()) {
             return { status: 'invalid', reason: 'Learning source must be a regular file' };
@@ -410,7 +411,7 @@ function readLearningSourceFile(filePath, homeRoot, contentRoot) {
             return { status: 'invalid', reason: 'Learning source escapes configured home' };
         }
         const content = (0, fs_1.readFileSync)(filePath, 'utf8');
-        return { ...(0, learning_source_record_1.parseLearningSourceRecord)(content, filePath, homeRoot, contentRoot), content };
+        return { ...(0, learning_source_record_1.parseLearningSourceRecord)(content, filePath, homeRoot, contentRoot, configuredPaths), content };
     }
     catch {
         return { status: 'invalid', reason: 'Learning source unavailable' };
@@ -434,7 +435,7 @@ function collectPendingL0SourceFiles(workspaceRoot, resolvedUserId, _roots) {
     for (const home of homes) {
         let paths;
         try {
-            paths = (0, artifact_paths_1.resolveLearningPaths)(home.root, home.contentRoot);
+            paths = (0, pack_home_1.resolvePackArtifactPaths)(home);
         }
         catch {
             continue;
@@ -449,7 +450,7 @@ function collectPendingL0SourceFiles(workspaceRoot, resolvedUserId, _roots) {
                     const file = (0, path_1.join)(directory, name);
                     if (reservations.has((0, learning_source_record_1.normalizeLearningSourcePath)(file)))
                         continue;
-                    const result = readLearningSourceFile(file, home.root, home.contentRoot);
+                    const result = readLearningSourceFile(file, home.root, home.contentRoot, paths);
                     if (result.status !== 'valid' || result.record.author !== resolvedUserId
                         || result.record.state !== 'pending' || result.record.synthesized
                         || isTruthyFlag(readFrontmatter(result.content).dismissed))
@@ -474,15 +475,17 @@ function collectPendingL0SourceFiles(workspaceRoot, resolvedUserId, _roots) {
  * it cannot drift from the read path again.
  */
 function orgCacheDisplayPath(fileName) {
-    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', fileName);
+    const cachePath = (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', fileName);
     return userFraimDisplayPathFor(cachePath);
 }
 function userFraimDisplayPathFor(absolutePath) {
-    const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
-    const rel = absolutePath.startsWith(fraimDir)
-        ? absolutePath.slice(fraimDir.length).replace(/\\/g, '/').replace(/^\//, '')
-        : absolutePath.replace(/\\/g, '/');
-    return (0, project_fraim_paths_1.getUserFraimDisplayPath)(rel);
+    const fraimDir = (0, path_1.resolve)((0, project_fraim_paths_1.getUserFraimDirPath)());
+    const resolved = (0, path_1.resolve)(absolutePath);
+    const rel = (0, path_1.relative)(fraimDir, resolved);
+    const isWithin = rel !== '..' && !rel.startsWith('..' + path_1.sep) && !(0, path_1.isAbsolute)(rel);
+    return isWithin
+        ? (0, project_fraim_paths_1.getUserFraimDisplayPath)(rel.replace(/\\/g, '/'))
+        : resolved.replace(/\\/g, '/');
 }
 /**
  * Resolve an L2 org-scope learning file (issue #563): a repo-local override
@@ -497,7 +500,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', { migrateLegacy: false }).contentRoot, 'learnings', fileName);
+    const cachePath = (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', fileName);
     if ((0, fs_1.existsSync)(cachePath)) {
         return { present: true, path: cachePath, displayPath: orgCacheDisplayPath(fileName) };
     }
@@ -510,7 +513,7 @@ function resolveOrgLearningFile(repoLearningsBase, fileName) {
  */
 function resolveOrgLearningFileTiers(repoLearningsBase, fileName) {
     const tiers = [];
-    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', fileName);
+    const cachePath = (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', fileName);
     if ((0, fs_1.existsSync)(cachePath)) {
         tiers.push({
             level: 'org',
@@ -738,7 +741,7 @@ function resolveOrgContextFile(workspaceRoot, relativePath, orgCacheEligible = t
             };
         }
         if (orgCacheEligible) {
-            const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, relativePath);
+            const cachePath = (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, relativePath);
             if ((0, fs_1.existsSync)(cachePath)) {
                 return {
                     present: true,
@@ -747,20 +750,12 @@ function resolveOrgContextFile(workspaceRoot, relativePath, orgCacheEligible = t
             }
         }
         if (!orgCacheEligible) {
-            const managerHome = (0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false });
+            const managerHome = (0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false });
             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)(relToFraim)
+                    displayPath: userFraimDisplayPathFor(managerCachePath)
                 };
             }
         }
@@ -927,7 +922,7 @@ function resolveTeamContextFile(workspaceRoot, key, options = {}) {
     // 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', { migrateLegacy: false, ...options }).contentRoot, relativePath);
+        const cachePath = (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false, ...options }).contentRoot, relativePath);
         if ((0, fs_1.existsSync)(cachePath)) {
             const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
             const orgDisplayPath = cachePath.startsWith(fraimDir)
@@ -944,7 +939,7 @@ function resolveTeamContextFile(workspaceRoot, key, options = {}) {
         }
     }
     if (key === 'manager' || key === 'managerRules') {
-        const managerHome = (0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false, ...options });
+        const managerHome = (0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false, ...options });
         const managerCachePath = (0, path_1.join)(managerHome.contentRoot, relativePath);
         if ((0, fs_1.existsSync)(managerCachePath)) {
             const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
@@ -986,7 +981,7 @@ function resolveTeamContextFile(workspaceRoot, key, options = {}) {
 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', { migrateLegacy: false }).contentRoot, 'context'),
+        (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'context'),
         (0, path_1.join)((0, project_fraim_paths_1.getUserFraimDirPath)(), 'personalized-employee', 'context'),
     ];
 }
@@ -1561,8 +1556,8 @@ function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine',
     // Only the human library reads these observations. An unavailable store must
     // fail this read, so a client can retain known history rather than invent zeroes.
     const resolvedUserId = scope === 'org' ? userId : resolveLearningUserId(workspaceRoot, userId, roots);
-    const managerHome = (0, pack_home_1.resolvePackHome)('manager', { migrateLegacy: false });
-    const orgHome = scope === 'org' ? (0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }) : null;
+    const managerHome = (0, pack_home_2.resolvePackHome)('manager', { migrateLegacy: false });
+    const orgHome = scope === 'org' ? (0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }) : null;
     const assessmentHomes = [
         { level: 'Project', root: (0, project_fraim_paths_1.getWorkspaceFraimDir)(workspaceRoot), contentRoot: (0, path_1.join)((0, project_fraim_paths_1.getWorkspaceFraimDir)(workspaceRoot), 'personalized-employee') },
         { level: 'Manager', root: managerHome.root, contentRoot: managerHome.contentRoot },
@@ -1605,8 +1600,8 @@ function readPreservedLearnings(workspaceRoot, userId, scope, level = 'machine',
             // #806: domain-scoped org learnings — union from both locations.
             const allDomainFiles = [
                 ...listDomainLearningFiles(roots.repoLearningsBase, 'org', fileType, effectiveCatalog).map((d) => ({ ...d, base: roots.repoLearningsBase })),
-                ...listDomainLearningFiles((0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings'), 'org', fileType, effectiveCatalog)
-                    .map((d) => ({ ...d, base: (0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings') })),
+                ...listDomainLearningFiles((0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings'), 'org', fileType, effectiveCatalog)
+                    .map((d) => ({ ...d, base: (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings') })),
             ];
             const seenDomainFile = new Set();
             for (const { fileName, domain, base } of allDomainFiles) {
@@ -1667,7 +1662,7 @@ function resolveLearningFilePath(workspaceRoot, userId, ref, effectiveCatalog) {
         // Write org entries to the org pack home — same location share-with-others uses.
         // The Hub read path already merges pack home + repo-local, so edits land where
         // the agent reads them without needing a repo commit.
-        return (0, path_1.join)((0, pack_home_1.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', learningFileName('org', fileType, ref.domain, effectiveCatalog));
+        return (0, path_1.join)((0, pack_home_2.resolvePackHome)('org', { migrateLegacy: false }).contentRoot, 'learnings', learningFileName('org', fileType, ref.domain, effectiveCatalog));
     }
     const resolvedUserId = resolveLearningUserId(workspaceRoot, userId, roots);
     // Issue #1070: for the 'machine' level use the configured manager home.

package/package.json

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