fraim-hub 2.0.312 → 2.0.314

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

@@ -19,12 +19,31 @@ const pack_home_1 = require("../cli/utils/pack-home");
 // Directories scanned for employee jobs at runtime, in lowest-to-highest
 // precedence order. Later entries win on {categoryId, jobId} collision.
 //
-// FRAIM execution normally reads only the two `fraim/` layers: the synced
-// baseline and the personalized override. The Hub can explicitly opt into the
+// FRAIM execution normally reads three layers: the machine-level baseline
+// (shared across every project on this machine), the project-level synced
+// baseline, and the personalized override. The Hub can explicitly opt into the
 // source `registry/` fallback when running against the FRAIM repo before sync.
-//   - <project>/fraim/ai-employee/jobs/<category>/           - synced baseline
-//   - <project>/fraim/personalized-employee/jobs/<category>/ - taught/customized override
+//   - ~/.fraim/ai-employee/jobs/<category>/                   - machine-level baseline (issue #1644)
+//   - <project>/fraim/ai-employee/jobs/<category>/            - synced baseline
+//   - <project>/fraim/personalized-employee/jobs/<category>/  - taught/customized override
 // Only the personalized-employee layer is "personalized" (issue #566).
+//
+// Issue #1644: `fraim sync` Layer 1 (always runs, regardless of whether cwd is
+// a FRAIM project) writes baseline job stubs to ~/.fraim/ai-employee/jobs/ and
+// ~/.fraim/ai-manager/jobs/ so every project on the machine sees the current
+// catalog without its own project-level sync. This is the lowest-precedence
+// layer: a project- or personalized-level stub with the same id always wins.
+//
+// Resolved as a function, not a module-level constant: getUserFraimDirPath()
+// reads FRAIM_USER_DIR at call time, and callers (including tests that
+// isolate a temp machine home) need that resolved fresh on every discovery
+// call, not frozen at module-import time.
+function machineJobLayers(role) {
+    const root = path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), role, 'jobs');
+    // Issue #1002 convention: a machine-level stub displays as `~/.fraim/...`,
+    // not a long `../../..` walk out of the project.
+    return [{ root, segments: [], personalized: false, displayRoot: root, displayPrefix: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`${role}/jobs`) }];
+}
 const EMPLOYEE_JOB_LAYERS = [
     { segments: ['ai-employee', 'jobs'], personalized: false },
 ];
@@ -90,8 +109,14 @@ function resolveExtendedStubPath(projectPath, extendsValue) {
     if (!relative || relative.includes('..'))
         return null;
     const candidateRoots = [
+        // Project-level checked first, matching the precedence used everywhere
+        // else in this file (project overrides machine on a name collision).
         path_1.default.join(projectPath, 'fraim', 'ai-employee', 'jobs'),
         path_1.default.join(projectPath, 'fraim', 'ai-manager', 'jobs'),
+        // Issue #1644: the baseline a stub `extends` may exist only at the
+        // machine-level home now that Layer 1 writes it there.
+        path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'ai-employee', 'jobs'),
+        path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'ai-manager', 'jobs'),
         path_1.default.join(projectPath, 'registry', 'jobs', 'ai-employee'),
         path_1.default.join(projectPath, 'registry', 'jobs', 'ai-manager'),
     ];
