fraim 2.0.264 → 2.0.266

package/dist/src/cli/doctor/checks/mcp-connectivity-checks.js

@@ -673,6 +673,19 @@ async function spawnAndHandshake(command, args, timeoutMs = STDIO_HANDSHAKE_TIME
         child.on('error', (err) => {
             spawnError = err;
         });
+        const handleStdinError = (err) => {
+            if (settled)
+                return;
+            const msg = err.message || String(err);
+            settle({
+                status: 'error',
+                phase: 'spawn',
+                message: `Failed to start MCP server: ${msg}`,
+                suggestion: 'Verify that the MCP server command is installed and accessible on PATH.',
+                details: { command, args, error: (0, fraim_mcp_diagnostics_1.sanitizeDiagnosticText)(msg, knownSecrets) }
+            });
+        };
+        child.stdin?.on('error', handleStdinError);
         const handleStdoutLine = (line) => {
             const trimmed = line.trim();
             if (!trimmed)
@@ -804,14 +817,20 @@ async function spawnAndHandshake(command, args, timeoutMs = STDIO_HANDSHAKE_TIME
                     clientInfo: { name: 'fraim-doctor', version: '1.0' }
                 }
             }) + '\n';
-            child.stdin?.write(initMsg);
+            child.stdin?.write(initMsg, (err) => {
+                if (err)
+                    handleStdinError(err);
+            });
             const toolsMsg = JSON.stringify({
                 jsonrpc: '2.0',
                 id: 2,
                 method: 'tools/list',
                 params: {}
             }) + '\n';
