dankgrinder 7.11.0 → 7.12.0

package/lib/commands/farm.js

@@ -1409,6 +1409,7 @@ async function runFarm({ channel, waitForDankMemer, client, redis, accountId, fo
   let forcedNextAction = null; // When advancing a phase, force the next action check
   let lastApplyResp = null; // Track the last apply response for coin/cooldown parsing
   let lastRejectedAction = null; // Track last rejected action to break empty-farm loops
+  let lastRejectedAction2 = null; // Track previous rejected action to detect 3-in-a-row loops
 
   while (cycleDepth < 5) {
     // Reset per-cycle state
@@ -1589,6 +1590,30 @@ async function runFarm({ channel, waitForDankMemer, client, redis, accountId, fo
       const ephem = lastApplyResp?._capturedEphemeral;
       const ephemText = (ephem?.cv2Text || ephem?.allText || '').toLowerCase();
 
+      // Generic "nothing to X" no-op: when an action completes but has nothing to act on,
+      // cascade forward without treating it as a rejection. Also use this as a safety break
+      // when the same action keeps getting rejected (stuck in a loop).
+      if (
+        // "Nothing to water/hoe/plant/harvest" — action succeeded but was a no-op
+        /nothing to (water|hoe|plant|harvest)|no crops? (to |to )?(water|harvest)|0 x [a-z]|nothing to do/i.test(ephemText) ||
+        // Safety: if the same action was rejected 3+ cycles in a row, something is stuck — break
+        (lastRejectedAction === action && lastRejectedAction2 === action)
+      ) {
+        LOG.warn(`[farm:cycle:${cycleDepth}:reject] ${action} is a no-op or stuck loop (${ephemText.slice(0, 80)}) — cascading to next phase`);
+        const currentIdx = FARM_PHASE_ORDER.indexOf(action);
+        const nextPhase = FARM_PHASE_ORDER[currentIdx + 1] || null;
+        lastRejectedAction2 = lastRejectedAction;
+        lastRejectedAction = action;
+        forcedNextAction = nextPhase;
+        lastAction = action;
+        justRejected = true;
+        cycleDepth++;
+        if (!nextPhase) { forcedNextAction = null; break; }
+        await reenterManage();
+        await sleep(300);
+        continue;
+      }
+
       // Helper: re-enter the manage menu from the farm view so the next
       // findNextFarmActionFromManage iteration has buttons to work with.
       async function reenterManage() {
@@ -1614,6 +1639,8 @@ async function runFarm({ channel, waitForDankMemer, client, redis, accountId, fo
         LOG.warn(`[farm:cycle:${cycleDepth}:reject] Hoe rejected: tiles not empty — cascading to water`);
         const currentIdx = FARM_PHASE_ORDER.indexOf(action);
         const nextPhase = FARM_PHASE_ORDER[currentIdx + 1] || null;
+        lastRejectedAction2 = lastRejectedAction;
+        lastRejectedAction = action;
         forcedNextAction = nextPhase;
         lastAction = action;
         justRejected = true;
@@ -1630,11 +1657,13 @@ async function runFarm({ channel, waitForDankMemer, client, redis, accountId, fo
         LOG.warn(`[farm:cycle:${cycleDepth}:reject] Water rejected (${ephemText.slice(0, 100)}) — cascading to plant`);
         const currentIdx = FARM_PHASE_ORDER.indexOf(action);
         const nextPhase = FARM_PHASE_ORDER[currentIdx + 1] || null;
+        lastRejectedAction2 = lastRejectedAction;
+        lastRejectedAction = action;
         forcedNextAction = nextPhase;
         lastAction = action;
         justRejected = true;
         // Break oscillation guard: if we bounced back here from plant, stop.
-        if (lastRejectedAction === 'plant' && action === 'water') {
+        if (lastRejectedAction2 === 'plant' && lastRejectedAction === 'water') {
           LOG.warn(`[farm:cycle:${cycleDepth}:reject] hoe→water→plant oscillation detected — breaking`);
           break;
         }
@@ -1651,6 +1680,8 @@ async function runFarm({ channel, waitForDankMemer, client, redis, accountId, fo
         LOG.warn(`[farm:cycle:${cycleDepth}:reject] Plant rejected (${ephemText.slice(0, 100)}) — cascading to harvest`);
         const currentIdx = FARM_PHASE_ORDER.indexOf(action);
         const nextPhase = FARM_PHASE_ORDER[currentIdx + 1] || null;
+        lastRejectedAction2 = lastRejectedAction;
+        lastRejectedAction = action;
         forcedNextAction = nextPhase;
         lastAction = action;
         justRejected = true;

package/package.json

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