fraim-hub 2.0.279 → 2.0.280

package/dist/src/ai-hub/bundled-asset-resolver.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveBundledAssetPath = resolveBundledAssetPath;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+/**
+ * Resolves a bundled asset that ships at a different relative depth depending on how the
+ * Hub is launched (`npx fraim-hub` unpacked, `npm run hub:desktop`, or a packaged app).
+ *
+ * Checks, in order: relative to the current working directory, then relative to
+ * `moduleDir` (pass `__dirname` from the caller) two and three levels up - the depths
+ * `dist/src/ai-hub/` sits at relative to a package root. Returns the first path that
+ * exists on disk, or null if none do, so callers can fall back rather than crash on a
+ * packaging gap.
+ *
+ * No Electron import here on purpose: `electron` resolves to a plain path string outside
+ * an Electron process, so anything that touches it can only run inside one. Keeping this
+ * resolution logic Electron-free is what makes it unit-testable with plain `node:test`.
+ */
+function resolveBundledAssetPath(relativePath, moduleDir, cwd = process.cwd()) {
+    const candidates = [
+        path_1.default.resolve(cwd, relativePath),
+        path_1.default.resolve(moduleDir, '..', '..', relativePath),
+        path_1.default.resolve(moduleDir, '..', '..', '..', relativePath),
+    ];
+    return candidates.find((c) => fs_1.default.existsSync(c)) ?? null;
+}

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

@@ -15,6 +15,7 @@ const project_fraim_paths_1 = require("../core/utils/project-fraim-paths");
 const version_utils_1 = require("../cli/utils/version-utils");
 const hub_runtime_file_1 = require("./hub-runtime-file");
 const window_open_decision_1 = require("./window-open-decision");
+const bundled_asset_resolver_1 = require("./bundled-asset-resolver");
 // ---------------------------------------------------------------------------
 // State
 // ---------------------------------------------------------------------------
@@ -61,19 +62,22 @@ function applyUserDataOverride() {
     electron_1.app.setPath('userData', userDataDir);
 }
 // ---------------------------------------------------------------------------
-// Tray icon resolution — prefers bundled icon, falls back to a 1×1 empty image
-// so the app never crashes if assets aren't present.
+// App icon — the FRAIM logo (#1329), used for the window/taskbar/dock icon
+// and, downscaled, the system tray. Falls back to Electron's own default
+// (window/dock) or an empty image (tray) so a packaging gap never crashes
+// the app. Path resolution itself lives in bundled-asset-resolver.ts, which
+// has no Electron import and so can be unit-tested directly.
 // ---------------------------------------------------------------------------
+const APP_ICON_RELATIVE_PATH = 'public/ai-hub/fraim-icon.png';
+function resolveAppIcon() {
+    const iconPath = (0, bundled_asset_resolver_1.resolveBundledAssetPath)(APP_ICON_RELATIVE_PATH, __dirname);
+    return iconPath ? electron_1.nativeImage.createFromPath(iconPath) : null;
+}
 function resolveTrayIcon() {
-    const candidates = [
-        path_1.default.resolve(process.cwd(), 'extensions/office-word/icon-64.png'),
-        path_1.default.resolve(__dirname, '..', '..', 'extensions/office-word/icon-64.png'),
-        path_1.default.resolve(__dirname, '..', '..', '..', 'extensions/office-word/icon-64.png'),
-    ];
-    for (const c of candidates) {
-        if (fs_1.default.existsSync(c))
-            return electron_1.nativeImage.createFromPath(c).resize({ width: 16, height: 16 });
-    }
+    const iconPath = (0, bundled_asset_resolver_1.resolveBundledAssetPath)(APP_ICON_RELATIVE_PATH, __dirname)
+        ?? (0, bundled_asset_resolver_1.resolveBundledAssetPath)('extensions/office-word/icon-64.png', __dirname);
+    if (iconPath)
+        return electron_1.nativeImage.createFromPath(iconPath).resize({ width: 16, height: 16 });
     return electron_1.nativeImage.createEmpty();
 }
 // ---------------------------------------------------------------------------
@@ -210,6 +214,7 @@ async function createWindow(url, runtimeId = process.env.FRAIM_HUB_RUNTIME_ID ||
     const isWin = process.platform === 'win32';
     mainWindow = new electron_1.BrowserWindow({
         title: displayName(runtimeId),
+        icon: resolveAppIcon() ?? undefined,
         width,
         height,
         minWidth: 1200,
@@ -407,6 +412,14 @@ async function bootstrap() {
     });
     await electron_1.app.whenReady();
     electron_1.app.setName(displayName(options.runtimeId));
+    // 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
+    // own icon there unless we set it explicitly (#1329).
+    if (process.platform === 'darwin') {
+        const dockIcon = resolveAppIcon();
+        if (dockIcon)
+            electron_1.app.dock?.setIcon(dockIcon);
+    }
     // First-launch housekeeping (idempotent, fast on subsequent runs)
     ensureLoginItem();
     configureAutoUpdater();

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

@@ -2858,7 +2858,9 @@ class AiHubServer {
                 // first event so the ref is always on disk within the same synchronous
                 // turn. Subsequent events use the normal debounced path.
                 if (ref.eventCount === 1) {
-                    this.persistRunConversationNow(run, run.conversationId || run.id);
+                    // Issue #1009: a delegated child's first raw event must not steal the
+                    // active board slot from its parent/orchestrator conversation.
+                    this.persistRunConversationNow(run, run.managedByRunId ? undefined : (run.conversationId || run.id));
                 }
             }
             catch (error) {
@@ -3043,7 +3045,11 @@ class AiHubServer {
         const run = this.runRegistry.get(runId);
         if (!run)
             return;
-        this.persistRunConversationNow(run, activeId ?? run.conversationId ?? run.id);
+        // Issue #1009: a delegated child run finishing or parking must not steal the
+        // active board slot from its parent/orchestrator conversation. Only a
+        // standalone (non-delegated) run's own finalize should claim activeId.
+        const resolvedActiveId = run.managedByRunId ? undefined : (activeId ?? run.conversationId ?? run.id);
+        this.persistRunConversationNow(run, resolvedActiveId);
         console.info('[ai-hub] hub.conversation_projection.finalized', {
             conversationId: run.conversationId || run.id,
             runId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.279",
+  "version": "2.0.280",
   "description": "FRAIM Hub local companion package.",
   "bin": {
     "fraim-hub": "bin/fraim-hub.js",
@@ -135,6 +135,7 @@
       "repo": "FRAIM"
     },
     "win": {
+      "icon": "build/icon.ico",
       "target": [
         "nsis",
         "portable"
@@ -146,6 +147,7 @@
       "allowToChangeInstallationDirectory": true
     },
     "mac": {
+      "icon": "build/icon.icns",
       "target": [
         "dmg",
         "zip"
@@ -154,6 +156,7 @@
       "gatekeeperAssess": false
     },
     "linux": {
+      "icon": "build/icon.png",
       "target": [
         "AppImage",
         "deb"
@@ -176,7 +179,7 @@
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
     "extract-zip": "^2.0.1",
-    "fraim": "2.0.279",
+    "fraim": "2.0.280",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",