fraim 2.0.326 → 2.0.328

package/dist/src/local-mcp-server/stdio-server.js

@@ -62,6 +62,7 @@ const crypto_1 = require("crypto");
 const axios_1 = __importDefault(require("axios"));
 const provider_utils_1 = require("../core/utils/provider-utils");
 const object_utils_1 = require("../core/utils/object-utils");
+const redact_secrets_1 = require("../core/utils/redact-secrets");
 const pack_home_1 = require("../cli/utils/pack-home");
 const local_registry_resolver_1 = require("../core/utils/local-registry-resolver");
 const ai_mentor_1 = require("../core/ai-mentor");
@@ -553,7 +554,7 @@ class FraimLocalMCPServer {
         }
         this.log('🚀 FRAIM Local MCP Server starting... [DEBUG-PROXY-V3]');
         this.log(`📡 Remote server: ${this.remoteUrl}`);
-        this.log(`🔑 API key: ${this.apiKey.substring(0, 10)}...`);
+        this.log(`🔑 API key: ${(0, redact_secrets_1.redactApiKey)(this.apiKey)}`);
         this.log(`Local MCP version: ${this.localVersion}`);
         this.log(`🔍 DEBUG BUILD: Machine detection v2 active`);
         // Initialize usage collector
@@ -626,23 +627,35 @@ class FraimLocalMCPServer {
             this.log(`Could not persist userEmail: ${e instanceof Error ? e.message : String(e)}`);
         }
     }
