@fyow/copilot-everything 1.0.9 → 1.0.11

package/copilot/mcp-config.json

@@ -1,5 +1,5 @@
 {
-  "servers": {
+  "mcpServers": {
     "context7": {
       "command": "npx",
       "args": ["-y", "@upstash/context7-mcp@latest"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fyow/copilot-everything",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Everything you need for GitHub Copilot CLI - agents, skills, instructions, and hooks configurations",
   "main": "src/index.js",
   "bin": {

package/src/commands/init.js

@@ -82,6 +82,77 @@ function copyFile(src, dest, options = {}) {
   }
 }
 
+/**
+ * Process MCP config and substitute environment variables
+ * Returns { content, substituted, missing } where:
+ * - content: the processed JSON string
+ * - substituted: array of env var names that were found and substituted
+ * - missing: array of env var names that are still placeholders
+ */
+function processMcpConfig(src) {
+  const content = fs.readFileSync(src, 'utf-8');
+  const substituted = [];
+  const missing = [];
+  
+  // Find all ${VAR_NAME} patterns
+  const envVarPattern = /\$\{([A-Z_][A-Z0-9_]*)\}/g;
+  const matches = content.matchAll(envVarPattern);
+  
+  // Collect unique env var names
+  const envVars = new Set();
+  for (const match of matches) {
+    envVars.add(match[1]);
+  }
+  
+  // Check which ones exist in environment and substitute
+  let processedContent = content;
+  for (const varName of envVars) {
+    const envValue = process.env[varName];
+    if (envValue) {
+      // Replace all occurrences of ${VAR_NAME} with actual value
+      processedContent = processedContent.replace(
+        new RegExp(`\\$\\{${varName}\\}`, 'g'),
+        envValue
+      );
+      substituted.push(varName);
+    } else {
+      missing.push(varName);
+    }
+  }
+  
+  return { content: processedContent, substituted, missing };
+}
+
+/**
+ * Copy MCP config file with environment variable substitution
+ */
+function copyMcpConfig(src, dest, options = {}) {
+  const { force = false, dryRun = false } = options;
+
+  if (!fs.existsSync(src)) {
+    return { copied: 0, skipped: 0, errors: [{ path: dest, error: 'Source not found' }], substituted: [], missing: [] };
+  }
+
+  if (fs.existsSync(dest) && !force) {
+    return { copied: 0, skipped: 1, errors: [], substituted: [], missing: [] };
+  }
+
+  try {
+    const { content, substituted, missing } = processMcpConfig(src);
+    
+    if (!dryRun) {
+      const destDir = path.dirname(dest);
+      if (!fs.existsSync(destDir)) {
+        fs.mkdirSync(destDir, { recursive: true });
+      }
+      fs.writeFileSync(dest, content, 'utf-8');
+    }
+    return { copied: 1, skipped: 0, errors: [], substituted, missing };
+  } catch (error) {
+    return { copied: 0, skipped: 0, errors: [{ path: dest, error: error.message }], substituted: [], missing: [] };
+  }
+}
+
 const readline = require('readline');
 
 /**
@@ -257,9 +328,17 @@ async function init(flags = {}) {
         console.log(`      💡 Template available at: ${mcpConfigSrc}`);
         totalSkipped += 1;
       } else {
-        const mcpResult = copyFile(mcpConfigSrc, mcpConfigDest, { force: forceMcp });
+        const mcpResult = copyMcpConfig(mcpConfigSrc, mcpConfigDest, { force: forceMcp });
         if (mcpResult.copied > 0) {
           console.log(`   ✅ MCP config: ${forceMcp ? 'overwritten' : 'installed'} to ${mcpConfigDest}`);
+          
+          // Report env var substitution results
+          if (mcpResult.substituted.length > 0) {
+            console.log(`      🔑 Auto-filled from environment: ${mcpResult.substituted.join(', ')}`);
+          }
+          if (mcpResult.missing.length > 0) {
+            console.log(`      📝 Need to configure: ${mcpResult.missing.join(', ')}`);
+          }
         }
         totalCopied += mcpResult.copied;
         totalSkipped += mcpResult.skipped;