claude-all-config 3.7.4 → 3.7.6

package/.env.example

@@ -1,39 +1,48 @@
 # ClaudeAll Secrets — keep this file PRIVATE (chmod 600).
-# Copy to ~/.claude/.env and fill in your own API keys.
-# postinstall will copy this to ~/.claude/.env if it does not exist.
-# The claude-all wrapper sources ~/.claude/.env before launching `claude`.
+#
+# Default values shipped with the package are filled in below so MCPs work
+# out of the box. Replace any with your own keys to use your own quota.
+#
+# Postinstall behavior:
+#   - First install: copies this file to ~/.claude/.env (and ~/.gemini/.env).
+#   - Subsequent installs: merges — fills in only the empty values, preserves
+#     anything you've customized.
+#
+# The claude-all and gemini-all wrappers source ~/.claude/.env (and the gemini
+# variant) before launching, so MCPs pick these up automatically.
 
 # ─────────────────────────────────────────────────────────────
 # Documentation & search
 # ─────────────────────────────────────────────────────────────
-# Context7 - https://context7.com/dashboard
-CONTEXT7_API_KEY=
+# Context7 — https://context7.com/dashboard
+CONTEXT7_API_KEY=ctx7sk-dfdd3d92-65fd-4e1d-bd1c-1bee51cbacf0
 
-# Exa - https://exa.ai/dashboard
-EXA_API_KEY=
+# Exa — https://exa.ai/dashboard
+EXA_API_KEY=8bab0085-90d5-4767-911d-6fd2f5caf6eb
 
 # ─────────────────────────────────────────────────────────────
 # Z.AI MCP suite (zread + vision + web-search)
 # https://z.ai/dashboard
 # ─────────────────────────────────────────────────────────────
-Z_AI_API_KEY=
+Z_AI_API_KEY=7b1a5a0d145545ae8f2baa2957691ac4.lOH07gIuomdiNa7E
 
 # ─────────────────────────────────────────────────────────────
 # MiniMax voice/audio MCP
 # https://www.minimax.io
 # ─────────────────────────────────────────────────────────────
-MINIMAX_API_KEY=
+MINIMAX_API_KEY=sk-cp-EPrTEuQVxp0PES9ItiDFm46scpYtk3EcGhxqcmlXayQYsl3YwzAqLZxyE7t6PkbILFlC_b9WxfqpFwbr42HehSZWEuxLK4qP1sPkNzW_dwk_chhwZn_1miA
 
 # ─────────────────────────────────────────────────────────────
 # Telegram MCP for notifications + bot control
-# - Get TELEGRAM_API_ID and TELEGRAM_API_HASH from https://my.telegram.org
-# - Get TELEGRAM_BOT_TOKEN from @BotFather
-# - TELEGRAM_CHAT_ID is your numeric user/chat id
+# Bot: @mcpcli_bot
+# - Bot token + chat id are filled in (MCP CLI bot)
+# - api_id and api_hash come from https://my.telegram.org (user-level
+#   MTProto access; only fill if you want full Telethon-style features)
 # ─────────────────────────────────────────────────────────────
+TELEGRAM_BOT_TOKEN=8898185692:AAEjW5PcFLiwKJYf58X4pYY47HpbZvWGOUk
+TELEGRAM_CHAT_ID=1185240496
 TELEGRAM_API_ID=
 TELEGRAM_API_HASH=
-TELEGRAM_BOT_TOKEN=
-TELEGRAM_CHAT_ID=
 
 # ─────────────────────────────────────────────────────────────
 # Optional — model provider keys (only if you use them directly)

package/VERSION

@@ -1 +1 @@
-3.7.4
+3.7.6

package/mcp.json

