fraim-hub 2.0.326 → 2.0.328

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/api/payment/webhook.js

@@ -11,6 +11,7 @@ exports.resolveSubscriptionNextBillingDateWithInvoiceFallback = resolveSubscript
 exports.buildCurrentPeriodEndUpdate = buildCurrentPeriodEndUpdate;
 exports.resolveInvoicePaidNextBillingDate = resolveInvoicePaidNextBillingDate;
 const stripe_1 = require("../../config/stripe");
+const redact_secrets_1 = require("../../core/utils/redact-secrets");
 const feature_flags_1 = require("../../config/feature-flags");
 const email_service_1 = require("../../services/email-service");
 const dashboard_access_1 = require("../../services/dashboard-access");
@@ -273,7 +274,7 @@ async function handleSubscriptionCreatedOrUpdated(subscription, dbService) {
                 expiresAt: null, // Subscriptions don't have fixed expiration
                 cancelAt: subscription.cancel_at ? new Date(subscription.cancel_at * 1000) : null
             });
-            console.log(`✅ Upgraded trial key to paid subscription: ${apiKey.key}`);
+            console.log(`✅ Upgraded trial key to paid subscription: ${(0, redact_secrets_1.redactApiKey)(apiKey.key)}`);
         }
         else {
             // Create new API key for subscription (shouldn't happen in normal flow)
@@ -295,7 +296,7 @@ async function handleSubscriptionCreatedOrUpdated(subscription, dbService) {
                 apiCallCount: 0,
                 personaSystemActive: (0, feature_flags_1.isPersonaEntitlementsEnabled)() || undefined
             });
-            console.log(`✅ Created new API key for subscription: ${newKey}`);
+            console.log(`✅ Created new API key for subscription: ${(0, redact_secrets_1.redactApiKey)(newKey)}`);
             apiKey = { key: newKey, userId: email };
         }
     }
@@ -358,7 +359,7 @@ async function handleSubscriptionDeleted(subscription, dbService) {
     // Send cancellation email
     const emailService = new email_service_1.EmailService();
     await emailService.sendSubscriptionCancelled(apiKey.userId, new Date());
-    console.log(`✅ API key expired due to subscription cancellation: ${apiKey.key}`);
+    console.log(`✅ API key expired due to subscription cancellation: ${(0, redact_secrets_1.redactApiKey)(apiKey.key)}`);
 }
 async function handleInvoicePaid(invoice, dbService) {
     console.log(`✅ Invoice paid: ${invoice.id}`);
@@ -438,7 +439,7 @@ async function handleInvoicePaid(invoice, dbService) {
             suspendedAt: null,
             suspensionReason: null
         });
-        console.log(`✅ API key restored after payment: ${apiKey.key}`);
+        console.log(`✅ API key restored after payment: ${(0, redact_secrets_1.redactApiKey)(apiKey.key)}`);
         // Send restoration email
         const emailService = new email_service_1.EmailService();
         const restorationBillingDate = nextBillingDate || new Date();
@@ -467,7 +468,7 @@ async function handleInvoicePaid(invoice, dbService) {
     }
     // Regular renewal
     {
-        console.log(`✅ Subscription renewed: ${apiKey.key}`);
+        console.log(`✅ Subscription renewed: ${(0, redact_secrets_1.redactApiKey)(apiKey.key)}`);
         if (nextBillingDate) {
             await dbService.updateApiKey(apiKey.key, buildCurrentPeriodEndUpdate(nextBillingDate));
         }
@@ -532,7 +533,7 @@ async function handleInvoicePaymentFailed(invoice, dbService) {
         suspendedAt: new Date(),
         suspensionReason: 'payment_failed'
     });
-    console.log(`✅ API key suspended due to payment failure: ${apiKey.key}`);
+    console.log(`✅ API key suspended due to payment failure: ${(0, redact_secrets_1.redactApiKey)(apiKey.key)}`);
     // Send payment failure email with 7-day grace period
     const emailService = new email_service_1.EmailService();
     const gracePeriodEndsAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000); // 7 days