fraim 2.0.169 → 2.0.170

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

@@ -59,6 +59,7 @@ const conversation_store_1 = require("./conversation-store");
 const managed_browser_1 = require("./managed-browser");
 const managed_agent_paths_1 = require("../cli/utils/managed-agent-paths");
 let personaHiringModule;
+let managerHiringModule;
 function loadPersonaHiringModule() {
     const cached = personaHiringModule;
     if (cached !== undefined) {
@@ -77,6 +78,24 @@ function loadPersonaHiringModule() {
         return null;
     }
 }
+function loadManagerHiringModule() {
+    const cached = managerHiringModule;
+    if (cached !== undefined) {
+        return cached;
+    }
+    try {
+        // Server deployments include the manager-hiring catalog. The npm client
+        // package intentionally does not, so Hub bootstrap must not require it.
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const loaded = require('../config/ai-manager-hiring');
+        managerHiringModule = loaded;
+        return loaded;
+    }
+    catch {
+        managerHiringModule = null;
+        return null;
+    }
+}
 function loadPersonaCapabilityModule() {
     try {
         // Server deployments include the persona catalog. The npm client package
@@ -101,6 +120,13 @@ function buildHubPersonaHireUrl(personaKey, hireMode = 'job') {
 function buildHubPersonaAvatarUrl(personaKey) {
     return loadPersonaHiringModule()?.buildPersonaAvatarUrl(personaKey) ?? '';
 }
+function buildHubManagerHiringCatalog() {
+    return loadManagerHiringModule()?.buildManagerHiringCatalog() ?? {
+        qualities: [],
+        services: [],
+        roles: {},
+    };
+}
 async function getHubWorkspacePersonaState(dbService, userId, apiKey) {
     try {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -1037,7 +1063,7 @@ class AiHubServer {
             // Issue #538 — source of truth for the "Hire a human manager" UI. Lazy-required
             // (not a top-level import) so the lightweight client CLI paths that import this
             // module for findAvailablePort do not eagerly load server-only config (repro #422).
-            managerHiring: require('../config/ai-manager-hiring').buildManagerHiringCatalog(),
+            managerHiring: buildHubManagerHiringCatalog(),
             // Issue #540: server-authoritative manager team (personas assigned by this manager).
             managerTeam,
         };

package/dist/src/core/utils/inheritance-parser.js

@@ -187,6 +187,11 @@ class InheritanceParser {
         const parentMeta = JSON.parse(parentMatch[1]);
         const mergedMeta = { ...parentMeta, ...childMeta };
         delete mergedMeta.extends; // Remove extends from final merged content
+        // Deep-merge phase routing so child only overrides the entries it specifies;
+        // parent routing for untouched phases flows through unchanged.
+        if (parentMeta.phases && childMeta.phases) {
+            mergedMeta.phases = { ...parentMeta.phases, ...childMeta.phases };
+        }
         // 2. Extract Body (everything after frontmatter)
         const childBody = this.stripRedundantParentImports(child.substring(childMatch[0].length).trim(), typeof childMeta.extends === 'string' ? childMeta.extends : undefined);
         const parentBody = parent.substring(parentMatch[0].length).trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.169",
+  "version": "2.0.170",
   "description": "FRAIM CLI - Framework for Rigor-based AI Management (alias for fraim-framework)",
   "main": "index.js",
   "bin": {

package/public/ai-hub/script.js

@@ -3976,11 +3976,14 @@ async function startRun(job, instructions, employeeId, preassignedConvId) {
     // Issue #489: capture selection state at job-start so write-back knows insert-after vs append.
     wordStartedWithSelection: document.body.dataset.surface === 'task-pane' && !!(state.wordContext && state.wordContext.hasSelection),
   };
-  upsertConversation(conv);
-  state.activeId = conv.id;
-  persistConversations();
-  renderRail();
-  renderActive();
+  upsertConversation(conv);
+  state.activeId = conv.id;
+  // Issue #539: make Cmd/Ctrl+Shift+R available as soon as the run is queued,
+  // not only after the server responds with the run id.
+  state.lastRun = { job, instructions, employeeId };
+  persistConversations();
+  renderRail();
+  renderActive();
 
   try {
     const run = await requestJson('/api/ai-hub/runs', {
@@ -4008,9 +4011,8 @@ async function startRun(job, instructions, employeeId, preassignedConvId) {
     renderRail();
     renderActive();
     startPolling();
-    // Issue #539: record last run for Cmd+Shift+R re-run and update in-memory
-    // preferences so the next palette open shows the correct recent section.
-    state.lastRun = { job, instructions, employeeId };
+    // Issue #539: update in-memory preferences so the next palette open shows
+    // the correct recent section.
     if (state.bootstrap && state.bootstrap.preferences) {
       const prefs = state.bootstrap.preferences;
       const nextIds = [job.id, ...(prefs.recentJobIds || []).filter((id) => id !== job.id)].slice(0, 8);