fraim-framework 2.0.74 → 2.0.76

package/dist/src/cli/setup/mcp-config-generator.js

@@ -1,6 +1,87 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMCPConfig = exports.generateWindsurfMCPServers = exports.generateVSCodeMCPServers = exports.generateCodexMCPServers = exports.generateKiroMCPServers = exports.generateClaudeMCPServers = exports.generateStandardMCPServers = void 0;
+exports.generateMCPConfig = exports.generateWindsurfMCPServers = exports.generateVSCodeMCPServers = exports.generateCodexMCPServers = exports.generateKiroMCPServers = exports.generateClaudeMCPServers = exports.generateStandardMCPServers = exports.mergeTomlMCPServers = exports.extractTomlMcpServerBlock = void 0;
+const escapeTomlString = (value) => value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+const findTomlServerBlockRange = (content, server) => {
+    const lines = content.split(/\r?\n/);
+    const serverSection = `mcp_servers.${server}`;
+    const serverHeader = `[${serverSection}]`;
+    const start = lines.findIndex(line => line.trim() === serverHeader);
+    if (start === -1) {
+        return null;
+    }
+    let end = lines.length;
+    for (let i = start + 1; i < lines.length; i++) {
+        const sectionMatch = lines[i].trim().match(/^\[([^\]]+)\]$/);
+        if (!sectionMatch)
+            continue;
+        const sectionName = sectionMatch[1];
+        if (sectionName === serverSection || sectionName.startsWith(`${serverSection}.`)) {
+            continue;
+        }
+        end = i;
+        break;
+    }
+    return { start, end };
+};
+const extractTomlMcpServerBlock = (content, server) => {
+    const range = findTomlServerBlockRange(content, server);
+    if (!range)
+        return null;
+    const lines = content.split(/\r?\n/);
+    return lines.slice(range.start, range.end).join('\n').trim();
+};
+exports.extractTomlMcpServerBlock = extractTomlMcpServerBlock;
+const removeTomlMcpServerBlock = (content, server) => {
+    const range = findTomlServerBlockRange(content, server);
+    if (!range)
+        return content;
+    const lines = content.split(/\r?\n/);
+    const updated = [...lines.slice(0, range.start), ...lines.slice(range.end)].join('\n');
+    return updated.replace(/\n{3,}/g, '\n\n').trimEnd();
+};
+const appendTomlBlock = (content, block) => {
+    const trimmedContent = content.trimEnd();
+    const trimmedBlock = block.trim();
+    if (!trimmedBlock)
+        return trimmedContent;
+    if (!trimmedContent)
+        return `${trimmedBlock}\n`;
+    return `${trimmedContent}\n\n${trimmedBlock}\n`;
+};
+const mergeTomlMCPServers = (existingContent, generatedContent, servers) => {
+    let merged = existingContent || '';
+    const addedServers = [];
+    const replacedServers = [];
+    const skippedServers = [];
+    for (const server of servers) {
+        const newBlock = (0, exports.extractTomlMcpServerBlock)(generatedContent, server);
+        if (!newBlock) {
+            skippedServers.push(server);
+            continue;
+        }
+        const existingBlock = (0, exports.extractTomlMcpServerBlock)(merged, server);
+        if (existingBlock && existingBlock.trim() === newBlock.trim()) {
+            skippedServers.push(server);
+            continue;
+        }
+        if (existingBlock) {
+            merged = removeTomlMcpServerBlock(merged, server);
+            merged = appendTomlBlock(merged, newBlock);
+            replacedServers.push(server);
+            continue;
+        }
+        merged = appendTomlBlock(merged, newBlock);
+        addedServers.push(server);
+    }
+    return {
+        content: merged.trimEnd() + '\n',
+        addedServers,
+        replacedServers,
+        skippedServers
+    };
+};
+exports.mergeTomlMCPServers = mergeTomlMCPServers;
 const generateStandardMCPServers = (fraimKey, githubToken) => {
     const servers = {
         git: {
@@ -93,17 +174,19 @@ const generateKiroMCPServers = (fraimKey, githubToken) => {
 };
 exports.generateKiroMCPServers = generateKiroMCPServers;
 const generateCodexMCPServers = (fraimKey, githubToken) => {
-    let config = `
-[mcp_servers.git]
-command = "npx"
+    const escapedFraimKey = escapeTomlString(fraimKey);
+    const escapedGithubToken = escapeTomlString(githubToken);
+    let config = `
+[mcp_servers.git]
+command = "npx"
 args = ["-y", "@cyanheads/git-mcp-server"]
 `;
     // Only add GitHub server if token is provided
     if (githubToken) {
-        config += `
-[mcp_servers.github]
-url = "https://api.githubcopilot.com/mcp/"
-bearer_token_env_var = "GIT_TOKEN"
+        config += `
+[mcp_servers.github]
+url = "https://api.githubcopilot.com/mcp/"
+http_headers = { Authorization = "Bearer ${escapedGithubToken}" }
 `;
     }
     config += `
@@ -114,9 +197,9 @@ args = ["-y", "@playwright/mcp"]
 [mcp_servers.fraim]
 command = "fraim-mcp"
 
-[mcp_servers.fraim.env]
-FRAIM_API_KEY = "${fraimKey}"
-FRAIM_REMOTE_URL = "https://fraim.wellnessatwork.me"
+[mcp_servers.fraim.env]
+FRAIM_API_KEY = "${escapedFraimKey}"
+FRAIM_REMOTE_URL = "https://fraim.wellnessatwork.me"
 `;
     return config;
 };

package/dist/src/cli/utils/remote-sync.js

@@ -28,6 +28,7 @@ async function syncFromRemote(options) {
             success: false,
             workflowsSynced: 0,
             scriptsSynced: 0,
+            coachingSynced: 0,
             error: 'FRAIM_API_KEY not set'
         };
     }
@@ -48,6 +49,7 @@ async function syncFromRemote(options) {
                 success: false,
                 workflowsSynced: 0,
                 scriptsSynced: 0,
+                coachingSynced: 0,
                 error: 'No files received'
             };
         }
