fraim-framework 2.0.94 → 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/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 = {
@@ -859,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) {
@@ -1395,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;
     }
@@ -1574,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}`);

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

@@ -29,8 +29,10 @@ class UsageCollector {
      */
     collectMCPCall(toolName, args, sessionId, success = true, duration) {
         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,
@@ -44,6 +46,7 @@ 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)
@@ -99,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
             }, {
@@ -114,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-framework",
-  "version": "2.0.94",
+  "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": {

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;