@hoverlover/cc-discord 0.2.5 → 0.3.0

package/README.md

@@ -119,6 +119,7 @@ Project-local env files take precedence over `~/.config/cc-discord/`, so cloned-
 | `MAX_ATTACHMENT_INLINE_BYTES` | `100000` | Max bytes for inline attachment content |
 | `MAX_ATTACHMENT_DOWNLOAD_BYTES` | `10000000` | Max bytes for downloaded attachments |
 | `ATTACHMENT_TTL_MS` | `3600000` | TTL for downloaded attachment files (ms) |
+| `CATCHUP_MESSAGE_LIMIT` | `100` | Messages to fetch per channel on startup for catch-up (`0` to disable) |
 
 ### `.env.worker` — required
 
@@ -267,14 +268,14 @@ To keep cc-discord running across reboots and terminal closures, install it as a
 
 ### macOS (launchd)
 
-1. Find the full path to `bunx`:
+1. Find the full paths to `bunx` and `claude`:
 
 ```bash
-which bunx
-# e.g. /Users/you/.bun/bin/bunx
+which bunx    # e.g. /Users/you/.bun/bin/bunx
+which claude  # e.g. /Users/you/.local/bin/claude
 ```
 
-2. Create the plist file:
+2. Create the plist file (replace all `/Users/you/...` paths with your actual paths from step 1):
 
 ```bash
 cat > ~/Library/LaunchAgents/com.cc-discord.plist << 'EOF'
@@ -295,8 +296,9 @@ cat > ~/Library/LaunchAgents/com.cc-discord.plist << 'EOF'
 
   <key>EnvironmentVariables</key>
   <dict>
+    <!-- Must include directories for both bunx and claude -->
     <key>PATH</key>
-    <string>/Users/you/.bun/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+    <string>/Users/you/.bun/bin:/Users/you/.local/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
   </dict>
 
   <key>RunAtLoad</key>
@@ -315,7 +317,7 @@ cat > ~/Library/LaunchAgents/com.cc-discord.plist << 'EOF'
 EOF
 ```
 