-            child.stdin?.write(toolsMsg);
+            child.stdin?.write(toolsMsg, (err) => {
+                if (err)
+                    handleStdinError(err);
+            });
         }
         catch {
             // stdin may not be writable if the process exited immediately

package/dist/src/config/persona-capability-bundles.js

@@ -53,8 +53,8 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
     pam: {
         personaKey: 'pam',
         bundleId: 'persona-pam-core',
-        catalogMetadata: buildCatalogMetadata('pam', ['feature-specification', 'technical-design', 'project-plan-creation']),
-        protectedJobs: ['feature-specification', 'technical-design', 'experiment-tracking', 'project-plan-creation', 'implementation-feature-review', 'scrum-sprint-planning', 'mvp-validation-plan', 'sprint-planning', 'customer-prospect-discovery', 'interview-preparation', 'participant-recruitment', 'process-interview-notes', 'review-customer-development', 'triage-customer-needs'],
+        catalogMetadata: buildCatalogMetadata('pam', ['feature-specification', 'project-plan-creation', 'implementation-feature-review']),
+        protectedJobs: ['feature-specification', 'send-newsletter', 'send-thank-you-notes', 'experiment-tracking', 'project-plan-creation', 'implementation-feature-review', 'scrum-sprint-planning', 'mvp-validation-plan', 'sprint-planning', 'customer-prospect-discovery', 'interview-preparation', 'participant-recruitment', 'process-interview-notes', 'review-customer-development', 'triage-customer-needs'],
         protectedAliases: ['product-management', 'product-spec'],
         defaultHireMode: 'job',
         lockCopy: 'Hire PaM to unlock product-management work for this request.'
@@ -63,7 +63,7 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
         personaKey: 'swen',
         bundleId: 'persona-swen-core',
         catalogMetadata: buildCatalogMetadata('swen', ['feature-implementation', 'technical-design', 'code-refactoring']),
-        protectedJobs: ['feature-implementation', 'implementation-design-review', 'code-refactoring', 'pr-iteration', 'mobile-app-development', 'mcp-server-creation', 'cloud-application-deployment', 'cloud-cost-optimization', 'cloud-performance-diagnosis', 'route-llm-spend-to-cloud-credits', 'set-up-cloud-cost-alerts', 'gitlabs-to-github', 'system-migration', 'cross-cloud-migration', 'data-pipeline-design', 'data-quality-monitoring', 'data-platform-architecture', 'write-dev-docs', 'database-schema-design', 'create-architecture', 'project-scaffolding', 'codebase-analysis-and-ideation', 'github-org-setup', 'google-workspace-setup', 'mobile-app-rejection-response', 'mobile-app-submission', 'publish-mcp-app', 'application-replication-workflow'],
+        protectedJobs: ['feature-implementation', 'technical-design', 'implementation-design-review', 'code-refactoring', 'pr-iteration', 'mobile-app-development', 'mcp-server-creation', 'cloud-application-deployment', 'cloud-cost-optimization', 'cloud-performance-diagnosis', 'route-llm-spend-to-cloud-credits', 'set-up-cloud-cost-alerts', 'gitlabs-to-github', 'system-migration', 'cross-cloud-migration', 'data-pipeline-design', 'data-quality-monitoring', 'data-platform-architecture', 'write-dev-docs', 'database-schema-design', 'create-architecture', 'project-scaffolding', 'codebase-analysis-and-ideation', 'github-org-setup', 'google-workspace-setup', 'mobile-app-rejection-response', 'mobile-app-submission', 'publish-mcp-app', 'application-replication-workflow'],
         protectedAliases: ['software-engineering', 'implementation'],
         defaultHireMode: 'job',
         lockCopy: 'Hire SWEn to unlock software-engineering delivery for this request.'
@@ -117,7 +117,7 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
         personaKey: 'ashley',
         bundleId: 'persona-ashley-core',
         catalogMetadata: buildCatalogMetadata('ashley', ['chief-of-staff-briefing', 'executive-assistant', 'analyze-transcript']),
-        protectedJobs: ['chief-of-staff-briefing', 'calendar-triage', 'meeting-preparation', 'executive-assistant', 'send-newsletter', 'send-thank-you-notes', 'analyze-transcript', 'travel-planning', 'travel-disruption-rebooking'],
+        protectedJobs: ['chief-of-staff-briefing', 'calendar-triage', 'meeting-preparation', 'executive-assistant', 'analyze-transcript', 'travel-planning', 'travel-disruption-rebooking'],
         protectedAliases: ['executive-assistant', 'operations-assistant'],
         defaultHireMode: 'job',
         lockCopy: 'Hire AshLey to unlock executive-assistant work for this request.'
@@ -273,6 +273,7 @@ for (const bundle of Object.values(exports.PERSONA_CAPABILITY_BUNDLES)) {
 // as "free") so the Hub attributes them to FRAIMworker, but they are never
 // hire-gated because FRAIMworker is not a purchasable persona.
 const GENERIC_WORKER_OWNED_JOBS = new Set([
+    'create-hub-configured-agent',
     'contribute-to-fraim',
     'file-fraim-issue',
     'praise-fraim',

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

@@ -90,6 +90,13 @@ function getLearningRoots(workspaceRoot) {
         repoLearningsBase: (0, project_fraim_paths_1.getWorkspaceLearningsDir)(workspaceRoot)
     };
 }
+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').contentRoot, 'learnings'), globalBase)
+        || !sameResolvedPath(globalBase, (0, project_fraim_paths_1.getUserFraimLearningsDir)());
+}
 function resolvePersonalLearningFile(repoBase, managerCacheBase, managerCacheDisplayBase, globalBase, globalDisplayBase, fileName) {
     const repoPath = (0, path_1.join)(repoBase, fileName);
     if ((0, fs_1.existsSync)(repoPath)) {
@@ -100,14 +107,14 @@ function resolvePersonalLearningFile(repoBase, managerCacheBase, managerCacheDis
         };
     }
     const globalPath = (0, path_1.join)(globalBase, fileName);
-    if ((0, fs_1.existsSync)(globalPath)) {
+    const managerCachePath = (0, path_1.join)(managerCacheBase, fileName);
+    if (portablePersonalBaseIsLive(globalBase) && (0, fs_1.existsSync)(globalPath)) {
         return {
             present: true,
             path: globalPath,
             displayPath: `${globalDisplayBase.replace(/\/$/, '')}/${fileName}`
         };
     }
-    const managerCachePath = (0, path_1.join)(managerCacheBase, fileName);
     if ((0, fs_1.existsSync)(managerCachePath)) {
         return {
             present: true,
@@ -140,7 +147,9 @@ function resolvePersonalLearningFileTiers(repoBase, managerCacheBase, managerCac
         });
     }
     const globalPath = (0, path_1.join)(globalBase, fileName);
-    if ((0, fs_1.existsSync)(globalPath)) {
+    if (portablePersonalBaseIsLive(globalBase) &&
+        (0, fs_1.existsSync)(globalPath) &&
+        !tiers.some((tier) => sameResolvedPath(tier.path, globalPath))) {
         tiers.push({
             level: 'manager',
             path: globalPath,
@@ -405,10 +414,25 @@ function collectPendingL0SourceFiles(workspaceRoot, resolvedUserId, roots) {
     }
     return sources.sort((a, b) => b.sortKey.localeCompare(a.sortKey) || a.displayPath.localeCompare(b.displayPath));
 }
+/**
+ * Issue #1078 fix: derive the org display path from contentRoot rather than
+ * hardcoding the pre-migration flat layout. After migrateOrgFlatContent runs,
+ * contentRoot is ~/.fraim/org/personalized-employee/ — not ~/.fraim/org/.
+ * The relative portion after the ~/.fraim/ prefix is computed dynamically so
+ * it cannot drift from the read path again.
+ */
+function orgCacheDisplayPath(fileName) {
+    const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
+    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings', fileName);
+    const rel = cachePath.startsWith(fraimDir)
+        ? cachePath.slice(fraimDir.length).replace(/\\/g, '/').replace(/^\//, '')
+        : cachePath.replace(/\\/g, '/');
+    return (0, project_fraim_paths_1.getUserFraimDisplayPath)(rel);
+}
 /**
  * Resolve an L2 org-scope learning file (issue #563): a repo-local override
  * (`fraim/personalized-employee/learnings/`) wins, then the synced org cache
- * (`~/.fraim/org/learnings/`). Org learnings are part of the shared org pack,
+ * (contentRoot/learnings/). Org learnings are part of the shared org pack,
  * so a synced copy must be readable by the agent even with no repo-local copy.
  * Mirrors the org context/rules resolution order. Returns `present:false` with
  * the repo path/display when neither tier has the file.
@@ -420,7 +444,7 @@ function resolveOrgLearningFile(repoLearningsBase, 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}`) };
+        return { present: true, path: cachePath, displayPath: orgCacheDisplayPath(fileName) };
     }
     return { present: false, path: repoPath, displayPath: `${REPO_LEARNINGS_REL}/${fileName}` };
 }
@@ -436,7 +460,7 @@ function resolveOrgLearningFileTiers(repoLearningsBase, fileName) {
         tiers.push({
             level: 'org',
             path: cachePath,
-            displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`org/learnings/${fileName}`)
+            displayPath: orgCacheDisplayPath(fileName)
         });
     }
     const repoPath = (0, path_1.join)(repoLearningsBase, fileName);
@@ -1158,11 +1182,20 @@ function collectBrainLearningDots(workspaceRoot, userId) {
         if (coldEntries.length) {
             processed.push({ type: fileType, typeLabel, region, scope: 'cold', displayPath: coldResolved.displayPath, entries: coldEntries });
         }
-        // L2 org
-        const org = resolveOrgLearningFile(roots.repoLearningsBase, `org-${fileType}.md`);
-        const orgEntries = parseBrainLearningEntries(org.path, fileType);
-        if (orgEntries.length) {
-            processed.push({ type: fileType, typeLabel, region, scope: 'org', displayPath: org.displayPath, entries: orgEntries });
+        // L2 org — issue #1078 fix: use tiered resolver + merge so synced org home
+        // and repo-local org-*.md are both included, same as buildLearningContextSection.
+        const orgTiers = resolveOrgLearningFileTiers(roots.repoLearningsBase, `org-${fileType}.md`);
+        if (orgTiers.length > 0) {
+            // Merge entries across tiers; deduplicate by title (last tier wins = repo-local wins).
+            const allOrgEntries = orgTiers.flatMap(t => parseBrainLearningEntries(t.path, fileType));
+            const byTitle = new Map();
+            for (const e of allOrgEntries)
+                byTitle.set(e.title.trim().toLowerCase(), e);
+            const mergedOrgEntries = [...byTitle.values()];
+            if (mergedOrgEntries.length) {
+                // Use the first (highest-precedence = synced org home) tier's displayPath.
+                processed.push({ type: fileType, typeLabel, region, scope: 'org', displayPath: orgTiers[0].displayPath, entries: mergedOrgEntries });
+            }
         }
     }
     return { pending: { count: pendingSignals.length, signals: pendingSignals }, processed };

package/package.json

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