@gonzih/cc-discord 0.2.38 → 0.2.40

package/dist/bot.js

@@ -911,8 +911,15 @@ export class CcDiscordBot {
         this.lastActiveChannelId = channelId;
         switch (interaction.commandName) {
             case "reset": {
+                // Kill local DM session if any
                 this.killSession(channelId);
-                await interaction.reply("Session reset. Send a message to start.");
+                // Kill persistent meta-agent session if this is a routed channel.
+                // Unlike /clear, we do NOT delete the JSONL — context is preserved.
+                // Next message will respawn with --continue, picking up the same history.
+                const resetNs = this.resolveNamespaceForChannel(channelId);
+                this.metaAgentManager.killSession(resetNs);
+                await interaction.reply(`Session process killed for \`${resetNs}\`. Next message respawns with existing context intact.\n` +
+                    `Use \`/clear\` to also wipe conversation history.`);
                 break;
             }
             case "costs": {

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

@@ -65,21 +65,6 @@ export interface MetaAgentManager {
     /** Write a raw line to the stdin of the running session, if any. */
     sendToSession: (ns: string, line: string) => void;
 }
-/**
- * Create a MetaAgentManager that maintains one persistent Claude process per namespace.
- *
- * On first message for a namespace:
- *   1. ensureWorkspace + injectMcp
- *   2. Drain any pending Redis queue entries to stdin
- *   3. Write the new message to stdin
- *
- * On subsequent messages: write directly to stdin of the running process.
- *
- * On process exit: remove from sessions map. Next message triggers a respawn.
- *
- * The 3-second poll loop drains any messages that arrived while a session was
- * starting up or temporarily unavailable.
- */
 export declare function createMetaAgentManager(): MetaAgentManager;
 /**
  * Migrate the old cc-agent meta input key to the new cc-discord key.

package/dist/meta-agent-manager.js

@@ -293,7 +293,7 @@ export function spawnSession(ns, message, token, wire) {
  * Stdout is wired to Redis via wireStdoutToRedis.
  * Returns the ChildProcess.
  */
-function spawnPersistentSession(ns, token, wire, onExit) {
+function spawnPersistentSession(ns, token, wire, onExit, onOutput) {
     const wsPath = workspacePath(ns);
     const claudeBin = resolveClaude();
     const env = buildEnv(token);
@@ -312,6 +312,9 @@ function spawnPersistentSession(ns, token, wire, onExit) {
     ], { cwd: wsPath, env, stdio: ["pipe", "pipe", "pipe"] });
     proc.stdin.setDefaultEncoding("utf8");
     wireStdoutToRedis(proc, ns, wire);
+    if (onOutput) {
+        proc.stdout.on("data", onOutput);
+    }
     proc.on("exit", (code) => {
         console.log(`[meta-agent-manager] persistent session exited (ns=${ns}, code=${code})`);
         onExit();
@@ -337,15 +340,22 @@ function spawnPersistentSession(ns, token, wire, onExit) {
  * The 3-second poll loop drains any messages that arrived while a session was
  * starting up or temporarily unavailable.
  */
+/** Kill a session after this many ms of no stdout (or no new stdin). */
+const SESSION_INACTIVITY_MS = 5 * 60_000; // 5 minutes
 export function createMetaAgentManager() {
     let pollInterval = null;
+    let watchdogInterval = null;
     /** One persistent ChildProcess per namespace. */
     const sessions = new Map();
     /** Namespaces currently being set up (workspace clone / first spawn). */
     const startingUp = new Set();
+    /** Wire reference needed for watchdog notifications. Set in startPolling. */
+    let wireRef = null;
     /**
      * Write a line to the stdin of the persistent session for ns.
      * Silently no-ops if no session exists.
+     * Resets the inactivity timer so the watchdog doesn't kill a session
+     * that just received a message but hasn't responded yet.
      */
     function writeToStdin(ns, line) {
         const session = sessions.get(ns);
@@ -354,11 +364,54 @@ export function createMetaAgentManager() {
         try {
             // Interactive mode: plain text line, Claude reads it as user input
             session.proc.stdin.write(`${line}\n`);
+            // Reset inactivity timer — the session now has SESSION_INACTIVITY_MS to respond
+            session.lastOutputAt = Date.now();
         }
         catch (err) {
             console.warn(`[meta-agent-manager] stdin write failed (ns=${ns}):`, err.message);
         }
     }
+    /**
+     * Watchdog: scan all sessions every 60s. If any session has been silent
+     * (no stdout and no new stdin) for SESSION_INACTIVITY_MS, kill it and
+     * notify Discord so the user can see why the session went quiet.
+     */
+    function startWatchdog() {
+        if (watchdogInterval)
+            return;
+        watchdogInterval = setInterval(() => {
+            if (!wireRef)
+                return;
+            const now = Date.now();
+            for (const [ns, session] of sessions) {
+                const idleMs = now - session.lastOutputAt;
+                if (idleMs < SESSION_INACTIVITY_MS)
+                    continue;
+                const idleMin = Math.round(idleMs / 60_000);
+                console.warn(`[meta-agent-manager] watchdog: ns=${ns} idle ${idleMin}m, killing stuck session`);
+                // Notify Discord before killing so the user knows what happened
+                const alertMsg = {
+                    id: crypto.randomUUID(),
+                    source: "claude",
+                    role: "assistant",
+                    content: `⚠️ Session for **${ns}** was idle for ${idleMin} minutes (likely stuck on a tool call). Killed and removed — send any message to restart.`,
+                    timestamp: new Date().toISOString(),
+                    chatId: 0,
+                };
+                wireRef.discord.publishOutgoing(ns, alertMsg).catch((err) => {
+                    console.warn(`[meta-agent-manager] watchdog publishOutgoing failed (ns=${ns}):`, err.message);
+                });
+                try {
+                    session.proc.stdin.end();
+                    session.proc.kill("SIGTERM");
+                }
+                catch {
+                    // ignore kill errors
+                }
+                sessions.delete(ns);
+            }
+        }, 60_000);
+    }
     /**
      * Drain all pending messages from the Redis input queue into the session's stdin.
      */
@@ -405,12 +458,19 @@ export function createMetaAgentManager() {
             const wsPath = workspacePath(ns);
             await ensureWorkspace(ns, repoUrl);
             injectMcp(ns, wsPath, token);
+            // Placeholder — filled in after proc is known so the onOutput closure can update it
+            let session;
             const proc = spawnPersistentSession(ns, token, wire, () => {
                 // On exit: remove from map so next message triggers a respawn
                 sessions.delete(ns);
                 console.log(`[meta-agent-manager] session removed from map (ns=${ns})`);
+            }, () => {
+                // Reset inactivity timer on any stdout data
+                if (session)
+                    session.lastOutputAt = Date.now();
             });
-            sessions.set(ns, { proc, ns });
+            session = { proc, ns, lastOutputAt: Date.now() };
+            sessions.set(ns, session);
             // Drain any messages that arrived before this session started
             await drainQueue(ns, wire);
             // Write the triggering message last (after queue drain, in order)
@@ -443,6 +503,8 @@ export function createMetaAgentManager() {
         startPolling(wire, getNamespaces, instanceId) {
             if (pollInterval)
                 return; // already running
+            wireRef = wire;
+            startWatchdog();
             pollInterval = setInterval(() => {
                 const namespaces = getNamespaces();
                 if (namespaces.length === 0)
@@ -499,6 +561,10 @@ export function createMetaAgentManager() {
                 pollInterval = null;
                 console.log("[meta-agent-manager] polling stopped");
             }
+            if (watchdogInterval) {
+                clearInterval(watchdogInterval);
+                watchdogInterval = null;
+            }
             // Kill all active sessions
             for (const [ns, session] of sessions) {
                 try {

package/dist/notifier.js

@@ -279,11 +279,6 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         if (!buf || !buf.text.trim())
             return;
         const text = `← [${ns}] ` + stripAnsi(buf.text.trim());
-        if (text.length < 30) {
-            buf.text = "";
-            buf.timer = null;
-            return;
-        }
         buf.text = "";
         buf.timer = null;
         // During an active loop, route meta-agent output to the thread rather than main channel

package/dist/voice.d.ts

@@ -1,9 +1,10 @@
 /**
  * Voice message transcription via whisper.cpp.
- * Flow: Telegram OGG → ffmpeg convert to 16kHz WAV → whisper-cpp → text
+ * Flow: Discord voice memo (OGG/M4A) → ffmpeg convert to 16kHz WAV → whisper-cpp → text
  */
 /**
- * Transcribe a voice message from a Telegram file URL.
+ * Transcribe a voice message from a Discord CDN URL.
+ * Accepts OGG, M4A, MP3, or any audio format ffmpeg can decode.
  * Returns the transcribed text, or throws if whisper/ffmpeg not available.
  */
 export declare function transcribeVoice(fileUrl: string): Promise<string>;

package/dist/voice.js

@@ -1,40 +1,40 @@
 /**
  * Voice message transcription via whisper.cpp.
- * Flow: Telegram OGG → ffmpeg convert to 16kHz WAV → whisper-cpp → text
+ * Flow: Discord voice memo (OGG/M4A) → ffmpeg convert to 16kHz WAV → whisper-cpp → text
  */
 import { execFile } from "child_process";
 import { promisify } from "util";
-import { existsSync } from "fs";
-import { unlink, readFile } from "fs/promises";
+import { existsSync, createWriteStream } from "fs";
+import { unlink, readFile, access } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
 import https from "https";
 import http from "http";
-import { createWriteStream } from "fs";
 const execFileAsync = promisify(execFile);
-// Whisper model — small.en is fast and accurate enough for commands
-// Falls back to base.en if small not found
+// Env var overrides allow test injection: WHISPER_BIN, FFMPEG_BIN, WHISPER_MODEL
 const WHISPER_MODELS = [
+    process.env.WHISPER_MODEL,
     "/opt/homebrew/share/whisper-cpp/ggml-small.en.bin",
     "/opt/homebrew/share/whisper-cpp/ggml-small.bin",
     "/opt/homebrew/share/whisper-cpp/ggml-base.en.bin",
     "/opt/homebrew/share/whisper-cpp/ggml-base.bin",
-    // user-local
     `${process.env.HOME}/.local/share/whisper-cpp/ggml-small.en.bin`,
     `${process.env.HOME}/.local/share/whisper-cpp/ggml-base.en.bin`,
-];
+].filter(Boolean);
 const WHISPER_BIN_CANDIDATES = [
-    "/opt/homebrew/bin/whisper-cli", // whisper-cpp brew formula installs as whisper-cli
+    process.env.WHISPER_BIN,
+    "/opt/homebrew/bin/whisper-cli",
     "/opt/homebrew/bin/whisper-cpp",
     "/usr/local/bin/whisper-cli",
     "/usr/local/bin/whisper-cpp",
     "/opt/homebrew/bin/whisper",
-];
+].filter(Boolean);
 const FFMPEG_CANDIDATES = [
+    process.env.FFMPEG_BIN,
     "/opt/homebrew/bin/ffmpeg",
     "/usr/local/bin/ffmpeg",
     "/usr/bin/ffmpeg",
-];
+].filter(Boolean);
 function findBin(candidates) {
     for (const p of candidates) {
         if (existsSync(p))
@@ -49,15 +49,34 @@ function findModel() {
     }
     return null;
 }
-function downloadFile(url, dest) {
+/**
+ * Download a file from a URL to dest.
+ * Supports file:// (copies local file), and https/http with redirect following.
+ */
+async function downloadFile(url, dest, redirectsLeft = 5) {
+    if (url.startsWith("file://")) {
+        const { copyFile } = await import("fs/promises");
+        await copyFile(url.slice("file://".length), dest);
+        return;
+    }
     return new Promise((resolve, reject) => {
-        const file = createWriteStream(dest);
+        if (redirectsLeft <= 0) {
+            reject(new Error(`Too many redirects downloading ${url}`));
+            return;
+        }
         const getter = url.startsWith("https") ? https : http;
         getter.get(url, (res) => {
+            if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+                res.resume();
+                downloadFile(res.headers.location, dest, redirectsLeft - 1).then(resolve).catch(reject);
+                return;
+            }
             if (res.statusCode !== 200) {
+                res.resume();
                 reject(new Error(`HTTP ${res.statusCode} downloading ${url}`));
                 return;
             }
+            const file = createWriteStream(dest);
             res.pipe(file);
             file.on("finish", () => file.close(() => resolve()));
             file.on("error", reject);
@@ -65,7 +84,8 @@ function downloadFile(url, dest) {
     });
 }
 /**
- * Transcribe a voice message from a Telegram file URL.
+ * Transcribe a voice message from a Discord CDN URL.
+ * Accepts OGG, M4A, MP3, or any audio format ffmpeg can decode.
  * Returns the transcribed text, or throws if whisper/ffmpeg not available.
  */
 export async function transcribeVoice(fileUrl) {
@@ -78,58 +98,82 @@ export async function transcribeVoice(fileUrl) {
     const model = findModel();
     if (!model)
         throw new Error("No whisper model found — run: whisper-cpp-download-ggml-model small.en");
-    const tmp = join(tmpdir(), `cc-tg-voice-${Date.now()}`);
-    const oggPath = `${tmp}.ogg`;
+    const tmp = join(tmpdir(), `cc-discord-voice-${Date.now()}`);
+    // Preserve original extension so ffmpeg auto-detects format
+    const urlPath = new URL(fileUrl).pathname;
+    const ext = urlPath.includes(".") ? "." + urlPath.split(".").pop().split("?")[0] : ".ogg";
+    const audioPath = `${tmp}${ext}`;
     const wavPath = `${tmp}.wav`;
     try {
-        // 1. Download OGG from Telegram
-        await downloadFile(fileUrl, oggPath);
-        // 2. Convert OGG → 16kHz mono WAV (whisper requirement)
-        await execFileAsync(ffmpegBin, [
-            "-y", "-i", oggPath,
-            "-ar", "16000",
-            "-ac", "1",
-            "-c:a", "pcm_s16le",
-            wavPath,
-        ]);
+        // 1. Download audio from Discord CDN (follows redirects)
+        await downloadFile(fileUrl, audioPath);
+        // 2. Convert to 16kHz mono WAV (whisper requirement)
+        try {
+            await execFileAsync(ffmpegBin, [
+                "-y", "-i", audioPath,
+                "-ar", "16000",
+                "-ac", "1",
+                "-c:a", "pcm_s16le",
+                wavPath,
+            ]);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            throw new Error(`ffmpeg conversion failed: ${msg}`);
+        }
         // 3. Run whisper-cpp
-        // --output-txt writes to ${wavPath}.txt (NOT stdout)
-        // -l auto fails with .en models — detect and use -l en instead
+        // -l auto fails with .en models — use -l en for those
         const isEnModel = model.includes(".en.");
         const langArgs = isEnModel ? ["-l", "en"] : ["-l", "auto"];
+        let whisperStderr = "";
         try {
-            await execFileAsync(whisperBin, [
+            const result = await execFileAsync(whisperBin, [
                 "-m", model,
                 "-f", wavPath,
                 "--no-timestamps",
                 ...langArgs,
-                "--output-txt", // writes to wavPath + ".txt"
+                "--output-txt",
             ]);
+            whisperStderr = result.stderr ?? "";
         }
         catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            throw new Error(`whisper-cpp failed: ${msg}`);
+            const e = err;
+            whisperStderr = e.stderr ?? "";
+            const msg = e.message ?? String(err);
+            throw new Error(`whisper-cpp failed: ${msg}\nstderr: ${whisperStderr}`);
         }
-        // Read the output file whisper-cpp wrote
-        const txtPath = `${wavPath}.txt`;
+        // 4. Find output file — whisper-cpp versions differ on suffix:
+        //    some write {wavPath}.txt, others write {baseName}.txt (strip .wav)
+        const txtPathFull = `${wavPath}.txt`; // /tmp/foo.wav.txt
+        const txtPathStripped = wavPath.replace(/\.wav$/, ".txt"); // /tmp/foo.txt
         let raw = "";
-        try {
-            raw = await readFile(txtPath, "utf-8");
+        for (const candidate of [txtPathFull, txtPathStripped]) {
+            try {
+                await access(candidate);
+                raw = await readFile(candidate, "utf-8");
+                await unlink(candidate).catch(() => { });
+                break;
+            }
+            catch {
+                // try next
+            }
+        }
+        if (!raw && !whisperStderr) {
+            throw new Error("whisper-cpp ran but produced no output file (tried .wav.txt and .txt)");
         }
-        catch {
-            throw new Error("whisper-cpp ran but produced no output file");
+        // Use stdout text if file wasn't found but whisper printed to stderr (some versions do)
+        if (!raw) {
+            raw = whisperStderr;
         }
         const text = raw
             .replace(/\[BLANK_AUDIO\]/gi, "")
-            .replace(/\[.*?\]/g, "") // remove timestamp artifacts
+            .replace(/\[.*?\]/g, "")
             .trim();
         return text || "[empty transcription]";
     }
     finally {
-        // Cleanup temp files
-        await unlink(oggPath).catch(() => { });
+        await unlink(audioPath).catch(() => { });
         await unlink(wavPath).catch(() => { });
-        await unlink(`${wavPath}.txt`).catch(() => { });
     }
 }
 /**

package/package.json

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