fraim-framework 2.0.93 → 2.0.95

package/bin/fraim.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * FRAIM Framework CLI Entry Point

package/dist/src/cli/commands/sync.js

@@ -41,7 +41,6 @@ const commander_1 = require("commander");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
-const child_process_1 = require("child_process");
 const config_loader_1 = require("../../core/config-loader");
 const version_utils_1 = require("../utils/version-utils");
 const script_sync_utils_1 = require("../utils/script-sync-utils");
@@ -85,14 +84,13 @@ const runSync = async (options) => {
     const projectRoot = process.cwd();
     const config = (0, config_loader_1.loadFraimConfig)();
     const fraimDir = path_1.default.join(projectRoot, '.fraim');
-    // Check for CLI updates first (but skip during installation to prevent loops)
-    const isPostInstall = process.env.npm_lifecycle_event === 'postinstall' ||
-        process.env.npm_lifecycle_script === 'postinstall';
-    if (!options.skipUpdates && !isPostInstall) {
-        await checkAndUpdateCLI();
-    }
-    else if (isPostInstall) {
-        console.log(chalk_1.default.gray('⏭️ Skipping auto-update check during installation to prevent loops.'));
+    // Check if running via npx
+    const isNpx = process.env.npm_config_prefix === undefined || process.env.npm_lifecycle_event === 'npx';
+    const isGlobal = !isNpx && (process.env.npm_config_global === 'true' || process.env.npm_config_prefix);
+    if (isGlobal && !options.skipUpdates) {
+        console.log(chalk_1.default.yellow('⚠️  You are running a global installation of FRAIM.'));
+        console.log(chalk_1.default.gray('   Updates are not automatic in this mode.'));
+        console.log(chalk_1.default.cyan('   💡 Recommended: Use "npx fraim-framework@latest sync" instead.\n'));
     }
     const { syncFromRemote } = await Promise.resolve().then(() => __importStar(require('../utils/remote-sync')));
     // Path 1: --local flag → hit localhost MCP server
@@ -149,118 +147,9 @@ const runSync = async (options) => {
     updateVersionInConfig(fraimDir);
 };
 exports.runSync = runSync;
-async function checkAndUpdateCLI() {
-    try {
-        // Additional safety: check if we're in a global npm install context
-        const isGlobalInstall = process.env.npm_config_global === 'true' ||
-            process.env.npm_config_prefix ||
-            process.cwd().includes('node_modules');
-        if (isGlobalInstall) {
-            console.log(chalk_1.default.gray('⏭️ Skipping auto-update during global installation.'));
-            return;
-        }
-        console.log(chalk_1.default.blue('🔍 Checking for FRAIM CLI updates...'));
-        const currentVersion = (0, version_utils_1.getFraimVersion)();
-        const latestVersion = await getLatestNpmVersionHttp('fraim-framework');
-        if (!latestVersion) {
-            console.log(chalk_1.default.yellow('⚠️ Could not check for updates. Continuing with current version.'));
-            return;
-        }
-        if (isVersionUpToDate(currentVersion, latestVersion)) {
-            console.log(chalk_1.default.green(`✅ FRAIM CLI is up to date (${currentVersion})`));
-            return;
-        }
-        console.log(chalk_1.default.yellow(`📦 New version available: ${currentVersion} → ${latestVersion}`));
-        console.log(chalk_1.default.blue('🔄 Auto-updating FRAIM CLI...'));
-        const success = await updateGlobalPackageHttp('fraim-framework', latestVersion);
-        if (success) {
-            console.log(chalk_1.default.green(`✅ Successfully updated to FRAIM ${latestVersion}`));
-            console.log(chalk_1.default.gray('   Restart may be required for some changes to take effect.'));
-        }
-        else {
-            console.log(chalk_1.default.yellow('⚠️ Auto-update failed. Please run: npm install -g fraim-framework@latest'));
-        }
-    }
-    catch (error) {
-        console.log(chalk_1.default.yellow('⚠️ Could not check for updates. Continuing with current version.'));
-    }
-}
-async function getLatestNpmVersionHttp(packageName) {
-    try {
-        // Use Node.js built-in https module instead of spawn
-        const https = require('https');
-        return new Promise((resolve) => {
-            const req = https.get(`https://registry.npmjs.org/${packageName}/latest`, {
-                timeout: 5000,
-                headers: {
-                    'User-Agent': 'fraim-framework-cli'
-                }
-            }, (res) => {
-                let data = '';
-                res.on('data', (chunk) => {
-                    data += chunk;
-                });
-                res.on('end', () => {
-                    try {
-                        const packageInfo = JSON.parse(data);
-                        resolve(packageInfo.version || null);
-                    }
-                    catch (e) {
-                        resolve(null);
-                    }
-                });
-            });
-            req.on('error', () => {
-                resolve(null);
-            });
-            req.on('timeout', () => {
-                req.destroy();
-                resolve(null);
-            });
-        });
-    }
-    catch (error) {
-        return null;
-    }
-}
-function isVersionUpToDate(current, latest) {
-    // Simple version comparison - assumes semantic versioning
-    const currentParts = current.split('.').map(n => parseInt(n, 10));
-    const latestParts = latest.split('.').map(n => parseInt(n, 10));
-    for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {
-        const currentPart = currentParts[i] || 0;
-        const latestPart = latestParts[i] || 0;
-        if (currentPart < latestPart)
-            return false;
-        if (currentPart > latestPart)
-            return true;
-    }
-    return true; // Versions are equal
-}
-async function updateGlobalPackageHttp(packageName, version) {
-    return new Promise((resolve) => {
-        console.log(chalk_1.default.gray(`   Running: npm install -g ${packageName}@${version}`));
-        // Use npm.cmd on Windows, npm on Unix
-        const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-        const npmProcess = (0, child_process_1.spawn)(npmCommand, ['install', '-g', `${packageName}@${version}`], {
-            stdio: ['ignore', 'ignore', 'ignore'] // Suppress output for cleaner experience
-        });
-        npmProcess.on('close', (code) => {
-            resolve(code === 0);
-        });
-        npmProcess.on('error', () => {
-            resolve(false);
-        });
-        // Timeout after 30 seconds
-        setTimeout(() => {
-            npmProcess.kill();
-            resolve(false);
-        }, 30000);
-    });
-}
 exports.syncCommand = new commander_1.Command('sync')
     .description('Sync workflow stubs from the framework registry')
     .option('-f, --force', 'Force sync even if digest matches')
-    .option('--skip-updates', 'Skip checking for CLI updates')
+    .option('--skip-updates', 'Skip checking for CLI updates (legacy)')
     .option('--local', 'Sync from local development server (port derived from git branch)')
     .action(exports.runSync);

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

@@ -1,7 +1,4 @@
 "use strict";
-// MCP Server Registry - Builds MCP servers from provider definitions
-// This file NO LONGER contains hardcoded server configurations
-// All provider MCP server configs come from the provider registry (server or local fallback)
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BASE_MCP_SERVERS = void 0;
 exports.buildProviderMCPServer = buildProviderMCPServer;

package/dist/src/cli/setup/auto-mcp-setup.js

@@ -324,7 +324,7 @@ const autoConfigureMCP = async (fraimKey, tokenInput, selectedIDEs, providerConf
         console.log(chalk_1.default.blue('\n🎯 Next steps:'));
         console.log(chalk_1.default.cyan('   1. Restart your configured IDEs'));
         console.log(chalk_1.default.cyan('   2. Go to any project directory'));
-        console.log(chalk_1.default.cyan('   3. Run: fraim init-project'));
+        console.log(chalk_1.default.cyan('   3. Run: npx fraim-framework@latest init-project'));
         console.log(chalk_1.default.cyan('   4. Ask your AI agent: "list fraim workflows"'));
     }
 };

package/dist/src/core/types.js

@@ -2,8 +2,6 @@
 /**
  * FRAIM Configuration Types
  * TypeScript types for .fraim/config.json
- *
- * Each field includes rich metadata for agent detection and user interaction
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_FRAIM_CONFIG = void 0;

package/dist/src/core/utils/stub-generator.js

@@ -50,11 +50,11 @@ function extractLeadParagraph(content) {
  * These stubs are committed to the user's repo for discoverability.
  */
 function generateWorkflowStub(workflowName, workflowPath, intent, principles) {
-    return `${STUB_MARKER}
-# FRAIM Workflow: ${workflowName}
-
-> [!IMPORTANT]
-> This is a **FRAIM-managed workflow stub**. 
+    return `${STUB_MARKER}
+# FRAIM Workflow: ${workflowName}
+
+> [!IMPORTANT]
+> This is a **FRAIM-managed workflow stub**. 
 > To load the full context (rules, templates, and execution steps), ask your AI agent to:
 > \`@fraim get_fraim_workflow("${workflowName}")\`
 >
@@ -81,19 +81,19 @@ function parseRegistryWorkflow(content) {
  * Coaching stubs are discoverability artifacts and should be resolved with get_fraim_file.
  */
 function generateJobStub(jobName, _jobPath, intent, outcome, steps) {
-    return `${STUB_MARKER}
-# FRAIM Job: ${jobName}
-
-## Intent
-${intent}
-
-## Outcome
-${outcome}
-
-## Steps
-${steps}
-
----
+    return `${STUB_MARKER}
+# FRAIM Job: ${jobName}
+
+## Intent
+${intent}
+
+## Outcome
+${outcome}
+
+## Steps
+${steps}
+
+---
 
 > [!IMPORTANT]
 > **For AI Agents:** Do NOT attempt to execute this job based on the Intent/Outcome above.
@@ -110,41 +110,41 @@ ${steps}
  * Generates a lightweight markdown stub for a skill.
  */
 function generateSkillStub(skillName, skillPath, skillInput, skillOutput) {
-    return `${STUB_MARKER}
-# FRAIM Skill: ${skillName}
-
-## Skill Input
-${skillInput}
-
-## Skill Output
-${skillOutput}
-
----
-
-> [!IMPORTANT]
-> **For AI Agents:** This is a discoverability stub for the skill.
-> All execution details must be fetched from MCP before use.
-> To retrieve the complete skill instructions, call:
-> \`get_fraim_file({ path: "skills/${skillPath}" })\`
+    return `${STUB_MARKER}
+# FRAIM Skill: ${skillName}
+
+## Skill Input
+${skillInput}
+
+## Skill Output
+${skillOutput}
+
+---
+
+> [!IMPORTANT]
+> **For AI Agents:** This is a discoverability stub for the skill.
+> All execution details must be fetched from MCP before use.
+> To retrieve the complete skill instructions, call:
+> \`get_fraim_file({ path: "skills/${skillPath}" })\`
 `;
 }
 /**
  * Generates a lightweight markdown stub for a rule.
  */
 function generateRuleStub(ruleName, rulePath, intent) {
-    return `${STUB_MARKER}
-# FRAIM Rule: ${ruleName}
-
-## Intent
-${intent}
-
----
-
-> [!IMPORTANT]
-> **For AI Agents:** This is a discoverability stub for the rule.
-> All rule details must be fetched from MCP before use.
-> To retrieve the complete rule instructions, call:
-> \`get_fraim_file({ path: "rules/${rulePath}" })\`
+    return `${STUB_MARKER}
+# FRAIM Rule: ${ruleName}
+
+## Intent
+${intent}
+
+---
+
+> [!IMPORTANT]
+> **For AI Agents:** This is a discoverability stub for the rule.
+> All rule details must be fetched from MCP before use.
+> To retrieve the complete rule instructions, call:
+> \`get_fraim_file({ path: "rules/${rulePath}" })\`
 `;
 }
 /**

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

@@ -35,6 +35,7 @@ const usage_collector_js_1 = require("./usage-collector.js");
  */
 class FraimTemplateEngine {
     constructor(opts) {
+        this.userEmail = null;
         this.deliveryTemplatesCache = null;
         this.providerTemplatesCache = {};
         this.deliveryTemplatesLoadAttempted = false;
@@ -71,8 +72,15 @@ class FraimTemplateEngine {
     setConfig(config) {
         this.config = config;
     }
+    setUserEmail(email) {
+        this.userEmail = email;
+    }
     substituteTemplates(content) {
         let result = content;
+        // Substitute {{proxy.user.email}} with the email captured from fraim_connect
+        if (this.userEmail) {
+            result = result.replace(/\{\{proxy\.user\.email\}\}/g, this.userEmail);
+        }
         // 0. Substitute runtime context tokens: {{agent.*}}, {{machine.*}}, {{repository.*}}
         //    These come from the fraim_connect payload captured during handshake.
         const contexts = {
@@ -243,14 +251,6 @@ class FraimLocalMCPServer {
         this.machineInfo = null;
         this.repoInfo = null;
         this.engine = null;
-        this.fallbackRewriteCount = 0;
-        this.fallbackRewriteRequestCount = 0;
-        this.fallbackRewriteTokens = new Map();
-        this.pendingFallbackRequestCount = 0;
-        this.pendingFallbackTokenRewriteCount = 0;
-        this.pendingFallbackTokenCounts = new Map();
-        this.pendingFallbackEvents = [];
-        this.fallbackSummaryEmitted = false;
         this.writer = writer || process.stdout.write.bind(process.stdout);
         this.remoteUrl = process.env.FRAIM_REMOTE_URL || 'https://fraim.wellnessatwork.me';
         this.apiKey = this.loadApiKey();
@@ -867,6 +867,17 @@ class FraimLocalMCPServer {
         }
         // 2. Resolve includes within the content (for all registry tools)
         finalizedResponse = await this.resolveIncludesInResponse(finalizedResponse, requestSessionId, requestId);
+        // 3. After fraim_connect succeeds, capture user email for {{proxy.user.email}} substitution
+        if (toolName === 'fraim_connect' && !finalizedResponse.error) {
+            const text = finalizedResponse.result?.content?.[0]?.text;
+            if (typeof text === 'string') {
+                const emailMatch = text.match(/Your identity for this session: \*\*([^*]+)\*\*/);
+                if (emailMatch) {
+                    this.ensureEngine().setUserEmail(emailMatch[1].trim());
+                    this.log(`[req:${requestId}] Captured user email for template substitution: ${emailMatch[1].trim()}`);
+                }
+            }
+        }
         return this.processResponseWithHydration(finalizedResponse, requestSessionId);
     }
     async finalizeLocalToolTextResponse(request, requestSessionId, requestId, text) {
@@ -1043,7 +1054,6 @@ class FraimLocalMCPServer {
             return response;
         const rewritten = this.rewriteUnresolvedProxyPlaceholders(response.result);
         if (rewritten.tokens.length > 0) {
-            this.recordFallbackRewrite(rewritten.tokens);
             this.logError(`[${FraimLocalMCPServer.FALLBACK_ALERT_MARKER}] Rewrote unresolved proxy placeholders to agent placeholders: ${rewritten.tokens.join(', ')}`);
         }
         return {
@@ -1051,79 +1061,6 @@ class FraimLocalMCPServer {
             result: rewritten.value
         };
     }
-    recordFallbackRewrite(tokens) {
-        this.fallbackRewriteRequestCount += 1;
-        this.fallbackRewriteCount += tokens.length;
-        for (const token of tokens) {
-            const existing = this.fallbackRewriteTokens.get(token) || 0;
-            this.fallbackRewriteTokens.set(token, existing + 1);
-        }
-        this.pendingFallbackRequestCount += 1;
-        this.pendingFallbackTokenRewriteCount += tokens.length;
-        for (const token of tokens) {
-            const existing = this.pendingFallbackTokenCounts.get(token) || 0;
-            this.pendingFallbackTokenCounts.set(token, existing + 1);
-        }
-        this.pendingFallbackEvents.push({
-            at: new Date().toISOString(),
-            tokenCount: tokens.length,
-            tokens: [...tokens]
-        });
-        if (this.pendingFallbackEvents.length > 250) {
-            this.pendingFallbackEvents = this.pendingFallbackEvents.slice(-250);
-        }
-    }
-    buildPendingFallbackTelemetryPayload() {
-        if (this.pendingFallbackRequestCount === 0 &&
-            this.pendingFallbackTokenRewriteCount === 0 &&
-            this.pendingFallbackEvents.length === 0) {
-            return null;
-        }
-        const tokenCounts = {};
-        for (const [token, count] of this.pendingFallbackTokenCounts.entries()) {
-            tokenCounts[token] = count;
-        }
-        return {
-            requestFallbacks: this.pendingFallbackRequestCount,
-            tokenRewrites: this.pendingFallbackTokenRewriteCount,
-            tokenCounts,
-            events: this.pendingFallbackEvents.map((event) => ({
-                at: event.at,
-                tokenCount: event.tokenCount,
-                tokens: [...event.tokens]
-            }))
-        };
-    }
-    acknowledgePendingFallbackTelemetry(payload) {
-        this.pendingFallbackRequestCount = Math.max(0, this.pendingFallbackRequestCount - payload.requestFallbacks);
-        this.pendingFallbackTokenRewriteCount = Math.max(0, this.pendingFallbackTokenRewriteCount - payload.tokenRewrites);
-        for (const [token, sentCount] of Object.entries(payload.tokenCounts)) {
-            const current = this.pendingFallbackTokenCounts.get(token) || 0;
-            const next = Math.max(0, current - Math.max(0, sentCount));
-            if (next === 0) {
-                this.pendingFallbackTokenCounts.delete(token);
-            }
-            else {
-                this.pendingFallbackTokenCounts.set(token, next);
-            }
-        }
-        if (payload.events.length > 0) {
-            this.pendingFallbackEvents.splice(0, Math.min(payload.events.length, this.pendingFallbackEvents.length));
-        }
-    }
-    emitFallbackSummary(reason) {
-        if (this.fallbackSummaryEmitted)
-            return;
-        this.fallbackSummaryEmitted = true;
-        if (this.fallbackRewriteCount === 0)
-            return;
-        const topTokens = Array.from(this.fallbackRewriteTokens.entries())
-            .sort((a, b) => b[1] - a[1])
-            .slice(0, 10)
-            .map(([token, count]) => `${token}:${count}`)
-            .join(', ');
-        this.logError(`[${FraimLocalMCPServer.FALLBACK_SUMMARY_MARKER}] reason=${reason} requestFallbacks=${this.fallbackRewriteRequestCount} tokenRewrites=${this.fallbackRewriteCount} uniqueTokens=${this.fallbackRewriteTokens.size}${topTokens ? ` topTokens=${topTokens}` : ''}`);
-    }
     extractSessionIdFromRequest(request) {
         const sessionIdFromParams = request.params?.sessionId;
         if (typeof sessionIdFromParams === 'string' && sessionIdFromParams.trim().length > 0) {
@@ -1197,7 +1134,6 @@ class FraimLocalMCPServer {
      * tool calls and recursive inclusion resolution.
      */
     async _doProxyToRemote(request, requestId = (0, crypto_1.randomUUID)()) {
-        let sentFallbackTelemetry = null;
         try {
             // Special handling for fraim_connect - automatically inject machine and repo info
             if (request.method === 'tools/call' && request.params?.name === 'fraim_connect') {
@@ -1269,7 +1205,6 @@ class FraimLocalMCPServer {
                 // Update the request with injected info
                 request.params.arguments = args;
             }
-            sentFallbackTelemetry = this.buildPendingFallbackTelemetryPayload();
             const headers = {
                 'Content-Type': 'application/json',
                 'x-api-key': this.apiKey,
@@ -1280,11 +1215,6 @@ class FraimLocalMCPServer {
             if (sessionId) {
                 headers[FraimLocalMCPServer.SESSION_HEADER] = sessionId;
             }
-            if (sentFallbackTelemetry) {
-                headers[FraimLocalMCPServer.FALLBACK_HEADER] = Buffer
-                    .from(JSON.stringify(sentFallbackTelemetry), 'utf8')
-                    .toString('base64');
-            }
             this.log(`[req:${requestId}] Proxying ${request.method} to ${this.remoteUrl}/mcp`);
             // Resolve templates in the outgoing request so the remote server 
             // only ever sees finalized values.
@@ -1295,9 +1225,6 @@ class FraimLocalMCPServer {
                 headers,
                 timeout: 30000
             });
-            if (sentFallbackTelemetry) {
-                this.acknowledgePendingFallbackTelemetry(sentFallbackTelemetry);
-            }
             return response.data;
         }
         catch (error) {
@@ -1322,10 +1249,6 @@ class FraimLocalMCPServer {
                         localMcpVersion: this.localVersion
                     };
                 }
-                if (sentFallbackTelemetry) {
-                    // Request reached the server and produced a response; clear sent fallback delta.
-                    this.acknowledgePendingFallbackTelemetry(sentFallbackTelemetry);
-                }
                 return forwarded;
             }
             return {
@@ -1491,8 +1414,12 @@ class FraimLocalMCPServer {
         // Single point for usage tracking - log all tool calls
         if (injectedRequest.method === 'tools/call' && requestSessionId && toolName) {
             const success = !processedResponse.error;
+            this.log(`📊 Collecting usage: ${toolName} (session: ${requestSessionId}, success: ${success})`);
             this.usageCollector.collectMCPCall(toolName, args, requestSessionId, success);
         }
+        else if (injectedRequest.method === 'tools/call') {
+            this.log(`⚠️ Skipping usage collection: toolName=${toolName}, sessionId=${requestSessionId}`);
+        }
         this.log(`📤 ${injectedRequest.method} → ${processedResponse.error ? 'ERROR' : 'OK'}`);
         return processedResponse;
     }
@@ -1652,19 +1579,16 @@ class FraimLocalMCPServer {
         process.stdin.on('end', () => {
             this.log('🛑 Stdin closed, shutting down...');
             cleanup();
-            this.emitFallbackSummary('stdin_end');
             process.exit(0);
         });
         process.on('SIGTERM', () => {
             this.log('🛑 SIGTERM received, shutting down...');
             cleanup();
-            this.emitFallbackSummary('sigterm');
             process.exit(0);
         });
         process.on('SIGINT', () => {
             this.log('🛑 SIGINT received, shutting down...');
             cleanup();
-            this.emitFallbackSummary('sigint');
             process.exit(0);
         });
         this.log('✅ FRAIM Local MCP Server ready');
@@ -1673,13 +1597,14 @@ class FraimLocalMCPServer {
      * Flush collected usage data to the local database
      */
     async uploadUsageData() {
-        if (this.usageCollector.getEventCount() === 0) {
+        const eventCount = this.usageCollector.getEventCount();
+        this.log(`📊 Upload check: ${eventCount} events queued`);
+        if (eventCount === 0) {
             return; // Nothing to flush
         }
         try {
-            const count = this.usageCollector.getEventCount();
             await this.usageCollector.flush(this.remoteUrl, this.apiKey);
-            this.log(`📊 Flushed ${count} usage events to remote server`);
+            this.log(`📊 Flushed ${eventCount} usage events to remote server`);
         }
         catch (error) {
             this.log(`❌ Usage flushing error: ${error.message}`);
@@ -1692,8 +1617,6 @@ FraimLocalMCPServer.AGENT_RESOLUTION_NOTICE = [
     'Replace all `agent.*` placeholders with the best value from repository context, user intent, and available project config.'
 ].join('\n');
 FraimLocalMCPServer.FALLBACK_ALERT_MARKER = 'PROXY_FALLBACK_ALERT';
-FraimLocalMCPServer.FALLBACK_SUMMARY_MARKER = 'PROXY_FALLBACK_SUMMARY';
-FraimLocalMCPServer.FALLBACK_HEADER = 'x-fraim-proxy-fallback-telemetry';
 FraimLocalMCPServer.SESSION_HEADER = 'x-fraim-session-id';
 // Start server if run directly
 if (require.main === module) {

package/dist/src/local-mcp-server/usage-collector.js

@@ -4,7 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsageCollector = void 0;
+const mongodb_1 = require("mongodb");
 const axios_1 = __importDefault(require("axios"));
+// A placeholder ObjectId used when the real API key ID is not yet known.
+// The server will override this with the correct ID from the authenticated API key.
+const PLACEHOLDER_API_KEY_ID = new mongodb_1.ObjectId('000000000000000000000000');
 /**
  * Usage event collector for local MCP proxy
  * Collects usage events and batches them for upload
@@ -24,16 +28,17 @@ class UsageCollector {
      * Collect MCP tool call event
      */
     collectMCPCall(toolName, args, sessionId, success = true, duration) {
-        if (!this.apiKeyId) {
-            return; // Silently skip if no API key
-        }
         const parsed = this.parseMCPCall(toolName, args);
-        if (!parsed)
+        if (!parsed) {
+            console.error(`[UsageCollector] 🚫 Tool not tracked: ${toolName}`);
             return;
+        }
         const event = {
             type: parsed.type,
             name: parsed.name,
-            apiKeyId: this.apiKeyId,
+            // Use set apiKeyId if available, otherwise a placeholder.
+            // The server will override this with the correct value from the auth token.
+            apiKeyId: this.apiKeyId || PLACEHOLDER_API_KEY_ID,
             sessionId,
             success
         };
@@ -41,18 +46,18 @@ class UsageCollector {
             event.duration = duration;
         }
         this.events.push(event);
+        console.error(`[UsageCollector] ✅ Collected event: ${parsed.type}/${parsed.name} (session: ${sessionId}, queue: ${this.events.length})`);
     }
     /**
      * Collect usage event directly (for backward compatibility with tests)
      */
     collectEvent(type, name, sessionId, success = true, duration) {
-        if (!this.apiKeyId) {
-            return; // Silently skip if no API key
-        }
         const event = {
             type,
             name,
-            apiKeyId: this.apiKeyId,
+            // Use set apiKeyId if available, otherwise a placeholder.
+            // The server will override this with the correct value from the auth token.
+            apiKeyId: this.apiKeyId || PLACEHOLDER_API_KEY_ID,
             sessionId,
             success
         };
@@ -97,12 +102,15 @@ class UsageCollector {
      * Flush events to the remote server via API
      */
     async flush(remoteUrl, apiKey) {
-        if (this.events.length === 0)
+        if (this.events.length === 0) {
+            console.error(`[UsageCollector] 📊 No events to flush`);
             return;
+        }
         const events = [...this.events];
         this.events = [];
+        console.error(`[UsageCollector] 📤 Flushing ${events.length} events to ${remoteUrl}/api/analytics/events`);
         try {
-            await axios_1.default.post(`${remoteUrl}/api/analytics/events`, {
+            const response = await axios_1.default.post(`${remoteUrl}/api/analytics/events`, {
                 events,
                 apiKey
             }, {
@@ -112,12 +120,13 @@ class UsageCollector {
                     'Content-Type': 'application/json'
                 }
             });
+            console.error(`[UsageCollector] ✅ Successfully flushed ${events.length} events (HTTP ${response.status})`);
             // Success - events are already cleared from the queue
         }
         catch (error) {
             const status = error.response?.status;
             const message = error.response?.data?.error || error.message;
-            console.error(`❌ Failed to flush usage events (HTTP ${status}): ${message}`);
+            console.error(`[UsageCollector] ❌ Failed to flush usage events (HTTP ${status}): ${message}`);
             // Put events back at the beginning of the queue for next try
             this.events = [...events, ...this.events];
         }

package/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * FRAIM Framework - Smart Entry Point
@@ -36,13 +36,13 @@ function runCLI() {
         // Solution: On Windows with shell: true, quote paths containing spaces.
         // On Unix with shell: false, pass the path unquoted (spawnSync handles it correctly).
         const isWindows = process.platform === 'win32';
-        
+
         // On Windows with shell, quote paths with spaces to prevent shell misinterpretation
         // On Unix without shell, pass path as-is (spawnSync handles spaces correctly)
-        const processedSrcPath = (isWindows && srcPath.includes(' ')) 
-            ? `"${srcPath}"` 
+        const processedSrcPath = (isWindows && srcPath.includes(' '))
+            ? `"${srcPath}"`
             : srcPath;
-        
+
         const result = spawnSync(
             'npx',
             ['tsx', processedSrcPath, ...process.argv.slice(2)],
@@ -66,7 +66,7 @@ function runCLI() {
 module.exports = {
     FRAIM_INFO: {
         name: 'FRAIM',
-        version: '2.0.54',
+        version: '2.0.93',
         repository: 'https://github.com/mathursrus/FRAIM'
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-framework",
-  "version": "2.0.93",
+  "version": "2.0.95",
   "description": "FRAIM v2: Framework for Rigor-based AI Management - Transform from solo developer to AI manager orchestrating production-ready code with enterprise-grade discipline",
   "main": "index.js",
   "bin": {
@@ -10,10 +10,9 @@
   "scripts": {
     "dev": "tsx --watch src/fraim-mcp-server.ts > server.log 2>&1",
     "dev:prod": "npm run build && node dist/src/fraim-mcp-server.js > server.log 2>&1",
-    "build": "tsc && npm run build:stubs && npm run build:fraim-brain && npm run build:config-schema && node scripts/copy-registry.js && npm run validate:registry && npm run validate:fraim-pro-assets && tsx scripts/validate-purity.ts",
+    "build": "tsc && npm run build:stubs && npm run build:fraim-brain && node scripts/copy-registry.js && node -e \"require('fs').copyFileSync('src/core/types.ts', 'registry/templates/manager/fraim-config-schema.ts')\" && npm run validate:registry && npm run validate:fraim-pro-assets && tsx scripts/validate-purity.ts",
     "build:stubs": "tsx scripts/build-stub-registry.ts",
     "build:fraim-brain": "node scripts/generate-fraim-brain.js",
-    "build:config-schema": "tsx scripts/generate-config-schema-template.ts",
     "test-all": "npm run test && npm run test:isolated && npm run test:ui",
     "test": "node scripts/test-with-server.js",
     "test:isolated": "npx tsx --test --test-reporter=spec tests/isolated/test-*.ts",

package/dist/src/cli/services/device-flow-service.js

@@ -1,83 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeviceFlowService = void 0;
-const axios_1 = __importDefault(require("axios"));
-const chalk_1 = __importDefault(require("chalk"));
-class DeviceFlowService {
-    constructor(config) {
-        this.config = config;
-    }
-    /**
-     * Start the Device Flow Login
-     */
-    async login() {
-        console.log(chalk_1.default.blue('\n🔗 Starting Authentication...'));
-        try {
-            // 1. Request device and user codes
-            const deviceCode = await this.requestDeviceCode();
-            console.log(chalk_1.default.yellow('\nACTION REQUIRED:'));
-            console.log(`1. Go to: ${chalk_1.default.cyan.underline(deviceCode.verification_uri)}`);
-            console.log(`2. Enter the code: ${chalk_1.default.bold.green(deviceCode.user_code)}`);
-            console.log(chalk_1.default.gray(`\nWaiting for authorization (expires in ${Math.floor(deviceCode.expires_in / 60)} minutes)...`));
-            // 2. Poll for the access token
-            const token = await this.pollForToken(deviceCode.device_code, deviceCode.interval);
-            console.log(chalk_1.default.green('\n✅ Authentication Successful!'));
-            return token;
-        }
-        catch (error) {
-            console.error(chalk_1.default.red(`\n❌ Authentication failed: ${error.message}`));
-            throw error;
-        }
-    }
-    async requestDeviceCode() {
-        const response = await axios_1.default.post(this.config.authUrl, {
-            client_id: this.config.clientId,
-            scope: this.config.scope
-        }, {
-            headers: { Accept: 'application/json' }
-        });
-        return response.data;
-    }
-    async pollForToken(deviceCode, interval) {
-        let currentInterval = interval * 1000;
-        return new Promise((resolve, reject) => {
-            const poll = async () => {
-                try {
-                    const response = await axios_1.default.post(this.config.tokenUrl, {
-                        client_id: this.config.clientId,
-                        device_code: deviceCode,
-                        grant_type: 'urn:ietf:params:oauth:grant-type:device_code'
-                    }, {
-                        headers: { Accept: 'application/json' }
-                    });
-                    if (response.data.access_token) {
-                        resolve(response.data.access_token);
-                        return;
-                    }
-                    if (response.data.error) {
-                        const error = response.data.error;
-                        if (error === 'authorization_pending') {
-                            // Keep polling
-                            setTimeout(poll, currentInterval);
-                        }
-                        else if (error === 'slow_down') {
-                            currentInterval += 5000;
-                            setTimeout(poll, currentInterval);
-                        }
-                        else {
-                            reject(new Error(response.data.error_description || error));
-                        }
-                    }
-                }
-                catch (error) {
-                    reject(error);
-                }
-            };
-            setTimeout(poll, currentInterval);
-        });
-    }
-}
-exports.DeviceFlowService = DeviceFlowService;