dankgrinder 6.0.0 → 6.3.0

package/lib/grinder.js

@@ -219,6 +219,23 @@ function gradientLine(text, from, to) {
   return out + c.reset;
 }
 
+// ── Sparkline graph for earnings trend ───────────────────────
+const SPARK_CHARS = ['▁', '▂', '▃', '▄', '▅', '▆', '▇', '█'];
+function drawSparkline(data, width = 12) {
+  if (!data || data.length === 0) return c.dim + '──────' + c.reset;
+  const recent = data.slice(-width);
+  const min = Math.min(...recent);
+  const max = Math.max(...recent);
+  const range = max - min || 1;
+  return recent.map(v => {
+    const idx = Math.min(7, Math.floor(((v - min) / range) * 8));
+    const char = SPARK_CHARS[idx] || '▁';
+    return v >= max * 0.9 ? rgb(52, 211, 153) + char + c.reset :
+           v <= min * 1.1 ? rgb(239, 68, 68) + char + c.reset :
+           rgb(139, 92, 246) + char + c.reset;
+  }).join('');
+}
+
 const BANNER_RAW = [
   '    ██████╗  █████╗ ███╗   ██╗██╗  ██╗',
   '    ██╔══██╗██╔══██╗████╗  ██║██║ ██╔╝',
@@ -264,10 +281,15 @@ let totalCoins = 0;
 let totalCommands = 0;
 let startTime = Date.now();
 let shutdownCalled = false;
+let sessionPeakCoins = 0;
+let isNewHigh = false;
 // RingBuffer: O(1) push, bounded memory, no array shifting or GC pressure
 const recentLogs = new RingBuffer(6);
 const MAX_LOGS = 6;
 const RENDER_THROTTLE_MS = 250;
+// Earnings history for sparkline (sample every 10 seconds)
+const earningsHistory = new RingBuffer(20);
+let lastEarningsSample = 0;
 
 function formatUptime() {
   const s = Math.floor((Date.now() - startTime) / 1000);
@@ -311,70 +333,109 @@ function renderDashboard() {
     totalErrors += w.stats.errors || 0;
   }
   const successRate = totalCommands > 0 ? Math.round(((totalCommands - totalErrors) / totalCommands) * 100) : 100;
+  // Track session peak and new high
+  if (totalCoins > sessionPeakCoins) {
+    sessionPeakCoins = totalCoins;
+    isNewHigh = true;
+    setTimeout(() => { isNewHigh = false; }, 3000);
+  }
 
   const lines = [];
   const tw = Math.min(process.stdout.columns || 80, 78);
   const thinBar = c.dim + '─'.repeat(tw) + c.reset;
   const bar = rgb(139, 92, 246) + c.bold + '━'.repeat(tw) + c.reset;
   const doubleBar = rgb(139, 92, 246) + '╔' + '═'.repeat(tw - 2) + '╗' + c.reset;
+  const doubleBarMid = rgb(139, 92, 246) + '╠' + '═'.repeat(tw - 2) + '╣' + c.reset;
   const doubleBarBot = rgb(139, 92, 246) + '╚' + '═'.repeat(tw - 2) + '╝' + c.reset;
 
-  // Header with dynamic version, command count, and status
+  // Header with title, stats, and mode
   lines.push(doubleBar);
   const cmdCount = AccountWorker.COMMAND_MAP.length;
   const activeCount = workers.filter(w => w.running && !w.paused && !w.dashboardPaused).length;
   const mode = CLUSTER_ENABLED ? `${rgb(34, 211, 238)}Cluster${c.reset}` : `${c.dim}Standalone${c.reset}`;
 
-  // Animated spinner based on time
+  // Animated spinner and gradient title
   const spinners = ['◐', '◓', '◑', '◒'];
   const spinner = spinners[Math.floor(Date.now() / 250) % 4];
   const animatedSpinner = `${rgb(52, 211, 153)}${spinner}${c.reset}`;
-
-  lines.push(
-    `  ${rgb(139, 92, 246)}${c.bold}DankGrinder${c.reset} ${c.dim}v${PKG_VERSION}${c.reset}` +
-    `  ${c.dim}·${c.reset}  ${c.white}${cmdCount} Cmds${c.reset}` +
-    `  ${c.dim}·${c.reset}  ${mode}` +
-    `  ${c.dim}·${c.reset}  ${animatedSpinner} ${rgb(52, 211, 153)}${activeCount}${c.reset}${c.dim}/${c.reset}${c.white}${workers.length}${c.reset} ${c.dim}Live${c.reset}`
-  );
-
-  // Stats row with enhanced visual indicators
+  const gradientTitle = gradientLine('DankGrinder', [192, 132, 252], [34, 211, 238]);
+
+  // Network quality indicator (based on recent latency/errors)
+  const netQuality = workers.length > 0
+    ? workers.reduce((s, w) => s + (w._lastPing < 200 ? 1 : w._lastPing < 500 ? 0.5 : 0), 0) / workers.length
+    : 1;
+  const netIcon = netQuality > 0.8 ? `${rgb(52, 211, 153)}◉${c.reset}` :
+                  netQuality > 0.5 ? `${rgb(251, 191, 36)}◉${c.reset}` :
+                  `${rgb(239, 68, 68)}◉${c.reset}`;
+  const netLabel = netQuality > 0.8 ? `${c.dim}good${c.reset}` :
+                   netQuality > 0.5 ? `${c.dim}fair${c.reset}` :
+                   `${c.dim}poor${c.reset}`;
+
+  lines.push(`  ${c.bold}${gradientTitle}${c.reset} ${c.dim}v${PKG_VERSION}${c.reset}`);
+  lines.push(`  ${mode}  ${c.dim}·${c.reset}  ${netIcon} ${netLabel}  ${c.dim}·${c.reset}  ${c.white}${cmdCount} commands${c.reset}  ${c.dim}·${c.reset}  ${animatedSpinner} ${rgb(52, 211, 153)}${activeCount}${c.reset}${c.dim}/${c.reset}${c.white}${workers.length}${c.reset} ${c.dim}live${c.reset}`);
+
+  // Stats row 1: Balance & Earnings
+  lines.push(doubleBarMid);
   const liveIcon = rgb(52, 211, 153) + '●' + c.reset;
   const balStr = `${rgb(192, 132, 252)}${c.bold}⏣ ${formatCoins(totalBalance)}${c.reset}`;
   const earnStr = `${rgb(52, 211, 153)}▲ ${formatCoins(totalCoins)}${c.reset}`;
-  // Coins/hour rate
   const elapsedHrs = (Date.now() - startTime) / 3_600_000;
   const coinsPerHr = elapsedHrs > 0.01 ? Math.round(totalCoins / elapsedHrs) : 0;
   const rateLabel = `${rgb(52, 211, 153)}${formatCoins(coinsPerHr)}/h${c.reset}`;
+
+  // Stats row 2: Commands & Performance
   const cmdStr = `${rgb(96, 165, 250)}${totalCommands}${c.reset}${c.dim} cmds${c.reset}`;
   const rateStr = successRate >= 95
     ? `${rgb(52, 211, 153)}● ${successRate}%${c.reset}`
     : successRate >= 80 ? `${rgb(251, 191, 36)}● ${successRate}%${c.reset}`
     : `${rgb(239, 68, 68)}● ${successRate}%${c.reset}`;
+  const cpmVal = globalCmdRate.getRate().toFixed(1);
+  const cpmStr = `${rgb(34, 211, 238)}${cpmVal}${c.reset}${c.dim}/m${c.reset}`;
+
+  // Stats row 3: Uptime & Memory
   const upStr = `${rgb(251, 191, 36)}◷ ${formatUptime()}${c.reset}`;
-  // Memory usage (RSS in MB) with bar indicator
   const memMB = Math.round((process.memoryUsage?.rss?.() ?? process.memoryUsage().rss) / 1048576);
   const memPct = Math.min(100, (memMB / 1024) * 100);
   const memBarWidth = Math.floor((memPct / 100) * 10);
   const memBar = rgb(52, 211, 153) + '▅'.repeat(memBarWidth) + c.dim + '▅'.repeat(10 - memBarWidth) + c.reset;
   const memColor = memMB > 900 ? rgb(239, 68, 68) : memMB > 600 ? rgb(251, 191, 36) : rgb(52, 211, 153);
   const memStr = `${memColor}${memMB}MB${c.reset} ${memBar}`;
-  // Commands/minute from SlidingWindowCounter
-  const cpmVal = globalCmdRate.getRate().toFixed(1);
-  const cpmStr = `${rgb(34, 211, 238)}${cpmVal}${c.reset}${c.dim}/m${c.reset}`;
-  lines.push(
-    `  ${liveIcon} ${balStr}  ${c.dim}│${c.reset}  ${earnStr} ${c.dim}(${c.reset}${rateLabel}${c.dim})${c.reset}  ${c.dim}│${c.reset}  ${cmdStr} ${c.dim}(${c.reset}${rateStr}${c.dim})${c.reset}  ${c.dim}│${c.reset}  ${cpmStr}  ${c.dim}│${c.reset}  ${upStr}  ${c.dim}│${c.reset}  ${memStr}`
-  );
+
+  // Sample earnings for sparkline every 10 seconds
+  const now = Date.now();
+  if (now - lastEarningsSample > 10000) {
+    earningsHistory.push(totalCoins);
+    lastEarningsSample = now;
+  }
+  const sparkline = drawSparkline(earningsHistory.toArray(), 16);
+  const peakIndicator = isNewHigh ? `${rgb(255, 100, 100)} 🚀 NEW HIGH!${c.reset}` : '';
+
+  lines.push(`  ${liveIcon} ${balStr}  ${c.dim}│${c.reset}  ${earnStr} ${c.dim}(${c.reset}${rateLabel}${c.dim})${c.reset}${peakIndicator}`);
+  lines.push(`  ${cmdStr} ${c.dim}(${c.reset}${rateStr}${c.dim})${c.reset}  ${c.dim}│${c.reset}  ${cpmStr}  ${c.dim}│${c.reset}  ${upStr}`);
+  lines.push(`  ${c.dim}Peak:${c.reset} ${rgb(255, 215, 0)}⏣ ${formatCoins(sessionPeakCoins)}${c.reset}  ${c.dim}│${c.reset}  Trend: ${sparkline}  ${c.dim}│${c.reset}  ${memStr}`);
   lines.push(thinBar);
 
   // Worker rows — paginated for 10K+ accounts
   // Renders up to MAX_VISIBLE_WORKERS rows individually, then shows
   // a compact summary for the rest. This keeps terminal responsive.
-  const MAX_VISIBLE_WORKERS = 25;
-  const nameWidth = Math.min(16, tw > 65 ? 16 : 10);
-  const statusWidth = Math.max(16, tw - nameWidth - 34);
+  const MAX_VISIBLE_WORKERS = 30;
+  const nameWidth = Math.min(18, tw > 70 ? 18 : 12);
+  const statusWidth = Math.max(18, tw - nameWidth - 42);
   const RE_ANSI_STRIP = /\x1b\[[0-9;]*m/g;
 
-  const renderWorkerRow = (wk) => {
+  // Find top 3 earners for highlighting
+  const topEarners = [...workers]
+    .filter(w => w.running && (w.stats.coins || 0) > 0)
+    .sort((a, b) => (b.stats.coins || 0) - (a.stats.coins || 0))
+    .slice(0, 3);
+  const topEarnerIds = new Set(topEarners.map(w => w.account.id));
+
+  // Column headers
+  lines.push(`  ${c.dim}#${c.reset}  ${c.dim}Account${' '.repeat(nameWidth - 5)}${c.reset}  ${c.dim}Balance${c.reset}    ${c.dim}Earned${c.reset}     ${c.dim}Status${c.reset}`);
+  lines.push(`  ${c.dim}${'─'.repeat(tw - 4)}${c.reset}`);
+
+  const renderWorkerRow = (wk, index) => {
+    const pos = `${c.dim}#${c.reset}${c.bold}${(index + 1).toString().padStart(2, ' ')}${c.reset}`;
     const rawStatus = (wk.lastStatus || 'idle').replace(RE_ANSI_STRIP, '');
     const last = rawStatus.substring(0, statusWidth);
 
@@ -401,12 +462,19 @@ function renderDashboard() {
       stateLabel = `${c.dim}${last}${c.reset}`;
     }
 
+    // Top earner medal
+    let medal = '  ';
+    if (topEarnerIds.has(wk.account.id)) {
+      const rank = topEarners.findIndex(e => e.account.id === wk.account.id);
+      medal = rank === 0 ? `${rgb(255, 215, 0)}🥇${c.reset}` : rank === 1 ? `${rgb(192, 192, 192)}🥈${c.reset}` : `${rgb(205, 127, 50)}🥉${c.reset}`;
+    }
+
     const name = `${wk.color}${c.bold}${(wk.username || '?').substring(0, nameWidth)}${c.reset}`;
     const bal = wk.stats.balance > 0
-      ? `${rgb(251, 191, 36)}⏣${c.reset} ${c.white}${formatCoins(wk.stats.balance).padStart(7)}${c.reset}`
-      : `${c.dim}⏣       -${c.reset}`;
+      ? `${rgb(251, 191, 36)}⏣${c.reset} ${c.white}${formatCoins(wk.stats.balance).padStart(8)}${c.reset}`
+      : `${c.dim}⏣        -${c.reset}`;
 
-    // Mini progress bar for earned coins (visual indicator of activity)
+    // Enhanced progress bar for earned coins
     const earnedNum = wk.stats.coins || 0;
     const earnedBarWidth = earnedNum > 0 ? Math.min(5, Math.max(1, Math.floor(Math.log10(earnedNum + 1)))) : 0;
     const earnedBar = earnedNum > 0
@@ -416,14 +484,14 @@ function renderDashboard() {
       ? `${rgb(52, 211, 153)}+${formatCoins(earnedNum)}${c.reset} ${earnedBar}`
       : `${c.dim}+0${c.reset} ${earnedBar}`;
 
-    lines.push(`  ${dot} ${name.padEnd(nameWidth + wk.color.length + c.bold.length + c.reset.length)} ${bal}  ${earned}  ${stateLabel}`);
+    lines.push(`  ${pos} ${medal}${dot} ${name.padEnd(nameWidth + wk.color.length + c.bold.length + c.reset.length + 2)} ${bal}  ${earned}  ${stateLabel}`);
   };
 
   if (workers.length <= MAX_VISIBLE_WORKERS) {
-    for (let i = 0; i < workers.length; i++) renderWorkerRow(workers[i]);
+    for (let i = 0; i < workers.length; i++) renderWorkerRow(workers[i], i);
   } else {
     // Pagination: show first MAX_VISIBLE_WORKERS, summarize rest
-    for (let i = 0; i < MAX_VISIBLE_WORKERS; i++) renderWorkerRow(workers[i]);
+    for (let i = 0; i < MAX_VISIBLE_WORKERS; i++) renderWorkerRow(workers[i], i);
     const remaining = workers.length - MAX_VISIBLE_WORKERS;
     let hiddenActive = 0, hiddenPaused = 0, hiddenRecovering = 0, hiddenOffline = 0;
     for (let i = MAX_VISIBLE_WORKERS; i < workers.length; i++) {
@@ -433,31 +501,33 @@ function renderDashboard() {
       else if (w._recoveryAttempts > 0 && w._errorCooldownUntil > Date.now()) hiddenRecovering++;
       else hiddenActive++;
     }
-    const parts = [`${c.dim}... +${remaining} more${c.reset}`];
-    if (hiddenActive > 0) parts.push(`${rgb(52, 211, 153)}${hiddenActive} active${c.reset}`);
-    if (hiddenPaused > 0) parts.push(`${rgb(251, 191, 36)}${hiddenPaused} paused${c.reset}`);
-    if (hiddenRecovering > 0) parts.push(`${rgb(251, 191, 36)}${hiddenRecovering} recovering${c.reset}`);
-    if (hiddenOffline > 0) parts.push(`${c.dim}${hiddenOffline} offline${c.reset}`);
+    const parts = [`${c.dim}┃${c.reset}  ${c.dim}... +${remaining} more${c.reset}`];
+    if (hiddenActive > 0) parts.push(`${rgb(52, 211, 153)}● ${hiddenActive} active${c.reset}`);
+    if (hiddenPaused > 0) parts.push(`${rgb(251, 191, 36)}⏸ ${hiddenPaused} paused${c.reset}`);
+    if (hiddenRecovering > 0) parts.push(`${rgb(251, 191, 36)}↻ ${hiddenRecovering} recovering${c.reset}`);
+    if (hiddenOffline > 0) parts.push(`${c.dim}○ ${hiddenOffline} offline${c.reset}`);
     lines.push(`  ${parts.join(`  ${c.dim}·${c.reset}  `)}`);
   }
 
-  // Recovery summary line
+  // Recovery & status summary line with enhanced styling
   const recoveringCount = workers.filter(w => w._recoveryAttempts > 0 && w._errorCooldownUntil > Date.now()).length;
   const pausedCount = workers.filter(w => w.paused).length;
   const totalRecoveries = workers.reduce((s, w) => s + (w._totalRecoveries || 0), 0);
-  if (recoveringCount > 0 || pausedCount > 0 || totalRecoveries > 0) {
+  const totalDisconnects = workers.reduce((s, w) => s + (w._disconnectCount || 0), 0);
+  if (recoveringCount > 0 || pausedCount > 0 || totalRecoveries > 0 || totalDisconnects > 0) {
     const parts = [];
     if (recoveringCount > 0) parts.push(`${rgb(251, 191, 36)}↻ ${recoveringCount} recovering${c.reset}`);
     if (pausedCount > 0) parts.push(`${rgb(239, 68, 68)}⏸ ${pausedCount} paused${c.reset}`);
     if (totalRecoveries > 0) parts.push(`${c.dim}${totalRecoveries} auto-recovered${c.reset}`);
-    lines.push(`  ${parts.join(`  ${c.dim}·${c.reset}  `)}`);
+    if (totalDisconnects > 0) parts.push(`${c.dim}${totalDisconnects} reconnects${c.reset}`);
+    lines.push(`  ${c.dim}┃${c.reset}  ${parts.join(`  ${c.dim}·${c.reset}  `)}`);
   }
 
-  // Cluster info line
+  // Cluster info line with enhanced styling
   if (CLUSTER_ENABLED) {
     const nodeShort = NODE_ID.substring(0, 12);
     const claimedCount = workers.filter(w => w.running).length;
-    lines.push(`  ${rgb(34, 211, 238)}⊞${c.reset} ${c.dim}Node: ${nodeShort} · ${claimedCount} claimed${c.reset}`);
+    lines.push(`  ${rgb(34, 211, 238)}╔${c.reset}${c.dim} Cluster: ${nodeShort} · ${claimedCount} claimed ${c.reset}${rgb(34, 211, 238)}╗${c.reset}`);
   }
 
   // Log section
@@ -1170,11 +1240,10 @@ class AccountWorker {
       const tries = Math.max(1, Number.isFinite(maxAttempts) ? maxAttempts : 1);
       let lastErr = null;
       for (let attempt = 1; attempt <= tries; attempt++) {
-        if (startupProgress && Number.isInteger(startupProgress.current) && Number.isInteger(startupProgress.total)) {
-          this.log('info', `Checking inventory... (${startupProgress.current}/${startupProgress.total}) [try ${attempt}/${tries}]`);
-        } else {
-          this.log('info', `Checking inventory...${tries > 1 ? ` [try ${attempt}/${tries}]` : ''}`);
-        }
+        const baseLabel = startupProgress ? `[inv] ${startupProgress.current}/${startupProgress.total}` : '[inv]';
+        const attemptLabel = tries > 1 ? ` [try ${attempt}/${tries}]` : '';
+        const progressLine = `${baseLabel}${c.bold} ${this.username}${c.reset}${attemptLabel}`;
+        process.stdout.write(`\x1b[2K\r${progressLine}`);
 
         try {
           const result = await commands.runInventory({
@@ -1184,9 +1253,9 @@ class AccountWorker {
             accountId: this.account.id,
             redis,
             onPageProgress: ({ page, total }) => {
-              // Minimal progress update on same line
+              // Update progress on same line
               const erase = '\x1b[2K\r';
-              process.stdout.write(`${erase}${this.color}[inv] ${page}/${total}${c.reset}`);
+              process.stdout.write(`${erase}${baseLabel} ${c.bold}${this.username}${c.reset} · page ${page}/${total}${attemptLabel}`);
             },
           });
 
@@ -1194,9 +1263,9 @@ class AccountWorker {
             throw new Error(`incomplete pages (${result.pagesVisited || 0}/${result.pagesTotal || 0})`);
           }
 
-          // Add newline after inventory progress
-          process.stdout.write('\n');
-          this.log('success', `Inventory: ${result.items?.length || 0} items, ⏣ ${(result.totalValue || 0).toLocaleString()} net`);
+          // Final result on same line
+          const resultLine = `${baseLabel} ${c.bold}${this.username}${c.reset}: ${c.green}${result.items?.length || 0} items${c.reset}, ⏣ ${c.green}${(result.totalValue || 0).toLocaleString()}${c.reset} net${attemptLabel}`;
+          process.stdout.write(`\x1b[2K\r${resultLine}\n`);
           try {
             await fetch(`${API_URL}/api/grinder/inventory`, {
               method: 'POST',
@@ -1220,7 +1289,9 @@ class AccountWorker {
         } catch (e) {
           lastErr = e;
           if (attempt < tries) {
-            this.log('warn', `Inventory attempt ${attempt}/${tries} failed (${e.message}). Retrying...`);
+            const baseLabel = startupProgress ? `[inv] ${startupProgress.current}/${startupProgress.total}` : '[inv]';
+            const retryLine = `${baseLabel} ${c.bold}${this.username}${c.reset}: ${c.yellow}attempt ${attempt}/${tries} failed${c.reset} — retrying...`;
+            process.stdout.write(`\x1b[2K\r${retryLine}\n`);
             await new Promise((r) => setTimeout(r, 1500 + Math.floor(Math.random() * 1500)));
             continue;
           }
@@ -1229,7 +1300,9 @@ class AccountWorker {
 
       throw lastErr || new Error('inventory check failed');
     } catch (e) {
-      this.log('error', `Inventory check failed: ${e.message}`);
+      const baseLabel = startupProgress ? `[inv] ${startupProgress.current}/${startupProgress.total}` : '[inv]';
+      const failLine = `${baseLabel} ${c.bold}${this.username}${c.reset}: ${c.red}failed${c.reset} — ${e.message}`;
+      process.stdout.write(`\x1b[2K\r${failLine}\n`);
       return { ok: false, error: e.message };
     } finally {
       this._invRunning = false;
@@ -2114,7 +2187,7 @@ class AccountWorker {
     }
 
     const prefix = this.account.use_slash ? '/' : 'pls';
-    this.setStatus(`pls ${item.cmd}`);
+    this.setStatus(formatCommandName(item.cmd));
 
     // Report "running" to dashboard
     const nextItemRun = this.commandQueue?.peek?.();
@@ -2226,7 +2299,7 @@ class AccountWorker {
       if (text.includes('alert') || text.includes('notification') ||
           text.includes('you have a pending') || text.includes('check your alerts')) {
         if (!this.busy) {
-          this.log('info', 'Alert detected → running pls alert');
+          this.log('info', 'Alert detected → running alert');
           this.busy = true;
           const prefix = this.account.use_slash ? '/' : 'pls';
           this.runCommand('alert', prefix).finally(() => { this.busy = false; });
@@ -2327,22 +2400,37 @@ class AccountWorker {
     if (!this.account.discord_token) { this.log('error', 'No token'); return; }
     if (!this.account.channel_id) { this.log('error', 'No channel'); return; }
 
+    const LOGIN_TIMEOUT_MS = 30_000; // 30s max per account login
+
     return new Promise((resolve) => {
+      let resolved = false;
+      const done = () => { if (!resolved) { resolved = true; resolve(); } };
+
+      // Timeout guard — don't let a single account hang the batch
+      const timeoutId = setTimeout(() => {
+        if (!resolved) {
+          this.log('warn', 'Login timed out after 30s — will retry in background');
+          done();
+          // Retry login in background after timeout
+          this._retryLoginBackground();
+        }
+      }, LOGIN_TIMEOUT_MS);
+
       this.client.on('ready', async () => {
+        clearTimeout(timeoutId);
         this.username = this.client.user.tag || this.username;
         this.avatarUrl = this.client.user.displayAvatarURL?.({ format: 'png', dynamic: true, size: 128 }) || null;
-        try {
-          await fetch(`${API_URL}/api/grinder/status`, {
-            method: 'POST',
-            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-            body: JSON.stringify({ account_id: this.account.id, discord_username: this.username, avatar_url: this.avatarUrl }),
-          });
-        } catch { /* silent */ }
+        // Report status non-blocking
+        fetch(`${API_URL}/api/grinder/status`, {
+          method: 'POST',
+          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+          body: JSON.stringify({ account_id: this.account.id, discord_username: this.username, avatar_url: this.avatarUrl }),
+        }).catch(() => {});
 
         this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
         if (!this.channel) {
           this.log('error', `Channel not found`);
-          resolve(); return;
+          done(); return;
         }
 
         const enabledCmds = [
@@ -2365,49 +2453,108 @@ class AccountWorker {
         this.log('success', `#${chName} · ${enabledCmds.length} cmds`);
         this.setStatus('starting...');
 
-        // Load daily/weekly/monthly done state from Redis
-        if (redis) {
-          for (const cmd of ['daily', 'weekly', 'monthly', 'drops']) {
-            try {
-              const val = await redis.get(`dkg:done:${this.account.id}:${cmd}`);
-              if (val) {
-                const ttlSec = await redis.ttl(`dkg:done:${this.account.id}:${cmd}`);
-                if (ttlSec > 0) {
-                  this.doneToday.set(cmd, Date.now() + ttlSec * 1000);
-                  this.log('info', `${cmd} already claimed (${Math.round(ttlSec / 3600)}h remaining)`);
-                }
-              }
-            } catch {}
+        // Load daily/weekly/monthly done state from Redis (non-blocking for login speed)
+        this._loadRedisState().catch(() => {});
+
+        // Reduced settle time — 200ms is enough for most gateways
+        await new Promise(r => setTimeout(r, 200));
+        done();
+      });
+
+      // Handle login errors so they don't hang
+      this.client.on('error', (err) => {
+        if (!resolved) {
+          clearTimeout(timeoutId);
+          const msg = (err?.message || '').toLowerCase();
+          if (msg.includes('token_invalid') || msg.includes('invalid token') || msg.includes('401')) {
+            this.log('error', `✗ TOKEN INVALID — this token is no longer valid`);
+            this.paused = true;
+            this._tokenInvalid = true;
+          } else {
+            this.log('error', `Login error: ${err?.message || err}`);
           }
-          // Load cached balance from Redis
-          try {
-            const balData = await redis.get(`dkg:bal:${this.account.id}`);
-            if (balData) {
-              const { wallet, bank } = JSON.parse(balData);
-              if (wallet > 0 || bank > 0) {
-                this.stats.balance = wallet;
-                this.stats.bankBalance = bank;
-                await fetch(`${API_URL}/api/grinder/status`, {
-                  method: 'POST',
-                  headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-                  body: JSON.stringify({ account_id: this.account.id, balance: wallet, bank_balance: bank, total_balance: wallet + bank }),
-                }).catch(() => {});
-              }
-            }
-          } catch {}
+          done();
         }
-
-        // Let Discord gateway settle (reduced for faster startup)
-        await new Promise(r => setTimeout(r, 500));
-        resolve();
       });
 
       // Attach auto-recovery event listeners before login
       this._attachRecoveryListeners();
-      this.client.login(this.account.discord_token);
+      this.client.login(this.account.discord_token).catch((err) => {
+        clearTimeout(timeoutId);
+        const msg = (err?.message || '').toLowerCase();
+        if (msg.includes('token_invalid') || msg.includes('invalid token') || msg.includes('401') || msg.includes('incorrect login')) {
+          this.log('error', `✗ TOKEN INVALID — check this account's token`);
+          this.paused = true;
+          this._tokenInvalid = true;
+          // Report invalid status to API
+          fetch(`${API_URL}/api/grinder/status`, {
+            method: 'POST',
+            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ account_id: this.account.id, active: false, status: 'token_invalid' }),
+          }).catch(() => {});
+          sendWebhook('Token Invalid', `**${this.account.label || this.account.id}** has an invalid Discord token.`, 0xef4444);
+        } else {
+          this.log('error', `Login failed: ${err?.message || 'unknown error'}`);
+        }
+        done();
+      });
     });
   }
 
+  /** Load Redis cached state in background (non-blocking) */
+  async _loadRedisState() {
+    if (!redis) return;
+    for (const cmd of ['daily', 'weekly', 'monthly', 'drops']) {
+      try {
+        const val = await redis.get(`dkg:done:${this.account.id}:${cmd}`);
+        if (val) {
+          const ttlSec = await redis.ttl(`dkg:done:${this.account.id}:${cmd}`);
+          if (ttlSec > 0) {
+            this.doneToday.set(cmd, Date.now() + ttlSec * 1000);
+            this.log('info', `${cmd} already claimed (${Math.round(ttlSec / 3600)}h remaining)`);
+          }
+        }
+      } catch {}
+    }
+    // Load cached balance from Redis
+    try {
+      const balData = await redis.get(`dkg:bal:${this.account.id}`);
+      if (balData) {
+        const { wallet, bank } = JSON.parse(balData);
+        if (wallet > 0 || bank > 0) {
+          this.stats.balance = wallet;
+          this.stats.bankBalance = bank;
+          await fetch(`${API_URL}/api/grinder/status`, {
+            method: 'POST',
+            headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ account_id: this.account.id, balance: wallet, bank_balance: bank, total_balance: wallet + bank }),
+          }).catch(() => {});
+        }
+      }
+    } catch {}
+  }
+
+  /** Retry login in background after a timeout */
+  async _retryLoginBackground() {
+    await new Promise(r => setTimeout(r, 5000));
+    if (this.client && !this.running) {
+      this.log('info', 'Retrying login in background...');
+      try {
+        this.client.destroy();
+        this.client = createLeanClient();
+        this._attachRecoveryListeners();
+        await this.client.login(this.account.discord_token);
+        this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
+        if (this.channel) {
+          this.username = this.client.user?.tag || this.username;
+          this.log('success', `Background login OK`);
+        }
+      } catch (err) {
+        this.log('error', `Background login failed: ${err?.message || err}`);
+      }
+    }
+  }
+
   stop() {
     this.running = false;
     this.paused = false;
@@ -2537,13 +2684,19 @@ async function start(apiKey, apiUrl) {
   };
 
   // Parallel login in batches of 10 to avoid rate limits while being fast
+  // Within each batch, stagger logins by 100-600ms to avoid gateway flood
   const BATCH_SIZE = 10;
   for (let i = 0; i < accounts.length; i += BATCH_SIZE) {
     if (shutdownCalled) break;
     const batch = accounts.slice(i, Math.min(i + BATCH_SIZE, accounts.length));
 
-    // Login batch in parallel
+    // Staggered parallel login: fire each login with a small jitter delay
     await Promise.all(batch.map(async (acc, idx) => {
+      // Stagger within batch: 0ms for first, 100-600ms for subsequent
+      if (idx > 0) {
+        const jitter = 100 + Math.floor(Math.random() * 500);
+        await new Promise(r => setTimeout(r, jitter));
+      }
       const worker = new AccountWorker(acc, i + idx);
       workers.push(worker);
       workerMap.set(acc.id, worker);
@@ -2560,21 +2713,33 @@ async function start(apiKey, apiUrl) {
     hintGC();
   }
 
-  // Phase 2: Run inventory on ALL accounts in parallel (must complete before grinding)
-  log('info', `${c.dim}Checking inventory for ${workers.length} accounts...${c.reset}`);
+  // Login summary: show invalid tokens clearly
+  const invalidWorkers = workers.filter(w => w._tokenInvalid);
+  const timedOutWorkers = workers.filter(w => !w.channel && !w._tokenInvalid);
+  if (invalidWorkers.length > 0) {
+    console.log('');
+    log('warn', `${rgb(239, 68, 68)}${invalidWorkers.length} account(s) have INVALID tokens:${c.reset}`);
+    for (const w of invalidWorkers) {
+      log('error', `  ✗ ${w.account.label || w.account.id} — token is invalid or expired`);
+    }
+    console.log('');
+  }
+  if (timedOutWorkers.length > 0) {
+    log('warn', `${timedOutWorkers.length} account(s) timed out during login (will retry in background)`);
+  }
+
+  // Filter out workers with invalid tokens from grinding
+  const activeWorkers = workers.filter(w => !w._tokenInvalid);
+
+  // Phase 2: Run inventory on ALL valid accounts in parallel (must complete before grinding)
+  log('info', `${c.dim}Checking inventory for ${activeWorkers.length} accounts...${c.reset}`);
 
   // Parallel inventory checks with single-line progress
   let invDone = 0;
   let invFailed = 0;
-  const total = workers.length;
-
-  await Promise.all(workers.map(async (w, i) => {
-    const label = w?.username || w?.account?.label || 'account';
-
-    // Update progress on same line
-    const progress = `[inv] ${invDone + invFailed + 1}/${total}: ${label}`;
-    process.stdout.write(`\x1b[2K\r${c.dim}${progress}${c.reset}`);
+  const total = activeWorkers.length;
 
+  await Promise.all(activeWorkers.map(async (w, i) => {
     try {
       const invRes = await w.checkInventory({
         force: true,
@@ -2589,20 +2754,19 @@ async function start(apiKey, apiUrl) {
     }
   }));
 
-  // Final newline and summary
-  process.stdout.write('\n');
+  // Final summary
   log('success', `Inventory: ${invDone}/${total} done${invFailed > 0 ? `, ${c.yellow}${invFailed} failed${c.reset}` : ''}`);
 
   if (invFailed > 0) {
-    log('error', `${c.red}Inventory phase incomplete: ${invDone}/${workers.length} complete, ${invFailed} failed/incomplete. Not starting grind loops.${c.reset}`);
+    log('error', `${c.red}Inventory phase incomplete: ${invDone}/${activeWorkers.length} complete, ${invFailed} failed/incomplete. Not starting grind loops.${c.reset}`);
     return;
   }
 
   const invSummaryColor = invFailed > 0 ? c.yellow : c.green;
-  log('success', `${c.dim}Inventory phase complete: ${invSummaryColor}${invDone}/${workers.length}${c.reset}${c.dim} done${invFailed > 0 ? `, ${c.yellow}${invFailed} failed${c.reset}${c.dim}` : ''}. Starting grind loops...${c.reset}`);
+  log('success', `${c.dim}Inventory phase complete: ${invSummaryColor}${invDone}/${activeWorkers.length}${c.reset}${c.dim} done${invFailed > 0 ? `, ${c.yellow}${invFailed} failed${c.reset}${c.dim}` : ''}. Starting grind loops...${c.reset}`);
 
-  // Phase 3: Start all grind loops
-  for (const w of workers) {
+  // Phase 3: Start all grind loops (only for valid workers)
+  for (const w of activeWorkers) {
     if (!shutdownCalled) w.grindLoop();
   }
 
@@ -2764,7 +2928,10 @@ function setupKeyboardShortcuts() {
     process.stdin.resume();
     process.stdin.setEncoding('utf8');
 
-    console.log(`\n  ${c.dim}Keyboard shortcuts: ${c.reset}p=pause/resume all ${c.dim}·${c.reset} r=resume all ${c.dim}·${c.reset} s=status ${c.dim}·${c.reset} q=quit ${c.dim}·${c.reset} 1-9=toggle account`);
+    // Modern styled keyboard shortcuts with box drawing
+    console.log(`\n  ${rgb(139, 92, 246)}╭${c.reset}${c.dim}${'─'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╮${c.reset}`);
+    console.log(`  ${rgb(139, 92, 246)}│${c.reset}  ${c.bold}Shortcuts:${c.reset}  ${c.dim}p${c.reset}=pause  ${c.dim}r${c.reset}=resume  ${c.dim}s${c.reset}=status  ${c.dim}q${c.reset}=quit  ${c.dim}?${c.reset}=help  ${rgb(139, 92, 246)}│${c.reset}`);
+    console.log(`  ${rgb(139, 92, 246)}╰${c.reset}${c.dim}${'─'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╯${c.reset}`);
 
     process.stdin.on('data', (key) => {
       const k = key.toString().toLowerCase();
@@ -2780,7 +2947,9 @@ function setupKeyboardShortcuts() {
       if (k === 'p') {
         let paused = 0;
         workers.forEach(w => { if (w.running && !w.paused) { w.paused = true; paused++; } });
-        console.log(`\n  ${c.yellow}Paused ${paused} accounts${c.reset}`);
+        console.log(`\n  ${rgb(139, 92, 246)}╭${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╮${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}│${c.reset}  ${c.yellow}⏸ Paused ${paused} accounts${c.reset}                        ${rgb(139, 92, 246)}│${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}╰${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╯${c.reset}`);
         return;
       }
 
@@ -2788,40 +2957,39 @@ function setupKeyboardShortcuts() {
       if (k === 'r') {
         let resumed = 0;
         workers.forEach(w => { if (w.paused) { w.paused = false; resumed++; } });
-        console.log(`\n  ${c.green}Resumed ${resumed} accounts${c.reset}`);
+        console.log(`\n  ${rgb(139, 92, 246)}╭${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╮${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}│${c.reset}  ${c.green}● Resumed ${resumed} accounts${c.reset}                      ${rgb(139, 92, 246)}│${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}╰${c.reset}${c.dim}${'─'.repeat(40)}${c.reset}${rgb(139, 92, 246)}╯${c.reset}`);
         return;
       }
 
       // s = show status summary
       if (k === 's') {
-        console.log(`\n  ${c.bold}Status Summary:${c.reset}`);
         const active = workers.filter(w => w.running && !w.paused).length;
         const paused = workers.filter(w => w.paused).length;
         const offline = workers.filter(w => !w.running).length;
         const recovering = workers.filter(w => w._recoveryAttempts > 0 && w._errorCooldownUntil > Date.now()).length;
-        console.log(`  ${c.green}● ${active} active${c.reset}  ${c.yellow}⏸ ${paused} paused${c.reset}  ${c.red}○ ${offline} offline${c.reset}  ${c.yellow}↻ ${recovering} recovering${c.reset}`);
-        console.log(`  ${c.dim}Total earnings: ⏣ ${workers.reduce((s, w) => s + (w.stats.coins || 0), 0).toLocaleString()}${c.reset}`);
-        return;
-      }
-
-      // 1-9 = toggle specific account (for small account counts)
-      const num = parseInt(k, 10);
-      if (num >= 1 && num <= 9 && workers[num - 1]) {
-        const w = workers[num - 1];
-        w.paused = !w.paused;
-        console.log(`\n  ${w.color}${w.username}${c.reset} ${w.paused ? c.yellow + 'paused' : c.green + 'resumed'}${c.reset}`);
+        const totalEarn = workers.reduce((s, w) => s + (w.stats.coins || 0), 0);
+        console.log(`\n  ${rgb(139, 92, 246)}╔${c.reset}${c.bold}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╗${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.bold}Status Summary${c.reset}                                      ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}╠${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╣${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.green}● ${active} active${c.reset}  ${c.yellow}⏸ ${paused} paused${c.reset}  ${c.red}○ ${offline} offline${c.reset}  ${c.yellow}↻ ${recovering} recovering${c.reset}      ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.dim}Total earnings:${c.reset} ${rgb(52, 211, 153)}⏣ ${totalEarn.toLocaleString()}${c.reset}                        ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}╚${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╝${c.reset}`);
         return;
       }
 
       // ? = show help
       if (k === '?' || k === 'h') {
-        console.log(`\n  ${c.bold}Keyboard Shortcuts:${c.reset}`);
-        console.log(`  ${c.white}p${c.reset} Pause all accounts`);
-        console.log(`  ${c.white}r${c.reset} Resume all accounts`);
-        console.log(`  ${c.white}s${c.reset} Show status summary`);
-        console.log(`  ${c.white}q${c.reset} Quit gracefully`);
-        console.log(`  ${c.white}1-9${c.reset} Toggle account N`);
-        console.log(`  ${c.white}?${c.reset} Show this help`);
+        console.log(`\n  ${rgb(139, 92, 246)}╔${c.reset}${c.bold}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╗${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.bold}Keyboard Shortcuts${c.reset}                                  ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}╠${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╣${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}p${c.reset}  Pause all accounts                                ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}r${c.reset}  Resume all accounts                               ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}s${c.reset}  Show status summary                               ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}q${c.reset}  Quit gracefully                                   ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}║${c.reset}  ${c.white}?${c.reset}  Show this help                                    ${rgb(139, 92, 246)}║${c.reset}`);
+        console.log(`  ${rgb(139, 92, 246)}╚${c.reset}${c.dim}${'═'.repeat(50)}${c.reset}${rgb(139, 92, 246)}╝${c.reset}`);
         return;
       }
     });

package/package.json

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