fraim-hub 2.0.326 → 2.0.327

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

@@ -337,7 +337,7 @@ function normalizeConversation(projectPath, raw) {
         status: value.status,
         // Issue #904: carry pauseReason explicitly so it survives the ...value spread round-trip.
         ...(value.pauseReason !== undefined && { pauseReason: value.pauseReason }),
-        createdAt: value.createdAt ?? new Date().toISOString(),
+        createdAt: value.createdAt ?? value.lastUpdatedAt ?? new Date().toISOString(),
         lastUpdatedAt: value.lastUpdatedAt ?? value.createdAt ?? new Date().toISOString(),
     };
 }

package/dist/src/ai-hub/desktop-installer-setup.js

@@ -0,0 +1,79 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readInstallerSetupApiKey = readInstallerSetupApiKey;
+exports.repairInstallerIdeMcpEntries = repairInstallerIdeMcpEntries;
+exports.runDesktopInstallerSetup = runDesktopInstallerSetup;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
+const project_fraim_paths_1 = require("../core/utils/project-fraim-paths");
+const ide_detector_1 = require("../cli/setup/ide-detector");
+const auto_mcp_setup_1 = require("../cli/setup/auto-mcp-setup");
+const fraim_mcp_latest_launcher_1 = require("../cli/mcp/fraim-mcp-latest-launcher");
+const managed_node_runtime_1 = require("../cli/utils/managed-node-runtime");
+const win32_cmd_spawn_1 = require("../cli/utils/win32-cmd-spawn");
+function readInstallerSetupApiKey(configPath = path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'config.json')) {
+    if (!fs_1.default.existsSync(configPath))
+        return null;
+    try {
+        const parsed = JSON.parse(fs_1.default.readFileSync(configPath, 'utf8'));
+        return typeof parsed.apiKey === 'string' && parsed.apiKey.trim() ? parsed.apiKey.trim() : null;
+    }
+    catch {
+        return null;
+    }
+}
+async function repairInstallerIdeMcpEntries(options = {}) {
+    const logger = options.logger ?? console;
+    const fraimKey = readInstallerSetupApiKey(options.configPath);
+    if (!fraimKey) {
+        logger.log('[fraim-installer-setup] no existing config.json apiKey; IDE MCP repair will run from first-run');
+        return { status: 'skipped', ideCount: 0, reason: 'missing-config-api-key' };
+    }
+    const detectedIDEs = (options.detectInstalledIDEs ?? ide_detector_1.detectInstalledIDEs)();
+    const ideNames = detectedIDEs.map((ide) => ide.name).filter(Boolean);
+    if (ideNames.length === 0) {
+        logger.log('[fraim-installer-setup] no supported IDEs detected for MCP repair');
+        return { status: 'skipped', ideCount: 0, reason: 'no-detected-ides' };
+    }
+    const previousNonInteractive = process.env.FRAIM_NON_INTERACTIVE;
+    process.env.FRAIM_NON_INTERACTIVE = '1';
+    try {
+        await (options.autoConfigureMCP ?? auto_mcp_setup_1.autoConfigureMCP)(fraimKey, ideNames);
+        logger.log(`[fraim-installer-setup] repaired MCP config for ${ideNames.length} detected IDE(s)`);
+        return { status: 'repaired', ideCount: ideNames.length };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        logger.warn(`[fraim-installer-setup] IDE MCP repair skipped after error: ${message}`);
+        return { status: 'failed', ideCount: ideNames.length, reason: message };
+    }
+    finally {
+        if (previousNonInteractive === undefined)
+            delete process.env.FRAIM_NON_INTERACTIVE;
+        else
+            process.env.FRAIM_NON_INTERACTIVE = previousNonInteractive;
+    }
+}
+function warmInstallerCliCache() {
+    const cliShim = (0, fraim_mcp_latest_launcher_1.getFraimCliShimPath)();
+    const options = { env: process.env, encoding: 'utf8', stdio: 'inherit' };
+    const result = process.platform === 'win32'
+        ? (0, win32_cmd_spawn_1.spawnViaCmdExe)(cliShim, ['--version'], options)
+        : (0, child_process_1.spawnSync)(cliShim, ['--version'], options);
+    if (result.status !== 0) {
+        throw new Error(`FRAIM CLI bootstrap exited with code ${result.status ?? 'unknown'}.`);
+    }
+}
+async function runDesktopInstallerSetup(logger = console) {
+    await (0, managed_node_runtime_1.ensureManagedNpm)({
+        onProgress: (message) => logger.log(`[fraim-installer-setup] ${message}`),
+    });
+    (0, fraim_mcp_latest_launcher_1.ensureFraimMcpLatestLauncher)();
+    warmInstallerCliCache();
+    await repairInstallerIdeMcpEntries({ logger });
+    logger.log('[fraim-installer-setup] stable CLI and MCP launchers are ready');
+}

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

@@ -20,6 +20,10 @@ async function bootstrapFrom(entryPath) {
     await entry.bootstrap();
 }
 async function launch() {
+    if (process.argv.includes('--fraim-installer-setup')) {
+        await bootstrapFrom(BUNDLED_ENTRY_PATH);
+        return;
+    }
     // Issue #1415: deterministic escape hatch for integration testing — skips the real npm
     // resolution (and its dependence on whatever happens to be published at test time) so a test can
     // prove the Electron main-process boot chain itself (resolveHubAppEntry -> require -> bootstrap

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

@@ -20,7 +20,7 @@ const window_open_decision_1 = require("./window-open-decision");
 const bundled_asset_resolver_1 = require("./bundled-asset-resolver");
 const server_2 = require("../first-run/server");
 const session_service_1 = require("../first-run/session-service");
-const fraim_mcp_latest_launcher_1 = require("../cli/mcp/fraim-mcp-latest-launcher");
+const desktop_installer_setup_1 = require("./desktop-installer-setup");
 const desktop_auto_updater_1 = require("./desktop-auto-updater");
 const hub_app_materializer_1 = require("./hub-app-materializer");
 const hub_instance_reconciliation_1 = require("./hub-instance-reconciliation");
@@ -89,13 +89,6 @@ function applyUserDataOverride() {
     fs_1.default.mkdirSync(userDataDir, { recursive: true });
     electron_1.app.setPath('userData', userDataDir);
 }
-function configurePackagedFraimRuntime() {
-    if (!electron_1.app.isPackaged && process.env.FRAIM_DESKTOP_FIRST_RUN !== '1')
-        return;
-    process.env.FRAIM_PACKAGED_CLI_EXECUTABLE = process.execPath;
-    process.env.FRAIM_PACKAGED_CLI_SCRIPT = (0, hub_app_materializer_1.resolvePackagedCliScriptPath)(__dirname);
-    (0, fraim_mcp_latest_launcher_1.ensureFraimMcpLatestLauncher)();
-}
 function shouldShowEmbeddedFirstRun() {
     if (!electron_1.app.isPackaged && process.env.FRAIM_DESKTOP_FIRST_RUN !== '1')
         return false;
@@ -153,6 +146,16 @@ async function configureAutoUpdater() {
     });
     return result.action === 'installing';
 }
