fraim-hub 2.0.291 → 2.0.293

package/dist/src/ai-hub/conversation-store.js

@@ -78,6 +78,13 @@ function normalizeConversationKey(key) {
 function normalizeProjectPath(projectPath) {
     return normalizeConversationKey(projectPath);
 }
+function scopeForBucket(projectPath) {
+    if (projectPath === exports.MANAGER_SCOPE_KEY)
+        return 'manager';
+    if (projectPath === exports.COMPANY_SCOPE_KEY)
+        return 'company';
+    return undefined;
+}
 // Issue #708: fold legacy manager/company-invoked runs into the reserved scope buckets on read.
 function migrateScopeBuckets(store) {
     const projects = {};
@@ -297,9 +304,11 @@ function normalizeConversation(projectPath, raw) {
         return null;
     if (value.status !== 'running' && value.status !== 'completed' && value.status !== 'failed')
         return null;
+    const repairedScope = value.scope ?? scopeForBucket(projectPath);
     return {
         ...value,
         id: value.id,
+        ...(repairedScope !== undefined && { scope: repairedScope }),
         projectPath: normalizeProjectPath(typeof value.projectPath === 'string' ? value.projectPath : projectPath),
         title: value.title,
         jobId: value.jobId,

package/dist/src/ai-hub/desktop-main.js

@@ -65,6 +65,20 @@ function parseArgs(argv) {
     }
     return { projectPath, preferredPort, runtimeId };
 }
+// Issue #1415 (follow-up): the orphan sweep inside reconcileRunningHub hits real system ports
+// directly (not scoped to FRAIM_USER_DIR), so a test proving it fires must not point it at the
+// real 43091-43200 range - that could kill whatever Hub is genuinely running on the machine the
+// test happens to execute on. Not used in any real launch path; mirrors the existing
+// FRAIM_HUB_SKIP_MATERIALIZE / FRAIM_INSTALLER_LIFECYCLE_TEST kill-switch pattern.
+function resolveOrphanScanPortRangeOverride() {
+    const raw = process.env.FRAIM_HUB_ORPHAN_SCAN_PORT_RANGE;
+    if (!raw)
+        return hub_instance_reconciliation_1.DEFAULT_HUB_ORPHAN_SCAN_PORT_RANGE;
+    const [start, end] = raw.split('-').map(Number);
+    if (!Number.isFinite(start) || !Number.isFinite(end) || start > end)
+        return hub_instance_reconciliation_1.DEFAULT_HUB_ORPHAN_SCAN_PORT_RANGE;
+    return { start, end };
+}
 function applyUserDataOverride() {
     const userDataDir = process.env.FRAIM_AI_HUB_USER_DATA_DIR;
     if (!userDataDir)
@@ -570,7 +584,7 @@ async function bootstrap() {
     // regardless of FRAIM_USER_DIR isolation, so a test double (FAKE_HOST=1) skips it for the same
     // reason it skips the lock — it must never disturb a real Hub already running on this machine.
     if (!skipSingleInstance) {
-        await (0, hub_instance_reconciliation_1.reconcileRunningHub)({ restart: true, keepRunning: false }, options.runtimeId);
+        await (0, hub_instance_reconciliation_1.reconcileRunningHub)({ restart: true, keepRunning: false }, options.runtimeId, resolveOrphanScanPortRangeOverride());
     }
     // macOS reads the dock icon from the app bundle once packaged, but an
     // unpackaged `npm run hub:desktop` / `npx fraim-hub` run shows Electron's

package/dist/src/ai-hub/hub-instance-reconciliation.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_HUB_ORPHAN_SCAN_PORT_RANGE = void 0;
 exports.killPid = killPid;
 exports.isPortFree = isPortFree;
 exports.waitForPortFree = waitForPortFree;
@@ -109,10 +110,13 @@ function fetchHubPid(port) {
         req.on('timeout', () => { req.destroy(); resolve(null); });
     });
 }
-async function scanAndKillOrphanHubs(excludePid) {
-    const HUB_PORT_SCAN_START = 43091;
-    const HUB_PORT_SCAN_END = 43200;
-    for (let port = HUB_PORT_SCAN_START; port <= HUB_PORT_SCAN_END; port++) {
+exports.DEFAULT_HUB_ORPHAN_SCAN_PORT_RANGE = { start: 43091, end: 43200 };
+// `portRange` is injectable (default: the real Hub port range) so a test can point this at an
+// isolated range instead - the scan hits real system ports directly, independent of any
+// FRAIM_USER_DIR isolation, so exercising it against the real range in a test would risk killing
+// whatever Hub is genuinely running on this machine at the time.
+async function scanAndKillOrphanHubs(excludePid, portRange = exports.DEFAULT_HUB_ORPHAN_SCAN_PORT_RANGE) {
+    for (let port = portRange.start; port <= portRange.end; port++) {
         const version = await fetchRunningHubVersion(port);
         if (!version)
             continue; // port not a Hub
@@ -127,8 +131,8 @@ async function scanAndKillOrphanHubs(excludePid) {
 // The one entry point both launch paths call before starting their own server: reads
 // hub-runtime.json for `runtimeId`, confirms the recorded pid is actually alive and answering
 // (not just present in a stale file), and - when the decision is `replace` - kills it, waits for
-// its port to free, then sweeps for any unregistered orphan on the standard Hub port range.
-async function reconcileRunningHub(flags, runtimeId = 'hub') {
+// its port to free. The orphan sweep (#921) then runs independently of that decision - see below.
+async function reconcileRunningHub(flags, runtimeId = 'hub', orphanScanPortRange = exports.DEFAULT_HUB_ORPHAN_SCAN_PORT_RANGE) {
     const running = (0, hub_runtime_file_1.readHubRuntimeFile)((0, project_fraim_paths_1.getUserFraimDirPath)(), runtimeId);
     const confirmedVersion = running ? await fetchRunningHubVersion(running.port) : null;
     const live = !!(running && confirmedVersion && (0, process_liveness_1.isPidAlive)(running.pid));
@@ -140,17 +144,27 @@ async function reconcileRunningHub(flags, runtimeId = 'hub') {
         restart: flags.restart,
         noRestart: flags.keepRunning,
     });
+    let replacedPid = null;
     if (decision.action === 'replace' && effective) {
         console.log(`Replacing running Hub (v${effective.version}, pid ${effective.pid}) - ${decision.reason}`);
         killPid(effective.pid);
         await waitForPortFree(effective.port);
-        // #921: after killing the registered pid, scan for orphan Hub processes that were
-        // never registered in hub-runtime.json (e.g. older versions started via bare npx).
-        if (runtimeId === 'hub') {
-            await scanAndKillOrphanHubs(effective.pid);
-        }
+        replacedPid = effective.pid;
     }
     else if (decision.action === 'focus-existing' && effective) {
         console.log(`A Hub (v${effective.version}) is already running - focusing it. Use --restart to replace it.`);
+        return;
+    }
+    // Issue #1415 (follow-up): confirmed live - a Hub started via a different launch path (so it
+    // was never registered in hub-runtime.json at all, e.g. an older `npx fraim-hub` build) is only
+    // ever caught here. The bug this closes: the *registered* Hub can perfectly well have already
+    // quit on its own (a clean shutdown, or - observed live - electron-updater's own native update
+    // silently restarting it) by the time this reconciliation runs. That collapses the decision to
+    // 'launch-fresh', and the sweep used to live *inside* the 'replace' branch above, so a real,
+    // still-running orphan on the standard port range was never even looked for. The sweep must run
+    // whenever there is no live-and-focusable Hub for this runtimeId, not only when one was found
+    // and replaced - "no other launch path registered a Hub" is not evidence "no Hub is running."
+    if (runtimeId === 'hub') {
+        await scanAndKillOrphanHubs(replacedPid, orphanScanPortRange);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.291",
+  "version": "2.0.293",
   "description": "FRAIM Hub local companion package.",
   "author": "Sid Mathur <sid.mathur@gmail.com>",
   "homepage": "https://github.com/mathursrus/FRAIM#readme",
@@ -211,7 +211,7 @@
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
     "extract-zip": "^2.0.1",
-    "fraim": "2.0.291",
+    "fraim": "2.0.293",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/script.js

@@ -1405,6 +1405,12 @@ function persistConversations(options) {
   if (opts.disk !== false) scheduleConversationDiskPersist();
 }
 
+function renderActiveScopedArea() {
+  if (typeof tf === 'undefined') return;
+  if (tf.area === 'manager' && typeof tfRenderManager === 'function') tfRenderManager();
+  else if (tf.area === 'company' && typeof tfRenderCompany === 'function') tfRenderCompany();
+}
+
 async function hydrateConversationsFromServer() {
   // Issue #708: load the project-independent scope buckets (manager/company) first, so
   // manager runs are present regardless of whether a project is selected.
@@ -1425,7 +1431,7 @@ async function hydrateConversationsFromServer() {
     console.warn('Could not hydrate manager/company conversations:', error);
   }
   if (!state.projectPath) {
-    if (typeof tfRenderManager === 'function' && typeof tf !== 'undefined' && tf.area === 'manager') tfRenderManager();
+    renderActiveScopedArea();
     return;
   }
   const projectPath = state.projectPath;
@@ -1454,6 +1460,7 @@ async function hydrateConversationsFromServer() {
     renderRail();
     renderActive();
     await hydrateConversationBody(projectPath, state.activeId);
+    renderActiveScopedArea();
     syncConversationRefreshPolling();
   } catch (error) {
     if (state.conversationBodiesPending === projectPath) state.conversationBodiesPending = null;
@@ -6280,8 +6287,9 @@ function renderNextJobRecommendations(conv) {
         const instructions = issueNumber
           ? `Continue from issue #${issueNumber}: ${summary}`
           : `Continue from ${conv.jobTitle || 'the previous job'}: ${summary}`;
-        const area = conv.scope === 'manager' ? 'manager'
-          : conv.scope === 'company' ? 'company'
+        const scope = convScope(conv);
+        const area = scope === 'manager' ? 'manager'
+          : scope === 'company' ? 'company'
             : 'projects';
         const employeeId = conversationAgentName(conv) || (state.selectedEmployeeId) || 'claude';
         // Issue #989 R1-R6: open step-2 with job pre-selected and instructions pre-filled
@@ -8053,7 +8061,7 @@ async function startRun(job, instructions, employeeId, preassignedConvId, invoke
         projectPath: state.projectPath,
         // Issue #892: send the run scope so project-independent runs (Company/Manager
         // onboarding) can start with no project selected.
-        scope: conv.scope,
+        scope: convScope(conv),
         hostId: baseHostIdForAgent(employeeId),
         configuredAgentId: employeeId,
         jobId: job.id,
@@ -8105,13 +8113,14 @@ async function restartConvWithAgent(conv, newAgentId, text) {
   renderRail();
   renderActive();
   try {
+    const scope = convScope(conv);
     const result = await requestJson(`/api/ai-hub/conversations/${encodeURIComponent(conv.id)}/switch-agent`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         projectPath: state.projectPath,
         configuredAgentId: newAgentId,
-        scope: conv.scope === 'manager' || conv.scope === 'company' ? conv.scope : undefined,
+        scope: scope === 'manager' || scope === 'company' ? scope : undefined,
         instructions: text,
       }),
     });
@@ -11599,6 +11608,12 @@ function kbMakeCard(conv) {
   // Kanban/Cards overview is read-only. Clicking anywhere on the card navigates to the workspace.
   const navigate = () => {
     if (!conv.id) return;
+    const scope = convScope(conv);
+    if (scope === 'manager' || scope === 'company') {
+      tfShowArea(scope);
+      switchToConversation(conv.id);
+      return;
+    }
     const _proj = conv.projectPath ? tfProjectForPath(conv.projectPath) : null;
     tfSelectProjectView('workspace', _proj ? _proj.id : tf.activeProjectId);
     switchToConversation(conv.id);