@hoverlover/cc-discord 0.3.2 → 0.3.3

package/hooks/track-activity.ts

@@ -43,6 +43,9 @@ const toolInput = input.tool_input || input.toolInput || null;
 let db: InstanceType<typeof DatabaseSync>;
 try {
   db = new DatabaseSync(dbPath);
+  // WAL mode for better concurrency with the relay server's flush loop
+  db.exec("PRAGMA journal_mode = WAL;");
+  db.exec("PRAGMA busy_timeout = 5000;");
 } catch {
   process.exit(0);
 }
@@ -107,7 +110,9 @@ try {
           INSERT INTO trace_events (session_id, agent_id, channel_id, event_type, tool_name, summary)
           VALUES (?, ?, ?, 'tool_start', ?, ?)
         `).run(sessionId, agentId, traceChannelId, toolName || "tool", summary);
-      } catch { /* fail-open */ }
+      } catch {
+        /* fail-open */
+      }
     }
 
     process.exit(0);
@@ -118,17 +123,21 @@ try {
     let elapsedTag = "";
     if (traceEnabled && hookEvent === "PostToolUse") {
       try {
-        const row = db.prepare(`
+        const row = db
+          .prepare(`
           SELECT started_at FROM agent_activity
           WHERE session_id = ? AND agent_id = ?
-        `).get(sessionId, agentId) as { started_at?: string } | undefined;
+        `)
+          .get(sessionId, agentId) as { started_at?: string } | undefined;
         if (row?.started_at) {
           const elapsedMs = Date.now() - new Date(row.started_at).getTime();
           if (elapsedMs >= 0 && elapsedMs < 600_000) {
             elapsedTag = `elapsed:${elapsedMs}|`;
           }
         }
-      } catch { /* best-effort */ }
+      } catch {
+        /* best-effort */
+      }
     }
 
     db.prepare(`
@@ -157,7 +166,9 @@ try {
           INSERT INTO trace_events (session_id, agent_id, channel_id, event_type, tool_name, summary)
           VALUES (?, ?, ?, 'tool_end', ?, ?)
         `).run(sessionId, agentId, traceChannelId, toolName || "tool", `${elapsedTag}${summary}`);
-      } catch { /* fail-open */ }
+      } catch {
+        /* fail-open */
+      }
     }
   }
 } catch {

package/package.json

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

package/server/db.ts

@@ -11,6 +11,11 @@ mkdirSync(DATA_DIR, { recursive: true });
 
 export const db = new DatabaseSync(join(DATA_DIR, "messages.db"));
 
+// Enable WAL mode for better concurrent access between relay server and hook processes.
+// WAL allows readers and writers to operate concurrently without SQLITE_BUSY errors.
+db.exec("PRAGMA journal_mode = WAL;");
+db.exec("PRAGMA busy_timeout = 5000;");
+
 db.exec(`
   CREATE TABLE IF NOT EXISTS messages (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -170,14 +175,29 @@ export function getPendingTraceEvents(limit: number = 50): TraceEvent[] {
   }
 }
 
-export function markTraceEventsPosted(ids: number[]) {
-  if (!ids.length) return;
-  try {
-    const placeholders = ids.map(() => "?").join(",");
-    db.prepare(`UPDATE trace_events SET posted = 1 WHERE id IN (${placeholders})`).run(...ids);
-  } catch {
-    // fail-open
+export function markTraceEventsPosted(ids: number[]): boolean {
+  if (!ids.length) return true;
+  // Retry up to 3 times to handle SQLITE_BUSY from concurrent hook writes
+  for (let attempt = 0; attempt < 3; attempt++) {
+    try {
+      const placeholders = ids.map(() => "?").join(",");
+      db.prepare(`UPDATE trace_events SET posted = 1 WHERE id IN (${placeholders})`).run(...ids);
+      return true;
+    } catch (err) {
+      const code = (err as any)?.code;
+      if (code === "SQLITE_BUSY" && attempt < 2) {
+        // Brief sync delay before retry (Bun doesn't have Atomics.wait, use a spin)
+        const end = Date.now() + 50 * (attempt + 1);
+        while (Date.now() < end) {
+          /* spin wait */
+        }
+        continue;
+      }
+      console.error(`[Trace] markTraceEventsPosted failed (attempt ${attempt + 1}/3, ${ids.length} ids):`, err);
+      return false;
+    }
   }
+  return false;
 }
 
 export function insertTraceEvent(

package/server/trace-thread.ts

@@ -6,17 +6,8 @@
  *   hooks write → trace_events table → flush loop reads → batches → posts to thread
  */
 
-import {
-  ChannelType,
-  type Client,
-  type TextChannel,
-  type ThreadChannel,
-} from "discord.js";
-import {
-  TRACE_FLUSH_INTERVAL_MS,
-  TRACE_THREAD_ENABLED,
-  TRACE_THREAD_NAME,
-} from "./config.ts";
+import { ChannelType, type Client, type TextChannel, type ThreadChannel } from "discord.js";
+import { TRACE_FLUSH_INTERVAL_MS, TRACE_THREAD_ENABLED, TRACE_THREAD_NAME } from "./config.ts";
 import {
   getPendingTraceEvents,
   getTraceThreadId,
@@ -241,7 +232,7 @@ function formatTimestamp(iso: string): string {
 /** Clean up text for display — convert literal \n to real newlines, preserve full content. */
 function cleanWhitespace(text: string): string {
   return String(text || "")
-    .replace(/\\n/g, "\n")   // convert literal \n to real newlines
+    .replace(/\\n/g, "\n") // convert literal \n to real newlines
     .replace(/[ \t]+/g, " ") // collapse horizontal whitespace (but keep newlines)
     .trim();
 }
@@ -284,14 +275,25 @@ async function flushTraceEvents(client: Client) {
       return true;
     });
 
-    // Even if filtered out, mark all as posted
-    postedIds.push(...channelEvents.map((e) => e.id));
-
-    if (!meaningful.length) continue;
+    // If all events were filtered out, mark them as posted immediately
+    if (!meaningful.length) {
+      postedIds.push(...channelEvents.map((e) => e.id));
+      continue;
+    }
 
     try {
       const thread = await ensureTraceThread(client, channelId);
-      if (!thread) continue;
+      if (!thread) {
+        // Can't get thread (cooldown or missing channel) — DON'T mark as posted
+        // so they'll be retried after cooldown expires. To prevent infinite
+        // growth, mark them posted if they're older than the cooldown period.
+        const now = Date.now();
+        for (const e of channelEvents) {
+          const age = now - new Date(e.created_at).getTime();
+          if (age > FAILURE_COOLDOWN_MS) postedIds.push(e.id);
+        }
+        continue;
+      }
 
       // Batch into a single message (Discord max 2000 chars)
       const lines = meaningful.map(formatTraceEvent);
@@ -300,6 +302,9 @@ async function flushTraceEvents(client: Client) {
       for (const batch of batches) {
         await thread.send(batch);
       }
+
+      // Only mark as posted AFTER successful Discord send
+      postedIds.push(...channelEvents.map((e) => e.id));
     } catch (err) {
       const code = (err as any)?.code;
       if (code === 50001 || code === 50013) {
@@ -307,13 +312,23 @@ async function flushTraceEvents(client: Client) {
         console.warn(`[Trace] No access to trace thread for channel ${channelId} (${code}) — backing off 5m`);
         threadCache.delete(channelId);
         failedChannels.set(channelId, Date.now());
+        // Mark as posted to avoid infinite retry on permanent access errors
+        postedIds.push(...channelEvents.map((e) => e.id));
       } else {
         console.error(`[Trace] Failed to post trace events for channel ${channelId}:`, err);
+        // Don't mark as posted — they'll be retried on next flush
       }
     }
   }
 
-  markTraceEventsPosted(postedIds);
+  if (postedIds.length > 0) {
+    const success = markTraceEventsPosted(postedIds);
+    if (!success) {
+      console.error(
+        `[Trace] CRITICAL: Failed to mark ${postedIds.length} events as posted — duplicates likely on next flush`,
+      );
+    }
+  }
 }
 
 /** Split lines into batches that fit within maxLen characters.

package/tools/send-discord.ts

@@ -16,6 +16,21 @@ const textParts: string[] = [];
 
 for (let i = 0; i < args.length; i++) {
   const arg = args[i];
+  if (arg === "--help" || arg === "-h") {
+    console.log(`
+Usage: send-discord [--channel <id>] [--reply <messageId>] "message"
+
+Options:
+  --channel  Target channel ID (defaults to AGENT_ID env var)
+  --reply    Message ID to reply to
+
+Examples:
+  send-discord "Build started"
+  send-discord --channel 123456789012345678 "Hello from Claude"
+  send-discord --reply 123456789012345678 "Thanks, on it"
+`);
+    process.exit(0);
+  }
   if (arg === "--channel" && args[i + 1]) {
     channelId = args[++i];
     continue;
@@ -24,6 +39,11 @@ for (let i = 0; i < args.length; i++) {
     replyTo = args[++i];
     continue;
   }
+  // Reject unrecognized flags — don't let them become message content
+  if (arg.startsWith("--")) {
+    console.error(`Unknown flag: ${arg}\nUse --help for usage.`);
+    process.exit(1);
+  }
   textParts.push(arg);
 }