+async function runPackagedInstallerRepair() {
+    if (!electron_1.app.isPackaged || process.env.FRAIM_INSTALLER_LIFECYCLE_TEST === '1')
+        return;
+    try {
+        await (0, desktop_installer_setup_1.runDesktopInstallerSetup)(console);
+    }
+    catch (error) {
+        console.warn('[fraim] packaged installer repair failed:', error);
+    }
+}
 // Issue #1415: shared by every path that needs to know "is a newer FRAIM Hub published than the
 // one currently running" — the automatic second-instance/activate recheck below, and the
 // manually-triggered restart from the web UI's update badge (see restartToLatestNow). Compares
@@ -655,6 +658,12 @@ async function bootstrap() {
         preferredPort: options.preferredPort,
         hasProjectPath: Boolean(options.projectPath),
     });
+    if (process.argv.includes('--fraim-installer-setup')) {
+        await electron_1.app.whenReady();
+        await (0, desktop_installer_setup_1.runDesktopInstallerSetup)(console);
+        electron_1.app.exit(0);
+        return;
+    }
     electron_1.app.on('child-process-gone', (_event, details) => {
         (0, hub_main_diagnostics_1.recordHubMainDiagnostic)('app.child_process_gone', details);
     });
@@ -679,7 +688,6 @@ async function bootstrap() {
     });
     await electron_1.app.whenReady();
     electron_1.app.setName(displayName(options.runtimeId));
-    configurePackagedFraimRuntime();
     // Issue #1415 (follow-up): app.requestSingleInstanceLock() above only sees another instance of
     // *this same identity* — it cannot see a Hub already running via a different launch path (e.g.
     // `npx fraim-hub`'s raw electron.exe, confirmed live to end up under a different userData scope
