@gonzih/cc-discord 0.2.49 → 0.2.51

package/dist/bot.js

@@ -413,7 +413,7 @@ export class CcDiscordBot {
             await this.editLiveMessageWithPacing(key, entry.msg, entry.text, 1);
         }
         catch (err) {
-            if (this.liveMessages.get(key)?.msg.id === entry.msg.id) {
+            if (!this.liveEditQueue.has(key) && this.liveMessages.get(key)?.msg.id === entry.msg.id) {
                 this.liveEditQueue.set(key, entry);
             }
         }

package/dist/claude.d.ts

@@ -15,7 +15,7 @@ export interface ClaudeMessage {
 export interface ClaudeOptions {
     cwd?: string;
     systemPrompt?: string;
-    /** OAuth token (sk-ant-oat01-...) or API key (sk-ant-api03-...) */
+    /** OAuth token (FILL_IN_TUESDAY) or API key (FILL_IN_TUESDAY) */
     token?: string;
 }
 export interface UsageEvent {

package/dist/notifier.js

@@ -272,6 +272,7 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
     });
     const TOOL_SLOT = "tools";
     const RESPONSE_SLOT = "response";
+    const showToolUsage = () => /^(1|true|yes)$/i.test(process.env.CC_DISCORD_SHOW_TOOL_USAGE ?? "");
     const liveStates = new Map();
     function getLiveState(ns, targetChannelId) {
         let state = liveStates.get(ns);
@@ -333,7 +334,7 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         bot.stopMetaAgentTyping(deliverTo);
         const trimmed = state.text.trim();
         const toolText = state.toolLog.length > 0 ? toolLogText(ns, state, false) : "";
-        if (state.toolStarted || state.toolLog.length > 0) {
+        if (showToolUsage() && (state.toolStarted || state.toolLog.length > 0)) {
             await bot.finalizeLiveMessage(deliverTo, toolText, TOOL_SLOT);
         }
         if (!trimmed && !state.responseStarted)
@@ -379,20 +380,24 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         if (event === "tool_start") {
             const toolName = parsed.content || "tool";
             state.activeTool = toolName;
-            state.toolLog.unshift(`⚙️ \`${toolName}\`...`);
             if (state.finalTimer) {
                 clearTimeout(state.finalTimer);
                 state.finalTimer = null;
             }
-            void ensureToolLogMessage(ns, deliverTo, state);
+            if (showToolUsage()) {
+                state.toolLog.unshift(`⚙️ \`${toolName}\`...`);
+                void ensureToolLogMessage(ns, deliverTo, state);
+            }
             return;
         }
         // tool_end: clear overlay, resume finalize timer if text is pending
         if (event === "tool_end") {
             const toolName = state.activeTool || "tool";
-            replaceNewestActiveTool(state, `✓ \`${toolName}\``);
             state.activeTool = "";
-            if (state.toolStarted) {
+            if (showToolUsage()) {
+                replaceNewestActiveTool(state, `✓ \`${toolName}\``);
+            }
+            if (showToolUsage() && state.toolStarted) {
                 bot.updateLiveMessage(deliverTo, toolLogText(ns, state, true), TOOL_SLOT);
             }
             if (state.text.trim())
@@ -417,7 +422,10 @@ export function startNotifier(bot, notifyChannelId, namespace, redis, handleUser
         if (!state.responseStarted) {
             if (!state.responseStarting) {
                 state.responseStarting = true;
-                ensureToolLogMessage(ns, deliverTo, state).then(() => {
+                const beforeResponse = showToolUsage()
+                    ? ensureToolLogMessage(ns, deliverTo, state)
+                    : Promise.resolve();
+                beforeResponse.then(() => {
                     return bot.startOrGetLiveMessage(deliverTo, textDisplay, RESPONSE_SLOT);
                 }).then((msg) => {
                     state.responseStarting = false;

package/dist/voice.js

@@ -4,22 +4,36 @@
  */
 import { execFile } from "child_process";
 import { promisify } from "util";
-import { existsSync, createWriteStream } from "fs";
-import { unlink, readFile, access } from "fs/promises";
+import { existsSync, createWriteStream, readdirSync } from "fs";
+import { unlink, readFile, access, mkdir } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
 import https from "https";
 import http from "http";
 const execFileAsync = promisify(execFile);
-// Env var overrides allow test injection: WHISPER_BIN, FFMPEG_BIN, WHISPER_MODEL
+// Env var overrides allow test injection: WHISPER_BIN, FFMPEG_BIN, WHISPER_MODEL.
+// WHISPER_MODEL may point to either a model file or a directory containing ggml*.bin.
+const WHISPER_MODEL_NAMES = [
+    "ggml-small.en.bin",
+    "ggml-small.bin",
+    "ggml-base.en.bin",
+    "ggml-base.bin",
+    "ggml-tiny.en.bin",
+    "ggml-tiny.bin",
+];
 const WHISPER_MODELS = [
     process.env.WHISPER_MODEL,
+    process.env.WHISPER_MODEL_DIR,
     "/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",
+    "/opt/homebrew/share/whisper-cpp",
+    "/usr/local/share/whisper-cpp",
     `${process.env.HOME}/.local/share/whisper-cpp/ggml-small.en.bin`,
     `${process.env.HOME}/.local/share/whisper-cpp/ggml-base.en.bin`,
+    `${process.env.HOME}/.local/share/whisper-cpp`,
+    `${process.env.HOME}/Library/Application Support/whisper-cpp`,
 ].filter(Boolean);
 const WHISPER_BIN_CANDIDATES = [
     process.env.WHISPER_BIN,
@@ -35,6 +49,13 @@ const FFMPEG_CANDIDATES = [
     "/usr/local/bin/ffmpeg",
     "/usr/bin/ffmpeg",
 ].filter(Boolean);
+const WHISPER_DOWNLOAD_CANDIDATES = [
+    process.env.WHISPER_DOWNLOAD_BIN,
+    "/opt/homebrew/bin/whisper-cpp-download-ggml-model",
+    "/usr/local/bin/whisper-cpp-download-ggml-model",
+].filter(Boolean);
+const DEFAULT_WHISPER_MODEL_URL = process.env.WHISPER_MODEL_URL ||
+    "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-small.en.bin";
 function findBin(candidates) {
     for (const p of candidates) {
         if (existsSync(p))
@@ -44,11 +65,46 @@ function findBin(candidates) {
 }
 function findModel() {
     for (const p of WHISPER_MODELS) {
-        if (existsSync(p))
+        if (!existsSync(p))
+            continue;
+        try {
+            const entries = readdirSync(p, { withFileTypes: true });
+            const model = WHISPER_MODEL_NAMES.find((name) => entries.some((entry) => entry.isFile() && entry.name === name));
+            if (model)
+                return join(p, model);
+            const anyModel = entries.find((entry) => entry.isFile() &&
+                /ggml.*\.bin$/i.test(entry.name) &&
+                !entry.name.startsWith("for-tests-"));
+            if (anyModel)
+                return join(p, anyModel.name);
+        }
+        catch {
             return p;
+        }
     }
     return null;
 }
+async function ensureModel() {
+    const existing = findModel();
+    if (existing)
+        return existing;
+    if (process.env.NODE_ENV === "test" && process.env.WHISPER_ALLOW_DOWNLOAD !== "1")
+        return null;
+    const downloader = findBin(WHISPER_DOWNLOAD_CANDIDATES);
+    const modelDir = process.env.WHISPER_MODEL_DIR || `${process.env.HOME}/.local/share/whisper-cpp`;
+    await mkdir(modelDir, { recursive: true });
+    if (downloader) {
+        await execFileAsync(downloader, ["small.en"], {
+            cwd: modelDir,
+            timeout: 10 * 60_000,
+            maxBuffer: 1024 * 1024,
+        });
+    }
+    else {
+        await downloadFile(DEFAULT_WHISPER_MODEL_URL, join(modelDir, "ggml-small.en.bin"));
+    }
+    return findModel();
+}
 /**
  * Download a file from a URL to dest.
  * Supports file:// (copies local file), and https/http with redirect following.
@@ -95,7 +151,7 @@ export async function transcribeVoice(fileUrl) {
     const ffmpegBin = findBin(FFMPEG_CANDIDATES);
     if (!ffmpegBin)
         throw new Error("ffmpeg not found — install with: brew install ffmpeg");
-    const model = findModel();
+    const model = await ensureModel();
     if (!model)
         throw new Error("No whisper model found — run: whisper-cpp-download-ggml-model small.en");
     const tmp = join(tmpdir(), `cc-discord-voice-${Date.now()}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gonzih/cc-discord",
-  "version": "0.2.49",
+  "version": "0.2.51",
   "description": "Discord bot for routed Claude Code or Codex agents with ATC dispatch",
   "type": "module",
   "bin": {