dankgrinder 7.1.0 → 7.6.0

package/lib/commands/farm.js

@@ -474,8 +474,8 @@ function getVisionRepairPlan(actionName, score) {
   }
   if (actionName === 'hoe') {
     const planted = score.ratios?.planted || 0;
-    const wet = score.ratios?.wet || 0;
-    if ((planted + wet) >= 0.45) {
+    const tilled = score.ratios?.tilled || 0;
+    if (planted >= 0.30 || tilled >= 0.30) {
       // Farm likely already progressed beyond hoe stage.
       return null;
     }
@@ -488,10 +488,9 @@ function getVisionRepairPlan(actionName, score) {
 function inferNextActionFromScore(actionName, score) {
   if (!score) return null;
   const planted = score.ratios?.planted || 0;
-  const wet = score.ratios?.wet || 0;
   const tilled = score.ratios?.tilled || 0;
 
-  if (actionName === 'hoe' && (planted + wet) >= 0.45) {
+  if (actionName === 'hoe' && (planted + tilled) >= 0.45) {
     return 'water';
   }
   if (actionName === 'water' && planted >= 0.45) {
@@ -515,16 +514,14 @@ async function inferPreferredActionFromImage(msg) {
     const slots = Math.max(1, (analysis?.rows || 3) * (analysis?.cols || 3));
     const ratios = {
       tilled: (analysis?.counts?.tilled || 0) / slots,
-      wet: (analysis?.counts?.wet || 0) / slots,
       planted: (analysis?.counts?.planted || 0) / slots,
       unknown: (analysis?.counts?.unknown || 0) / slots,
     };
 
     let suggested = null;
-    // Image-first phase routing.
-    if (ratios.planted >= 0.45) suggested = 'plant';
-    else if (ratios.wet >= 0.35) suggested = 'plant';
-    else if (ratios.tilled >= 0.35) suggested = 'water';
+    // Image-first phase routing (3-state: tilled/planted/unknown, no separate wet state).
+    if (ratios.planted >= 0.30) suggested = 'plant';
+    else if (ratios.tilled >= 0.30) suggested = 'water';
     else suggested = 'hoe';
 
     let dbg = null;
@@ -541,7 +538,6 @@ async function inferPreferredActionFromImage(msg) {
 
     LOG.info(`[farm:phase-image] url=${url} grid=${gridToString(analysis)} counts=${JSON.stringify(analysis.counts)} conf=${analysis.avgConfidence} suggested=${suggested} ratios=${JSON.stringify({
       tilled: +ratios.tilled.toFixed(3),
-      wet: +ratios.wet.toFixed(3),
       planted: +ratios.planted.toFixed(3),
       unknown: +ratios.unknown.toFixed(3),
     })}`);
@@ -1117,31 +1113,30 @@ async function findNextFarmActionFromManage(msg, text, currentAction, imageAnaly
     const slots = Math.max(1, (imageAnalysis.rows || 3) * (imageAnalysis.cols || 3));
     const ratios = {
       tilled: (imageAnalysis.counts?.tilled || 0) / slots,
-      wet: (imageAnalysis.counts?.wet || 0) / slots,
       planted: (imageAnalysis.counts?.planted || 0) / slots,
       unknown: (imageAnalysis.counts?.unknown || 0) / slots,
     };
 
-    // Phase-aware selection: pick the earliest incomplete phase.
-    // Harvest when planted >= 45%.
-    if (ratios.planted >= 0.45) {
+    // Phase-aware selection: pick the earliest incomplete phase (3-state model).
+    // Harvest when planted >= 30%.
+    if (ratios.planted >= 0.30) {
       const btn = managedActions.harvest || btns.find(b => hasAny(b, ['harvest', 'reap', 'collect']));
       if (btn) return { action: 'harvest', button: btn, reason: `harvest-ready-vision(planted=${ratios.planted.toFixed(2)})` };
     }
-    // Plant when wet >= 45% or tilled >= 45%.
-    if (ratios.wet >= 0.45 || ratios.tilled >= 0.45) {
+    // Plant when tilled >= 30%.
+    if (ratios.tilled >= 0.30) {
       const btn = managedActions.plant || btns.find(b => hasAny(b, ['plant', 'seed', 'sow']));
-      if (btn) return { action: 'plant', button: btn, reason: `plant-vision(wet=${ratios.wet.toFixed(2)},tilled=${ratios.tilled.toFixed(2)})` };
+      if (btn) return { action: 'plant', button: btn, reason: `plant-vision(tilled=${ratios.tilled.toFixed(2)})` };
     }
-    // Water when we have tilled tiles but not enough wet.
-    if (ratios.tilled >= 0.35 && ratios.wet < 0.35) {
+    // Water when we have tilled tiles.
+    if (ratios.tilled >= 0.15) {
       const btn = managedActions.water || btns.find(b => hasAny(b, ['water', 'watering']));
-      if (btn) return { action: 'water', button: btn, reason: `water-vision(tilled=${ratios.tilled.toFixed(2)},wet=${ratios.wet.toFixed(2)})` };
+      if (btn) return { action: 'water', button: btn, reason: `water-vision(tilled=${ratios.tilled.toFixed(2)})` };
     }
     // Hoe when farm is mostly unknown/empty.
-    if (ratios.tilled < 0.35 && ratios.wet < 0.35 && ratios.planted < 0.35) {
+    if (ratios.tilled < 0.15 && ratios.planted < 0.30) {
       const btn = managedActions.hoe || btns.find(b => hasAny(b, ['hoe', 'till']));
-      if (btn) return { action: 'hoe', button: btn, reason: `hoe-vision(t=${ratios.tilled.toFixed(2)},w=${ratios.wet.toFixed(2)},p=${ratios.planted.toFixed(2)})` };
+      if (btn) return { action: 'hoe', button: btn, reason: `hoe-vision(t=${ratios.tilled.toFixed(2)},p=${ratios.planted.toFixed(2)})` };
     }
   }
 

package/lib/commands/farmVision.js

@@ -82,12 +82,16 @@ function extractFarmImageUrl(msg) {
 function colorStatsForPixel(r, g, b) {
   const sum = r + g + b;
   const brightness = sum / 3;
-  const greenStrong = g > r * 1.12 && g > b * 1.1;
-  const blueStrong = b > r * 1.08 && b > g * 1.02;
-  const brownish = r > g * 1.03 && g > b * 1.03 && r > 45 && g > 28 && b < 95;
-  const dark = brightness < 56;
+  // Crop green — harvest phase: large bright leaves, G significantly > R and B
+  const greenStrong = g > r * 1.25 && g > b * 1.25 && g > 38;
+  // Weeds/grass — small scattered green, less intense than crop green
+  const weedGreen = g > r * 1.12 && g > b * 1.1 && g <= 38;
+  // Wet soil — rich dark brown, no blue, higher R than typical dry soil
+  const wetSoil = r > 50 && r > g * 1.5 && b < 20 && brightness < 45;
+  // Dry tilled soil — medium brown, debris textures
+  const drySoil = r > 35 && r > g * 1.2 && b < 30;
   const whiteish = brightness > 210 && Math.abs(r - g) < 20 && Math.abs(g - b) < 20;
-  return { brightness, greenStrong, blueStrong, brownish, dark, whiteish };
+  return { brightness, greenStrong, weedGreen, wetSoil, drySoil, whiteish };
 }
 
 function clamp01(n) {
@@ -97,52 +101,34 @@ function clamp01(n) {
 function classifyCell(features) {
   const { greenPct, bluePct, brownPct, darkPct, avgBrightness } = features;
 
-  // Score bands tuned for Dank farm palette.
-  const scorePlanted =
-    (greenPct * 1.9) +
-    (clamp01((120 - avgBrightness) / 120) * 0.2) -
-    (bluePct * 0.4);
-
-  const scoreWet =
-    (bluePct * 1.7) +
-    (darkPct * 0.7) +
-    (clamp01((105 - avgBrightness) / 105) * 0.15) -
-    (greenPct * 0.35);
-
-  const scoreTilled =
-    (brownPct * 1.9) +
-    (clamp01((125 - avgBrightness) / 125) * 0.1) -
-    (greenPct * 0.25) -
-    (bluePct * 0.2);
-
-  const scored = [
-    ['planted', scorePlanted],
-    ['wet', scoreWet],
-    ['tilled', scoreTilled],
-  ].sort((a, b) => b[1] - a[1]);
-
-  const [bestState, bestScore] = scored[0];
-  const secondScore = scored[1][1];
-  const margin = bestScore - secondScore;
-
-  // Confidence from score margin + minimum signal level.
-  const signal = Math.max(greenPct, bluePct, brownPct);
-  const confidence = clamp01((margin * 2.1) + (signal * 0.6));
+  // ── HARVEST: Bright green mature crops (G >> R,B, G>38) ──
+  // Detected by greenStrong pixel percentage — crop leaves are vivid green
+  if (greenPct >= 0.30) {
+    const confidence = clamp01(0.5 + (greenPct - 0.30) * 2.0);
+    return { state: 'planted', confidence: +confidence.toFixed(3), scores: { planted: +greenPct.toFixed(3), wet: +darkPct.toFixed(3), tilled: +brownPct.toFixed(3) } };
+  }
 
-  // Low-signal cells become unknown.
-  if (signal < 0.085 || confidence < 0.20) {
-    return { state: 'unknown', confidence: +confidence.toFixed(3), scores: { planted: +scorePlanted.toFixed(3), wet: +scoreWet.toFixed(3), tilled: +scoreTilled.toFixed(3) } };
+  // ── TILLED / WET: Brown soil — no meaningful green or blue ──
+  if (brownPct >= 0.15) {
+    // High brown percentage = definitely soil. Both hoe (dry) and water (wet)
+    // phases look like brown soil. We classify as 'tilled' — the farming
+    // logic handles water vs hoe state transition by phase context.
+    const confidence = clamp01((brownPct - 0.15) * 2.5 + (1 - darkPct) * 0.3);
+    return { state: 'tilled', confidence: +confidence.toFixed(3), scores: { planted: +greenPct.toFixed(3), wet: +darkPct.toFixed(3), tilled: +brownPct.toFixed(3) } };
   }
 
-  return {
-    state: bestState,
-    confidence: +confidence.toFixed(3),
-    scores: {
-      planted: +scorePlanted.toFixed(3),
-      wet: +scoreWet.toFixed(3),
-      tilled: +scoreTilled.toFixed(3),
-    },
-  };
+  // ── PLANTED (early stage): Soil with green weeds ──
+  // Cells with 5-30% green are likely soil with weeds/crops starting.
+  // This is distinct from harvest (30%+) which is handled above.
+  if (greenPct >= 0.05 && greenPct < 0.30) {
+    const confidence = clamp01((greenPct - 0.05) * 3.0);
+    return { state: 'planted', confidence: +confidence.toFixed(3), scores: { planted: +greenPct.toFixed(3), wet: +darkPct.toFixed(3), tilled: +brownPct.toFixed(3) } };
+  }
+
+  // ── UNKNOWN: Low signal — grass borders, artifacts, etc. ──
+  const signal = Math.max(greenPct, bluePct, brownPct);
+  const confidence = signal * 1.5;
+  return { state: 'unknown', confidence: +confidence.toFixed(3), scores: { planted: +greenPct.toFixed(3), wet: +darkPct.toFixed(3), tilled: +brownPct.toFixed(3) } };
 }
 
 async function analyzeFarmGrid(imgBuffer, cols = 3, rows = 3) {
@@ -160,18 +146,17 @@ async function analyzeFarmGrid(imgBuffer, cols = 3, rows = 3) {
       const ey = Math.min(sy + cellH, height);
 
   // Sample center region only (ignore grass borders around each tile).
-  const padX = Math.floor((ex - sx) * 0.18);
-  const padY = Math.floor((ey - sy) * 0.18);
+  const padX = Math.floor((ex - sx) * 0.20);  // 20% padding to cut more grass
+  const padY = Math.floor((ey - sy) * 0.20);
   const csx = sx + padX;
   const csy = sy + padY;
   const cex = ex - padX;
   const cey = ey - padY;
 
       let total = 0;
-      let greenPx = 0;
-      let bluePx = 0;
-      let brownPx = 0;
-      let darkPx = 0;
+      let greenPx = 0;  // crop green: G > R*1.25 && G > B*1.25 && G > 38
+      let brownPx = 0;   // soil brown: R > G*1.2 && B < 30
+      let darkPx = 0;    // very dark: brightness < 56
       let whitePx = 0;
       let brightSum = 0;
 
@@ -184,22 +169,20 @@ async function analyzeFarmGrid(imgBuffer, cols = 3, rows = 3) {
           const s = colorStatsForPixel(r, g, b);
           total++;
           brightSum += s.brightness;
-          if (s.greenStrong) greenPx++;
-          if (s.blueStrong) bluePx++;
-          if (s.brownish) brownPx++;
+          if (s.greenStrong) greenPx++;        // harvest green (vivid crop leaves)
+          if (s.drySoil || s.wetSoil) brownPx++; // soil — dry or wet
           if (s.dark) darkPx++;
           if (s.whiteish) whitePx++;
         }
       }
 
       const greenPct = greenPx / total;
-      const bluePct = bluePx / total;
       const brownPct = brownPx / total;
       const darkPct = darkPx / total;
       const whitePct = whitePx / total;
       const avgBrightness = brightSum / total;
 
-      const classified = classifyCell({ greenPct, bluePct, brownPct, darkPct, avgBrightness, whitePct });
+      const classified = classifyCell({ greenPct, brownPct, darkPct, avgBrightness });
 
       cells.push({
         row,
@@ -208,16 +191,14 @@ async function analyzeFarmGrid(imgBuffer, cols = 3, rows = 3) {
         confidence: classified.confidence,
         scores: classified.scores,
         greenPct: +greenPct.toFixed(3),
-        bluePct: +bluePct.toFixed(3),
         brownPct: +brownPct.toFixed(3),
         darkPct: +darkPct.toFixed(3),
-        whitePct: +whitePct.toFixed(3),
         avgBrightness: +avgBrightness.toFixed(1),
       });
     }
   }
 
-  const counts = { tilled: 0, wet: 0, planted: 0, unknown: 0 };
+  const counts = { tilled: 0, planted: 0, unknown: 0 };
   for (const c of cells) counts[c.state] = (counts[c.state] || 0) + 1;
 
   const avgConfidence = cells.length > 0
@@ -228,7 +209,7 @@ async function analyzeFarmGrid(imgBuffer, cols = 3, rows = 3) {
 }
 
 function gridToString(analysis) {
-  const icon = { tilled: 'T', wet: 'W', planted: 'P', unknown: '?' };
+  const icon = { tilled: 'T', planted: 'P', unknown: '?' };
   const rows = [];
   for (let r = 0; r < (analysis?.rows || 0); r++) {
     const line = [];
@@ -251,25 +232,23 @@ function evaluateActionNeed(actionName, analysis) {
   const slots = 9;
 
   // Avoid aggressive repeats when confidence is too low.
-  if (conf < 0.22) return false;
+  if (conf < 0.20) return false;
 
-  // Conservative rules: only request repeat if we have clear evidence.
+  // Simple rules:
+  // - hoe: repeat until farm has enough tilled/planted soil
+  // - water: skip (we don't distinguish wet vs tilled visually — use phase context instead)
+  // - plant: repeat until most cells show green crops
+  // - harvest: repeat if any planted crops visible
   if (actionName === 'hoe') {
-    return (tilled + wet + planted) < slots && unknown < 6;
-  }
-  if (actionName === 'water') {
-    // If still many plain-tilled (not watered/planted), water likely incomplete.
-    return tilled > 0 && (wet + planted) < slots;
+    return (tilled + planted) < slots && unknown < 6;
   }
   if (actionName === 'plant') {
-    return planted < slots && (tilled + wet) > 0;
+    return planted < slots && (tilled) > 0;
   }
   if (actionName === 'harvest') {
-    // If many planted remain, harvest may still be pending.
     return planted > 0;
   }
-
-  // Fertilizer optional; do not force repeats.
+  // water and others: don't force repeats
   return false;
 }
 
@@ -277,59 +256,45 @@ function evaluateActionScores(actionName, analysis) {
   const c = analysis?.counts || {};
   const slots = Math.max(1, (analysis?.rows || 3) * (analysis?.cols || 3));
   const tilled = c.tilled || 0;
-  const wet = c.wet || 0;
   const planted = c.planted || 0;
   const unknown = c.unknown || 0;
   const conf = analysis?.avgConfidence || 0;
 
   const ratios = {
     tilled: tilled / slots,
-    wet: wet / slots,
     planted: planted / slots,
     unknown: unknown / slots,
   };
 
   const clamp = (n) => Math.max(0, Math.min(1, n));
-  const withConf = (base, mult = 0.25) => clamp(base * (0.82 + (conf * mult)));
+  const withConf = (base) => clamp(base * (0.85 + conf * 0.3));
 
   let score = 0;
-  let threshold = 0.8;
+  let threshold = 0.7;
   let reason = 'ok';
 
   if (actionName === 'hoe') {
-    // Hoe is considered good if farm has mostly actionable soil/crops and little unknown noise.
-    const base = (ratios.tilled * 0.9) + (ratios.wet * 0.52) + (ratios.planted * 0.4) - (ratios.unknown * 0.32);
-    score = withConf(base);
-    threshold = 0.68;
-    if (ratios.unknown > 0.45) reason = 'too_many_unknown_cells';
-    else if (ratios.tilled < 0.45 && (ratios.wet + ratios.planted) < 0.35) reason = 'not_enough_tilled_or_progressed_tiles';
-  } else if (actionName === 'water') {
-    // After watering, we want wet/planted dominance and minimal plain-tilled.
-    const base = (ratios.wet * 0.92) + (ratios.planted * 0.34) - (ratios.tilled * 0.48) - (ratios.unknown * 0.22);
+    // Hoe is good if farm has mostly soil (tilled or planted)
+    const base = (ratios.tilled * 0.9) + (ratios.planted * 0.5) - (ratios.unknown * 0.4);
     score = withConf(base);
-    threshold = 0.7;
-    if (ratios.planted >= 0.45) {
-      // If many planted tiles are already visible, watering phase is effectively done.
-      score = Math.max(score, withConf(0.86));
-      reason = 'progressed_to_plant_phase';
-    }
-    if (ratios.wet < 0.45 && ratios.planted < 0.2) reason = 'not_enough_wet_tiles';
-    else if (ratios.tilled > 0.4) reason = 'too_many_dry_tilled_tiles';
+    threshold = 0.55;
+    if (ratios.unknown > 0.5) reason = 'too_many_unknown_cells';
+    else if (ratios.tilled + ratios.planted < 0.4) reason = 'farm_not_ready';
   } else if (actionName === 'plant') {
-    // Plant stage should end with mostly planted tiles.
-    const base = (ratios.planted * 0.96) + (ratios.wet * 0.12) - (ratios.tilled * 0.48) - (ratios.unknown * 0.2);
+    // Plant should end with mostly planted cells
+    const base = (ratios.planted * 0.98) - (ratios.tilled * 0.3) - (ratios.unknown * 0.2);
     score = withConf(base);
-    threshold = 0.72;
-    if (ratios.planted < 0.6) reason = 'not_enough_planted_tiles';
+    threshold = 0.65;
+    if (ratios.planted < 0.5) reason = 'not_enough_planted_tiles';
   } else if (actionName === 'harvest') {
-    // Harvest should reduce planted tiles; tilled/wet should dominate after collection.
-    const base = ((ratios.tilled + ratios.wet) * 0.86) - (ratios.planted * 0.76) - (ratios.unknown * 0.18);
+    // Harvest is good if planted tiles dominate
+    const base = (ratios.planted * 0.9) - (ratios.tilled * 0.1) - (ratios.unknown * 0.2);
     score = withConf(base);
-    threshold = 0.68;
-    if (ratios.planted > 0.34) reason = 'too_many_unharvested_plants';
+    threshold = 0.5;
+    if (ratios.planted < 0.3) reason = 'no_plants_to_harvest';
   } else {
-    score = withConf(0.7 - (ratios.unknown * 0.2));
-    threshold = 0.7;
+    score = withConf(0.6 - ratios.unknown * 0.3);
+    threshold = 0.6;
   }
 
   const matched = conf >= 0.2 && score >= threshold;
@@ -341,10 +306,9 @@ function evaluateActionScores(actionName, analysis) {
     threshold: +threshold.toFixed(3),
     confidence: +conf.toFixed(3),
     reason,
-    counts: { tilled, wet, planted, unknown, slots },
+    counts: { tilled, planted, unknown, slots },
     ratios: {
       tilled: +ratios.tilled.toFixed(3),
-      wet: +ratios.wet.toFixed(3),
       planted: +ratios.planted.toFixed(3),
       unknown: +ratios.unknown.toFixed(3),
     },

package/lib/commands/utils.js

@@ -558,7 +558,7 @@ async function clickCV2Button(msg, customId) {
   const gId = msg.guildId || msg.guild?.id;
   if (!token) throw new Error('No token for CV2 click');
   const sessionId = msg.client?.ws?.shards?.first?.()?.sessionId;
-  const nonce = `${BigInt(Date.now() - 1420070400000) << 22n}`;
+  const nonce = `${(BigInt(Date.now() - 1420070400000) << 22n)}`;
   const payloadObj = {
     type: 3,
     application_id: String(msg.applicationId || DANK_MEMER_ID),

package/lib/rawLogger.js

@@ -31,16 +31,41 @@ let memIdx = 0;
 
 // ── Redis init ──
 async function init(redisUrl) {
-  if (!redisUrl) return;
+  if (!redisUrl) {
+    console.log('[rawLogger] No Redis URL — raw logging disabled');
+    return;
+  }
   try {
     const Redis = require('ioredis');
     redis = new Redis(redisUrl, {
       maxRetriesPerRequest: 2,
       retryStrategy: (times) => times > 3 ? null : Math.min(times * 500, 3000),
-      lazyConnect: true,
+      lazyConnect: false,
+    });
+    // Wait for actual connection before marking ready
+    await new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        reject(new Error('Redis connection timeout (5s)'));
+      }, 5000);
+      redis.once('ready', () => { clearTimeout(timeout); resolve(); });
+      redis.once('error', (e) => { clearTimeout(timeout); reject(e); });
+      redis.connect().catch(reject);
     });
-    await redis.connect();
     redisReady = true;
+    console.log('[rawLogger] Redis connected');
+    redis.on('error', (e) => {
+      console.error(`[rawLogger] Redis error: ${e.message}`);
+      redisReady = false;
+    });
+    redis.on('close', () => {
+      redisReady = false;
+    });
+    redis.on('reconnecting', () => {
+      redisReady = false;
+    });
+    redis.on('ready', () => {
+      redisReady = true;
+    });
   } catch (e) {
     console.error(`[rawLogger] Redis connect failed: ${e.message}`);
     redis = null;
@@ -105,8 +130,19 @@ function extractEmbedText(embeds) {
 
 // ── Detect command from components/embeds ──
 function detectCommand(d) {
+  // Build a combined text source that works even when d.components is a JSON string
+  // (stored in Redis and retrieved as a string breaks for-of iteration over objects).
+  // Prefer pre-extracted allText (stored in parseRawPacket) over re-extracting.
+  const cv2Texts = extractTexts(d.components);
+  const cv2Text = cv2Texts.join(' ').toLowerCase();
+  const contentText = (d.content || '').toLowerCase();
+  const embedText = extractEmbedText(d.embeds).toLowerCase();
+  // allText combines all text fields — used as a fallback when components can't be parsed
+  const allText = [contentText, cv2Text, embedText].join(' ').trim();
+
   // Check button custom_ids
   const walk = (items) => {
+    if (typeof items === 'string') return null;
     for (const c of (items || [])) {
       const cid = c.custom_id || '';
       // Gambling
@@ -140,101 +176,171 @@ function detectCommand(d) {
   const fromBtn = walk(d.components);
   if (fromBtn) return fromBtn;
 
-  // Check CV2 text content
-  const cv2Text = extractTexts(d.components).join(' ').toLowerCase();
-  if (cv2Text.includes('coin toss')) return 'cointoss';
-  if (cv2Text.includes('blackjack')) return 'blackjack';
-  if (cv2Text.includes('roulette')) return 'roulette';
-  if (cv2Text.includes('slots')) return 'slots';
-  if (cv2Text.includes('snakeeyes') || cv2Text.includes('snake eyes')) return 'snakeeyes';
-  if (cv2Text.includes('cooldown') || cv2Text.includes('again <t:')) return 'cooldown';
-  // Non-gambling CV2
-  if (cv2Text.includes('fishing') || cv2Text.includes('fisherfolk')) return 'fish';
-  if (cv2Text.includes('deposit') || cv2Text.includes('bank account')) return 'deposit';
-  if (cv2Text.includes('begging') || cv2Text.includes('imagine begging')) return 'beg';
-  if (cv2Text.includes('hunting') || cv2Text.includes('went hunting') || cv2Text.includes('hunting rifle') || cv2Text.includes('your aim was so bad') || cv2Text.includes('animals laughed') || cv2Text.includes('animals attacked') || cv2Text.includes('barely escaped') || cv2Text.includes('fell asleep in a tree') || cv2Text.includes('caught nothing') || cv2Text.includes('brought back literally nothing') || cv2Text.includes('rifle broke')) return 'hunt';
-  if (cv2Text.includes('digging') || cv2Text.includes('found nothing while') || cv2Text.includes('you dig') || cv2Text.includes('dug in the dirt') || cv2Text.includes('brought back') && (cv2Text.includes('ant') || cv2Text.includes('worm') || cv2Text.includes('stickbug') || cv2Text.includes('ladybug'))) return 'dig';
-  if (cv2Text.includes('great work') || cv2Text.includes('for your shift') || cv2Text.includes('working as') || cv2Text.includes('work shift') || cv2Text.includes('what color was') || cv2Text.includes('remember words order') || cv2Text.includes('remember the colors') || cv2Text.includes('remember the emojis') || cv2Text.includes('what word was repeated') || cv2Text.includes('unscramble') || cv2Text.includes('remember the number') || cv2Text.includes('click the buttons in correct order') || cv2Text.includes('babysitter') || cv2Text.includes('click the matching')) return 'work';
-  if (cv2Text.includes('weekly')) return 'weekly';
-  if (cv2Text.includes('daily')) return 'daily';
-  if (cv2Text.includes('inventory')) return 'inventory';
-  if (cv2Text.includes('profile') || cv2Text.includes('level:')) return 'profile';
-  if (cv2Text.includes('balances') && cv2Text.includes('global rank')) return 'balance';
-
-  // Check content text (plain message content)
-  const contentText = (d.content || '').toLowerCase();
-  if (contentText.includes('balances') && contentText.includes('global rank')) return 'balance';
-  if (contentText.includes('your aim was so bad') || contentText.includes('animals laughed')) return 'hunt';
-  if (contentText.includes('imagine going into the woods')) return 'hunt';
-  if (contentText.includes('you ran an ad for') && contentText.includes('received')) return 'stream';
-  if (contentText.includes('you can\'t interact with your stream')) return 'stream';
-  if (contentText.includes('you dug in the dirt') || contentText.includes('found nothing while digging')) return 'dig';
-
-  // Check embed text
-  const embedText = extractEmbedText(d.embeds).toLowerCase();
-  // Gambling
-  if (embedText.includes('high') && embedText.includes('low') && embedText.includes('secret number')) return 'highlow';
-  if (embedText.includes('you won') && embedText.includes('your hint was') && embedText.includes('the hidden number was')) return 'highlow';
-  if (embedText.includes('you lost') && embedText.includes('your hint was') && embedText.includes('the hidden number was')) return 'highlow';
-  if (embedText.includes('blackjack') || embedText.includes('dealer')) return 'blackjack';
-  if (embedText.includes('roulette')) return 'roulette';
-  if (embedText.includes('spinning') && embedText.includes('slots')) return 'slots';
-  if (embedText.includes('snakeeyes') || embedText.includes('snake eyes') || embedText.includes('dice')) return 'snakeeyes';
-  if (embedText.includes('scratch')) return 'scratch';
-  // Adventure
-  if (embedText.includes('adventure') || embedText.includes('choose an adventure')) return 'adventure';
-  // Crime / search
-  if (embedText.includes('what crime do you want')) return 'crime';
-  if (embedText.includes('where do you want to search')) return 'search';
-  if (embedText.includes('you searched') || embedText.includes('searched the')) return 'search';
-  if (embedText.includes('committed') && (embedText.includes('trespassing') || embedText.includes('identity theft') || embedText.includes('fraud') || embedText.includes('shoplifting') || embedText.includes('dui') || embedText.includes('tax evasion') || embedText.includes('littering') || embedText.includes('cyber bullying') || embedText.includes('grand theft auto') || embedText.includes('drug distribution') || embedText.includes('bank robbing') || embedText.includes('arson') || embedText.includes('murder') || embedText.includes('vandalism') || embedText.includes('jaywalking') || embedText.includes('piracy') || embedText.includes('breaking and entering'))) return 'crime';
-  if (embedText.includes('you committed') || embedText.includes('went outside')) return 'crime';
-  if (embedText.includes('stole a developer') || embedText.includes('got confused about what trespassing')) return 'crime';
-  // Search results (person names) - also check for beg results
-  if ((embedText.includes('oh you poor soul') || embedText.includes('take this') || embedText.includes('sure take') || embedText.includes('here\'s a thought') || embedText.includes('nope, nothing') || embedText.includes('no u') || embedText.includes('coins? in this economy')) && (embedText.includes('###') || embedText.includes('charlie chaplin') || embedText.includes('shrek') || embedText.includes('elton john') || embedText.includes('alexa') || embedText.includes('confucius') || embedText.includes('doctor strange') || embedText.includes('rick astley') || embedText.includes('toby turner') || embedText.includes('oprah') || embedText.includes('bruce lee') || embedText.includes('david attenborough') || embedText.includes('honey badger'))) {
-    // Check if it's a beg result (has life saver or specific beg text)
-    if (embedText.includes('life saver') || embedText.includes('lifesaver')) return 'beg';
+  // ── Shared helpers ──
+  const has = (text, needle) => text.includes(needle);
+  const anyOf = (text, needles) => needles.some(n => text.includes(n));
+  const hasAll = (text, needles) => needles.every(n => text.includes(n));
+
+  // ── CV2 text content ──
+  if (anyOf(cv2Text, ['coin toss'])) return 'cointoss';
+  if (has(cv2Text, 'blackjack')) return 'blackjack';
+  if (has(cv2Text, 'roulette')) return 'roulette';
+  if (has(cv2Text, 'slots')) return 'slots';
+  if (anyOf(cv2Text, ['snakeeyes', 'snake eyes'])) return 'snakeeyes';
+  if (anyOf(cv2Text, ['fishing', 'fisherfolk'])) return 'fish';
+  if (anyOf(cv2Text, ['deposit', 'bank account'])) return 'deposit';
+  // Stream success (ephemeral DM with ad results) — catch early before other checks
+  if (anyOf(cv2Text, ['ran an ad', 'received', 'for an ad', 'sponsor'])) return 'stream';
+  // Beg detection — check beg phrases FIRST (before person name check)
+  // CV2 text may not have ### header, so match beg phrases directly
+  if (anyOf(cv2Text, ['oh you poor soul', 'life saver', 'lifesaver', 'sure take this', "here's a thought", 'take this'])) return 'beg';
+  if (anyOf(cv2Text, ['begging', 'imagine begging'])) return 'beg';
+  if (anyOf(cv2Text, ['you must be fun at parties', 'guess ', ' hates u', 'hates u', 'you were denied', 'get away', 'piss poor attempt', 'too poor', "wouldn't have given"])) return 'beg';
+  if (anyOf(cv2Text, ['hunting', 'went hunting', 'hunting rifle', 'your aim was so bad', 'animals laughed', 'animals attacked', 'barely escaped', 'fell asleep in a tree', 'caught nothing', 'brought back literally nothing', 'rifle broke', 'imagine going into the woods to hunt', 'laughed you out of the forest', 'brought back ant', 'brought back worm', 'brought back stickbug', 'brought back ladybug'])) return 'hunt';
+  if (anyOf(cv2Text, ['digging', 'found nothing while', 'you dug', 'dug in the dirt', 'what are the odds lol'])) return 'dig';
+  if (anyOf(cv2Text, ['brought back']) && anyOf(cv2Text, ['ant', 'worm', 'stickbug', 'ladybug'])) return 'dig';
+  // Work minigame messages — color/word, basketball, and emoji variants
+  if (anyOf(cv2Text, ['great work', 'for your shift', 'working as', 'work shift', 'what color was', 'remember words order', 'remember the colors', 'remember the emojis', 'what word was repeated', 'unscramble', 'remember the number', 'click the buttons in correct order', 'babysitter', 'click the matching', 'dunk the ball', 'wastebasket', 'look at the emoji', 'what was the emoji'])) return 'work';
+  if (has(cv2Text, 'weekly')) return 'weekly';
+  if (has(cv2Text, 'daily')) return 'daily';  // must be BEFORE cooldown (also matches "again <t:")
+  if (has(cv2Text, 'inventory')) return 'inventory';
+  if (has(cv2Text, 'level:')) return 'profile';
+  // Premium / ability upgrade message
+  if (anyOf(cv2Text, ['you can buy the ability', 'premium feature', 'upgrade to premium'])) return 'premium';
+  if (hasAll(cv2Text, ['balances', 'global rank'])) return 'balance';
+  // Balance: "username's Balances" format — less strict check
+  if (anyOf(cv2Text, ["'s balances", 'balances', 'global rank', 'net worth'])) return 'balance';
+  // Work cooldown message — specific check before generic cooldown
+  if (has(cv2Text, 'you can work again at')) return 'work';
+  // Deposit validation errors (CV2) — catch these before cooldown
+  if (anyOf(cv2Text, ['amount needs to be greater than 0'])) return 'deposit';
+  // Gambling validation errors (CV2) — catch these before unknown
+  if (anyOf(cv2Text, ["can't bet less", 'bet less than', 'minimum bet', 'insufficient', 'not enough'])) return 'cointoss';
+  // Generic cooldown — must be AFTER specific command checks
+  if (anyOf(cv2Text, ['cooldown', 'again <t:'])) return 'cooldown';
+  if (has(cv2Text, 'you must specify a subcommand')) return 'shop';
+
+  // ── Content text ──
+  if (hasAll(contentText, ['balances', 'global rank'])) return 'balance';
+  if (anyOf(contentText, ["'s balances", 'balances', 'global rank', 'net worth'])) return 'balance';
+  if (anyOf(contentText, ['your aim was so bad', 'animals laughed', 'imagine going into the woods', 'laughed you out of', 'hunt', 'hunting', 'brought back'])) return 'hunt';
+  if (anyOf(contentText, ['you dug', 'dug in the dirt', 'found nothing while digging'])) return 'dig';
+  if (anyOf(contentText, ['you ran an ad for', 'received'])) return 'stream';
+  if (has(contentText, "can't interact with your stream")) return 'stream';
+  // Beg failure — person denied the request (plain content, not CV2)
+  if (anyOf(contentText, ['you must be fun at parties', 'guess ', ' hates u', 'get away', 'piss poor attempt', 'too poor', "wouldn't have given"])) return 'beg';
+  // Work minigame messages — these arrive as plain text (d.content), not embeds
+  if (anyOf(contentText, ['what color was', 'terrible work', 'lost the mini-game', 'you lost the mini-game', 'lost because you didn', 'what word was repeated', 'remember words in order', 'remember the word', 'look at each color', 'unscramble the word', 'dunk the ball', 'wastebasket', 'look at the emoji', 'what was the emoji', 'emoji closely'])) return 'work';
+
+  // ── Embed text ──
+  // Highlow — check "the hidden number was" which appears in ALL result messages
+  if (anyOf(embedText, ['you won', 'you lost']) && has(embedText, 'the hidden number was')) return 'highlow';
+  if (hasAll(embedText, ['high', 'low', 'secret number'])) return 'highlow';
+  if (anyOf(embedText, ['blackjack', 'dealer'])) return 'blackjack';
+  if (has(embedText, 'roulette')) return 'roulette';
+  if (hasAll(embedText, ['spinning', 'slots'])) return 'slots';
+  if (anyOf(embedText, ['snakeeyes', 'snake eyes', 'dice'])) return 'snakeeyes';
+  if (has(embedText, 'scratch')) return 'scratch';
+  if (anyOf(embedText, ['adventure', 'choose an adventure'])) return 'adventure';
+  if (has(embedText, 'what crime do you want')) return 'crime';
+  if (has(embedText, 'where do you want to search')) return 'search';
+  if (anyOf(embedText, ['you searched', 'searched the'])) return 'search';
+  if (has(embedText, 'what crime do you want')) return 'crime';
+  if (has(embedText, 'committed') && anyOf(embedText, ['trespassing', 'identity theft', 'fraud', 'shoplifting', 'dui', 'tax evasion', 'littering', 'cyber bullying', 'grand theft auto', 'drug distribution', 'bank robbing', 'arson', 'murder', 'vandalism', 'jaywalking', 'piracy', 'breaking and entering'])) return 'crime';
+  if (anyOf(embedText, ['you committed', 'went outside', 'stole a developer', 'got confused about what trespassing'])) return 'crime';
+  // Search / beg result: person names in ### header
+  if (has(embedText, '###') && anyOf(embedText, ['charlie chaplin', 'shrek', 'elton john', 'alexa', 'confucius', 'doctor strange', 'rick astley', 'toby turner', 'oprah', 'bruce lee', 'david attenborough', 'honey badger', 'a honey badger', 'nope, nothing', 'no u', "here's a thought"])) {
+    if (anyOf(embedText, ['life saver', 'lifesaver', 'oh you poor soul', 'take this', 'sure take', 'coins? in this economy'])) return 'beg';
     return 'search';
   }
-  // Hunt / dig
-  if (embedText.includes('hunting') || embedText.includes('came back with') || embedText.includes('hunting rifle') || embedText.includes('dragon\'s fireball') || embedText.includes('dodge the') || embedText.includes('went hunting') || embedText.includes('your aim was so bad') || embedText.includes('animals laughed') || embedText.includes('animals attacked') || embedText.includes('barely escaped') || embedText.includes('fell asleep in a tree') || embedText.includes('caught nothing') || embedText.includes('brought back literally nothing') || embedText.includes('rifle broke') || embedText.includes('imagine going into the woods')) return 'hunt';
-  if (embedText.includes('digging') || embedText.includes('you dig') || embedText.includes('dug in the dirt') || embedText.includes('found nothing while') || embedText.includes('what are the odds lol') || embedText.includes('brought back') && (embedText.includes('ant') || embedText.includes('worm') || embedText.includes('stickbug') || embedText.includes('ladybug'))) return 'dig';
-  // Work — match both minigame prompt AND completion
-  if (embedText.includes('work') && (embedText.includes('shift') || embedText.includes('mini-game') || embedText.includes('color') || embedText.includes('what color') || embedText.includes('babysitter') || embedText.includes('great work') || embedText.includes('for your shift'))) return 'work';
-  if (embedText.includes('you were given') && embedText.includes('shift')) return 'work';
-  if (embedText.includes('working as') || embedText.includes('for your shift')) return 'work';
-  if (embedText.includes('remember words order') || embedText.includes('remember the colors') || embedText.includes('remember the emojis') || embedText.includes('what word was repeated') || embedText.includes('unscramble the word') || embedText.includes('remember the number') || embedText.includes('click the buttons in correct order') || embedText.includes('click the matching')) return 'work';
-  // Postmemes
-  if (embedText.includes('pick a meme') || embedText.includes('meme posting')) return 'postmemes';
-  // Stream
-  if (embedText.includes('stream manager') || embedText.includes('go live') || embedText.includes('what game do you want to stream') || embedText.includes('you ran an ad for') || embedText.includes('you received') && embedText.includes('from your sponsors') || embedText.includes('### chat') && embedText.includes('hasanbabi')) return 'stream';
-  if (embedText.includes('you can\'t interact with your stream') || embedText.includes('stream can last')) return 'stream';
-  // Deposit
-  if (embedText.includes('deposited') && embedText.includes('bank balance')) return 'deposit';
-  // Balance
-  if (embedText.includes('balances') && embedText.includes('global rank') && embedText.includes('net worth')) return 'balance';
-  // Trivia
-  if (embedText.includes('you have 10 seconds to answer') || embedText.includes('you have 12 seconds to answer') || embedText.includes('you have 15 seconds to answer') || embedText.includes('trivia') || embedText.includes('difficulty') && embedText.includes('category') && (embedText.includes('correct answer was') || embedText.includes('you got that answer correct'))) return 'trivia';
-  if (embedText.includes('who in pulp fiction') || embedText.includes('what was') || embedText.includes('which of')) return 'trivia';
-  // Cooldown messages
-  if (embedText.includes('you can work again at') || embedText.includes('you can use this command again')) return 'cooldown';
-  if (embedText.includes('amount needs to be greater than 0')) return 'cooldown';
-  // Premium/upgrade messages
-  if (embedText.includes('you can buy the ability to use this command')) return 'premium';
-  // Profile / level
-  if (embedText.includes('level:') && embedText.includes('experience:')) return 'profile';
-  // Shop
-  if (embedText.includes('dank memer shop') || embedText.includes('successful purchase')) return 'shop';
-  // Farm
-  if (embedText.includes('farm') && (embedText.includes('harvest') || embedText.includes('plant') || embedText.includes('hoe') || embedText.includes('water'))) return 'farm';
-  // Beg
-  if (embedText.includes('begging')) return 'beg';
-  // Daily/weekly quest
-  if (embedText.includes('daily quest')) return 'daily';
-  // Fish
-  if (embedText.includes('fishing') || embedText.includes('fish')) return 'fish';
-  // Hold tight
-  if (embedText.includes('hold tight')) return 'holdtight';
+  if (anyOf(embedText, ['hunting', 'came back with', 'hunting rifle', "dragon's fireball", 'dodge the', 'went hunting', 'your aim was so bad', 'animals laughed', 'animals attacked', 'barely escaped', 'fell asleep in a tree', 'caught nothing', 'brought back literally nothing', 'rifle broke', 'imagine going into the woods'])) return 'hunt';
+  if (anyOf(embedText, ['digging', 'you dug', 'dug in the dirt', 'found nothing while', 'what are the odds lol'])) return 'dig';
+  if (anyOf(embedText, ['brought back']) && anyOf(embedText, ['ant', 'worm', 'stickbug', 'ladybug'])) return 'dig';
+  if (hasAll(embedText, ['work', 'shift'])) return 'work';
+  if (anyOf(embedText, ['great work', 'you were given', 'working as', 'for your shift'])) return 'work';
+  if (anyOf(embedText, ['remember words order', 'remember the colors', 'remember the emojis', 'what word was repeated', 'unscramble the word', 'remember the number', 'click the buttons in correct order', 'click the matching'])) return 'work';
+  if (anyOf(embedText, ['pick a meme', 'meme posting'])) return 'postmemes';
+  if (anyOf(embedText, ['stream manager', 'go live', 'what game do you want to stream', 'you ran an ad for', 'you received', 'from your sponsors'])) return 'stream';
+  if (has(embedText, "can't interact with your stream")) return 'stream';
+  if (hasAll(embedText, ['deposited', 'bank balance'])) return 'deposit';
+  if (hasAll(embedText, ['balances', 'global rank', 'net worth'])) return 'balance';
+  if (anyOf(embedText, ['you have 10 seconds to answer', 'you have 12 seconds to answer', 'you have 15 seconds to answer', 'trivia'])) return 'trivia';
+  if (anyOf(embedText, ['correct answer was', 'you got that answer correct'])) return 'trivia';
+  if (anyOf(embedText, ['you can work again at', 'you can use this command again', 'amount needs to be greater than 0'])) return 'cooldown';
+  if (has(embedText, 'you can buy the ability to use this command')) return 'premium';
+  if (hasAll(embedText, ['level:', 'experience:'])) return 'profile';
+  if (anyOf(embedText, ['dank memer shop', 'successful purchase'])) return 'shop';
+  if (has(embedText, 'farm') && anyOf(embedText, ['harvest', 'plant', 'hoe', 'water'])) return 'farm';
+  if (has(embedText, 'begging')) return 'beg';
+  if (has(embedText, 'daily quest')) return 'daily';
+  if (anyOf(embedText, ["'s daily coins", 'daily coins', 'streak bonus', 'daily bonus'])) return 'daily';
+  if (anyOf(embedText, ['fishing', 'fish'])) return 'fish';
+  if (has(embedText, 'hold tight')) return 'holdtight';
+
+  // ── allText fallback — catches CV2 messages where d.components is a JSON string ──
+  if (anyOf(allText, ['hunting', 'went hunting', 'hunting rifle', 'your aim was so bad', 'animals laughed', 'animals attacked', 'barely escaped', 'fell asleep in a tree', 'caught nothing', 'brought back literally nothing', 'rifle broke', 'imagine going into the woods'])) return 'hunt';
+  if (anyOf(allText, ['digging', 'you dug', 'dug in the dirt', 'found nothing while', 'what are the odds lol'])) return 'dig';
+  if (anyOf(allText, ['brought back']) && anyOf(allText, ['ant', 'worm', 'stickbug', 'ladybug'])) return 'dig';
+  if (anyOf(allText, ['great work', 'you were given', 'for your shift', 'working as', 'dunk the ball', 'wastebasket', 'look at the emoji', 'what was the emoji'])) return 'work';
+  if (has(allText, "can't interact with your stream")) return 'stream';
+  if (anyOf(allText, ['you won', 'you lost']) && has(allText, 'the hidden number was')) return 'highlow';
+  if (anyOf(allText, ['you can work again at', 'amount needs to be greater than 0'])) return 'cooldown';
+  if (anyOf(allText, ["'s daily coins", 'daily coins', 'streak bonus'])) return 'daily';
+  if (anyOf(allText, ['you must be fun at parties', 'get away', 'piss poor attempt', 'too poor', "wouldn't have given"])) return 'beg';
+  if (anyOf(allText, ['charlie chaplin', 'shrek', 'elton john', 'alexa', 'confucius', 'doctor strange', 'rick astley', 'a honey badger'])) {
+    if (anyOf(allText, ['life saver', 'lifesaver', 'oh you poor soul', 'take this'])) return 'beg';
+    return 'search';
+  }
+
+  // ── Last-resort Dank Memer catch-all — ANY message from Dank Memer that got
+  //    this far has recognizable game keywords even if format is unusual.
+  //    Avoids dropping valid Dank Memer messages as 'unknown'.
+  if (anyOf(allText, [
+    // Dank Memer currency / items
+    '⏣', 'coins', 'bank', 'balance', 'wallet', 'pocket',
+    // Game mechanics
+    'cooldown', 'work shift', 'shift', 'hunting', 'digging', 'fishing', 'search', 'crime',
+    'beg', 'daily', 'weekly', 'hourly', 'quest', 'adventure', 'stream', 'postmemes',
+    // Gamble keywords
+    'gamble', 'bet', 'poker', 'blackjack', 'roulette', 'slots', 'cointoss', 'coin toss',
+    // Work minigame variants (color/word/emoji/basketball)
+    'color', 'emoji', 'word', 'dunk', 'basketball', 'wastebasket', 'mini-game', 'minigame',
+    'lost', 'won', 'correct', 'wrong', 'answer', 'click',
+    // Command responses
+    'you can work', 'you can use', 'again', 'try again', 'already',
+    // Item names (common drops)
+    'fossil', 'worm', 'ant', 'bug', 'fish', 'coin', 'gem', 'lore', 'crate', 'box',
+    // Button labels
+    'pls ', 'command', 'subcommand', 'specify',
+    // Failure/success
+    'nothing', 'found', 'brought back', 'got', 'received', 'earned',
+  ])) {
+    // Try to narrow it down by what's most distinctive in allText
+    if (anyOf(allText, ['you can work again', 'work shift', 'for your shift', 'working as', 'great work'])) return 'work';
+    if (anyOf(allText, ['⏣', 'pocket', 'winnings', 'spinning', 'net:'])) return 'slots';
+    if (anyOf(allText, ['dealer', 'blackjack'])) return 'blackjack';
+    if (anyOf(allText, ['coin toss', 'cointoss', "can't bet"])) return 'cointoss';
+    if (anyOf(allText, ['roulette'])) return 'roulette';
+    if (anyOf(allText, ['trivia', 'seconds to answer', 'correct answer'])) return 'trivia';
+    if (anyOf(allText, ['daily', 'quest', 'streak', 'already got'])) return 'daily';
+    if (anyOf(allText, ['bank', 'deposit', 'deposited'])) return 'deposit';
+    if (anyOf(allText, ['hunt', 'hunting', 'rifle', 'caught', 'animals'])) return 'hunt';
+    if (anyOf(allText, ['dig', 'digging', 'fossil', 'worm', 'ant', 'bug', 'brought back'])) return 'dig';
+    if (anyOf(allText, ['fish', 'fishing', 'fisherfolk'])) return 'fish';
+    if (anyOf(allText, ['search', 'searched'])) return 'search';
+    if (anyOf(allText, ['crime', 'commit', 'trespassing', 'fraud', 'rob'])) return 'crime';
+    if (anyOf(allText, ['stream', 'live', 'sponsor'])) return 'stream';
+    if (anyOf(allText, ['beg', 'beggar', 'begging'])) return 'beg';
+    if (anyOf(allText, ['adventure', 'adventure ticket'])) return 'adventure';
+    if (anyOf(allText, ['shop', 'buy', 'purchase', 'item'])) return 'shop';
+    if (anyOf(allText, ['postmeme', 'meme'])) return 'postmemes';
+    if (anyOf(allText, ['balance', 'net worth', 'global rank'])) return 'balance';
+    if (anyOf(allText, ['emoji', 'color', 'word', 'dunk', 'basketball', 'minigame', 'mini-game', 'lost', 'won'])) return 'work';
+    if (anyOf(allText, ['high', 'low', 'secret number', 'higher or lower'])) return 'highlow';
+    if (anyOf(allText, ['cooldown', 'again <t:', 'try again', 'already'])) return 'cooldown';
+    // Generic fallback — it's definitely from Dank Memer, return a best guess
+    return 'holdtight';
+  }
 
   return 'unknown';
 }
@@ -301,7 +407,7 @@ async function store(d, event) {
   channelLast.set(d.channel_id, d.id);
 
   // Redis (non-blocking, fire-and-forget)
-  if (redisReady && redis) {
+  if (redisReady && redis && redis.status === 'ready') {
     try {
       const key = `raw:msg:${d.id}`;
       const histKey = `raw:msg:${d.id}:history`;
@@ -316,8 +422,8 @@ async function store(d, event) {
       // History (all versions)
       pipe.rpush(histKey, json);
       pipe.expire(histKey, MSG_TTL);
-      // Per-command log
-      if (parsed.command && parsed.command !== 'unknown') {
+      // Per-command log (including 'unknown' so we can track detection gaps)
+      if (parsed.command) {
         const cmdKey = `raw:cmd:${parsed.command}:log`;
         pipe.lpush(cmdKey, `${d.id}:${parsed._capturedAt}:${event}`);
         pipe.ltrim(cmdKey, 0, 4999);
@@ -416,7 +522,7 @@ function attachDmLogger(client, opts = {}) {
     }
 
     // Store in Redis
-    if (redisReady && redis && dmEvent) {
+    if (redisReady && redis && redis.status === 'ready' && dmEvent) {
       const json = JSON.stringify({
         id: d.id,
         channelId: d.channel_id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dankgrinder",
-  "version": "7.1.0",
+  "version": "7.6.0",
   "description": "Dank Memer automation engine — grind coins while you sleep",
   "bin": {
     "dankgrinder": "bin/dankgrinder.js"