@gonzih/cc-discord 0.2.2 → 0.2.4

package/dist/meta-agent-manager.js

@@ -8,7 +8,7 @@
  *   4. spawnSession: claude --continue -p "{message}" pipes stdout → wire.discord.publishOutgoing
  */
 import { spawn, execSync } from "child_process";
-import { existsSync, mkdirSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 import { CC_DISCORD_WORKSPACE_ROOT, TIMING, discordMetaInputKey, } from "@gonzih/cc-wire";
@@ -59,25 +59,55 @@ export function injectMcp(ns, wsPath, token) {
     const npmCache = process.env.npm_config_cache ?? `${homedir()}/.npm`;
     const trustedOwners = process.env.CC_AGENT_TRUSTED_OWNERS ?? "";
     const systemPath = process.env.PATH ?? "/usr/local/bin:/usr/bin:/bin";
-    const config = {
-        mcpServers: {
-            "cc-agent": {
-                command: "/opt/homebrew/bin/npx",
-                args: ["-y", "--prefer-online", "@gonzih/cc-agent"],
-                env: {
-                    CC_AGENT_NAMESPACE: ns,
-                    CWD: wsPath,
-                    CLAUDE_CODE_OAUTH_TOKEN: token,
-                    CLAUDE_TOKENS: token,
-                    CC_AGENT_TRUSTED_OWNERS: trustedOwners,
-                    PATH: systemPath,
-                    npm_config_cache: npmCache,
-                },
+    const servers = {
+        "cc-agent": {
+            command: "/opt/homebrew/bin/npx",
+            args: ["-y", "--prefer-online", "@gonzih/cc-agent"],
+            env: {
+                CC_AGENT_NAMESPACE: ns,
+                CWD: wsPath,
+                CLAUDE_CODE_OAUTH_TOKEN: token,
+                CLAUDE_TOKENS: token,
+                CC_AGENT_TRUSTED_OWNERS: trustedOwners,
+                PATH: systemPath,
+                npm_config_cache: npmCache,
             },
         },
     };
+    // Merge extra MCP servers from ~/.config/cc-discord-mcp.json (credentials file, not in source)
+    const extraMcpPath = join(homedir(), ".config", "cc-discord-mcp.json");
+    if (existsSync(extraMcpPath)) {
+        try {
+            const extra = JSON.parse(readFileSync(extraMcpPath, "utf8"));
+            Object.assign(servers, extra);
+            console.log(`[meta-agent-manager] merged extra MCP servers from ${extraMcpPath}: ${Object.keys(extra).join(", ")}`);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            console.warn(`[meta-agent-manager] failed to read extra MCP config: ${msg}`);
+        }
+    }
+    // Also check env vars as fallback for gmail and github
+    const gmailEmail = process.env.GMAIL_EMAIL;
+    const gmailPass = process.env.GMAIL_APP_PASSWORD;
+    if (gmailEmail && gmailPass && !servers["gmail-personal"]) {
+        servers["gmail-personal"] = {
+            command: "/opt/homebrew/bin/npx",
+            args: ["-y", "gmail-mcp-imap"],
+            env: { GMAIL_EMAIL: gmailEmail, GMAIL_APP_PASSWORD: gmailPass, npm_config_cache: npmCache },
+        };
+    }
+    const ghToken = process.env.GITHUB_PERSONAL_ACCESS_TOKEN;
+    if (ghToken && !servers["github"]) {
+        servers["github"] = {
+            command: "docker",
+            args: ["run", "-i", "--rm", "-e", "GITHUB_PERSONAL_ACCESS_TOKEN", "ghcr.io/github/github-mcp-server"],
+            env: { GITHUB_PERSONAL_ACCESS_TOKEN: ghToken },
+        };
+    }
+    const config = { mcpServers: servers };
     writeFileSync(mcpPath, JSON.stringify(config, null, 2), "utf8");
-    console.log(`[meta-agent-manager] injected MCP config for namespace=${ns}`);
+    console.log(`[meta-agent-manager] injected MCP config for namespace=${ns} (servers: ${Object.keys(servers).join(", ")})`);
 }
 /**
  * Resolve claude binary — same logic as claude.ts resolveClaude.

package/dist/notifier.js

@@ -10,7 +10,7 @@
  *   cca:discord:chat:log:{ns}           — LPUSH + LTRIM 0 499 (last 500 messages)
  *   cca:discord:chat:outgoing:{ns}      — PUBLISH for web UI to consume
  */
-import { discordChatLog, discordChatOutgoing, discordNotify, chatIncomingChannel, createCcWire, TIMING, } from "@gonzih/cc-wire";
+import { discordChatLog, discordChatOutgoing, discordNotify, notifyChannel, chatIncomingChannel, createCcWire, TIMING, } from "@gonzih/cc-wire";
 import { existsSync, statSync } from "fs";
 import { splitLongMessage, stripAnsi } from "./formatter.js";
 const SAFE_DIRS = ["/tmp/", "/var/folders/"];
@@ -152,9 +152,11 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         if (subscribedNamespaces.has(ns))
             return;
         subscribedNamespaces.add(ns);
-        const notifyCh = discordNotify(ns);
+        const notifyCh = discordNotify(ns); // cca:discord:notify:{ns} — new cc-wire path
+        const legacyNotifyCh = notifyChannel(ns); // cca:notify:{ns} — cc-agent still publishes here
         const incomingCh = chatIncomingChannel(ns);
         channelToNamespace.set(notifyCh, ns);
+        channelToNamespace.set(legacyNotifyCh, ns);
         channelToNamespace.set(incomingCh, ns);
         sub.subscribe(notifyCh, (err) => {
             if (err) {
@@ -164,6 +166,15 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
                 log("info", `subscribed to ${notifyCh}`);
             }
         });
+        // Also subscribe to legacy cc-agent notification channel
+        sub.subscribe(legacyNotifyCh, (err) => {
+            if (err) {
+                log("error", `subscribe ${legacyNotifyCh} failed:`, err.message);
+            }
+            else {
+                log("info", `subscribed to ${legacyNotifyCh} (legacy cc-agent)`);
+            }
+        });
         sub.subscribe(incomingCh, (err) => {
             if (err) {
                 log("error", `subscribe ${incomingCh} failed:`, err.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gonzih/cc-discord",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Claude Code Discord bot — chat with Claude Code via Discord",
   "type": "module",
   "bin": {