fraim-framework 2.0.75 → 2.0.76

package/README.md

@@ -66,7 +66,7 @@ R - Retrospectives: Continuous learning from experience
 
 ### ✅ **The FRAIM Solution**
 
-#### 🛡️ **Agent Integrity & Test Ethics** (`.ai-agents/rules/integrity-and-test-ethics.md`)
+#### 🛡️ **Agent Integrity & Test Ethics** 
 **Problem**: Agents claim "tests pass" when they actually fail
 **Solution**: Mandatory evidence collection, test immutability rules, and accountability frameworks
 ```bash
@@ -74,7 +74,7 @@ R - Retrospectives: Continuous learning from experience
 # After FRAIM: "Here's the test output proving all 47 tests pass"
 ```
 
-#### 🧪 **Comprehensive Testing Guidelines** (`.ai-agents/rules/agent-testing-guidelines.md`)
+#### 🧪 **Comprehensive Testing Guidelines** 
 **Problem**: Superficial testing that misses real issues
 **Solution**: Multi-layer validation (database, API, UI, integration) with mandatory evidence
 ```bash
@@ -82,7 +82,7 @@ R - Retrospectives: Continuous learning from experience
 # After: Test real systems, prove it works, show evidence
 ```
 
-#### 🗣️ **Clear Communication Standards** (`.ai-agents/rules/communication.md`)
+#### 🗣️ **Clear Communication Standards** 
 **Problem**: Vague progress reports and unclear accountability
 **Solution**: Structured progress updates with concrete evidence and absolute accountability
 ```bash
@@ -90,7 +90,7 @@ R - Retrospectives: Continuous learning from experience
 # After: "Fixed API timeout, tests passing, evidence attached, ready for review"
 ```
 
-#### 🏗️ **Architectural Discipline** (`.ai-agents/rules/architecture.md`)
+#### 🏗️ **Architectural Discipline** 
 **Problem**: Agents create architectural chaos and technical debt
 **Solution**: Clean separation of concerns, type safety, and testability patterns
 ```bash
@@ -98,7 +98,7 @@ R - Retrospectives: Continuous learning from experience
 # After: Clean layers with proper boundaries and validation
 ```
 
-#### 🎯 **Spike-First Development** (`.ai-agents/rules/spike-first-development.md`)
+#### 🎯 **Spike-First Development** 
 **Problem**: Agents build complex solutions without validating assumptions
 **Solution**: 5-15 minute proof-of-concepts before major implementation
 ```bash
@@ -106,7 +106,7 @@ R - Retrospectives: Continuous learning from experience
 # After: 10-minute spike, validate approach, then build confidently
 ```
 
-#### 🔄 **Continuous Learning System** (`.ai-agents/rules/continuous-learning.md`)
+#### 🔄 **Continuous Learning System** 
 **Problem**: Same mistakes repeated across projects
 **Solution**: Retrospective-driven knowledge capture and pattern recognition
 ```bash
@@ -114,7 +114,7 @@ R - Retrospectives: Continuous learning from experience
 # After: Knowledge accumulates, patterns emerge, quality improves
 ```
 
-#### 🧹 **Simplicity Discipline** (`.ai-agents/rules/simplicity.md`)
+#### 🧹 **Simplicity Discipline** 
 **Problem**: Over-engineered solutions that are hard to maintain
 **Solution**: "Keep it simple" principles with complexity budgets
 ```bash
@@ -122,7 +122,7 @@ R - Retrospectives: Continuous learning from experience
 # After: Minimal, focused solution that actually works
 ```
 
-#### 🔧 **Git Safety & Timeout Management** (`.ai-agents/rules/git-safe-commands.md`)
+#### 🔧 **Git Safety & Timeout Management**
 **Problem**: Agents hang on interactive Git commands and long-running tasks, requiring human intervention
 **Solution**: Safe Git commands and timeout scripts with output visibility
 ```bash
@@ -131,7 +131,7 @@ R - Retrospectives: Continuous learning from experience
 # Example: exec-with-timeout.ts runs tests with timeout and saves output to files
 ```
 