-3. Replace `/Users/you/.bun/bin/bunx` and the `PATH` value with your actual paths.
+3. **Important:** launchd does not source your shell profile, so the `PATH` must explicitly include the directories for both `bunx` and `claude`. Verify the paths match your system.
 
 4. Load the service:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoverlover/cc-discord",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Discord <-> Claude Code relay: use your Claude subscription to power per-channel AI bots",
   "type": "module",
   "bin": {

package/scripts/start.sh

@@ -149,7 +149,7 @@ RELAY_PORT="${RELAY_PORT:-3199}"
 RELAY_API_TOKEN="${RELAY_API_TOKEN:-}"
 
 # Ensure bun/curl/claude are findable
-export PATH="$HOME/.bun/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
+export PATH="$HOME/.bun/bin:$HOME/.local/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 
 # ---- Pre-flight: Claude auth check ----
 if ! claude auth status >/dev/null 2>&1; then

package/server/catchup.ts

@@ -0,0 +1,54 @@
+/**
+ * Catch-up: fetch recent messages from allowed channels on startup
+ * to fill in any messages missed while the relay was offline.
+ */
+
+import type { Client } from "discord.js";
+import { CATCHUP_MESSAGE_LIMIT, IGNORED_CHANNEL_IDS, ALLOWED_CHANNEL_IDS, isAllowedUser } from "./config.ts";
+import { persistInboundDiscordMessage, persistOutboundDiscordMessage } from "./messages.ts";
+import { startTypingIndicator } from "./typing.ts";
+
+export async function catchUpMissedMessages(client: Client) {
+  if (CATCHUP_MESSAGE_LIMIT <= 0) {
+    console.log("[Catchup] Disabled (CATCHUP_MESSAGE_LIMIT=0)");
+    return;
+  }
+
+  let channelsScanned = 0;
+  let messagesCaughtUp = 0;
+
+  for (const [, guild] of client.guilds.cache) {
+    const guildChannels = await guild.channels.fetch();
+    for (const [, channel] of guildChannels) {
+      if (!channel || !channel.isTextBased() || channel.isThread() || channel.isVoiceBased()) continue;
+      if (IGNORED_CHANNEL_IDS.has(channel.id)) continue;
+      if (ALLOWED_CHANNEL_IDS.length > 0 && !ALLOWED_CHANNEL_IDS.includes(channel.id)) continue;
+
+      try {
+        const messages = await channel.messages.fetch({ limit: CATCHUP_MESSAGE_LIMIT });
+        channelsScanned++;
+
+        // Sort oldest-first so they're persisted in chronological order
+        const sorted = [...messages.values()]
+          .filter((m) => !m.author.bot && isAllowedUser(m.author.id))
+          .sort((a, b) => a.createdTimestamp - b.createdTimestamp);
+
+        let channelHasNew = false;
+        for (const msg of sorted) {
+          const isNew = await persistInboundDiscordMessage(msg);
+          if (isNew) {
+            messagesCaughtUp++;
+            channelHasNew = true;
+          }
+        }
+        if (channelHasNew) {
+          startTypingIndicator(client, channel.id, persistOutboundDiscordMessage);
+        }
+      } catch (err: unknown) {
+        console.error(`[Catchup] Failed to fetch messages for #${channel.name} (${channel.id}):`, (err as Error).message);
+      }
+    }
+  }
+
+  console.log(`[Catchup] Done — scanned ${channelsScanned} channel(s), caught up ${messagesCaughtUp} message(s)`);
+}

package/server/config.ts

@@ -83,8 +83,23 @@ export const MAX_ATTACHMENT_INLINE_BYTES = Number(process.env.MAX_ATTACHMENT_INL
 export const MAX_ATTACHMENT_DOWNLOAD_BYTES = Number(process.env.MAX_ATTACHMENT_DOWNLOAD_BYTES || 10_000_000);
 export const ATTACHMENT_TTL_MS = Number(process.env.ATTACHMENT_TTL_MS || 3_600_000);
 
+export const CATCHUP_MESSAGE_LIMIT = Number(process.env.CATCHUP_MESSAGE_LIMIT ?? 100);
+
 export const ATTACHMENT_DIR = join("/tmp", "cc-discord", "attachments");
 
+export function isAllowedChannel(channelId: string): boolean {
+  if (!channelId) return false;
+  if (IGNORED_CHANNEL_IDS.has(channelId)) return false;
+  if (ALLOWED_CHANNEL_IDS.length > 0) return ALLOWED_CHANNEL_IDS.includes(channelId);
+  return true;
+}
+
+export function isAllowedUser(userId: string | undefined): boolean {
+  if (!userId) return false;
+  if (ALLOWED_DISCORD_USER_IDS.length === 0) return true;
+  return ALLOWED_DISCORD_USER_IDS.includes(userId);
+}
+
 function loadDotEnv(path: string) {
   if (!existsSync(path)) return;
   const raw = readFileSync(path, "utf8");

package/server/index.ts

@@ -4,6 +4,7 @@ import { Client, GatewayIntentBits, REST, Routes, SlashCommandBuilder } from "di
 import express, { type NextFunction, type Request, type Response } from "express";
 import { cleanupOldAttachments } from "./attachment.ts";
 import { maybeNotifyBusyQueued } from "./busy-notify.ts";
+import { catchUpMissedMessages } from "./catchup.ts";
 import {
   ALLOWED_CHANNEL_IDS,
   ALLOWED_DISCORD_USER_IDS,
@@ -13,6 +14,8 @@ import {
   DISCORD_BOT_TOKEN,
   DISCORD_SESSION_ID,
   IGNORED_CHANNEL_IDS,
+  isAllowedChannel,
+  isAllowedUser,
   MESSAGE_ROUTING_MODE,
   RELAY_ALLOW_NO_AUTH,
   RELAY_API_TOKEN,
@@ -39,19 +42,6 @@ const client = new Client({
   intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages, GatewayIntentBits.MessageContent],
 });
 
-function isAllowedChannel(channelId: string): boolean {
-  if (!channelId) return false;
-  if (IGNORED_CHANNEL_IDS.has(channelId)) return false;
-  if (ALLOWED_CHANNEL_IDS.length > 0) return ALLOWED_CHANNEL_IDS.includes(channelId);
-  return true;
-}
-
-function isAllowedUser(userId: string | undefined): boolean {
-  if (!userId) return false;
-  if (ALLOWED_DISCORD_USER_IDS.length === 0) return true;
-  return ALLOWED_DISCORD_USER_IDS.includes(userId);
-}
-
 function requireAuth(req: Request, res: Response): boolean {
   if (RELAY_ALLOW_NO_AUTH) return true;
   const token = req.header("x-api-token") || req.header("authorization")?.replace(/^Bearer\s+/i, "");
@@ -104,6 +94,11 @@ client.once("clientReady", async () => {
 
   // Start live trace thread flush loop
   startTraceFlushLoop(client);
+
+  // Catch up messages missed while offline
+  catchUpMissedMessages(client).catch((err) => {
+    console.error("[Relay] Catch-up failed:", (err as Error).message);
+  });
 });
 
 client.on("messageCreate", async (message) => {

package/server/messages.ts

@@ -26,7 +26,7 @@ export async function formatInboundMessage(message: any) {
   return `${author}: ${fullText}`;
 }
 
-export async function persistInboundDiscordMessage(message: any) {
+export async function persistInboundDiscordMessage(message: any): Promise<boolean> {
   const normalizedContent = await formatInboundMessage(message);
   // In channel mode, route to channelId so per-channel subagents consume independently.
   // In agent mode (legacy), route to CLAUDE_AGENT_ID for single-agent consumption.
@@ -57,13 +57,15 @@ export async function persistInboundDiscordMessage(message: any) {
     });
 
     console.log(`[Relay] queued Discord message ${message.id} -> ${targetAgent}`);
+    return true;
   } catch (err: unknown) {
     const msg = String((err as any)?.message || "");
     if (msg.includes("UNIQUE constraint failed")) {
       // Discord can re-deliver in edge cases; idempotent ignore
-      return;
+      return false;
     }
     console.error("[Relay] failed to persist inbound message:", (err as Error).message);
+    return false;
   }
 }