@@ -88,11 +90,28 @@ async function syncFromRemote(options) {
             (0, fs_1.writeFileSync)(filePath, file.content, 'utf8');
             console.log(chalk_1.default.gray(`  + ${file.path}`));
         }
-        console.log(chalk_1.default.green(`\n✅ Synced ${workflowFiles.length} workflows and ${scriptFiles.length} scripts from remote`));
+        // Sync coaching files to .fraim/coaching-moments/
+        const coachingFiles = files.filter(f => f.type === 'coaching');
+        const coachingDir = (0, path_1.join)(options.projectRoot, '.fraim', 'coaching-moments');
+        if (!(0, fs_1.existsSync)(coachingDir)) {
+            (0, fs_1.mkdirSync)(coachingDir, { recursive: true });
+        }
+        cleanDirectory(coachingDir);
+        for (const file of coachingFiles) {
+            const filePath = (0, path_1.join)(coachingDir, file.path);
+            const fileDir = (0, path_1.dirname)(filePath);
+            if (!(0, fs_1.existsSync)(fileDir)) {
+                (0, fs_1.mkdirSync)(fileDir, { recursive: true });
+            }
+            (0, fs_1.writeFileSync)(filePath, file.content, 'utf8');
+            console.log(chalk_1.default.gray(`  + coaching-moments/${file.path}`));
+        }
+        console.log(chalk_1.default.green(`\n✅ Synced ${workflowFiles.length} workflows, ${scriptFiles.length} scripts, and ${coachingFiles.length} coaching files from remote`));
         return {
             success: true,
             workflowsSynced: workflowFiles.length,
-            scriptsSynced: scriptFiles.length
+            scriptsSynced: scriptFiles.length,
+            coachingSynced: coachingFiles.length
         };
     }
     catch (error) {
@@ -101,6 +120,7 @@ async function syncFromRemote(options) {
             success: false,
             workflowsSynced: 0,
             scriptsSynced: 0,
+            coachingSynced: 0,
             error: error.message
         };
     }

