fraim-hub 2.0.236 → 2.0.237

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

@@ -1848,12 +1848,18 @@ class AiHubServer {
             console.warn('[ai-hub] manager-team lookup failed:', err?.message || err);
             return [];
         });
-        const personaProjectionPromise = this.computePersonas(resolvedApiKey, managerTeamPromise);
-        const fallbackPersonaProjection = this.fallbackPersonaProjection(resolvedApiKey);
+        const personaProjectionPromise = this.computePersonas(resolvedApiKey, managerTeamPromise, normalizedProjectPath);
+        const fallbackPersonaProjection = this.fallbackPersonaProjection(resolvedApiKey, normalizedProjectPath);
         const personaProjection = await this.withFirstPaintBudget(personaProjectionPromise, fallbackPersonaProjection, 'persona projection');
-        const managerTeam = personaProjection === fallbackPersonaProjection
-            ? []
-            : await this.withFirstPaintBudget(managerTeamPromise, [], 'manager team');
+        // Issue #1005: identity — not persona contents — is what distinguishes a first-paint
+        // placeholder from an answer. withFirstPaintBudget resolves to this exact object only
+        // on timeout; computePersonas returns a fresh `{ ...fallbackProjection, userKey }` even
+        // when the authority definitively locks everything (401 / feature-off). So a real
+        // sign-out is still `resolved`, and only a budget miss is `unresolved`.
+        const personasResolved = personaProjection !== fallbackPersonaProjection;
+        const managerTeam = personasResolved
+            ? await this.withFirstPaintBudget(managerTeamPromise, [], 'manager team')
+            : [];
         const { personas, subscriptionActive, workspaceId, userKey } = personaProjection;
         void personaProjectionPromise.catch(() => undefined);
         void managerTeamPromise.catch(() => undefined);