+    /**
+     * Non-reversible reference for this proxy's key (issue #1701). Every line the
+     * proxy writes carries it, and the proxy mirrors those lines into a temp file
+     * that survives the process, so the key itself must never appear here. The
+     * reference matches the one the server logs for the same key, so a user's local
+     * log still correlates with the server-side log.
+     */
+    keyRef() {
+        return this.apiKey ? (0, redact_secrets_1.redactApiKey)(this.apiKey) : 'MISSING_API_KEY';
+    }
     log(message) {
         // Log to stderr (stdout is reserved for MCP protocol)
-        const key = this.apiKey || 'MISSING_API_KEY';
-        console.error(`[FRAIM key:${key}] ${message}`);
+        const keyRef = this.keyRef();
+        // Messages are assembled from remote responses and caught errors, either of
+        // which can carry a credential this proxy did not author.
+        const safeMessage = (0, redact_secrets_1.redactSecretsInText)(message);
+        console.error(`[FRAIM key:${keyRef}] ${safeMessage}`);
         // Also log to file for debugging
         try {
             const fs = require('fs');
             const logFile = require('path').join(require('os').tmpdir(), 'fraim-mcp-proxy.log');
-            fs.appendFileSync(logFile, `${new Date().toISOString()} [${key}] ${message}\n`);
+            fs.appendFileSync(logFile, `${new Date().toISOString()} [${keyRef}] ${safeMessage}\n`);
         }
         catch (e) {
             // Ignore file logging errors
         }
     }
     logError(message) {
-        const key = this.apiKey || 'MISSING_API_KEY';
-        console.error(`[FRAIM ERROR key:${key}] ${message}`);
+        console.error(`[FRAIM ERROR key:${this.keyRef()}] ${(0, redact_secrets_1.redactSecretsInText)(message)}`);
     }
     detectLocalVersion() {
         const candidates = [

package/dist/src/middleware/auth.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthMiddleware = void 0;
+const redact_secrets_1 = require("../core/utils/redact-secrets");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const cookie_service_1 = require("../services/cookie-service");
@@ -219,7 +220,7 @@ class AuthMiddleware {
         try {
             const apiKeyData = await this.dbService.verifyApiKey(apiKey);
             if (!apiKeyData) {
-                console.error(`❌ FRAIM AUTH: Invalid API key: ${apiKey}`);
+                console.error(`❌ FRAIM AUTH: Invalid API key: ${(0, redact_secrets_1.redactApiKey)(apiKey)}`);
                 setMcpAuthenticateChallenge();
                 return res.status(401).json({
                     jsonrpc: '2.0',
@@ -230,7 +231,7 @@ class AuthMiddleware {
             // Check if key is suspended
             if (apiKeyData.status === 'suspended') {
                 const reason = apiKeyData.suspensionReason || 'payment failure';
-                console.error(`❌ FRAIM AUTH: Suspended API key: ${apiKey} (reason: ${reason})`);
+                console.error(`❌ FRAIM AUTH: Suspended API key: ${(0, redact_secrets_1.redactApiKey)(apiKey)} (reason: ${reason})`);
                 return res.status(402).json({
                     jsonrpc: '2.0',
                     error: {
@@ -255,7 +256,7 @@ class AuthMiddleware {
                 const message = tier === 'trial'
                     ? 'Your 14-day free trial has expired. Please upgrade to continue using FRAIM.'
                     : 'Your subscription has expired. Please renew to continue using FRAIM.';
-                console.error(`❌ FRAIM AUTH: Expired API key: ${apiKey} (tier: ${tier})`);
+                console.error(`❌ FRAIM AUTH: Expired API key: ${(0, redact_secrets_1.redactApiKey)(apiKey)} (tier: ${tier})`);
                 return res.status(402).json({
                     jsonrpc: '2.0',
                     error: {

package/dist/src/middleware/logger.js

@@ -35,38 +35,21 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestLogger = requestLogger;
 const crypto_1 = require("crypto");
+const redact_secrets_1 = require("../core/utils/redact-secrets");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const LOG_FILE = path.join(process.cwd(), 'server-direct.log');
-/**
- * Extracts API key from request for logging purposes
- */
-function getApiKeyForLogging(req) {
-    const fromContext = req.apiKeyData?.key;
-    if (typeof fromContext === 'string' && fromContext.trim().length > 0) {
-        return fromContext;
-    }
-    const fromHeader = Array.isArray(req.headers['x-api-key'])
-        ? req.headers['x-api-key'][0]
-        : req.headers['x-api-key'];
-    if (typeof fromHeader === 'string' && fromHeader.trim().length > 0) {
-        return fromHeader;
-    }
-    const fromQuery = req.query?.['api-key'];
-    if (typeof fromQuery === 'string' && fromQuery.trim().length > 0) {
-        return fromQuery;
-    }
-    return 'ANONYMOUS';
-}
 function getBodyForLogging(req) {
     if (req.path === '/api/ai-hub/brand' && req.body && typeof req.body === 'object') {
         const body = { ...req.body };
         if (typeof body.logo === 'string' && body.logo.length > 0) {
             body.logo = `[redacted logo payload, ${body.logo.length} chars]`;
         }
-        return JSON.stringify(body);
+        return (0, redact_secrets_1.redactSecretsInText)(JSON.stringify(body));
     }
-    return JSON.stringify(req.body);
+    // Bodies are logged verbatim; a caller that puts a credential in one must not
+    // have it land in the log in the clear (issue #1701).
+    return (0, redact_secrets_1.redactSecretsInText)(JSON.stringify(req.body));
 }
 /**
  * Middleware to log all requests
@@ -118,8 +101,8 @@ function requestLogger(req, res, next) {
     res.on('finish', () => {
         const duration = Date.now() - start;
         const status = res.statusCode;
-        const keyStr = getApiKeyForLogging(req);
-        const logMsg = `[req:${requestId}] [local:${localMcpVersion}] ${keyStr} END ${method} ${path} ${status} ${duration}ms`;
+        const keyRef = (0, redact_secrets_1.apiKeyRefFromRequest)(req);
+        const logMsg = `[req:${requestId}] [local:${localMcpVersion}] ${keyRef} END ${method} ${path} ${status} ${duration}ms`;
         logEntry(logMsg);
     });
     next();

package/dist/src/middleware/telemetry.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelemetryMiddleware = void 0;
+const redact_secrets_1 = require("../core/utils/redact-secrets");
 class TelemetryMiddleware {
     constructor(sessionManager) {
         this.sessionManager = sessionManager;
@@ -125,7 +126,7 @@ After successful fraim_connect, all other FRAIM tools will work. This is require
                     id: req.body?.id || null
                 });
             }
-            console.log(`Telemetry active for ${apiKey}`);
+            console.log(`Telemetry active for ${(0, redact_secrets_1.redactApiKey)(apiKey)}`);
             return next();
         }
         catch (error) {

package/dist/src/services/installer-service.js

@@ -1,26 +1,9 @@
 "use strict";
 /**
- * InstallerService - Generates installer scripts and dashboard HTML for the Get Started flow.
- * Scripts are loaded from templates in scripts/installer/ and populated with token/baseUrl.
+ * InstallerService - Generates dashboard HTML for the Get Started flow.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstallerService = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-function getScriptsDir() {
-    // When running from dist: dist/services/ -> dist/../scripts = scripts
-    // When running from src with tsx: src/services/ -> src/../scripts = scripts
-    const candidates = [
-        (0, path_1.join)(process.cwd(), 'scripts', 'installer'),
-        (0, path_1.join)(__dirname, '..', '..', 'scripts', 'installer'),
-        (0, path_1.join)(__dirname, '..', '..', '..', 'scripts', 'installer')
-    ];
-    for (const dir of candidates) {
-        if ((0, fs_1.existsSync)(dir))
-            return dir;
-    }
-    return null;
-}
 /**
  * Default marketing site base URL. All asset references and nav links in the
  * layout shell resolve against this host. Overridable via FRAIM_MARKETING_URL.
@@ -55,15 +38,6 @@ function buildLayoutShell(marketingBaseUrl) {
 <script src="${m}/js/script.js"></script></body></html>`;
 }
 class InstallerService {
-    constructor() {
-        this.scriptsDir = getScriptsDir();
-    }
-    requireScriptsDir() {
-        if (!this.scriptsDir) {
-            throw new Error('Installer scripts directory not found. Installer download is unavailable.');
-        }
-        return this.scriptsDir;
-    }
     /**
      * Build the HTML layout shell (nav, styles, theme) wrapping body content.
      *
@@ -105,27 +79,11 @@ class InstallerService {
 <h1 style="color:var(--error-color);margin-bottom:12px">${title}</h1><p style="color:var(--text-secondary)">${message}</p>
 <p style="margin-top:16px"><a href="${linkHref}" class="btn-primary">${linkText}</a></p></div></div>`;
     }
-    /**
-     * Generate the Mac installer script (.command) with the API key embedded.
-     */
-    generateMacScript(key, _baseUrl) {
-        const fraimCmd = `npx -y fraim@latest first-run --key=${key}`;
-        const templatePath = (0, path_1.join)(this.requireScriptsDir(), 'fraim-install-mac.template.sh');
-        const template = (0, fs_1.readFileSync)(templatePath, 'utf-8');
-        return template
-            .replace('{{FRAIM_CMD}}', fraimCmd)
-            .split('{{KEY}}').join(key);
+    generateMacScript(_key, _baseUrl) {
+        throw new Error('Shell installer fallbacks are retired; download FRAIM-Setup.dmg.');
     }
-    /**
-     * Generate the Windows installer script (.cmd) with the API key embedded.
-     */
-    generateWindowsScript(key, _baseUrl) {
-        const fraimCmd = `npx -y fraim@latest first-run --key=${key}`;
-        const templatePath = (0, path_1.join)(this.requireScriptsDir(), 'fraim-install-win.template.cmd');
-        const template = (0, fs_1.readFileSync)(templatePath, 'utf-8');
-        return template
-            .replace('{{FRAIM_CMD}}', fraimCmd)
-            .split('{{KEY}}').join(key);
+    generateWindowsScript(_key, _baseUrl) {
+        throw new Error('Command installer fallbacks are retired; download FRAIM-Setup.exe.');
     }
 }
 exports.InstallerService = InstallerService;

package/dist/src/services/session-service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionManager = void 0;
+const redact_secrets_1 = require("../core/utils/redact-secrets");
 class SessionManager {
     constructor(dbService) {
         this.sessions = new Map();
@@ -42,7 +43,7 @@ class SessionManager {
                     : await this.dbService.getActiveSessionByApiKey(apiKey);
                 if (dbSession) {
                     sessionKey = this.getSessionKey(apiKey, dbSession.sessionId);
-                    console.log(`Re-hydrating session for API Key: ${apiKey}, sessionId: ${dbSession.sessionId}`);
+                    console.log(`Re-hydrating session for API Key: ${(0, redact_secrets_1.redactApiKey)(apiKey)}, sessionId: ${dbSession.sessionId}`);
                     session = {
                         sessionId: dbSession.sessionId,
                         lastWrite: now,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.326",
+  "version": "2.0.328",
   "description": "FRAIM core CLI and MCP package.",
   "main": "index.js",
   "bin": {