@gonzih/cc-discord 0.2.43 → 0.2.45

package/dist/meta-agent-manager.js

@@ -223,52 +223,55 @@ function wireStdoutToRedis(proc, ns, wire) {
                     result: resultText,
                     is_error: parsed.is_error ?? false,
                 };
-                if (resultText && !parsed.is_error) {
-                    const msg = {
+                if (parsed.is_error && resultText) {
+                    // Error case: assistant event may not carry the error message — publish it directly
+                    const errMsg = {
                         id: crypto.randomUUID(),
                         source: "claude",
                         role: "assistant",
-                        content: resultText,
+                        content: `⚠️ Error: ${resultText}`,
                         timestamp: new Date().toISOString(),
                         chatId: 0,
                     };
-                    // Publish text first (logs to chat history), then signal done for immediate finalization
-                    wire.discord.publishOutgoing(ns, msg).then(() => {
-                        rawRedis.publish(discordChatOutgoing(ns), JSON.stringify({
-                            id: crypto.randomUUID(), source: "claude", role: "assistant",
-                            content: "", event: "done", timestamp: new Date().toISOString(), chatId: 0,
-                        })).catch(() => { });
-                    }).catch((err) => {
-                        console.warn(`[meta-agent-manager] publishOutgoing (result) failed (ns=${ns}):`, err.message);
-                        // Still signal done even if text publish failed
-                        rawRedis.publish(discordChatOutgoing(ns), JSON.stringify({
-                            id: crypto.randomUUID(), source: "claude", role: "assistant",
-                            content: "", event: "done", timestamp: new Date().toISOString(), chatId: 0,
-                        })).catch(() => { });
-                    });
+                    wire.discord.publishOutgoing(ns, errMsg).catch(() => { });
                 }
-                else if (parsed.is_error) {
-                    // Error result: publish error text and signal done
-                    const errMsg = {
+                // Signal turn completion — text was already published via the assistant event above.
+                // Do NOT re-publish resultText here: that would double-deliver the same content.
+                rawRedis.publish(discordChatOutgoing(ns), JSON.stringify({
+                    id: crypto.randomUUID(), source: "claude", role: "assistant",
+                    content: "", event: "done", timestamp: new Date().toISOString(), chatId: 0,
+                })).catch(() => { });
+            }
+            else if (type === "rate_limit_event") {
+                const rl = parsed.rate_limit_info;
+                structuredEvent = parsed;
+                // Throttled: five-hour window exhausted and no overage credits.
+                // Claude will hang on API calls until the window resets — notify Discord immediately
+                // and signal done so the live message finalizes, rather than silently timing out.
+                if (rl?.overageStatus === "rejected") {
+                    const resetsAt = rl.resetsAt ? new Date(rl.resetsAt * 1000).toLocaleTimeString("en-US", { hour: "numeric", minute: "2-digit", timeZoneName: "short" }) : "soon";
+                    const alertMsg = {
                         id: crypto.randomUUID(),
                         source: "claude",
                         role: "assistant",
-                        content: `⚠️ Error: ${resultText || "unknown error"}`,
+                        content: `⏳ Rate limited — five-hour window exhausted. Resets at **${resetsAt}**. Session paused; send any message after reset to resume.`,
                         timestamp: new Date().toISOString(),
                         chatId: 0,
                     };
-                    wire.discord.publishOutgoing(ns, errMsg).catch(() => { });
-                    rawRedis.publish(discordChatOutgoing(ns), JSON.stringify({
-                        id: crypto.randomUUID(), source: "claude", role: "assistant",
-                        content: "", event: "done", timestamp: new Date().toISOString(), chatId: 0,
-                    })).catch(() => { });
-                }
-                else {
-                    // Empty result — just signal done
+                    wire.discord.publishOutgoing(ns, alertMsg).catch(() => { });
+                    // Fire done so notifier finalizes the live message
                     rawRedis.publish(discordChatOutgoing(ns), JSON.stringify({
                         id: crypto.randomUUID(), source: "claude", role: "assistant",
                         content: "", event: "done", timestamp: new Date().toISOString(), chatId: 0,
                     })).catch(() => { });
+                    // Kill the process — API calls will hang until reset anyway
+                    setTimeout(() => {
+                        try {
+                            proc.stdin.end();
+                            proc.kill("SIGTERM");
+                        }
+                        catch { /* ignore */ }
+                    }, 500);
                 }
             }
             else {

package/package.json

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