package/dist/src/core/config-loader.js

@@ -46,22 +46,16 @@ function loadFraimConfig() {
                 ...(config.customizations || {})
             }
         };
-        // Add optional fields only if they exist in the config
-        if (config.persona) {
-            mergedConfig.persona = config.persona;
-        }
-        if (config.marketing) {
-            mergedConfig.marketing = config.marketing;
-        }
-        if (config.database) {
-            mergedConfig.database = config.database;
-        }
+        // Add optional workflow-driven fields only if they exist in the config
         if (config.compliance) {
             mergedConfig.compliance = config.compliance;
         }
         if (config.learning) {
             mergedConfig.learning = config.learning;
         }
+        if (config.competitors && typeof config.competitors === 'object') {
+            mergedConfig.competitors = config.competitors;
+        }
         console.log(`📋 Loaded FRAIM config from .fraim/config.json (version ${mergedConfig.version})`);
         // Warn about deprecated git config
         if (config.git && !config.repository) {

package/dist/src/core/types.js

@@ -4,7 +4,7 @@
  * TypeScript types for .fraim/config.json
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MINIMAL_FRAIM_CONFIG = exports.DEFAULT_FRAIM_CONFIG = void 0;
+exports.DEFAULT_FRAIM_CONFIG = void 0;
 /**
  * Default configuration values
  */
@@ -19,22 +19,5 @@ exports.DEFAULT_FRAIM_CONFIG = {
         name: '',
         defaultBranch: 'main'
     },
-    customizations: {
-        workflowsPath: '.fraim/workflows'
-    }
-};
-/**
- * Minimal config template for new projects
- */
-exports.MINIMAL_FRAIM_CONFIG = {
-    version: '2.0.47',
-    project: {
-        name: 'My Project'
-    },
-    repository: {
-        provider: 'github',
-        owner: 'your-username',
-        name: 'your-repo',
-        defaultBranch: 'main'
-    }
+    customizations: {}
 };

package/dist/src/core/utils/include-resolver.js

@@ -0,0 +1,47 @@
+"use strict";
+/**
+ * Resolve {{include:path}} directives in registry content.
+ *
+ * Used by: MCP service (get_fraim_file, get_fraim_workflow), AI Mentor (phase instructions),
+ * and any other server-side content that needs includes resolved.
+ *
+ * - Resolves recursively (e.g. skills can include other skills)
+ * - MAX_PASSES prevents infinite loops from circular includes
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_INCLUDE_PASSES = void 0;
+exports.resolveIncludesWithIndex = resolveIncludesWithIndex;
+const fs_1 = require("fs");
+/** Maximum resolution passes to prevent infinite loops from circular includes */
+exports.MAX_INCLUDE_PASSES = 10;
+/**
+ * Resolve {{include:path}} directives in content.
+ * Looks up referenced files in the fileIndex and inlines their content.
+ *
+ * @param content - Raw content that may contain {{include:path}} directives
+ * @param fileIndex - Map of path -> { fullPath, ... } for registry files
+ * @returns Content with all resolvable includes inlined (recursive, up to MAX_PASSES)
+ */
+function resolveIncludesWithIndex(content, fileIndex) {
+    let result = content;
+    let pass = 0;
+    while (result.includes('{{include:') && pass < exports.MAX_INCLUDE_PASSES) {
+        result = result.replace(/\{\{include:([^}]+)\}\}/g, (match, filePath) => {
+            const trimmedPath = filePath.trim();
+            const fileEntry = fileIndex.get(trimmedPath);
+            if (fileEntry?.fullPath) {
+                try {
+                    return (0, fs_1.readFileSync)(fileEntry.fullPath, 'utf-8');
+                }
+                catch (error) {
+                    console.error(`❌ Failed to read included file: ${trimmedPath}`, error);
+                    return match;
+                }
+            }
+            console.warn(`⚠️ Include file not found in fileIndex: ${trimmedPath}`);
+            return match;
+        });
+        pass++;
+    }
+    return result;
+}