@@ -1888,6 +1894,9 @@ class AiHubServer {
             employees,
             configuredAgents,
             personas,
+            // Issue #1005: lets the client tell a resolved projection from the first-paint
+            // placeholder, so a late unresolved bootstrap cannot wipe a resolved roster.
+            personasResolved,
             subscriptionActive,
             activeRun,
             projects,
@@ -2597,9 +2606,15 @@ class AiHubServer {
         const message = (invocationForm ?? (0, manager_turns_1.buildSameJobContinueMessage)(userText)) + (0, manager_turns_1.buildCommunicationStyleNote)();
         return { message, display };
     }
-    async computePersonas(apiKey, managerTeamPromise) {
+    async computePersonas(apiKey, managerTeamPromise, 
+    // Issue #1005: the project whose custom employees belong in this projection. Custom
+    // employees are per-project (`fraim/personalized-employee/employees/`), so reading
+    // them from `this.projectPath` (the directory the Hub launched from) leaked one
+    // project's employees into every other project's roster. Defaults to the launch
+    // project only so callers that genuinely have no project context keep working.
+    projectPath = this.projectPath) {
         const allBundles = listHubPersonaBundles();
-        const fallbackProjection = this.fallbackPersonaProjection(apiKey);
+        const fallbackProjection = this.fallbackPersonaProjection(apiKey, projectPath);
         // Issue #701: persona state comes from the hosted server (GET /api/personas/me)
         // via the user's API key — never a local MongoDB connection. Issue #925: resolve
         // it in a transport-aware way so a transient outage does not collapse to the same
@@ -2616,7 +2631,7 @@ class AiHubServer {
         // (feature-off, legacy bypass, per-entitlement gating) lives solely in
         // persona-entitlement-service.resolvePersonaAccessStatuses — the Hub does not
         // re-derive it.
-        const customPersonas = (0, custom_employees_1.readCustomEmployees)(this.projectPath).map(custom_employees_1.buildCustomEmployeePersona);
+        const customPersonas = (0, custom_employees_1.readCustomEmployees)(projectPath).map(custom_employees_1.buildCustomEmployeePersona);
         if (!state) {
             return { ...fallbackProjection, userKey };
         }
@@ -2655,7 +2670,9 @@ class AiHubServer {
             return { ...fallbackProjection, userKey };
         }
     }
-    fallbackPersonaProjection(apiKey) {
+    fallbackPersonaProjection(apiKey, 
+    // Issue #1005: see computePersonas — custom employees are per-project.
+    projectPath = this.projectPath) {
         const fallbackPersonas = listHubPersonaBundles().map((bundle) => ({
             key: bundle.personaKey,
             displayName: bundle.catalogMetadata.displayName,
@@ -2668,7 +2685,7 @@ class AiHubServer {
             seatsInUse: 0,
             origin: 'catalog',
         }));
-        const customPersonas = (0, custom_employees_1.readCustomEmployees)(this.projectPath).map(custom_employees_1.buildCustomEmployeePersona);
+        const customPersonas = (0, custom_employees_1.readCustomEmployees)(projectPath).map(custom_employees_1.buildCustomEmployeePersona);
         return {
             personas: [...fallbackPersonas, ...customPersonas],
             subscriptionActive: false,
@@ -2836,7 +2853,9 @@ class AiHubServer {
                 console.warn('[ai-hub] manager-team lookup failed:', err?.message || err);
                 return [];
             });
-            const { personas, subscriptionActive, workspaceId, userKey } = await this.computePersonas(apiKey, managerTeamPromise);
+            // Issue #1005: pass the requested project so custom employees are scoped to it,
+            // not to the directory the Hub launched from.
+            const { personas, subscriptionActive, workspaceId, userKey } = await this.computePersonas(apiKey, managerTeamPromise, projectPath);
             const managerTeam = await managerTeamPromise;
             const jobCount = (0, catalog_1.discoverEmployeeJobs)(projectPath, { includeRegistry: true })
                 .filter((job) => !FRAIM_INTERNAL_JOB_IDS.has(job.id))

package/package.json

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

package/public/ai-hub/script.js

@@ -210,7 +210,42 @@ function cacheBootstrapPayload(bootstrap, docUrl) {
   bootstrapCache.set(bootstrapCacheKey(bootstrap.project.path, docUrl), bootstrap);
 }
 
+// Issue #1005: `GET /api/ai-hub/bootstrap` time-boxes the hosted persona lookup to a
+// 250ms first-paint budget (#975). On a miss it returns `personasResolved: false` plus an
+// all-locked placeholder projection. That payload is NOT an authority statement, so
+// adopting it wholesale is what erased a resolved roster: the ~4s background bootstrap
+// refresh landed after the ~0.2s /api/ai-hub/personas refresh and `state.bootstrap =
+// bootstrap` overwrote every hired persona, collapsing the employee rail to nothing.
+//
+// Contract, mirrored by tests/ui/test-1005-persona-preserved-across-bootstrap.spec.ts:
+//   personasResolved !== false  -> adopt verbatim. A definitive not-entitled answer is a
+//                                  real answer, so a genuine sign-out still clears.
+//   personasResolved === false  -> keep the last RESOLVED projection's catalog half.
+//
+// Only the catalog half is preserved. Custom employees are a per-project local disk read
+// (`fraim/personalized-employee/employees/`) that never depends on the hosted authority,
+// so the incoming payload's custom personas are always correct for the incoming project —
+// carrying the previous project's across would re-create the cross-project leak.
+const PERSONA_AUTHORITY_FIELDS = ['subscriptionActive', 'workspaceId', 'userEmail', 'managerTeam'];
+
+function mergePersonaProjection(incoming, previous) {
+  if (!incoming || incoming.personasResolved !== false) return incoming;
+  // Nothing trustworthy to fall back on (cold start, or the previous payload was itself a
+  // placeholder). Adopt it and let tfRefreshAfterBootstrap schedule the real lookup.
+  if (!previous || previous.personasResolved === false) return incoming;
+  const previousCatalog = (previous.personas || []).filter((p) => p && p.origin !== 'custom');
+  if (!previousCatalog.length) return incoming;
+  const incomingCustom = (incoming.personas || []).filter((p) => p && p.origin === 'custom');
+  // Catalog-then-custom matches the server's own union order in computePersonas.
+  const merged = { ...incoming, personas: [...previousCatalog, ...incomingCustom], personasResolved: true };
+  for (const field of PERSONA_AUTHORITY_FIELDS) {
+    if (previous[field] !== undefined) merged[field] = previous[field];
+  }
+  return merged;
+}
+
 function applyBootstrap(bootstrap, docUrl) {
+  bootstrap = mergePersonaProjection(bootstrap, state.bootstrap);
   state.bootstrap = bootstrap;
   state.projectPath = bootstrap.project.path;
   state.remoteBaseUrl = bootstrap.remoteBaseUrl || null;
@@ -319,6 +354,11 @@ async function tfRefreshPersonasFromServerInBackground() {
       state.bootstrap = {
         ...state.bootstrap,
         personas: Array.isArray(payload.personas) ? payload.personas : state.bootstrap.personas,
+        // Issue #1005: GET /api/ai-hub/personas awaits the authority with no first-paint
+        // budget, so a successful response IS the resolved projection. Marking it lets
+        // applyBootstrap preserve it against a later unresolved bootstrap, and stops
+        // tfRefreshAfterBootstrap from re-requesting a lookup that already succeeded.
+        personasResolved: true,
         subscriptionActive: Boolean(payload.subscriptionActive),
         workspaceId: payload.workspaceId ?? null,
         userEmail: payload.userEmail ?? null,
@@ -12984,6 +13024,13 @@ function tfRefreshAfterBootstrap() {
   else if (tf.area === 'brain') tfRenderBrain();
   if (tf.projectView === 'overview') tfRenderOverview();
   else tfRenderTree();
+  // Issue #1005: the bootstrap we just applied missed the first-paint persona budget and
+  // mergePersonaProjection had no resolved projection to fall back on (cold start, or the
+  // shell's initial refresh failed). Schedule the authoritative lookup so the roster fills
+  // in instead of waiting for some later bootstrap to happen to win the race.
+  if (state.bootstrap && state.bootstrap.personasResolved === false) {
+    void tfRefreshPersonasFromServerInBackground();
+  }
 }
 
 // Kick off the shell once the initial bootstrap has settled. The IIFE init at