@gonzih/cc-discord 0.2.4 → 0.2.5

package/dist/bot.d.ts

@@ -64,7 +64,6 @@ export declare class CcDiscordBot {
     private sendToChannel;
     /** Send to a channel by ID — used by notifier callbacks. */
     sendToChannelById(channelId: string, text: string): Promise<void>;
-    sendAttachmentToChannelById(channelId: string, filePath: string): Promise<void>;
     private isAllowed;
     private handleMessage;
     private handleVoice;
@@ -97,6 +96,8 @@ export declare class CcDiscordBot {
     private writeChatMessage;
     /** Returns the last channelId that sent a message. */
     getLastActiveChannelId(): string | undefined;
+    /** Reverse lookup: find the Discord channelId registered for a given namespace. */
+    getChannelIdForNamespace(ns: string): string | undefined;
     /**
      * Feed a text message into the active Claude session for the given channel.
      * Called by the notifier when a UI message arrives via Redis pub/sub.

package/dist/bot.js

@@ -294,15 +294,6 @@ export class CcDiscordBot {
         }
         await this.sendToChannel(channel, text);
     }
-    async sendAttachmentToChannelById(channelId, filePath) {
-        const channel = await this.getChannel(channelId);
-        if (!channel) {
-            console.warn(`[bot] sendAttachmentToChannelById: channel ${channelId} not found`);
-            return;
-        }
-        const attachment = new AttachmentBuilder(filePath, { name: basename(filePath) });
-        await channel.send({ files: [attachment] });
-    }
     isAllowed(userId) {
         if (!this.opts.allowedUserIds?.length)
             return true;
@@ -1009,6 +1000,14 @@ export class CcDiscordBot {
     getLastActiveChannelId() {
         return this.lastActiveChannelId;
     }
+    /** Reverse lookup: find the Discord channelId registered for a given namespace. */
+    getChannelIdForNamespace(ns) {
+        for (const [channelId, mapping] of this.channelNamespaceMap) {
+            if (mapping.namespace === ns)
+                return channelId;
+        }
+        return undefined;
+    }
     /**
      * Feed a text message into the active Claude session for the given channel.
      * Called by the notifier when a UI message arrives via Redis pub/sub.
@@ -1072,7 +1071,7 @@ export class CcDiscordBot {
     startMetaAgentPolling() {
         if (!this.wire)
             return;
-        this.metaAgentManager.startPolling(this.wire, () => Array.from(this.channelNamespaceMap.values()));
+        this.metaAgentManager.startPolling(this.wire, () => Array.from(this.channelNamespaceMap.values()).map((v) => v.namespace));
     }
     stop() {
         for (const [key, session] of this.sessions) {

package/dist/index.js

@@ -142,7 +142,7 @@ const bot = new CcDiscordBot({
     namespace,
     registerRoutedChannelId: (ns, channelId) => notifier.registerRoutedChannelId(ns, channelId),
 });
-const notifier = startNotifier(bot, notifyChannelId, namespace, sharedRedis, (channelId, text) => handleUserMessageFn?.(channelId, text), (channelId, text) => forwardNotificationFn?.(channelId, text), () => getLastActiveChannelIdFn(), (n) => bot.reverseSnowflakeLookup(n));
+const notifier = startNotifier(bot, notifyChannelId, namespace, sharedRedis, (channelId, text) => handleUserMessageFn?.(channelId, text), (channelId, text) => forwardNotificationFn?.(channelId, text), () => getLastActiveChannelIdFn(), (n) => bot.reverseSnowflakeLookup(n), (ns) => bot.getChannelIdForNamespace(ns));
 console.log(`[notifier] started for namespace=${namespace} notifyChannelId=${notifyChannelId ?? "dynamic"}`);
 // Restore persisted channel→namespace mappings so routing survives restarts
 bot.loadChannelMappings().catch((err) => {

package/dist/meta-agent-manager.d.ts

@@ -36,14 +36,10 @@ export declare function injectMcp(ns: string, wsPath: string, token: string): vo
  * Returns a Promise that resolves when the process exits.
  */
 export declare function spawnSession(ns: string, message: string, token: string, wire: Wire): Promise<void>;
-export interface NamespaceEntry {
-    namespace: string;
-    repoUrl: string;
-}
 export interface MetaAgentManager {
     ensureWorkspace: (ns: string, repoUrl: string) => Promise<void>;
     injectMcp: (ns: string, token: string) => void;
-    startPolling: (wire: Wire, getNamespaceEntries: () => NamespaceEntry[]) => void;
+    startPolling: (wire: Wire, getNamespaces: () => string[]) => void;
     stop: () => void;
 }
 /**

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, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, writeFileSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 import { CC_DISCORD_WORKSPACE_ROOT, TIMING, discordMetaInputKey, } from "@gonzih/cc-wire";
@@ -59,55 +59,25 @@ 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 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,
+    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,
+                },
             },
         },
     };
-    // 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} (servers: ${Object.keys(servers).join(", ")})`);
+    console.log(`[meta-agent-manager] injected MCP config for namespace=${ns}`);
 }
 /**
  * Resolve claude binary — same logic as claude.ts resolveClaude.
@@ -213,14 +183,14 @@ export function createMetaAgentManager() {
             const wsPath = workspacePath(ns);
             injectMcp(ns, wsPath, token);
         },
-        startPolling(wire, getNamespaceEntries) {
+        startPolling(wire, getNamespaces) {
             if (pollInterval)
                 return; // already running
             pollInterval = setInterval(() => {
-                const entries = getNamespaceEntries();
-                if (entries.length === 0)
+                const namespaces = getNamespaces();
+                if (namespaces.length === 0)
                     return;
-                for (const { namespace: ns, repoUrl } of entries) {
+                for (const ns of namespaces) {
                     if (activeNamespaces.has(ns))
                         continue;
                     wire.discord.dequeue(ns)
@@ -258,24 +228,6 @@ export function createMetaAgentManager() {
                             });
                             return;
                         }
-                        // Ensure workspace exists before spawning — clone happens once, no-op on repeat.
-                        try {
-                            await ensureWorkspace(ns, repoUrl);
-                            injectMcp(ns, workspacePath(ns), token);
-                        }
-                        catch (wsErr) {
-                            const msg = wsErr instanceof Error ? wsErr.message : String(wsErr);
-                            console.error(`[meta-agent-manager] workspace setup failed (ns=${ns}):`, msg);
-                            activeNamespaces.delete(ns);
-                            await wire.discord.setStatus(ns, {
-                                namespace: ns,
-                                status: "idle",
-                                isTyping: false,
-                                turnCount: 0,
-                                updatedAt: new Date().toISOString(),
-                            }).catch(() => { });
-                            return;
-                        }
                         spawnSession(ns, content, token, wire)
                             .catch((err) => {
                             console.error(`[meta-agent-manager] session error (ns=${ns}):`, err.message);

package/dist/notifier.d.ts

@@ -40,10 +40,13 @@ export declare function parseNotification(raw: string): ParsedNotification | nul
 export declare function writeChatLog(redis: Redis, namespace: string, msg: ChatMessage): void;
 /**
  * Resolve the target Discord channelId for a notification.
- * When chatId is set and a reverse-lookup function is available, prefer the originating channel.
- * Falls back to notifyChannelId, then getActiveChannelId.
+ * Priority:
+ *   1. chatId → reverseSnowflakeLookup (originating channel from the notification payload)
+ *   2. ns → getChannelIdForNamespace (registered Discord channel for this namespace)
+ *   3. notifyChannelId (static env var — may be stale/dead)
+ *   4. getActiveChannelId (last channel that sent a message)
  */
-export declare function resolveNotifyChannel(chatId: number | undefined, notifyChannelId: string | null, getActiveChannelId?: () => string | undefined, reverseSnowflakeLookup?: (n: number) => string | undefined): string | undefined;
+export declare function resolveNotifyChannel(chatId: number | undefined, notifyChannelId: string | null, getActiveChannelId?: () => string | undefined, reverseSnowflakeLookup?: (n: number) => string | undefined, ns?: string, getChannelIdForNamespace?: (ns: string) => string | undefined): string | undefined;
 export interface NotifierHandle {
     /**
      * Register the originating Discord channel ID for a routed namespace.
@@ -57,13 +60,14 @@ export interface NotifierHandle {
 /**
  * Start the Discord notifier.
  *
- * @param bot                     - CcDiscordBot instance (for sending messages)
- * @param notifyChannelId         - Discord channel ID to forward notifications to. Pass null to use getActiveChannelId.
- * @param namespace               - primary namespace (used to build Redis channel names)
- * @param redis                   - ioredis client in normal mode (will be duplicated for pub/sub)
- * @param handleUserMessage       - Optional callback to feed UI messages into the active Claude session
- * @param forwardNotification     - Optional callback to forward job notifications
- * @param getActiveChannelId      - Optional callback to resolve channelId dynamically
- * @param reverseSnowflakeLookup  - Optional callback to resolve a chatId integer to a Discord channelId
+ * @param bot                       - CcDiscordBot instance (for sending messages)
+ * @param notifyChannelId           - Discord channel ID to forward notifications to. Pass null to use getActiveChannelId.
+ * @param namespace                 - primary namespace (used to build Redis channel names)
+ * @param redis                     - ioredis client in normal mode (will be duplicated for pub/sub)
+ * @param handleUserMessage         - Optional callback to feed UI messages into the active Claude session
+ * @param forwardNotification       - Optional callback to forward job notifications
+ * @param getActiveChannelId        - Optional callback to resolve channelId dynamically
+ * @param reverseSnowflakeLookup    - Optional callback to resolve a chatId integer to a Discord channelId
+ * @param getChannelIdForNamespace  - Optional callback to resolve a namespace to its registered Discord channelId
  */
-export declare function startNotifier(bot: CcDiscordBot, notifyChannelId: string | null, namespace: string, redis: Redis, handleUserMessage?: (channelId: string, text: string) => void, forwardNotification?: (channelId: string, text: string) => void, getActiveChannelId?: () => string | undefined, reverseSnowflakeLookup?: (n: number) => string | undefined): NotifierHandle;
+export declare function startNotifier(bot: CcDiscordBot, notifyChannelId: string | null, namespace: string, redis: Redis, handleUserMessage?: (channelId: string, text: string) => void, forwardNotification?: (channelId: string, text: string) => void, getActiveChannelId?: () => string | undefined, reverseSnowflakeLookup?: (n: number) => string | undefined, getChannelIdForNamespace?: (ns: string) => string | undefined): NotifierHandle;

package/dist/notifier.js

@@ -11,22 +11,7 @@
  *   cca:discord:chat:outgoing:{ns}      — PUBLISH for web UI to consume
  */
 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/"];
-const MAX_DISCORD_BYTES = 25 * 1024 * 1024; // 25 MB Discord file limit
-/** Extract /tmp/ or /var/folders/ file paths mentioned in text that actually exist on disk. */
-function extractAttachablePaths(text) {
-    const pattern = /(?:^|[\s`'"(])(\/(?:tmp|var\/folders)\/[\w.\-/]+\.[\w]{1,10})(?:[\s`'")\n]|$)/gm;
-    const quoted = /"(\/(?:tmp|var\/folders)\/[^"]+\.[a-zA-Z0-9]{1,10})"|'(\/(?:tmp|var\/folders)\/[^']+\.[a-zA-Z0-9]{1,10})'/g;
-    const candidates = new Set();
-    let m;
-    while ((m = pattern.exec(text)) !== null)
-        candidates.add(m[1]);
-    while ((m = quoted.exec(text)) !== null)
-        candidates.add(m[1] ?? m[2]);
-    return [...candidates].filter(p => SAFE_DIRS.some(d => p.startsWith(d)) && existsSync(p));
-}
 function log(level, ...args) {
     const fn = level === "error" ? console.error : level === "warn" ? console.warn : console.log;
     fn("[notifier]", ...args);
@@ -104,30 +89,39 @@ export function writeChatLog(redis, namespace, msg) {
 }
 /**
  * Resolve the target Discord channelId for a notification.
- * When chatId is set and a reverse-lookup function is available, prefer the originating channel.
- * Falls back to notifyChannelId, then getActiveChannelId.
+ * Priority:
+ *   1. chatId → reverseSnowflakeLookup (originating channel from the notification payload)
+ *   2. ns → getChannelIdForNamespace (registered Discord channel for this namespace)
+ *   3. notifyChannelId (static env var — may be stale/dead)
+ *   4. getActiveChannelId (last channel that sent a message)
  */
-export function resolveNotifyChannel(chatId, notifyChannelId, getActiveChannelId, reverseSnowflakeLookup) {
+export function resolveNotifyChannel(chatId, notifyChannelId, getActiveChannelId, reverseSnowflakeLookup, ns, getChannelIdForNamespace) {
     if (chatId != null && reverseSnowflakeLookup) {
         const resolved = reverseSnowflakeLookup(chatId);
         if (resolved)
             return resolved;
     }
+    if (ns && getChannelIdForNamespace) {
+        const resolved = getChannelIdForNamespace(ns);
+        if (resolved)
+            return resolved;
+    }
     return notifyChannelId ?? getActiveChannelId?.();
 }
 /**
  * Start the Discord notifier.
  *
- * @param bot                     - CcDiscordBot instance (for sending messages)
- * @param notifyChannelId         - Discord channel ID to forward notifications to. Pass null to use getActiveChannelId.
- * @param namespace               - primary namespace (used to build Redis channel names)
- * @param redis                   - ioredis client in normal mode (will be duplicated for pub/sub)
- * @param handleUserMessage       - Optional callback to feed UI messages into the active Claude session
- * @param forwardNotification     - Optional callback to forward job notifications
- * @param getActiveChannelId      - Optional callback to resolve channelId dynamically
- * @param reverseSnowflakeLookup  - Optional callback to resolve a chatId integer to a Discord channelId
+ * @param bot                       - CcDiscordBot instance (for sending messages)
+ * @param notifyChannelId           - Discord channel ID to forward notifications to. Pass null to use getActiveChannelId.
+ * @param namespace                 - primary namespace (used to build Redis channel names)
+ * @param redis                     - ioredis client in normal mode (will be duplicated for pub/sub)
+ * @param handleUserMessage         - Optional callback to feed UI messages into the active Claude session
+ * @param forwardNotification       - Optional callback to forward job notifications
+ * @param getActiveChannelId        - Optional callback to resolve channelId dynamically
+ * @param reverseSnowflakeLookup    - Optional callback to resolve a chatId integer to a Discord channelId
+ * @param getChannelIdForNamespace  - Optional callback to resolve a namespace to its registered Discord channelId
  */
-export function startNotifier(bot, notifyChannelId, namespace, redis, handleUserMessage, forwardNotification, getActiveChannelId, reverseSnowflakeLookup) {
+export function startNotifier(bot, notifyChannelId, namespace, redis, handleUserMessage, forwardNotification, getActiveChannelId, reverseSnowflakeLookup, getChannelIdForNamespace) {
     const wire = createCcWire(redis);
     // Per-namespace channelId registry — maps routed namespace → Discord channelId
     const routedChannelIds = new Map();
@@ -152,8 +146,8 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         if (subscribedNamespaces.has(ns))
             return;
         subscribedNamespaces.add(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 notifyCh = discordNotify(ns);
+        const legacyNotifyCh = notifyChannel(ns);
         const incomingCh = chatIncomingChannel(ns);
         channelToNamespace.set(notifyCh, ns);
         channelToNamespace.set(legacyNotifyCh, ns);
@@ -166,13 +160,12 @@ 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)`);
+                log("info", `subscribed to ${legacyNotifyCh}`);
             }
         });
         sub.subscribe(incomingCh, (err) => {
@@ -208,8 +201,7 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         const buf = metaAgentBuffers.get(ns);
         if (!buf || !buf.text.trim())
             return;
-        const rawText = stripAnsi(buf.text.trim());
-        const text = `← [${ns}] ` + rawText;
+        const text = `← [${ns}] ` + stripAnsi(buf.text.trim());
         buf.text = "";
         buf.timer = null;
         const chunks = splitLongMessage(text);
@@ -218,25 +210,6 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
                 log("warn", `meta-agent flush sendToChannelById failed (ns=${ns}):`, err.message);
             });
         }
-        // Attach any /tmp/ files mentioned in the response
-        const paths = extractAttachablePaths(rawText);
-        for (const filePath of paths) {
-            let size;
-            try {
-                size = statSync(filePath).size;
-            }
-            catch {
-                continue;
-            }
-            if (size > MAX_DISCORD_BYTES) {
-                bot.sendToChannelById(targetChannelId, `File too large for Discord (${(size / 1024 / 1024).toFixed(1)} MB): ${filePath}`).catch(() => { });
-                continue;
-            }
-            log("info", `attaching file to Discord (ns=${ns}): ${filePath}`);
-            bot.sendAttachmentToChannelById(targetChannelId, filePath).catch((err) => {
-                log("warn", `attachment send failed (ns=${ns}, path=${filePath}):`, err.message);
-            });
-        }
     }
     sub.on("pmessage", (pattern, channel, message) => {
         void pattern;
@@ -303,10 +276,11 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
             const notification = parseNotification(raw);
             if (notification === null)
                 continue; // routing excludes discord
-            // Primary namespace: honour chatId-based per-channel routing via reverseSnowflakeLookup.
+            // Primary namespace: honour chatId-based per-channel routing via reverseSnowflakeLookup,
+            // then namespace → channelId lookup, then notifyChannelId / active channel.
             // Routed namespaces: always deliver to the registered Discord channelId — no leakage.
             const destChannelId = ns === namespace
-                ? (resolveNotifyChannel(notification.chatId, notifyChannelId, getActiveChannelId, reverseSnowflakeLookup) ?? targetChannelId)
+                ? (resolveNotifyChannel(notification.chatId, notifyChannelId, getActiveChannelId, reverseSnowflakeLookup, ns, getChannelIdForNamespace) ?? targetChannelId)
                 : targetChannelId;
             bot.sendToChannelById(destChannelId, notification.text).catch((err) => {
                 log("warn", `notify list send failed (ns=${ns}):`, err.message);
@@ -322,8 +296,8 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         }
     };
     const pollNotifyList = async () => {
-        // Primary namespace
-        const primaryTargetId = notifyChannelId ?? getActiveChannelId?.();
+        // Primary namespace: prefer registered channel for this namespace, then env var, then active channel
+        const primaryTargetId = getChannelIdForNamespace?.(namespace) ?? notifyChannelId ?? getActiveChannelId?.();
         if (primaryTargetId != null) {
             await pollOneNamespace(namespace, primaryTargetId);
         }
@@ -344,14 +318,15 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
             return;
         const isPrimary = ns === namespace;
         const notifyCh = discordNotify(ns);
+        const legacyNotifyCh = notifyChannel(ns);
         const incomingCh = chatIncomingChannel(ns);
-        if (channel === notifyCh) {
+        if (channel === notifyCh || channel === legacyNotifyCh) {
             const notification = parseNotification(message);
             if (notification === null)
                 return; // routing excludes discord
             let targetId;
             if (isPrimary) {
-                targetId = resolveNotifyChannel(notification.chatId, notifyChannelId, getActiveChannelId, reverseSnowflakeLookup);
+                targetId = resolveNotifyChannel(notification.chatId, notifyChannelId, getActiveChannelId, reverseSnowflakeLookup, ns, getChannelIdForNamespace);
             }
             else {
                 // For routed namespaces, only use the registered channelId — no fallback to primary

package/package.json

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