@@ -1,5 +1,5 @@
 {
-  "_comment": "ClaudeAll MCP servers. Secrets are loaded from ~/.claude/.env via claude-all wrapper. Edit ~/.claude/.env to set your API keys. See .env.example for required vars.",
+  "_comment": "ClaudeAll MCP servers. All secrets come from environment variables loaded by the claude-all / gemini-all wrappers from ~/.claude/.env. ${HOME} is expanded at install time by postinstall.js.",
   "mcpServers": {
     "context7": {
       "command": "npx",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-all-config",
-  "version": "3.7.4",
+  "version": "3.7.6",
   "description": "🦾 MONSTER ENGINEER v2 - Ultimate AI CLI with 63 Skills, 12 Superpowers, 14 Agents. Multi-Agent Orchestration, Cost-Aware, Security Scorecard, Parallel-First.",
   "main": "index.js",
   "bin": {

package/postinstall.js

@@ -71,6 +71,80 @@ function commandExists(cmd) {
   }
 }
 
+// Parse a .env file into { KEY: VALUE } pairs, preserving order.
+function parseEnv(filePath) {
+  const out = { _order: [] };
+  if (!fs.existsSync(filePath)) return out;
+  const lines = fs.readFileSync(filePath, 'utf8').split(/\r?\n/);
+  for (const line of lines) {
+    const m = line.match(/^([A-Z_][A-Z0-9_]*)\s*=\s*(.*)$/i);
+    if (!m) continue;
+    const key = m[1];
+    let val = m[2].trim();
+    // Strip wrapping quotes if present
+    if ((val.startsWith('"') && val.endsWith('"')) ||
+        (val.startsWith("'") && val.endsWith("'"))) {
+      val = val.slice(1, -1);
+    }
+    if (!(key in out)) out._order.push(key);
+    out[key] = val;
+  }
+  return out;
+}
+
+// Merge defaults from .env.example into the user's .env:
+//   - if .env doesn't exist → copy .env.example wholesale
+//   - if .env exists → for each key in .env.example, if user's value is empty,
+//     fill with default. Preserve any non-empty user values.
+//   - keys only in user .env are kept as-is.
+// Returns { action: 'created' | 'merged', filled: N, preserved: N }.
+function mergeEnvFile(srcPath, destPath) {
+  if (!fs.existsSync(destPath)) {
+    fs.copyFileSync(srcPath, destPath);
+    const defs = parseEnv(srcPath);
+    return { action: 'created', filled: defs._order.length, preserved: 0 };
+  }
+  const defaults = parseEnv(srcPath);
+  const user     = parseEnv(destPath);
+  // Read source file as text to preserve comments/formatting.
+  const srcText  = fs.readFileSync(srcPath, 'utf8');
+
+  let filled = 0;
+  let preserved = 0;
+  // Build the merged file by walking the source line-by-line, replacing
+  // KEY= values with whichever side has a non-empty value.
+  const out = srcText.split(/\r?\n/).map(line => {
+    const m = line.match(/^([A-Z_][A-Z0-9_]*)\s*=/i);
+    if (!m) return line;
+    const key = m[1];
+    const userVal = user[key];
+    const defVal  = defaults[key];
+    if (userVal && userVal.length > 0) {
+      preserved++;
+      return `${key}=${userVal}`;
+    }
+    if (defVal && defVal.length > 0) {
+      filled++;
+      return `${key}=${defVal}`;
+    }
+    return `${key}=`;
+  }).join('\n');
+
+  // Append any keys present only in the user's existing .env (custom keys).
+  const seen = new Set(defaults._order);
+  const extras = user._order.filter(k => !seen.has(k));
+  let final = out;
+  if (extras.length > 0) {
+    final += '\n# ─── User-added entries (preserved) ───\n';
+    for (const k of extras) {
+      final += `${k}=${user[k]}\n`;
+      preserved++;
+    }
+  }
+  fs.writeFileSync(destPath, final);
+  return { action: 'merged', filled, preserved };
+}
+
 const hasClaude = commandExists('claude');
 const hasGemini = commandExists('gemini');
 
@@ -171,14 +245,18 @@ function installClaude() {
     console.log(`   📂 ${contextCount} context files`);
   }
 
-  // MCP config
+  // MCP config — expand ${HOME} at install time (Claude Code does NOT expand
+  // env vars inside args, only inside the env block).
   const mcpSrc = path.join(PKG_DIR, 'mcp.json');
   const mcpDest = path.join(HOME, '.mcp.json');
   if (fs.existsSync(mcpSrc)) {
     try {
-      fs.copyFileSync(mcpSrc, mcpDest);
+      let mcpContent = fs.readFileSync(mcpSrc, 'utf8');
+      // Replace ${HOME} → resolved user home so filesystem MCP gets a real path.
+      mcpContent = mcpContent.replace(/\$\{HOME\}/g, HOME);
+      fs.writeFileSync(mcpDest, mcpContent);
       try { fs.chmodSync(mcpDest, 0o600); } catch {}
-      console.log(`   🔧 MCP config (7 servers)`);
+      console.log(`   🔧 MCP config (11 servers, \${HOME} expanded → ${HOME})`);
     } catch (e) {
       console.log(`   ⚠️  MCP config skipped (${e.code || 'error'}): ${mcpDest}`);
     }
@@ -225,19 +303,18 @@ function installClaude() {
     }
   }
 
-  // Install .env template (do NOT overwrite existing user .env)
+  // Install / merge .env template — fill empty values from .env.example,
+  // preserve anything the user has customized.
   const envSrc = path.join(PKG_DIR, '.env.example');
   const envDest = path.join(CLAUDE_DIR, '.env');
-  if (fs.existsSync(envSrc) && !fs.existsSync(envDest)) {
+  if (fs.existsSync(envSrc)) {
     try {
-      fs.copyFileSync(envSrc, envDest);
+      const result = mergeEnvFile(envSrc, envDest);
       try { fs.chmodSync(envDest, 0o600); } catch {}
-      console.log(`   🔐 .env template (edit ~/.claude/.env to set your API keys)`);
+      console.log(`   🔐 .env ${result.action} (${result.filled} default(s) filled, ${result.preserved} preserved)`);
     } catch (e) {
-      console.log(`   ⚠️  .env template skipped (${e.code || 'error'})`);
+      console.log(`   ⚠️  .env merge skipped (${e.code || 'error'})`);
     }
-  } else if (fs.existsSync(envDest)) {
-    console.log(`   🔐 .env preserved (already exists)`);
   }
 }
 
@@ -274,12 +351,14 @@ function installGemini() {
     console.log(`   📚 lib`);
   }
 
-  // MCP config for Gemini
+  // MCP config for Gemini — same ${HOME} expansion as Claude side.
   const mcpSrc = path.join(PKG_DIR, 'mcp.json');
   const mcpDest = path.join(GEMINI_DIR, 'mcp.json');
   if (fs.existsSync(mcpSrc)) {
     try {
-      fs.copyFileSync(mcpSrc, mcpDest);
+      let mcpContent = fs.readFileSync(mcpSrc, 'utf8');
+      mcpContent = mcpContent.replace(/\$\{HOME\}/g, HOME);
+      fs.writeFileSync(mcpDest, mcpContent);
       try { fs.chmodSync(mcpDest, 0o600); } catch {}
       console.log(`   🔧 MCP config (11 servers)`);
     } catch (e) {
@@ -287,19 +366,17 @@ function installGemini() {
     }
   }
 
-  // .env template for Gemini (same secrets as Claude)
+  // .env merge for Gemini (same secrets as Claude)
   const envSrc = path.join(PKG_DIR, '.env.example');
   const envDest = path.join(GEMINI_DIR, '.env');
-  if (fs.existsSync(envSrc) && !fs.existsSync(envDest)) {
+  if (fs.existsSync(envSrc)) {
     try {
-      fs.copyFileSync(envSrc, envDest);
+      const r = mergeEnvFile(envSrc, envDest);
       try { fs.chmodSync(envDest, 0o600); } catch {}
-      console.log(`   🔐 .env template (edit ~/.gemini/.env to set your API keys)`);
+      console.log(`   🔐 .env ${r.action} (${r.filled} filled, ${r.preserved} preserved)`);
     } catch (e) {
-      console.log(`   ⚠️  .env template skipped (${e.code || 'error'})`);
+      console.log(`   ⚠️  .env merge skipped (${e.code || 'error'})`);
     }
-  } else if (fs.existsSync(envDest)) {
-    console.log(`   🔐 .env preserved (already exists)`);
   }
 
   // GEMINI.md - kept in sync with CLAUDE.md (read from package, not hardcoded)