@@ -286,8 +311,8 @@ function discoverEmployeeJobs(projectPath, options = {}) {
     if (!project.exists || (!project.hasFraim && !options.includeRegistry))
         return [];
     const layers = discoverLayers(projectPath, options.includeRegistry
-        ? [...REGISTRY_EMPLOYEE_JOB_LAYERS, ...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]
-        : [...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]);
+        ? [...REGISTRY_EMPLOYEE_JOB_LAYERS, ...machineJobLayers('ai-employee'), ...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]
+        : [...machineJobLayers('ai-employee'), ...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]);
     // Group by categoryId so all layers contribute to the same labelled category.
     const jobsByKey = new Map();
     for (const layer of layers) {
@@ -313,8 +338,8 @@ function discoverManagerTemplates(projectPath, options = {}) {
     if (!project.exists || (!project.hasFraim && !options.includeRegistry))
         return [];
     const layers = discoverLayers(projectPath, options.includeRegistry
-        ? [...REGISTRY_MANAGER_JOB_LAYERS, ...MANAGER_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'manager-jobs')]
-        : [...MANAGER_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'manager-jobs')]);
+        ? [...REGISTRY_MANAGER_JOB_LAYERS, ...machineJobLayers('ai-manager'), ...MANAGER_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'manager-jobs')]
+        : [...machineJobLayers('ai-manager'), ...MANAGER_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'manager-jobs')]);
     const templatesByKey = new Map();
     for (const layer of layers) {
         const groupLabel = humanizeName(layer.categoryId);
@@ -401,6 +426,8 @@ function findJobStubPath(projectPath, jobId) {
     // inspect any FRAIM job run, including manager-side jobs such as
     // sleep-on-learnings.
     const layers = discoverLayers(projectPath, [
+        ...machineJobLayers('ai-employee'),
+        ...machineJobLayers('ai-manager'),
         ...EMPLOYEE_JOB_LAYERS,
         ...MANAGER_JOB_LAYERS,
         ...personalizedLayerSegments(projectPath, 'jobs'),
@@ -518,8 +545,8 @@ function getAiHubCategories(projectPath, options = {}) {
         return [];
     // A category is any directory found at any layer; deduplicate by id.
     const layers = discoverLayers(projectPath, options.includeRegistry
-        ? [...REGISTRY_EMPLOYEE_JOB_LAYERS, ...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]
-        : [...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]);
+        ? [...REGISTRY_EMPLOYEE_JOB_LAYERS, ...machineJobLayers('ai-employee'), ...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]
+        : [...machineJobLayers('ai-employee'), ...EMPLOYEE_JOB_LAYERS, ...personalizedLayerSegments(projectPath, 'jobs')]);
     const seen = new Map();
     for (const layer of layers) {
         if (!seen.has(layer.categoryId)) {

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

@@ -41,6 +41,7 @@ exports.selfHealBrokenManagedAgents = selfHealBrokenManagedAgents;
 exports.configureFraimForHubAgent = configureFraimForHubAgent;
 exports.installAgentAndRefreshDetection = installAgentAndRefreshDetection;
 exports.hubCommandVersion = hubCommandVersion;
+exports.__setStartupSyncSpawnForTests = __setStartupSyncSpawnForTests;
 exports.__setAgentInstallTimeoutMsForTests = __setAgentInstallTimeoutMsForTests;
 exports.hubRunProcess = hubRunProcess;
 exports.buildOpenFileInvocation = buildOpenFileInvocation;
@@ -2147,6 +2148,13 @@ function hubRunSync(command, args, env) {
 // (typically seconds) while still bounding the failure the way AC-C1 requires.
 const DEFAULT_AGENT_INSTALL_TIMEOUT_MS = 90_000;
 let agentInstallTimeoutMs = DEFAULT_AGENT_INSTALL_TIMEOUT_MS;
+// Test seam for the startup machine-level sync (Issue #1645). Allows tests to
+// intercept the spawn call without actually invoking npx.
+let startupSyncSpawnFn = child_process_1.spawn;
+/** Test seam only. Pass null to restore the production spawn. */
+function __setStartupSyncSpawnForTests(fn) {
+    startupSyncSpawnFn = fn ?? child_process_1.spawn;
+}
 /** Test seam only. Mirrors __setEmployeeDetectionTtlForTests in hosts.ts — proves the bound
  * actually fires without a real 90s hang. Pass null to restore the production value. */
 function __setAgentInstallTimeoutMsForTests(ms) {
@@ -3265,6 +3273,17 @@ class AiHubServer {
                 console.warn('[ai-hub] self-heal pass failed:', error?.message || error);
             });
         }
+        // Issue #1645: fire-and-forget machine-level sync so the delegate job list
+        // is current within the session. Skipped in NODE_ENV=test to avoid spawning
+        // real processes in the test suite's many short-lived Hub instances.
+        if (process.env.NODE_ENV !== 'test') {
+            const syncChild = startupSyncSpawnFn('npx', ['fraim', 'sync', '--global'], {
+                detached: true,
+                stdio: 'ignore',
+            });
+            syncChild.on('error', () => { });
+            syncChild.unref();
+        }
         // Update-badge freshness: refresh the npm-latest cache on our own clock, not just when
         // a page load or relaunch decision happens to ask for it. Without this, a Hub that's
         // resident in the tray for days with no window reload and no tray re-click never learns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.312",
+  "version": "2.0.314",
   "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.312",
+    "fraim": "2.0.314",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/script.js

@@ -5669,7 +5669,6 @@ function scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, forceBottom)
   if (latest.status === 'running') {
     ensurePendingAnchorScrollListener(host);
     if (!forceBottom && pendingAnchorUserScrolled(host)) {
-      host.scrollTop = 0;
       return;
     }
     const pendingRow = host.querySelector('.message[data-pending="true"]');