@gonzih/cc-discord 0.2.46 → 0.2.48

package/dist/meta-agent-manager.js

@@ -252,20 +252,20 @@ function wireStdoutToRedis(proc, ns, wire) {
                 if (rl?.overageStatus === "rejected" && !rateLimitNotified) {
                     rateLimitNotified = true;
                     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: `⏳ 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, alertMsg).catch(() => { });
-                    // Fire done so notifier finalizes the live message
+                    const alertContent = `⏳ Rate limited — five-hour window exhausted. Resets at **${resetsAt}**. Session paused; send any message after reset to resume.`;
+                    // 1. Close the current turn first — finalizes any real response text already in the live state.
+                    //    If this is a pure rate-limit turn (no preceding text), done is a no-op in the notifier.
                     rawRedis.publish(discordChatOutgoing(ns), JSON.stringify({
                         id: crypto.randomUUID(), source: "claude", role: "assistant",
                         content: "", event: "done", timestamp: new Date().toISOString(), chatId: 0,
                     })).catch(() => { });
+                    // 2. Send alert tagged as "rate_limit" so the notifier delivers it as a standalone message,
+                    //    not accumulated into whatever text the current live state already holds.
+                    rawRedis.publish(discordChatOutgoing(ns), JSON.stringify({
+                        id: crypto.randomUUID(), source: "claude", role: "assistant",
+                        content: alertContent, event: "rate_limit",
+                        timestamp: new Date().toISOString(), chatId: 0,
+                    })).catch(() => { });
                     // Kill the process — API calls will hang until reset anyway
                     setTimeout(() => {
                         try {

package/dist/notifier.js

@@ -274,7 +274,7 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
     function getLiveState(ns, targetChannelId) {
         let state = liveStates.get(ns);
         if (!state) {
-            state = { text: "", toolStatus: "", targetChannelId, starting: false, liveStarted: false, finalTimer: null };
+            state = { text: "", toolStatus: "", targetChannelId, starting: false, liveStarted: false, finalTimer: null, pendingDone: false };
             liveStates.set(ns, state);
         }
         return state;
@@ -352,8 +352,26 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
                 scheduleFinal(ns, state);
             return;
         }
+        // rate_limit: delivered after the current turn's "done" — send as a standalone message,
+        // never accumulate into live state text (which already finalized above via "done").
+        if (event === "rate_limit") {
+            const alertContent = parsed.content ?? "";
+            if (alertContent) {
+                bot.sendToChannelById(deliverTo, `← [${ns}]\n${alertContent}`).catch((err) => {
+                    log("warn", `rate_limit alert send failed (ns=${ns}):`, err.message);
+                });
+            }
+            return;
+        }
         // done: immediate finalization (fired by meta-agent-manager after result event)
         if (event === "done") {
+            if (state.starting) {
+                // startOrGetLiveMessage is still in flight — defer finalization to its .then() callback
+                // so we don't race: finalizeState runs before the Discord message exists → fallback
+                // sends a second plain message, leaving the live message orphaned with ▋.
+                state.pendingDone = true;
+                return;
+            }
             finalizeState(ns, state).catch((err) => {
                 log("warn", `meta-agent done finalize failed (ns=${ns}):`, err.message);
             });
@@ -376,6 +394,12 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
                         state.liveStarted = true;
                         bot.updateLiveMessage(deliverTo, textDisplay);
                     }
+                    // done arrived while we were creating the message — finalize now
+                    if (state.pendingDone) {
+                        finalizeState(ns, state).catch((err) => {
+                            log("warn", `meta-agent deferred done finalize failed (ns=${ns}):`, err.message);
+                        });
+                    }
                 }).catch(() => { state.starting = false; });
             }
             // Text is buffered in state.text; applied when startOrGetLiveMessage resolves

package/package.json

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