@@ -710,6 +718,7 @@ async function bootstrap() {
     // First-launch housekeeping (idempotent, fast on subsequent runs)
     if (process.env.FRAIM_INSTALLER_LIFECYCLE_TEST !== '1') {
         ensureLoginItem();
+        await runPackagedInstallerRepair();
         const installingUpdate = await configureAutoUpdater();
         if (installingUpdate)
             return;

package/dist/src/ai-hub/hub-app-materializer.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HUB_APP_ENTRY_RELATIVE = exports.HUB_APP_PACKAGE_NAME = void 0;
 exports.redactCredentialLikeSubstrings = redactCredentialLikeSubstrings;
-exports.resolvePackagedCliScriptPath = resolvePackagedCliScriptPath;
 exports.planHubAppMaterialization = planHubAppMaterialization;
 exports.resolveHubAppCacheDir = resolveHubAppCacheDir;
 exports.isHubAppCacheComplete = isHubAppCacheComplete;
 exports.listCachedHubAppVersions = listCachedHubAppVersions;
+exports.runNpmInstall = runNpmInstall;
 exports.ensureMaterializedHubApp = ensureMaterializedHubApp;
 exports.resolveHubAppEntry = resolveHubAppEntry;
 const fs_1 = __importDefault(require("fs"));
@@ -55,19 +55,6 @@ function redactCredentialLikeSubstrings(text) {
 exports.HUB_APP_PACKAGE_NAME = 'fraim-hub';
 /** Relative path, from a materialized (or bundled) package root, to the Electron main entry. */
 exports.HUB_APP_ENTRY_RELATIVE = path_1.default.join('dist', 'src', 'ai-hub', 'desktop-main.js');
-/**
- * Where the packaged CLI/MCP shim (`ensureFraimMcpLatestLauncher()`) should find `fraim`'s CLI
- * script, derived from `desktop-main.ts`'s own directory (`<packageRoot>/dist/src/ai-hub/`) rather
- * than Electron's `app.getAppPath()`. `desktop-launcher.ts` may have loaded `desktop-main.js` from a
- * materialized `fraim-hub@<latest>` copy under `~/.fraim/bin/hub-app/<version>/` rather than from
- * the original app.asar, and `app.getAppPath()` always names the latter regardless of which copy is
- * actually running. `moduleDir` tracks whichever copy is really executing. Kept in this
- * Electron-free module (rather than inlined in `desktop-main.ts`) so it is unit-testable without an
- * Electron `app` object.
- */
-function resolvePackagedCliScriptPath(moduleDir) {
-    return path_1.default.join(moduleDir, '..', '..', '..', 'node_modules', 'fraim', 'bin', 'fraim.js');
-}
 function pickNewestComplete(cachedVersions) {
     const versions = cachedVersions.filter((entry) => entry.complete).map((entry) => entry.version);
     if (versions.length === 0)
@@ -178,16 +165,19 @@ function listCachedHubAppVersions(fraimDir = (0, project_fraim_paths_1.getUserFr
  * every dependency to that top level; nothing here relies on nested-dependency resolution.
  *
  * The `npm` executable itself is resolved via `ensureManagedNpm()` (system PATH, an already-managed
- * runtime, or a freshly downloaded one) rather than assumed present on PATH — a genuinely GUI-only
- * install (native installer only, no CLI ever run) has neither system npm nor FRAIM's own managed
- * one, since first-run's embedded-desktop path only needs Electron's own bundled Node for its own
- * purposes and never downloads a standalone npm (see managed-node-runtime.ts's own header comment).
+ * runtime, or a freshly downloaded one) rather than assumed present on PATH. Installer setup
+ * prepares that shared runtime, while this fallback also supports older installs and recovery
+ * when installer setup did not finish.
  */
 function runNpmInstall(npmPath, args) {
+    // POSIX npm uses /usr/bin/env node. A GUI launch may have no system Node
+    // on PATH even after ensureManagedNpm has downloaded a complete runtime.
+    const npmPathValue = [path_1.default.dirname(npmPath), process.env.PATH].filter(Boolean).join(path_1.default.delimiter);
+    const env = { ...process.env, PATH: npmPathValue, ...(process.platform === 'win32' ? { Path: npmPathValue } : {}) };
     if (process.platform !== 'win32') {
-        return (0, child_process_1.spawnSync)(npmPath, args, { encoding: 'utf8' });
+        return (0, child_process_1.spawnSync)(npmPath, args, { encoding: 'utf8', env });
     }
-    return (0, win32_cmd_spawn_1.spawnViaCmdExe)(npmPath, args, { encoding: 'utf8' });
+    return (0, win32_cmd_spawn_1.spawnViaCmdExe)(npmPath, args, { encoding: 'utf8', env });
 }
 const defaultInstallPackage = async (version, destDir) => {
     fs_1.default.mkdirSync(destDir, { recursive: true });

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

@@ -3826,8 +3826,9 @@ class AiHubServer {
         try {
             const ref = this.rawEventLogStore.append((0, conversation_store_1.conversationScopeKey)(run.scope, run.projectPath), run.conversationId || run.id, run.id, { channel: 'system', text, hubKind: kind, hostId: run.baseHostId || run.hostId, createdAt });
             run.eventLogRefs = upsertEventLogRef(run.eventLogRefs, ref);
-            if (ref.eventCount === 1)
+            if (ref.eventCount === 1 && this.runRegistry.get(run.id)) {
                 this.persistRunConversationNow(run, run.managedByRunId ? undefined : (run.conversationId || run.id));
+            }
         }
         catch (error) {
             run.events.push((0, hosts_1.createHubEvent)('system', 'Event archive write failed; some Micro-manage entries are unavailable.'));

package/dist/src/cli/mcp/fraim-mcp-latest-launcher.js

@@ -8,15 +8,12 @@ exports.getFraimMcpShimPath = getFraimMcpShimPath;
 exports.getFraimNpxShimPath = getFraimNpxShimPath;
 exports.getFraimCliShimPath = getFraimCliShimPath;
 exports.getPackagedFraimRuntimePath = getPackagedFraimRuntimePath;
-exports.getPackagedFraimRuntime = getPackagedFraimRuntime;
-exports.hasPackagedFraimRuntime = hasPackagedFraimRuntime;
 exports.ensureFraimMcpLatestLauncher = ensureFraimMcpLatestLauncher;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const windows_shim_path_search_1 = require("../../core/utils/windows-shim-path-search");
 const LAUNCHER_VERSION = 1;
-const PACKAGED_RUNTIME_VERSION = 1;
 const launcherSource = `#!/usr/bin/env node
 const fs = require('fs');
 const os = require('os');
@@ -32,7 +29,9 @@ const CACHE_ROOT = path.join(USER_DIR, 'npm-cache', 'mcp');
 const commandName = (name) => process.platform === 'win32' ? name + '.cmd' : name;
 const npmCommand = commandName('npm');
 const npxCommand = commandName('npx');
-const cliArgs = process.argv.slice(2).length > 0 ? process.argv.slice(2) : ['mcp'];
+const rawArgs = process.argv.slice(2);
+const cliMode = rawArgs[0] === '--fraim-cli';
+const cliArgs = cliMode ? rawArgs.slice(1) : (rawArgs.length > 0 ? rawArgs : ['mcp']);
 
 function quoteCmdArg(arg) {
   const value = String(arg);
@@ -133,75 +132,6 @@ function getFraimCliShimPath() {
 function getPackagedFraimRuntimePath() {
     return path_1.default.join(process.env.FRAIM_USER_DIR || path_1.default.join(os_1.default.homedir(), '.fraim'), 'bin', 'packaged-fraim-runtime.json');
 }
-function runtimeFromEnv(env = process.env) {
-    return env.FRAIM_PACKAGED_CLI_EXECUTABLE && env.FRAIM_PACKAGED_CLI_SCRIPT
-        ? { executable: env.FRAIM_PACKAGED_CLI_EXECUTABLE, script: env.FRAIM_PACKAGED_CLI_SCRIPT }
-        : null;
-}
-// Regular Node.js (and ELECTRON_RUN_AS_NODE) cannot see inside Electron's
-// .asar archives. For paths like …/app.asar/node_modules/…, verify the
-// archive file itself rather than the internal entry.
-function existsOrAsarExists(filePath) {
-    const normalized = filePath.replace(/\\/g, '/');
-    const asarSep = normalized.indexOf('.asar/');
-    if (asarSep === -1)
-        return fs_1.default.existsSync(filePath);
-    return fs_1.default.existsSync(filePath.slice(0, asarSep + '.asar'.length));
-}
-function getPackagedFraimRuntime(env = process.env) {
-    const envRuntime = runtimeFromEnv(env);
-    if (envRuntime)
-        return envRuntime;
-    try {
-        const raw = JSON.parse(fs_1.default.readFileSync(getPackagedFraimRuntimePath(), 'utf8'));
-        if (!raw.executable || !raw.script)
-            return null;
-        if (!fs_1.default.existsSync(raw.executable) || !existsOrAsarExists(raw.script))
-            return null;
-        return { executable: raw.executable, script: raw.script };
-    }
-    catch {
-        return null;
-    }
-}
-function hasPackagedFraimRuntime(env = process.env) {
-    return getPackagedFraimRuntime(env) !== null;
-}
-function posixSingleQuote(value) {
-    return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-function windowsBatchPath(value) {
-    return value.replace(/%/g, '%%').replace(/"/g, '""');
-}
-function writePackagedRuntimeMetadata(runtime) {
-    writeFileIfChanged(getPackagedFraimRuntimePath(), JSON.stringify({
-        version: PACKAGED_RUNTIME_VERSION,
-        executable: runtime.executable,
-        script: runtime.script,
-        updatedAt: new Date().toISOString(),
-    }, null, 2) + '\n');
-}
-function packagedFraimShimSource(command, runtime) {
-    const { executable, script } = runtime;
-    const commandArg = command === 'mcp' ? ' mcp' : '';
-    if (process.platform === 'win32') {
-        return [
-            '@echo off',
-            'setlocal',
-            'set "ELECTRON_RUN_AS_NODE=1"',
-            `"${windowsBatchPath(executable)}" "${windowsBatchPath(script)}"${commandArg} %*`,
-            'exit /b %ERRORLEVEL%',
-            '',
-        ].join('\r\n');
-    }
-    return [
-        '#!/usr/bin/env sh',
-        'set -eu',
-        'export ELECTRON_RUN_AS_NODE=1',
-        `exec ${posixSingleQuote(executable)} ${posixSingleQuote(script)}${commandArg} "$@"`,
-        '',
-    ].join('\n');
-}
 const windowsFraimMcpShimSource = `@echo off
 setlocal
 for %%I in ("%~dp0..") do set "FRAIM_USER_DIR_VALUE=%%~fI"
@@ -225,6 +155,9 @@ for /f "delims=" %%D in ('dir /b /ad /o-n "%FRAIM_USER_DIR_VALUE%\\node\\node-v*
 echo [fraim-mcp] Could not find node on PATH or in "%FRAIM_USER_DIR_VALUE%\\node" 1>&2
 exit /b 1
 `;
+const windowsFraimCliShimSource = windowsFraimMcpShimSource
+    .replace(/fraim-mcp-latest\.js" %\*/g, 'fraim-mcp-latest.js" --fraim-cli %*')
+    .replace(/\[fraim-mcp\]/g, '[fraim]');
 const windowsFraimNpxShimSource = `@echo off
 setlocal
 for %%I in ("%~dp0..") do set "FRAIM_USER_DIR_VALUE=%%~fI"
@@ -246,47 +179,31 @@ for /f "delims=" %%D in ('dir /b /ad /o-n "%FRAIM_USER_DIR_VALUE%\\node\\node-v*
 echo [fraim-npx] Could not find npx on PATH or in "%FRAIM_USER_DIR_VALUE%\\node" 1>&2
 exit /b 1
 `;
-const posixFraimMcpShimSource = `#!/usr/bin/env sh
+function posixFraimShimSource(executable) {
+    const args = executable === 'node' ? '"$FRAIM_USER_DIR_VALUE/bin/fraim-mcp-latest.js" "$@"' : '"$@"';
+    const label = executable === 'node' ? 'fraim-mcp' : 'fraim-npx';
+    return `#!/usr/bin/env sh
 set -eu
 SHIM_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 FRAIM_USER_DIR_VALUE=$(dirname "$SHIM_DIR")
-LAUNCHER="$FRAIM_USER_DIR_VALUE/bin/fraim-mcp-latest.js"
 
-if command -v node >/dev/null 2>&1; then
-  exec node "$LAUNCHER" "$@"
+if command -v ${executable} >/dev/null 2>&1; then
+  exec ${executable} ${args}
 fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/bin/node" ]; then
-  PATH="$FRAIM_USER_DIR_VALUE/node/bin:$PATH"
-  export PATH
-  exec "$FRAIM_USER_DIR_VALUE/node/bin/node" "$LAUNCHER" "$@"
-fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/node" ]; then
-  PATH="$FRAIM_USER_DIR_VALUE/node:$PATH"
-  export PATH
-  exec "$FRAIM_USER_DIR_VALUE/node/node" "$LAUNCHER" "$@"
-fi
-
-echo "[fraim-mcp] Could not find node on PATH or in $FRAIM_USER_DIR_VALUE/node" >&2
-exit 1
-`;
-const posixFraimNpxShimSource = `#!/usr/bin/env sh
-set -eu
-SHIM_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-FRAIM_USER_DIR_VALUE=$(dirname "$SHIM_DIR")
-
-if command -v npx >/dev/null 2>&1; then
-  exec npx "$@"
-fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/bin/npx" ]; then
-  exec "$FRAIM_USER_DIR_VALUE/node/bin/npx" "$@"
-fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/npx" ]; then
-  exec "$FRAIM_USER_DIR_VALUE/node/npx" "$@"
-fi
-
-echo "[fraim-npx] Could not find npx on PATH or in $FRAIM_USER_DIR_VALUE/node" >&2
+# Match the generating host's distribution layout; staging and other architectures
+# cannot match this suffix. Legacy installs remain valid fallback locations.
+for NODE_BIN in "$FRAIM_USER_DIR_VALUE/node"/node-v*-${process.platform}-${process.arch}/bin "$FRAIM_USER_DIR_VALUE/node/bin" "$FRAIM_USER_DIR_VALUE/node"; do
+  if [ -x "$NODE_BIN/node" ] && [ -x "$NODE_BIN/${executable}" ]; then
+    PATH="$NODE_BIN:$PATH"
+    export PATH
+    exec "$NODE_BIN/${executable}" ${args}
+  fi
+done
+
+echo "[${label}] Could not find ${executable} on PATH or in $FRAIM_USER_DIR_VALUE/node" >&2
 exit 1
 `;
+}
 const writeFileIfChanged = (filePath, content, mode) => {
     if (!fs_1.default.existsSync(filePath) || fs_1.default.readFileSync(filePath, 'utf8') !== content) {
         fs_1.default.writeFileSync(filePath, content, 'utf8');
@@ -306,30 +223,14 @@ function ensureFraimMcpLatestLauncher() {
     fs_1.default.mkdirSync(launcherDir, { recursive: true });
     const fraimMcpShimPath = getFraimMcpShimPath();
     const fraimNpxShimPath = getFraimNpxShimPath();
-    const packagedRuntime = getPackagedFraimRuntime();
-    if (packagedRuntime) {
-        const fraimCliShimPath = getFraimCliShimPath();
-        if (runtimeFromEnv()) {
-            writePackagedRuntimeMetadata(packagedRuntime);
-        }
-        writeFileIfChanged(fraimMcpShimPath, packagedFraimShimSource('mcp', packagedRuntime), process.platform === 'win32' ? undefined : 0o755);
-        writeFileIfChanged(fraimCliShimPath, packagedFraimShimSource('cli', packagedRuntime), process.platform === 'win32' ? undefined : 0o755);
-        // Issue #1474: keep the npx companion shim in parity with the non-packaged branch below.
-        // The packaged fraim-mcp shim itself never invokes npx, but git/playwright base MCP servers
-        // (added later via the connect-mcp skill once a system npm is available) and doctor's
-        // launch-plan diagnostic both expect this file to exist alongside the stable fraim shim.
-        // Without it, doctor's "stable shim missing on disk" check could never be satisfied on a
-        // packaged install, and --fix-mcp/add-ide (which call this same function) could never fix it.
-        writeFileIfChanged(fraimNpxShimPath, process.platform === 'win32' ? windowsFraimNpxShimSource : posixFraimNpxShimSource, process.platform === 'win32' ? undefined : 0o755);
-        return {
-            command: fraimMcpShimPath,
-            args: [],
-            path: packagedRuntime.script,
-        };
-    }
+    const fraimCliShimPath = getFraimCliShimPath();
+    fs_1.default.rmSync(getPackagedFraimRuntimePath(), { force: true });
     writeFileIfChanged(launcherPath, launcherSource, process.platform === 'win32' ? undefined : 0o755);
-    writeFileIfChanged(fraimMcpShimPath, process.platform === 'win32' ? windowsFraimMcpShimSource : posixFraimMcpShimSource, process.platform === 'win32' ? undefined : 0o755);
-    writeFileIfChanged(fraimNpxShimPath, process.platform === 'win32' ? windowsFraimNpxShimSource : posixFraimNpxShimSource, process.platform === 'win32' ? undefined : 0o755);
+    writeFileIfChanged(fraimMcpShimPath, process.platform === 'win32' ? windowsFraimMcpShimSource : posixFraimShimSource('node'), process.platform === 'win32' ? undefined : 0o755);
+    writeFileIfChanged(fraimNpxShimPath, process.platform === 'win32' ? windowsFraimNpxShimSource : posixFraimShimSource('npx'), process.platform === 'win32' ? undefined : 0o755);
+    writeFileIfChanged(fraimCliShimPath, process.platform === 'win32' ? windowsFraimCliShimSource : posixFraimShimSource('node')
+        .replace(/fraim-mcp-latest\.js" "\$@"/g, 'fraim-mcp-latest.js" --fraim-cli "$@"')
+        .replace(/\[fraim-mcp\]/g, '[fraim]'), process.platform === 'win32' ? undefined : 0o755);
     return {
         command: fraimMcpShimPath,
         args: [],

package/dist/src/cli/mcp/mcp-server-registry.js

@@ -56,12 +56,7 @@ exports.BASE_MCP_SERVERS = [
     }
 ];
 function activeBaseMCPServers() {
-    // The packaged desktop owns FRAIM's runtime but intentionally does not bundle
-    // npm. Keep third-party npx MCP servers out of fresh desktop-generated config;
-    // users can add them later through connect-mcp when a system npm is available.
-    return (0, fraim_mcp_latest_launcher_1.hasPackagedFraimRuntime)()
-        ? exports.BASE_MCP_SERVERS.filter((server) => server.id === 'fraim')
-        : exports.BASE_MCP_SERVERS;
+    return exports.BASE_MCP_SERVERS;
 }
 // ============================================================================
 // PROVIDER MCP SERVER BUILDER (uses provider registry)

package/dist/src/cli/utils/managed-agent-paths.js

@@ -36,12 +36,12 @@ Object.defineProperty(exports, "resolveMachinePathCached", { enumerable: true, g
 function getManagedNodeRoot() {
     return path_1.default.join((0, script_sync_utils_1.getUserFraimDir)(), 'node');
 }
-function getPortableNodeBinPath() {
+function getPortableNodeBinPath(platform = process.platform, arch = process.arch) {
     const nodeRoot = getManagedNodeRoot();
-    if (process.platform === 'win32') {
+    if (platform === 'win32') {
         if (fs_1.default.existsSync(nodeRoot)) {
             const extractedDir = fs_1.default.readdirSync(nodeRoot, { withFileTypes: true })
-                .filter((entry) => entry.isDirectory() && entry.name.startsWith('node-v'))
+                .filter((entry) => entry.isDirectory() && entry.name.startsWith('node-v') && !entry.name.includes('.staging-'))
                 .sort((a, b) => b.name.localeCompare(a.name))[0];
             if (extractedDir) {
                 return path_1.default.join(nodeRoot, extractedDir.name);
@@ -49,6 +49,17 @@ function getPortableNodeBinPath() {
         }
         return nodeRoot;
     }
+    if (fs_1.default.existsSync(nodeRoot)) {
+        const versioned = fs_1.default.readdirSync(nodeRoot, { withFileTypes: true })
+            .filter(entry => entry.isDirectory() && /^node-v\d+\.\d+\.\d+-/.test(entry.name)
+            && entry.name.endsWith(`-${platform}-${arch}`))
+            .sort((a, b) => b.name.localeCompare(a.name, undefined, { numeric: true }));
+        for (const entry of versioned) {
+            const bin = path_1.default.join(nodeRoot, entry.name, 'bin');
+            if (fs_1.default.existsSync(path_1.default.join(bin, 'node')) && fs_1.default.existsSync(path_1.default.join(bin, 'npm')))
+                return bin;
+        }
+    }
     return path_1.default.join(nodeRoot, 'bin');
 }
 function getManagedAgentBinDirs() {

package/dist/src/cli/utils/managed-node-runtime.js

@@ -17,16 +17,11 @@ const path_1 = __importDefault(require("path"));
 const https_1 = __importDefault(require("https"));
 const crypto_1 = __importDefault(require("crypto"));
 const managed_agent_paths_1 = require("./managed-agent-paths");
-// Issue #1415 (extended): a genuinely GUI-only FRAIM Hub install — the native installer
-// downloaded from the website, never a CLI — has no working `npm`/`npx` anywhere. First-run's
-// `embeddedDesktop` branch (session-service.ts) deliberately skips installing one (it only needs
-// Electron's own bundled Node for FRAIM's own CLI/MCP shim, via ELECTRON_RUN_AS_NODE), and the
-// separate CLI installer's portable-Node bootstrap (scripts/installer/fraim-install-win.template.cmd)
-// never runs for a desktop-only user. That left two features silently unable to do their real job
-// on such a machine: `hub-app-materializer.ts`'s npm install (this issue), and agent-CLI
-// installation (`managed-agent-install.ts`), which also shells out to a bare `npm`.
+// Desktop-only users may have no working system npm/npx. Installer setup, Hub
+// materialization, first-run setup, and agent installation share this managed
+// runtime resolver so each can prepare or reuse standalone Node and npm.
 //
-// This module is the one place that guarantees a real, usable `npm`/`node` exists, for both
+// This module is the one place that guarantees a real, usable `npm`/`node` exists for its
 // consumers: prefer whatever is already on system PATH (common for technical users), then an
 // already-downloaded managed runtime (shared with the CLI installer's `~/.fraim/node/` convention
 // via `managed-agent-paths.ts` — reused, not duplicated, so a user who has ever run the `fraim` CLI
@@ -65,11 +60,14 @@ function findExecutableOnPath(name, pathValue = process.env.PATH) {
 function hasWorkingNodeAndNpm(dir, platform = process.platform) {
     return fs_1.default.existsSync(path_1.default.join(dir, npmExecutableName(platform))) && fs_1.default.existsSync(path_1.default.join(dir, nodeExecutableName(platform)));
 }
-/** Whether `dir` (a specific versioned bin dir) holds a complete extraction for exactly `version`. */
+function nodeBinDir(root, platform) {
+    return platform === 'win32' ? root : path_1.default.join(root, 'bin');
+}
+/** Whether `dir` (a versioned distribution root) holds a complete extraction for `version`. */
 function isManagedNodeVersionComplete(dir, version, platform = process.platform) {
     try {
         const recorded = fs_1.default.readFileSync(path_1.default.join(dir, 'fraim-managed-node-version'), 'utf8').trim();
-        return recorded === version && hasWorkingNodeAndNpm(dir, platform);
+        return recorded === version && hasWorkingNodeAndNpm(nodeBinDir(dir, platform), platform);
     }
     catch {
         return false;
@@ -99,6 +97,9 @@ function assertPathSafeNodeVersion(version) {
 }
 /** The exact folder name Node's own official archive extracts as — also this module's versioned subfolder name under the shared `~/.fraim/node/` root. */
 function nodeVersionedDirName(request) {
+    if (!/^[a-z0-9_]+$/.test(request.arch)) {
+        throw new Error('Refusing to use an invalid managed Node.js architecture.');
+    }
     return `node-v${assertPathSafeNodeVersion(request.version)}-${nodePlatformName(request.platform)}-${request.arch}`;
 }
 function nodeArchiveFileName(request) {
@@ -203,15 +204,16 @@ const defaultExtractNodeArchive = async (archivePath, destDir, request) => {
 async function downloadAndPromoteVersionedNodeDir(args) {
     const { nodeRoot, request, downloadArchive, extractArchive } = args;
     const destDir = path_1.default.join(nodeRoot, nodeVersionedDirName(request));
-    const stagingDir = `${destDir}.staging-${process.pid}`;
     fs_1.default.mkdirSync(nodeRoot, { recursive: true });
-    fs_1.default.rmSync(stagingDir, { recursive: true, force: true });
     const archivePath = await downloadArchive(request);
+    let stagingDir;
     try {
+        // tar requires an existing cwd. Each invocation owns a separate directory,
+        // including simultaneous requests within the same process.
+        stagingDir = fs_1.default.mkdtempSync(`${destDir}.staging-${process.pid}-`);
         await extractArchive(archivePath, stagingDir, request);
-        // The archive's own top-level folder (matching nodeVersionedDirName) may land either as the
-        // extraction root itself (tar) or as one nested level inside it (some zip extractors preserve
-        // the archive's internal folder) — handle both without assuming either.
+        // Official tar and ZIP archives preserve their top-level distribution folder.
+        // Also accept a flattened root from a supplied extractor.
         const nestedCandidate = path_1.default.join(stagingDir, nodeVersionedDirName(request));
         const extractedRoot = fs_1.default.existsSync(nestedCandidate) ? nestedCandidate : stagingDir;
         fs_1.default.writeFileSync(path_1.default.join(extractedRoot, 'fraim-managed-node-version'), request.version, 'utf8');
@@ -233,9 +235,10 @@ async function downloadAndPromoteVersionedNodeDir(args) {
     }
     finally {
         fs_1.default.rmSync(archivePath, { force: true });
-        fs_1.default.rmSync(stagingDir, { recursive: true, force: true });
+        if (stagingDir)
+            fs_1.default.rmSync(stagingDir, { recursive: true, force: true });
     }
-    return destDir;
+    return nodeBinDir(destDir, request.platform);
 }
 /**
  * Resolve a working `npm` executable, preferring (in order): system PATH, an already-downloaded
@@ -252,7 +255,7 @@ async function ensureManagedNpm(options = {}) {
     if (systemNpm) {
         return { npmPath: systemNpm, binDir: path_1.default.dirname(systemNpm), source: 'system' };
     }
-    const existingBinDir = (0, managed_agent_paths_1.getPortableNodeBinPath)();
+    const existingBinDir = (0, managed_agent_paths_1.getPortableNodeBinPath)(platform, arch);
     if (hasWorkingNodeAndNpm(existingBinDir, platform)) {
         return { npmPath: path_1.default.join(existingBinDir, npmExecutableName(platform)), binDir: existingBinDir, source: 'managed-existing' };
     }

package/dist/src/first-run/session-service.js

@@ -323,7 +323,7 @@ function buildFirstRunHubLaunchArgs() {
 class FirstRunSessionService {
     constructor(options) {
         // Issue #646: the key may be absent when first-run is launched by the macOS
-        // installer (.pkg) instead of `fraim first-run --key=…`. In that case the
+        // installer (.dmg) instead of `fraim first-run --key=…`. In that case the
         // wizard prompts the user to paste their key (see setKey / needsKey).
         this.key = options.key || '';
         this.headless = options.headless === true;
@@ -393,13 +393,15 @@ class FirstRunSessionService {
         // Real detection — populate row statuses from `command -v` style probes.
         const nodeRow = this.getRow('node');
         const nodeVer = this.embeddedDesktop ? process.version : commandVersion('node');
-        if (nodeVer) {
+        const embeddedLaunchersReady = !this.embeddedDesktop
+            || (fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimCliShimPath)()) && fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimMcpShimPath)()));
+        if (nodeVer && embeddedLaunchersReady) {
             nodeRow.status = 'ok';
             nodeRow.verb = this.embeddedDesktop ? `${nodeVer} bundled with FRAIM` : `${nodeVer} detected`;
         }
         else {
             nodeRow.status = 'pending';
-            nodeRow.verb = "we'll install";
+            nodeRow.verb = this.embeddedDesktop ? 'installer repair required' : "we'll install";
         }
         const gitRow = this.getRow('git');
         const gitVer = commandVersion('git');
@@ -669,11 +671,16 @@ class FirstRunSessionService {
     async runNodeRow() {
         const row = this.getRow('node');
         if (this.embeddedDesktop) {
+            if (!this.fakeMode && (!fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimCliShimPath)()) || !fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimMcpShimPath)()))) {
+                this.setRowError(row, 'Checking the native installer setup', 'Stable FRAIM CLI/MCP launchers are missing. Re-run the native installer in repair mode.', [{ id: 'retry', label: 'Check again', variant: 'primary' }]);
+                this.persist();
+                return this.respond('FRAIM installer repair is required.', false);
+            }
             persistShellPath(this.embeddedDesktop);
             row.status = 'ok';
-            row.verb = `${process.version} bundled with FRAIM`;
+            row.verb = 'Node and FRAIM launchers ready';
             this.persist();
-            return this.respond(`FRAIM includes its own runtime (${process.version}).`, true);
+            return this.respond('FRAIM command-line tools are ready.', true);
         }
         // Node is bootstrapped by the install template before the wizard starts.
         // If node is missing here something is severely wrong; fall through to error.
@@ -737,10 +744,10 @@ class FirstRunSessionService {
             return this.respond('FRAIM configured.', true);
         }
         try {
-            if (this.embeddedDesktop) {
-                (0, fraim_mcp_latest_launcher_1.ensureFraimMcpLatestLauncher)();
+            if (this.embeddedDesktop && (!fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimCliShimPath)()) || !fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimMcpShimPath)()))) {
+                throw new Error('Stable FRAIM launchers are missing. Re-run the native installer in repair mode.');
             }
-            else if (!forceConfigure && !commandVersion('fraim')) {
+            else if (!this.embeddedDesktop && !forceConfigure && !commandVersion('fraim')) {
                 const prefix = path_1.default.join((0, script_sync_utils_1.getUserFraimDir)(), 'node');
                 fs_1.default.mkdirSync(prefix, { recursive: true });
                 row.streamOutput = 'Installing FRAIM on this machine...';
@@ -1051,12 +1058,11 @@ class FirstRunSessionService {
             };
         }
         if (this.embeddedDesktop) {
-            (0, fraim_mcp_latest_launcher_1.ensureFraimMcpLatestLauncher)();
-            if (!fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimCliShimPath)())) {
+            if (!fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimCliShimPath)()) || !fs_1.default.existsSync((0, fraim_mcp_latest_launcher_1.getFraimMcpShimPath)())) {
                 return {
                     ok: false,
                     needsAgentSetup: true,
-                    message: 'FRAIM CLI was not installed into the packaged desktop profile. Re-run FRAIM setup before opening Hub.',
+                    message: 'FRAIM CLI/MCP launchers are missing. Re-run the native installer in repair mode before opening Hub.',
                 };
             }
             appendInstallLog('hub-opened embedded-desktop');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.326",
+  "version": "2.0.327",
   "description": "FRAIM Hub local companion package.",
   "author": "Sid Mathur <sid.mathur@gmail.com>",
   "homepage": "https://github.com/mathursrus/FRAIM#readme",
@@ -168,7 +168,8 @@
       "shortcutName": "FRAIM Hub",
       "uninstallDisplayName": "FRAIM Hub",
       "artifactName": "FRAIM-Setup.${ext}",
-      "runAfterFinish": true
+      "runAfterFinish": false,
+      "include": "build/installer.nsh"
     },
     "mac": {
       "icon": "build/icon.icns",
@@ -213,7 +214,7 @@
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
     "extract-zip": "^2.0.1",
-    "fraim": "2.0.326",
+    "fraim": "2.0.327",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/index.html

@@ -442,6 +442,7 @@
               <span class="panel-summary-copy">
                 <span class="panel-kicker" id="thread-panel-kicker">Manage</span>
               </span>
+              <button class="conversation-focus-btn" id="conversation-focus-btn" type="button" aria-label="Expand conversation" title="Expand conversation" onclick="event.preventDefault(); event.stopPropagation();">&#8599;</button>
             </summary>
             <!-- Issue #1065: find a passage inside the open conversation (R44-R46). A result that
                  promises "+6 more matches" is an unkept promise without this: the manager lands in
@@ -475,7 +476,6 @@
             </div>
           </details>
             <div class="manage-header-actions">
-              <button class="conversation-focus-btn" id="conversation-focus-btn" type="button" aria-label="Expand conversation" title="Expand conversation" onclick="event.preventDefault(); event.stopPropagation();">&#8599;</button>
               <button class="micro-manage-toggle" id="micro-manage-toggle" type="button" role="switch" aria-checked="false" aria-controls="manage-body"><span>Micro-Manage</span><span class="micro-switch-track" aria-hidden="true"></span></button>
             </div>
           </div>

package/public/ai-hub/script.js

@@ -114,6 +114,18 @@ const state = {
 
 const bootstrapCache = new Map();
 const conversationBodyFetches = new Map();
+const deletedConversationIds = new Set();
+let activeConversationId = state.activeId;
+Object.defineProperty(state, 'activeId', {
+  get() {
+    return activeConversationId && deletedConversationIds.has(activeConversationId) ? null : activeConversationId;
+  },
+  set(value) {
+    activeConversationId = value && !deletedConversationIds.has(value) ? value : null;
+  },
+  enumerable: true,
+  configurable: true,
+});
 
 const els = {};
 
@@ -1406,6 +1418,7 @@ function clearConversationBodyPendingFor(conv, fallbackProjectPath, id) {
 
 async function hydrateConversationBody(projectPath, id, options = {}) {
   if (!id) return null;
+  if (deletedConversationIds.has(id)) return null;
   const existing = findConversation(id);
   if (!options.force && conversationHasBody(existing) && !conversationBodyIsStale(existing)) {
     clearConversationBodyPendingFor(existing, projectPath, id);
@@ -1418,7 +1431,9 @@ async function hydrateConversationBody(projectPath, id, options = {}) {
   const promise = (async () => {
     try {
       const payload = await requestJson(`/api/ai-hub/conversations?${params.toString()}`);
+      if (deletedConversationIds.has(id)) return null;
       const body = payload && payload.conversation;
+      if (body && deletedConversationIds.has(body.id)) return null;
       if (!body) throw new Error('Conversation activity is unavailable');
       activityLoadErrors.delete(manageKey(body));
       normalizeGeminiConversationMessages(body);
@@ -1613,7 +1628,8 @@ async function hydrateConversationsFromServer() {
   try {
     for (const [scope, key] of [['manager', MANAGER_CONV_KEY], ['company', COMPANY_CONV_KEY]]) {
       const scopePayload = await requestJson(`/api/ai-hub/conversations?scope=${scope}`);
-      const scopeConvs = Array.isArray(scopePayload.conversations) ? scopePayload.conversations : [];
+      const scopeConvs = (Array.isArray(scopePayload.conversations) ? scopePayload.conversations : [])
+        .filter((conv) => conv && !deletedConversationIds.has(conv.id));
       for (const conv of scopeConvs) normalizeGeminiConversationMessages(conv);
       // Only materialize a scope bucket when it has content (or already exists). Creating
       // empty @manager/@company buckets on every project hydrate pollutes state.conversations
@@ -1633,7 +1649,13 @@ async function hydrateConversationsFromServer() {
   const projectPath = state.projectPath;
   const enc = encodeURIComponent(projectPath);
   const pickActive = (list, serverActiveId) => {
-    const activeCandidates = [state.activeId, serverActiveId].filter(Boolean);
+    const suppressServerActive = !state.activeId && (state.cpBrowseAll || state.cpSelectedJob);
+    if (suppressServerActive) {
+      state.activeId = null;
+      return;
+    }
+    const activeCandidates = [state.activeId, suppressServerActive ? null : serverActiveId]
+      .filter((id) => id && !deletedConversationIds.has(id));
     // Issue #1408: a manager/company-scoped conversation must not become the Projects
     // workspace active conversation — it's shown in its own Company/Manager panel via
     // tfActiveOrgConv/tfActiveMgrConv instead. Decided by scope, not by job id.
@@ -1647,7 +1669,8 @@ async function hydrateConversationsFromServer() {
     // the selected conversation body. Never fetch the full project body on the interactive path.
     const headerPayload = await requestJson(`/api/ai-hub/conversations?projectPath=${enc}&headersOnly=1`);
     if (state.projectPath !== projectPath) return; // user switched projects mid-load
-    const headers = Array.isArray(headerPayload.conversations) ? headerPayload.conversations : [];
+    const headers = (Array.isArray(headerPayload.conversations) ? headerPayload.conversations : [])
+      .filter((conv) => conv && !deletedConversationIds.has(conv.id));
     const mergedHeaders = mergeConversationListHeaders(state.conversations[projectPath] || [], headers);
     state.conversations[projectPath] = mergedHeaders;
     pickActive(mergedHeaders, headerPayload.activeId);
@@ -1668,7 +1691,8 @@ async function hydrateConversationsFromServer() {
 async function hydrateProjectConversationHeaders(projectPath) {
   if (!projectPath) return false;
   const payload = await requestJson(`/api/ai-hub/conversations?projectPath=${encodeURIComponent(projectPath)}&headersOnly=1`);
-  const incoming = Array.isArray(payload.conversations) ? payload.conversations : [];
+  const incoming = (Array.isArray(payload.conversations) ? payload.conversations : [])
+    .filter((conv) => conv && !deletedConversationIds.has(conv.id));
   const existing = state.conversations[projectPath] || [];
   const merged = mergeConversationListHeaders(existing, incoming);
   const changed = existing.length !== merged.length
@@ -2037,6 +2061,9 @@ function findConversation(id) {
 }
 
 function activeConversation() {
+  if (state.activeId && deletedConversationIds.has(state.activeId)) {
+    state.activeId = null;
+  }
   if (!state.activeId) return null;
   return findConversation(state.activeId);
 }
@@ -2380,11 +2407,20 @@ async function deleteConversation(id) {
   const target = findConversation(id);
   if (!target) return false;
   const params = conversationLookupParams(target, target.projectPath);
+  // Tombstone before the async delete so any in-flight header/body hydrate that
+  // resolves during the server round trip cannot reselect or reinsert this run.
+  deletedConversationIds.add(id);
+  if (activeConversationId === id || state.activeId === id) {
+    activeConversationId = null;
+    state.activeId = null;
+    if (state.pollHandle) { window.clearInterval(state.pollHandle); state.pollHandle = null; }
+  }
   try {
     await requestJson(`/api/ai-hub/conversations/${encodeURIComponent(id)}?${params.toString()}`, {
       method: 'DELETE',
     });
   } catch (error) {
+    deletedConversationIds.delete(id);
     showStatus(error instanceof Error ? error.message : String(error), true);
     return false;
   }
@@ -2394,16 +2430,19 @@ async function deleteConversation(id) {
     const next = list.filter((c) => c && c.id !== id);
     if (next.length !== list.length) { state.conversations[key] = next; removed = true; }
   }
-  if (!removed) return false;
-  manageViews.delete(manageKey(target));
-  microArchiveViews.delete(manageKey(target));
-  activityLoadErrors.delete(manageKey(target));
-  if (state.activeId === id) {
+  const clearDeletedActive = () => {
+    if (!(activeConversationId === id || state.activeId === id || deletedConversationIds.has(activeConversationId) || deletedConversationIds.has(state.activeId))) return;
+    activeConversationId = null;
     state.activeId = null;
     // Deleting the active run: stop its poll so no zombie interval keeps ticking
     // against a conversation that no longer exists.
     if (state.pollHandle) { window.clearInterval(state.pollHandle); state.pollHandle = null; }
-  }
+  };
+  clearDeletedActive();
+  if (!removed) return false;
+  manageViews.delete(manageKey(target));
+  microArchiveViews.delete(manageKey(target));
+  activityLoadErrors.delete(manageKey(target));
   if (state.panelState) delete state.panelState[id];
   // Drop any learning-run pointer that referenced this conversation.
   if (typeof tfLearningRunByScope === 'object' && tfLearningRunByScope) {
@@ -2413,6 +2452,7 @@ async function deleteConversation(id) {
   }
   if (typeof refreshStatusSurfaces === 'function') refreshStatusSurfaces();
   if (typeof renderActive === 'function') renderActive();
+  clearDeletedActive();
   if (typeof showStatus === 'function') showStatus('Run deleted.', false);
   return true;
 }
@@ -7938,6 +7978,7 @@ function parseCpSearch(text) {
 function focusComposerForDelegate(opts) {
   state.cpActionContext = (opts && opts.actionContext) || managementActionContext(state.pendingNextJobArea || undefined);
   state.activeId = null;
+  persistActiveConversationSelection(null, { projectPath: state.projectPath || '' });
   state.showProjectInfo = false;
   if (tf.area === 'company' || tf.area === 'manager') {
     tf.areaSelection[tf.area] = 'delegate';
@@ -8036,6 +8077,9 @@ function renderComposerSuggestions(searchText) {
 // and never reaches this function. This is the only thing that changes
 // across every path; the box itself never does.
 async function sendFromComposer() {
+  const submitDelegate = (typeof window !== 'undefined' && typeof window.submitComposerDelegate === 'function')
+    ? window.submitComposerDelegate
+    : submitComposerDelegate;
   if (!state.activeId) {
     // Issue #989: a next-job-recommendation chip can pre-select a job (and
     // pre-fill instructions) without going through the suggestion list at
@@ -8053,7 +8097,7 @@ async function sendFromComposer() {
       }
       const job = state.cpSelectedJob;
       state.cpSelectedJob = null;
-      await submitComposerDelegate(job, text);
+      await submitDelegate(job, text);
       return;
     }
     if (state.cpHighlightIndex >= 0 && state.cpRows[state.cpHighlightIndex]) {
@@ -8061,7 +8105,7 @@ async function sendFromComposer() {
     } else {
       const text = els['coach-text'].value.trim();
       if (!text) return;
-      await submitComposerDelegate({ id: '__freeform__', title: 'Ad-hoc task', intent: '' }, text);
+      await submitDelegate({ id: '__freeform__', title: 'Ad-hoc task', intent: '' }, text);
     }
     return;
   }
@@ -11452,6 +11496,12 @@ function convFindOpen(term) {
   convFind.term = cleaned;
   convFind.index = 0;
   convFindApply({ scrollToCurrent: true });
+  setTimeout(() => {
+    if (convFind.open && convFind.term === cleaned) convFindApply({ scrollToCurrent: true });
+  }, 100);
+  setTimeout(() => {
+    if (convFind.open && convFind.term === cleaned) convFindApply({ scrollToCurrent: true });
+  }, 300);
 }
 
 function convFindClose() {
@@ -11562,8 +11612,31 @@ function convFindHighlightCurrent(scrollIntoView) {
   hits.forEach((hit, index) => hit.classList.toggle('on', index === convFind.index));
   const current = hits[convFind.index];
   if (current && scrollIntoView) {
+    const scrollCurrentIntoMessages = () => {
+      let host = document.getElementById('messages');
+      for (let node = current.parentElement; node && node !== document.body; node = node.parentElement) {
+        if (node.scrollHeight > node.clientHeight + 1) {
+          host = node;
+          break;
+        }
+        if (node.id === 'thread-panel') break;
+      }
+      if (!host) return;
+      const hostBox = host.getBoundingClientRect();
+      const currentBox = current.getBoundingClientRect();
+      const targetTop = host.scrollTop
+        + (currentBox.top - hostBox.top)
+        - (host.clientHeight / 2)
+        + (currentBox.height / 2);
+      host.scrollTop = Math.max(0, targetTop);
+    };
     // The thread panel scrolls, and a match can be hundreds of messages down (R45).
-    current.scrollIntoView({ block: 'center', inline: 'nearest' });
+    // scrollIntoView can target the page/details wrapper in Chromium; move the
+    // actual overflowing message ancestor directly.
+    scrollCurrentIntoMessages();
+    requestAnimationFrame(scrollCurrentIntoMessages);
+    setTimeout(scrollCurrentIntoMessages, 0);
+    setTimeout(scrollCurrentIntoMessages, 50);
   }
 }
 
@@ -18365,4 +18438,5 @@ if (typeof window !== 'undefined') {
   // Issue #1067: let the suite trigger the create-employee form so scope picker
   // tests can assert the rendered controls without depending on click coordinates.
   window.openInlineCreateEmployee = openInlineCreateEmployee;
+  window.submitComposerDelegate = submitComposerDelegate;
 }

package/public/ai-hub/styles.css

@@ -5738,10 +5738,11 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
 .hub-cobrand[hidden] { display: none; }
 .hub-cobrand-mark { width: 17px; height: 17px; border-radius: 5px; display: block; }
 .hub-cobrand-mark img { width: 100%; height: 100%; object-fit: contain; display: block; border-radius: 5px; }
-/* Tablet-width navs cannot hold the company lockup, tabs, search, co-mark, and
-   account control together. Keep the functional controls and shed the co-mark. */
+/* Tablet-width navs cannot hold the company lockup, tabs, search, co-mark,
+   update badge, and account control together. Keep the avatar reachable. */
 @media (max-width: 820px) {
   .hub-cobrand { display: none; }
+  .hub-update-badge { display: none; }
 }
 /* Very narrow windows (the Hub is desktop/Electron-first, but keep the dense nav
    from forcing horizontal page scroll): drop the co-mark and the company name,
@@ -5751,12 +5752,6 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
   .hub-brand { padding: 0 2px 0 10px; }
   .hub-brand-divider { margin: 0 4px 0 8px; }
   .hub-tab { padding: 10px 12px; }
-  /* #1379: the badge's own text ("Updates available") is exactly what forced the same
-     horizontal-scroll problem this block already exists to prevent - measured at 375px:
-     95px of overflow with the badge shown, none without it. Same treatment as the
-     co-mark above: the update is still reachable via #avatar-btn -> #am-update at this
-     width, just not duplicated in the top bar where there's no room for it. */
-  .hub-update-badge { display: none; }
 }
 
 /* Brand editor (Company tab → Brand accordion). */
@@ -5778,6 +5773,20 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
 [data-theme="dark"] .brand-editor-actions .send-button { color: var(--bg); }
 .brand-preview { border: 1px solid var(--line); border-radius: 12px; overflow: hidden; margin-top: 14px; }
 .brand-preview-cap { font-size: 11px; font-weight: 700; text-transform: uppercase; letter-spacing: .04em; color: var(--muted); padding: 10px 14px; background: var(--bg); border-bottom: 1px solid var(--line); }
+.brand-preview .hub-tabs { width: 100%; min-width: 0; max-width: 100%; overflow: hidden; }
+.brand-preview .hub-brand { min-width: 0; }
+.brand-preview .hub-brand-name { max-width: min(220px, 24vw); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.brand-preview .nav-right { min-width: 0; flex-shrink: 0; }
+@media (max-width: 820px) {
+  .brand-preview .hub-cobrand { display: none; }
+  .brand-preview .hub-brand-name { max-width: 120px; }
+  .brand-preview .hub-tab { padding-left: 12px; padding-right: 12px; }
+}
+@media (max-width: 700px) {
+  .brand-preview .hub-brand-name { display: none; }
+  .brand-preview .hub-brand { padding-left: 8px; }
+  .brand-preview .hub-tab { padding-left: 10px; padding-right: 10px; }
+}
 
 /* ── New-project: folder picker row ── */
 .np-folder-row { display:flex; gap:8px; }