-#### 🔄 **Merge Requirements & Branch Safety** (`.ai-agents/rules/merge-requirements.md`)
+#### 🔄 **Merge Requirements & Branch Safety** 
 **Problem**: Agents accidentally overwrite master branch or create merge conflicts
 **Solution**: Mandatory rebase workflows with conflict resolution patterns
 ```bash
@@ -139,7 +139,7 @@ R - Retrospectives: Continuous learning from experience
 # After: Rebase-on-master with force-with-lease for safety
 ```
 
-#### 🐛 **Systematic Debugging Patterns** (`.ai-agents/rules/successful-debugging-patterns.md`)
+#### 🐛 **Systematic Debugging Patterns** 
 **Problem**: Agents struggle with complex debugging and repeat the same mistakes
 **Solution**: Structured debugging methodology with evidence collection and pattern recognition
 ```bash
@@ -147,7 +147,7 @@ R - Retrospectives: Continuous learning from experience
 # After: Systematic approach with documented patterns and regression tests
 ```
 
-#### 📋 **Package Scripts & Output Visibility** (`.ai-agents/scripts/` and `sample_package.json`)
+#### 📋 **Package Scripts & Output Visibility**
 **Problem**: Long-running tasks hang agents and provide no visibility into progress
 **Solution**: Background execution with log files and timeout management
 ```bash
@@ -217,42 +217,6 @@ R - Retrospectives: Continuous learning from experience
 
 ## 🏗️ **Enterprise-Grade Framework Structure**
 
-```
-FRAIM/
-├── 🧠 .ai-agents/rules/          # Guardrails - The "HR Handbook" for AI agents
-│   ├── integrity-and-test-ethics.md    # Prevents "fake it till you make it"
-│   ├── agent-testing-guidelines.md     # Ensures real validation, not claims
-│   ├── communication.md                # Clear accountability and progress
-│   ├── architecture.md                 # Prevents technical debt
-│   ├── spike-first-development.md      # Validates before building
-│   ├── continuous-learning.md          # Learns from mistakes
-│   ├── simplicity.md                   # Prevents over-engineering
-│   ├── git-safe-commands.md            # Prevents agent hangs on Git commands
-│   ├── merge-requirements.md           # Safe branch management and rebasing
-│   ├── successful-debugging-patterns.md # Systematic debugging approach
-│   ├── local-development.md            # Local development best practices
-│   ├── pr-workflow-completeness.md     # PR workflow validation
-│   └── software-development-lifecycle.md # Full SDLC integration
-│
-├── 🔄 .ai-agents/workflows/      # Process - The "Project Management Office"
-│   ├── spec.md                   # Specification and requirements phase
-│   ├── design.md                 # Structured design phase
-│   ├── implement.md              # Implementation with validation
-│   ├── test.md                   # Comprehensive testing
-│   ├── resolve.md                # Issue resolution workflow
-│   └── retrospect.md             # Learning and improvement
-│
-├── 📋 .ai-agents/templates/      # Human Interfaces - The "Standard Operating Procedures"
-│   ├── evidence/                 # Proof of work templates
-│   ├── retrospective/            # Learning capture templates
-│   └── specs/                    # Specification templates
-│
-└── 🛠️ Scripts & Automation      # Determinism - The "DevOps Pipeline"
-    ├── prep-issue.sh             # Issue preparation
-    ├── exec-with-timeout.ts      # Command execution with timeout & output visibility
-    └── cleanup-branch.ts         # Branch management
-```
-
 ## 🚀 **Get Started in 60 Seconds**
 
 ### **⚠️ Prerequisites**
@@ -293,63 +257,6 @@ fraim sync                          # Sync latest workflows and rules
 
 **💡 Pro Tip**: Use `fraim add-ide` when you install a new IDE after initial setup. It reuses your existing FRAIM and GitHub keys, making it much faster than running full setup again.
 
-### **🔧 Customize for Your Project**
-
-After installation, customize these files for your specific project:
-
-#### **1. Architecture Rules** (`.ai-agents/rules/architecture.md`)
-- **Purpose**: Define your system's architectural patterns and boundaries
-- **Customize**: Replace generic examples with your specific architecture patterns
-- **Example**: Add your database patterns, API structures, service boundaries
-
-#### **2. Branch Cleanup Script** (`.ai-agents/scripts/cleanup-branch.ts`)
-- **Purpose**: Project-specific cleanup when branches are deleted
-- **Customize**: Add your cleanup logic in the `insertYourCodeHere()` method
-- **Example**: Database cleanup, cache invalidation, temporary file removal
-
-#### **3. Package Scripts** (`sample_package.json` → `package.json`)
-- **Purpose**: Testing and build scripts for your project
-- **Adopt**: Copy relevant scripts from `sample_package.json` into your main `package.json`
-- **Customize**: Update test commands, build processes, and framework-specific commands
-- **Example**: Replace `baml-cli generate` with your framework's generate command
-
-#### **4. Test Utilities** (`test-utils.ts` → your project)
-- **Purpose**: Generic test framework with tagging system
-- **Adopt**: Copy `test-utils.ts` into your project and import in your test files
-- **Customize**: Extend `BaseTestCase` interface for your specific test needs
-- **Example**: Create domain-specific test cases using the tagging system
-
-#### **5. Test Structure** (`examples/simple-webapp/example-test.ts`)
-- **Purpose**: Example test cases with proper tagging
-- **Adopt**: Use as a template for your project's test structure
-- **Customize**: Replace with your project's test cases and domain-specific tags
-- **Example**: Add your specific test scenarios and validation patterns
-
-## 🎯 **The Transformation: From Developer to AI Manager**
-
-### **Phase 1: Setup (5 minutes)**
-```bash
-npx fraim-framework init
-# ✅ Repository configured with AI management rules
-# ✅ Agents assigned to specific roles (Design, Implementation, Testing)
-# ✅ Workflows and templates installed
-```
-
-### **Phase 2: Issue Management (30 seconds per issue)**
-```bash
-gh issue create --title "Add user authentication" --label "ai-agent:cursor"
-# ✅ Git issue is centralized coordination point
-# ✅ Agent assignment handled
-# ✅ Ready for work 
-```
-
-### **Phase 3: Orchestrated Development**
-```bash
-.ai-agents/scripts/prep-issue.sh #issue_number
-# ✅ Local clone and new branch created
-# ✅ Coding agent initiated
-# ✅ Tell coding agent which phase it should proceed with 
-```
 
 ## 🌟 **Why FRAIM is the Future**
 
@@ -414,4 +321,4 @@ Stop fighting with AI agents. Start orchestrating them.
 [![GitHub stars](https://img.shields.io/github/stars/mathursrus/FRAIM.svg)](https://github.com/mathursrus/FRAIM/stargazers)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-</div>
+</div>

package/bin/fraim-mcp.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * FRAIM MCP Server - Smart Entry Point

package/dist/src/cli/commands/add-ide.js

@@ -12,6 +12,7 @@ const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const ide_detector_1 = require("../setup/ide-detector");
 const mcp_config_generator_1 = require("../setup/mcp-config-generator");
+const codex_local_config_1 = require("../setup/codex-local-config");
 const loadGlobalConfig = () => {
     const globalConfigPath = path_1.default.join(os_1.default.homedir(), '.fraim', 'config.json');
     if (!fs_1.default.existsSync(globalConfigPath)) {
@@ -129,26 +130,18 @@ const configureIDEMCP = async (ide, fraimKey, githubToken) => {
             console.log(chalk_1.default.gray(`  📋 Found existing TOML config`));
         }
         const newTomlContent = (0, mcp_config_generator_1.generateMCPConfig)(ide.configType, fraimKey, githubToken);
-        let finalContent = existingTomlContent;
         const serversToAdd = ['fraim', 'git', 'github', 'playwright'];
-        const addedServers = [];
-        for (const server of serversToAdd) {
-            if (!existingTomlContent.includes(`[mcp_servers.${server}]`)) {
-                const serverRegex = new RegExp(`\\[mcp_servers\\.${server}\\][\\s\\S]*?(?=\\[mcp_servers\\.|$)`, 'g');
-                const serverMatch = newTomlContent.match(serverRegex);
-                if (serverMatch) {
-                    finalContent += '\n' + serverMatch[0].trim() + '\n';
-                    addedServers.push(server);
-                }
-            }
-            else {
-                console.log(chalk_1.default.gray(`  ⏭️ Skipped ${server} (already exists)`));
-            }
-        }
-        fs_1.default.writeFileSync(configPath, finalContent);
-        addedServers.forEach(server => {
+        const mergeResult = (0, mcp_config_generator_1.mergeTomlMCPServers)(existingTomlContent, newTomlContent, serversToAdd);
+        fs_1.default.writeFileSync(configPath, mergeResult.content);
+        mergeResult.addedServers.forEach(server => {
             console.log(chalk_1.default.green(`  ✅ Added ${server} MCP server`));
         });
+        mergeResult.replacedServers.forEach(server => {
+            console.log(chalk_1.default.green(`  ✅ Updated ${server} MCP server`));
+        });
+        mergeResult.skippedServers.forEach(server => {
+            console.log(chalk_1.default.gray(`  ⏭️ Skipped ${server} (already configured or not requested)`));
+        });
     }
     else {
         // Handle JSON format
@@ -183,6 +176,11 @@ const configureIDEMCP = async (ide, fraimKey, githubToken) => {
         });
     }
     console.log(chalk_1.default.green(`✅ Updated ${configPath}`));
+    if (ide.configType === 'codex') {
+        const localResult = (0, codex_local_config_1.ensureCodexLocalConfig)(process.cwd());
+        const status = localResult.created ? 'Created' : localResult.updated ? 'Updated' : 'Verified';
+        console.log(chalk_1.default.green(`  ✅ ${status} local Codex config: ${localResult.path}`));
+    }
 };
 const listSupportedIDEs = () => {
     const allIDEs = (0, ide_detector_1.getAllSupportedIDEs)();

package/dist/src/cli/commands/init-project.js

@@ -12,6 +12,8 @@ const chalk_1 = __importDefault(require("chalk"));
 const sync_1 = require("./sync");
 const platform_detection_1 = require("../utils/platform-detection");
 const version_utils_1 = require("../utils/version-utils");
+const ide_detector_1 = require("../setup/ide-detector");
+const codex_local_config_1 = require("../setup/codex-local-config");
 const checkGlobalSetup = () => {
     const fraimUserDir = process.env.FRAIM_USER_DIR || path_1.default.join(os_1.default.homedir(), '.fraim');
     const globalConfigPath = path_1.default.join(fraimUserDir, 'config.json');
@@ -63,9 +65,7 @@ const runInitProject = async () => {
                 project: {
                     name: projectName
                 },
-                customizations: {
-                    workflowsPath: '.fraim/workflows'
-                }
+                customizations: {}
             };
             console.log(chalk_1.default.blue('   Conversational mode: No platform integration'));
             console.log(chalk_1.default.gray(`   Project: ${projectName}`));
@@ -88,9 +88,7 @@ const runInitProject = async () => {
                         name: detection.repository.name
                     },
                     repository: detection.repository,
-                    customizations: {
-                        workflowsPath: '.fraim/workflows'
-                    }
+                    customizations: {}
                 };
                 console.log(chalk_1.default.blue(`   Platform: ${detection.provider.toUpperCase()}`));
                 if (detection.provider === 'github') {
@@ -115,9 +113,7 @@ const runInitProject = async () => {
                     project: {
                         name: repoName
                     },
-                    customizations: {
-                        workflowsPath: '.fraim/workflows'
-                    }
+                    customizations: {}
                 };
                 console.log(chalk_1.default.gray('   Please update .fraim/config.json if you add a repository later.'));
             }
@@ -135,6 +131,12 @@ const runInitProject = async () => {
     });
     // Sync workflows from registry
     await (0, sync_1.runSync)({});
+    const codexAvailable = (0, ide_detector_1.detectInstalledIDEs)().some((ide) => ide.configType === 'codex');
+    if (codexAvailable) {
+        const codexLocalResult = (0, codex_local_config_1.ensureCodexLocalConfig)(projectRoot);
+        const status = codexLocalResult.created ? 'Created' : codexLocalResult.updated ? 'Updated' : 'Verified';
+        console.log(chalk_1.default.green(`✅ ${status} project Codex config at ${codexLocalResult.path}`));
+    }
     console.log(chalk_1.default.green('\n✅ FRAIM project initialized!'));
     console.log(chalk_1.default.cyan('Try: Ask your AI agent "list fraim workflows"'));
 };

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

@@ -108,7 +108,11 @@ exports.overrideCommand = new commander_1.Command('override')
                     }
                 }
             };
-            await axios_1.default.post(`${serverUrl}/mcp`, connectRequest, { headers, timeout: 30000 });
+            const connectResponse = await axios_1.default.post(`${serverUrl}/mcp`, connectRequest, { headers, timeout: 30000 });
+            const sessionId = connectResponse.data?.result?.sessionId;
+            if (typeof sessionId !== 'string' || sessionId.trim().length === 0) {
+                throw new Error('fraim_connect did not return a sessionId');
+            }
             // Now determine MCP tool and arguments based on path
             let toolName;
             let toolArgs;
@@ -132,9 +136,15 @@ exports.overrideCommand = new commander_1.Command('override')
                 method: 'tools/call',
                 params: {
                     name: toolName,
+                    sessionId: sessionId.trim(),
                     arguments: toolArgs
                 }
             };
+            // Mirror sessionId in arguments for compatibility with both server and proxy paths.
+            mcpRequest.params.arguments = {
+                ...mcpRequest.params.arguments,
+                sessionId: sessionId.trim()
+            };
             const response = await axios_1.default.post(`${serverUrl}/mcp`, mcpRequest, {
                 headers,
                 timeout: 30000

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

@@ -11,6 +11,7 @@ const prompts_1 = __importDefault(require("prompts"));
 const ide_detector_1 = require("./ide-detector");
 const mcp_config_generator_1 = require("./mcp-config-generator");
 const token_validator_1 = require("./token-validator");
+const codex_local_config_1 = require("./codex-local-config");
 const promptForIDESelection = async (detectedIDEs, githubToken) => {
     console.log(chalk_1.default.green(`✅ Found ${detectedIDEs.length} IDEs that can be configured with FRAIM:\n`));
     detectedIDEs.forEach((ide, index) => {
@@ -228,28 +229,18 @@ const configureIDEMCP = async (ide, fraimKey, githubToken) => {
             console.log(chalk_1.default.gray(`  📋 Found existing TOML config`));
         }
         const newTomlContent = (0, mcp_config_generator_1.generateMCPConfig)(ide.configType, fraimKey, githubToken);
-        // For TOML, we'll append new servers if they don't exist
-        let finalContent = existingTomlContent;
         const serversToAdd = ['fraim', 'git', 'github', 'playwright'];
-        const addedServers = [];
-        for (const server of serversToAdd) {
-            if (!existingTomlContent.includes(`[mcp_servers.${server}]`)) {
-                // Extract this server's config from the new content
-                const serverRegex = new RegExp(`\\[mcp_servers\\.${server}\\][\\s\\S]*?(?=\\[mcp_servers\\.|$)`, 'g');
-                const serverMatch = newTomlContent.match(serverRegex);
-                if (serverMatch) {
-                    finalContent += '\n' + serverMatch[0].trim() + '\n';
-                    addedServers.push(server);
-                }
-            }
-            else {
-                console.log(chalk_1.default.gray(`  ⏭️ Skipped ${server} (already exists)`));
-            }
-        }
-        fs_1.default.writeFileSync(configPath, finalContent);
-        addedServers.forEach(server => {
+        const mergeResult = (0, mcp_config_generator_1.mergeTomlMCPServers)(existingTomlContent, newTomlContent, serversToAdd);
+        fs_1.default.writeFileSync(configPath, mergeResult.content);
+        mergeResult.addedServers.forEach(server => {
             console.log(chalk_1.default.green(`  ✅ Added ${server} MCP server`));
         });
+        mergeResult.replacedServers.forEach(server => {
+            console.log(chalk_1.default.green(`  ✅ Updated ${server} MCP server`));
+        });
+        mergeResult.skippedServers.forEach(server => {
+            console.log(chalk_1.default.gray(`  ⏭️ Skipped ${server} (already configured or not requested)`));
+        });
     }
     else {
         // For JSON configs - intelligent merging
@@ -283,6 +274,11 @@ const configureIDEMCP = async (ide, fraimKey, githubToken) => {
         });
     }
     console.log(chalk_1.default.green(`✅ Updated ${configPath}`));
+    if (ide.configType === 'codex') {
+        const localResult = (0, codex_local_config_1.ensureCodexLocalConfig)(process.cwd());
+        const status = localResult.created ? 'Created' : localResult.updated ? 'Updated' : 'Verified';
+        console.log(chalk_1.default.green(`  ✅ ${status} local Codex config: ${localResult.path}`));
+    }
 };
 const autoConfigureMCP = async (fraimKey, githubToken, selectedIDEs) => {
     const detectedIDEs = (0, ide_detector_1.detectInstalledIDEs)();

package/dist/src/cli/setup/codex-local-config.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureCodexLocalConfig = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const mcp_config_generator_1 = require("./mcp-config-generator");
+const escapeTomlString = (value) => value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+const buildFraimCwdBlock = (projectRoot) => `
+[mcp_servers.fraim]
+cwd = "${escapeTomlString(projectRoot)}"
+`;
+const ensureCodexLocalConfig = (projectRoot) => {
+    const codexDir = path_1.default.join(projectRoot, '.codex');
+    const codexConfigPath = path_1.default.join(codexDir, 'config.toml');
+    if (!fs_1.default.existsSync(codexDir)) {
+        fs_1.default.mkdirSync(codexDir, { recursive: true });
+    }
+    const hadExistingFile = fs_1.default.existsSync(codexConfigPath);
+    const existingContent = hadExistingFile ? fs_1.default.readFileSync(codexConfigPath, 'utf8') : '';
+    const generatedContent = buildFraimCwdBlock(projectRoot);
+    const mergeResult = (0, mcp_config_generator_1.mergeTomlMCPServers)(existingContent, generatedContent, ['fraim']);
+    const normalizedExisting = existingContent.replace(/\r\n/g, '\n');
+    const normalizedMerged = mergeResult.content.replace(/\r\n/g, '\n');
+    const shouldWrite = !hadExistingFile || normalizedExisting !== normalizedMerged;
+    if (shouldWrite) {
+        fs_1.default.writeFileSync(codexConfigPath, mergeResult.content);
+    }
+    return {
+        path: codexConfigPath,
+        created: !hadExistingFile,
+        updated: shouldWrite && hadExistingFile
+    };
+};
+exports.ensureCodexLocalConfig = ensureCodexLocalConfig;

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/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: {}
 };