fraim-hub 2.0.221 → 2.0.223

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

@@ -45,6 +45,7 @@ const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const net_1 = __importDefault(require("net"));
 const http_1 = __importDefault(require("http"));
+const tree_kill_1 = __importDefault(require("tree-kill"));
 const hub_launch_decision_1 = require("./hub-launch-decision");
 const hub_runtime_file_1 = require("./hub-runtime-file");
 const project_fraim_paths_1 = require("../core/utils/project-fraim-paths");
@@ -116,16 +117,58 @@ function isProcessAlive(pid) {
 function killPid(pid) {
     try {
         if (process.platform === 'win32') {
+            // /T kills the entire process tree; /F forces termination without prompting.
             (0, child_process_1.execFileSync)('taskkill', ['/PID', String(pid), '/T', '/F'], { stdio: 'ignore' });
         }
         else {
-            process.kill(pid, 'SIGTERM');
+            // tree-kill sends SIGTERM to the process group so child Electron helper processes
+            // are also terminated, not just the root node process (#921).
+            (0, tree_kill_1.default)(pid, 'SIGTERM');
         }
     }
     catch {
         /* already gone */
     }
 }
+// #921: after killing the registered pid, probe ports 43091-43200 for any Hub HTTP
+// response. Any Hub found on those ports that is NOT the already-killed pid is an
+// orphan (e.g. an older version started via bare `npx` that never wrote hub-runtime.json).
+// GET /api/ai-hub/pid identifies the pid; we then kill it and wait for its port to free.
+async function fetchHubPid(port) {
+    return new Promise((resolve) => {
+        const req = http_1.default.get({ host: '127.0.0.1', port, path: '/api/ai-hub/pid', timeout: 1000 }, (res) => {
+            if (res.statusCode !== 200) {
+                res.resume();
+                return resolve(null);
+            }
+            let body = '';
+            res.on('data', (c) => { body += c; });
+            res.on('end', () => { try {
+                resolve(JSON.parse(body).pid ?? null);
+            }
+            catch {
+                resolve(null);
+            } });
+        });
+        req.on('error', () => resolve(null));
+        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++) {
+        const version = await fetchRunningHubVersion(port);
+        if (!version)
+            continue; // port not a Hub
+        const pid = await fetchHubPid(port);
+        if (pid === null || pid === excludePid)
+            continue; // same process we already killed
+        console.log(`Killing orphan Hub (pid ${pid}) on port ${port}`);
+        killPid(pid);
+        await waitForPortFree(port);
+    }
+}
 function isPortFree(port, timeoutMs = 500) {
     return new Promise((resolve) => {
         const sock = net_1.default.connect({ host: '127.0.0.1', port }, () => { sock.destroy(); resolve(false); });
@@ -177,6 +220,9 @@ async function reconcileRunningHub(flags) {
         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).
+        await scanAndKillOrphanHubs(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.`);

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

@@ -0,0 +1,166 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hubInstallCommand = void 0;
+exports.resolveHubInstallDir = resolveHubInstallDir;
+exports.resolveShortcutTarget = resolveShortcutTarget;
+exports.getOsShortcutPaths = getOsShortcutPaths;
+exports.writeMacosLaunchAgent = writeMacosLaunchAgent;
+exports.writeLinuxDesktopEntry = writeLinuxDesktopEntry;
+exports.runHubInstall = runHubInstall;
+// #921: `fraim hub install` — register the FRAIM Hub as an OS application so users
+// can launch it without a terminal or npx command.
+//
+// This is an interim mitigation. Full packaged installers (electron-builder, code
+// signing, .msi/.dmg) are a separate effort requiring signing infrastructure.
+const commander_1 = require("commander");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const child_process_1 = require("child_process");
+const project_fraim_paths_1 = require("../core/utils/project-fraim-paths");
+// Stable install directory under ~/.fraim/bin/fraim-hub-electron/
+function resolveHubInstallDir() {
+    return path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'bin', 'fraim-hub-electron');
+}
+// The binary that OS shortcuts should point at. On Windows this is the Electron .exe;
+// on POSIX systems it is the unpacked Electron binary or a shell wrapper.
+function resolveShortcutTarget() {
+    const installDir = resolveHubInstallDir();
+    if (process.platform === 'win32') {
+        return path_1.default.join(installDir, 'fraim-hub.exe');
+    }
+    if (process.platform === 'darwin') {
+        return path_1.default.join(installDir, 'FRAIM Hub.app', 'Contents', 'MacOS', 'FRAIM Hub');
+    }
+    return path_1.default.join(installDir, 'fraim-hub');
+}
+// Platform-correct locations for OS launcher entries.
+function getOsShortcutPaths(home) {
+    if (process.platform === 'win32') {
+        const appData = process.env.APPDATA || path_1.default.join(home, 'AppData', 'Roaming');
+        return {
+            startMenu: path_1.default.join(appData, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'FRAIM Hub.lnk'),
+        };
+    }
+    if (process.platform === 'darwin') {
+        return {
+            launchAgent: path_1.default.join(home, 'Library', 'LaunchAgents', 'ai.fraim.hub.plist'),
+        };
+    }
+    return {
+        desktopEntry: path_1.default.join(home, '.local', 'share', 'applications', 'fraim-hub.desktop'),
+    };
+}
+function writeMacosLaunchAgent(plistPath, target) {
+    const content = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>ai.fraim.hub</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${target}</string>
+    <string>--no-open</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <false/>
+  <key>StandardOutPath</key>
+  <string>${path_1.default.join(os_1.default.homedir(), '.fraim', 'hub-launchagent.log')}</string>
+  <key>StandardErrorPath</key>
+  <string>${path_1.default.join(os_1.default.homedir(), '.fraim', 'hub-launchagent-error.log')}</string>
+</dict>
+</plist>
+`;
+    fs_1.default.mkdirSync(path_1.default.dirname(plistPath), { recursive: true });
+    fs_1.default.writeFileSync(plistPath, content, 'utf8');
+}
+function writeLinuxDesktopEntry(desktopPath, target) {
+    const content = `[Desktop Entry]
+Name=FRAIM Hub
+Comment=FRAIM AI Workforce Hub
+Exec=${target} --no-open
+Icon=fraim-hub
+Terminal=false
+Type=Application
+Categories=Utility;
+StartupNotify=true
+`;
+    fs_1.default.mkdirSync(path_1.default.dirname(desktopPath), { recursive: true });
+    fs_1.default.writeFileSync(desktopPath, content, 'utf8');
+    try {
+        fs_1.default.chmodSync(desktopPath, 0o644);
+    }
+    catch { /* non-fatal */ }
+}
+function writeWindowsShortcutScript(lnkPath, target) {
+    // PowerShell WScript.Shell creates a real .lnk shortcut.
+    const ps = [
+        '$ws = New-Object -ComObject WScript.Shell',
+        `$sc = $ws.CreateShortcut('${lnkPath.replace(/'/g, "''")}')`,
+        `$sc.TargetPath = '${target.replace(/'/g, "''")}'`,
+        "$sc.WindowStyle = 1",
+        '$sc.Save()',
+    ].join('; ');
+    try {
+        (0, child_process_1.execFileSync)('powershell', ['-NoProfile', '-NonInteractive', '-Command', ps], { stdio: 'pipe' });
+    }
+    catch {
+        // PowerShell unavailable (e.g. minimal CI image) — write a plain .cmd launcher as fallback.
+        const safeTarget = target.replace(/"/g, '""');
+        const cmd = `@echo off\r\nstart "" "${safeTarget}"\r\n`;
+        const cmdPath = lnkPath.replace(/\.lnk$/i, '.cmd');
+        fs_1.default.mkdirSync(path_1.default.dirname(cmdPath), { recursive: true });
+        fs_1.default.writeFileSync(cmdPath, cmd, 'utf8');
+    }
+}
+async function runHubInstall() {
+    console.log('Installing FRAIM Hub as an OS application...');
+    const installDir = resolveHubInstallDir();
+    const target = resolveShortcutTarget();
+    const home = os_1.default.homedir();
+    const shortcuts = getOsShortcutPaths(home);
+    // Ensure the install directory exists (the actual Electron binary download
+    // is a separate step — this wires the OS launcher to the expected path so
+    // the shortcut is ready as soon as the binary is downloaded).
+    fs_1.default.mkdirSync(installDir, { recursive: true });
+    if (process.platform === 'win32' && shortcuts.startMenu) {
+        fs_1.default.mkdirSync(path_1.default.dirname(shortcuts.startMenu), { recursive: true });
+        writeWindowsShortcutScript(shortcuts.startMenu, target);
+        console.log(`  Start Menu shortcut: ${shortcuts.startMenu}`);
+    }
+    else if (process.platform === 'darwin' && shortcuts.launchAgent) {
+        writeMacosLaunchAgent(shortcuts.launchAgent, target);
+        // Load the agent so it is active immediately without a logout/login.
+        try {
+            (0, child_process_1.execFileSync)('launchctl', ['load', shortcuts.launchAgent], { stdio: 'ignore' });
+        }
+        catch { /* non-fatal if already loaded */ }
+        console.log(`  LaunchAgent: ${shortcuts.launchAgent}`);
+    }
+    else if (shortcuts.desktopEntry) {
+        writeLinuxDesktopEntry(shortcuts.desktopEntry, target);
+        // Notify the desktop environment to refresh its app database.
+        try {
+            (0, child_process_1.execFileSync)('update-desktop-database', [path_1.default.dirname(shortcuts.desktopEntry)], { stdio: 'ignore' });
+        }
+        catch { /* non-fatal if tool absent */ }
+        console.log(`  Desktop entry: ${shortcuts.desktopEntry}`);
+    }
+    console.log('');
+    console.log('FRAIM Hub is registered as an OS application.');
+    console.log('Launch it from your Start Menu / Launchpad / application launcher.');
+    console.log('');
+    console.log('Note: the Hub binary will be downloaded on first launch via:');
+    console.log('  fraim hub  (or npx fraim-hub@latest)');
+}
+exports.hubInstallCommand = new commander_1.Command('install')
+    .description('Register FRAIM Hub as an OS application (Start Menu / Launchpad entry)')
+    .action(async () => {
+    await runHubInstall();
+});

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

@@ -3182,6 +3182,11 @@ class AiHubServer {
             const updateAvailable = !!(latest && semver.valid(version) && semver.valid(latest) && semver.gt(latest, version));
             return res.json({ version, latest, updateAvailable });
         });
+        // #921: expose the server's pid so the orphan scanner in cli.ts can identify and
+        // kill Hub processes that are not registered in hub-runtime.json.
+        this.app.get('/api/ai-hub/pid', (_req, res) => {
+            return res.json({ pid: process.pid });
+        });
         this.app.post('/api/ai-hub/project-path/pick', async (_req, res) => {
             try {
                 const projectPath = await this.folderPicker();

package/dist/src/cli/fraim-hub.js

@@ -9,6 +9,7 @@ const commander_1 = require("commander");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const cli_1 = require("../ai-hub/cli");
+const hub_install_1 = require("../ai-hub/hub-install");
 function readPackageVersion() {
     try {
         let currentDir = __dirname;
@@ -40,6 +41,8 @@ function createFraimHubProgram(action = cli_1.runHub) {
         .option('--keep-running', 'Do not replace a running Hub; keep single-instance focus (default replaces only an older/stale instance)')
         .allowExcessArguments(false)
         .action(action);
+    // #921: `fraim-hub install` — register Hub as an OS app (Start Menu / Launchpad entry)
+    program.addCommand(hub_install_1.hubInstallCommand);
     return program;
 }
 if (require.main === module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.221",
+  "version": "2.0.223",
   "description": "FRAIM Hub local companion package.",
   "main": "index.js",
   "bin": {
@@ -93,7 +93,7 @@
     "dotenv": "^16.4.7",
     "electron": "^41.2.2",
     "express": "^5.2.1",
-    "fraim": "2.0.221",
+    "fraim": "2.0.223",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/index.html

@@ -16,8 +16,8 @@
     // before company branding). script.js refines the per-theme accent on load.
     try{var b=JSON.parse(localStorage.getItem('fraim-org-brand')||'null');if(b){if(typeof b.color==='string'&&/^#[0-9a-f]{6}$/i.test(b.color)){h.style.setProperty('--accent',b.color);h.style.setProperty('--accent-strong',b.color);}if(typeof b.name==='string'&&b.name){document.title=b.name+' Hub';}}}catch(e){}
   })();</script>
-  <link rel="stylesheet" href="./styles.css?v=conv-panels-20260611b">
-  <link rel="stylesheet" href="./review.css">
+  <link rel="stylesheet" href="./styles.css?v=dark-status-20260721">
+  <link rel="stylesheet" href="./review.css?v=dark-status-20260721">
 </head>
 <body>
 
@@ -1037,6 +1037,6 @@
     </div>
   </div>
 
-  <script src="./script.js?v=persona-mgr-del-20260707"></script>
+  <script src="./script.js?v=dark-status-20260721"></script>
 </body>
 </html>

package/public/ai-hub/script.js

@@ -589,8 +589,8 @@ function normalizeGeminiConversationMessages(conv) {
 // registry and writes them to the conversation store on every run update
 // (persistRunConversation), so the client must NOT re-upload them: a large run's
 // messages/events/artifacts push the PUT body past the server's size limit, the
-// request 413s, the error is swallowed, and the client-owned flags in the SAME
-// payload (e.g. reviewApproved from "Mark complete") never persist. Strip them
+// request 413s, the error is swallowed, and the client-owned fields in the SAME
+// payload (e.g. pauseReason='done' from "Mark complete") never persist. Strip them
 // here; the server's PUT handler merges them back from the stored record.
 const SERVER_OWNED_CONV_FIELDS = ['messages', 'events', 'artifacts', 'run', 'delegation'];
 const CLIENT_ONLY_CONV_FIELDS = ['_bodyLoaded', '_stopping'];
@@ -1798,11 +1798,11 @@ function statusLabel(s) {
 }
 
 function conversationUiState(conv) {
-  if (!conv) return 'idle';
-  if (conv.blocked) return 'blocked';
-  if (conv.status === 'running') return 'working';
-  // Issue #904: read pauseReason first for non-running records so the pill
-  // reflects the exit classification rather than mapping all completed -> 'waiting'.
+  if (!conv) return 'idle';
+  if (conv.blocked) return 'blocked';
+  if (conv.status === 'running') return 'working';
+  // Issue #904: read pauseReason first for non-running records so the pill
+  // reflects the exit classification rather than mapping all completed -> 'waiting'.
   if (conv.pauseReason === 'working') return 'working';
   if (conv.pauseReason === 'done') return 'complete';
   if (conv.pauseReason === 'error') return 'error';
@@ -1815,10 +1815,13 @@ function conversationUiState(conv) {
   // Guard on status==='failed' only: a completed run should resolve to complete/waiting,
   // not stay stuck as stopped even if the stopped flag was not cleared.
   if (conv.stopped && conv.status === 'failed') return 'stopped';
-  if (conv.status === 'failed') return 'waiting';
-  if (isManagedDelegationChild(conv) && conv.status === 'completed' && conv.managedReviewStatus === 'reviewed') return 'complete';
-  if (conv.status === 'completed' && conv.reviewApproved) return 'complete';
-  if (conv.status === 'completed') {
+  if (conv.status === 'failed') return 'waiting';
+  if (isManagedDelegationChild(conv) && conv.status === 'completed' && conv.managedReviewStatus === 'reviewed') return 'complete';
+  // Legacy records written before pauseReason='done' used reviewApproved=true as
+  // the only persisted manual-completion marker. Preserve those as done, but do
+  // not let reviewApproved override an explicit awaiting_* pauseReason.
+  if (conv.status === 'completed' && conv.reviewApproved && conv.pauseReason === undefined) return 'complete';
+  if (conv.status === 'completed') {
     // For fully-delegate runs: if child workstreams are still active, the manager
     // is waiting for them — show 'working' not 'waiting' so the user isn't prompted
     // to act when the Hub will auto-route child deliverables back to Mandy.
@@ -2552,18 +2555,13 @@ function renderConversationIdentity(conv) {
   host.appendChild(text);
 }
 
-function renderRunStatePill(conv) {
-  const pill = els['run-state-pill'];
-  if (!pill) return;
-  if (conv.reviewApproved && conv.status === 'completed') {
-    pill.textContent = 'DONE';
-    pill.className = 'run-state-pill complete';
-  } else {
-    // #549 R3: conversationUiState now returns 'stopped' for manager-stopped runs.
-    // conversationStateLabel returns 'Stopped' for that state; toUpperCase() => 'STOPPED'.
-    pill.textContent = conversationStateLabel(conv).toUpperCase();
-    pill.className = `run-state-pill ${conversationUiState(conv)}`;
-  }
+function renderRunStatePill(conv) {
+  const pill = els['run-state-pill'];
+  if (!pill) return;
+  // #549 R3: conversationUiState now returns 'stopped' for manager-stopped runs.
+  // conversationStateLabel returns 'Stopped' for that state; toUpperCase() => 'STOPPED'.
+  pill.textContent = conversationStateLabel(conv).toUpperCase();
+  pill.className = `run-state-pill ${conversationUiState(conv)}`;
   // #521: Stop is offered only while the employee is actively working.
   const stopBtn = els['run-stop-btn'];
   if (stopBtn) {
@@ -3828,12 +3826,14 @@ function clearPendingCoachingJob() {
 // Awaiting-review signal: the read-side run model does not yet emit a structured
 // "awaiting-manager" event, so we degrade gracefully and drive it from the
 // terminal run status the read-side already returns (`completed`). A run that
-// the manager has approved (conv.reviewApproved) is no longer awaiting.
+// the manager has approved (conv.reviewApproved) or manually completed
+// (pauseReason='done') is no longer awaiting.
 // ---------------------------------------------------------------------------
 
 function convAwaitingReview(conv) {
-  if (!conv) return false;
-  if (conv.reviewApproved) return false;
+  if (!conv) return false;
+  if (conv.pauseReason === 'done') return false;
+  if (conv.reviewApproved) return false;
   // #770 R2/R4: never ask for a decision while the run is actively working a
   // (possibly later, no-decision) phase. conv.status is maintained by
   // foldRunIntoConversation. While 'running' the manager is coaching, not
@@ -4942,10 +4942,11 @@ async function approveReview(options) {
     showStatus(opts.reviewAction ? 'Approval command sent.' : 'Approval sent.', false);
     await continueRun(approvalMessage, { preserveReviewApproved: true });
     return;
-  }
-  conv.status = 'completed';
-  conv.reviewApproved = true;
-  upsertConversation(conv);
+  }
+  conv.status = 'completed';
+  conv.reviewApproved = false;
+  conv.pauseReason = 'done';
+  upsertConversation(conv);
   refreshStatusSurfaces();
   renderActive();
   syncSendButton();