@ape-church/skill 1.0.3 → 1.0.4

package/bin/cli.js

@@ -414,7 +414,7 @@ function getStrategyConfig(strategy) {
   );
   const configs = {
     conservative: {
-      minBetApe: 10,
+      minBetApe: 1,
       targetBetPct: 0.05,
       maxBetPct: 0.1,
       baseCooldownMs: 60 * 1000, // 60 seconds
@@ -423,7 +423,7 @@ function getStrategyConfig(strategy) {
       gameWeights: defaultWeights,
     },
     balanced: {
-      minBetApe: 10,
+      minBetApe: 1,
       targetBetPct: 0.08,
       maxBetPct: 0.15,
       baseCooldownMs: 30 * 1000, // 30 seconds
@@ -432,7 +432,7 @@ function getStrategyConfig(strategy) {
       gameWeights: defaultWeights,
     },
     aggressive: {
-      minBetApe: 10,
+      minBetApe: 1,
       targetBetPct: 0.12,
       maxBetPct: 0.25,
       baseCooldownMs: 15 * 1000, // 15 seconds
@@ -441,7 +441,7 @@ function getStrategyConfig(strategy) {
       gameWeights: defaultWeights,
     },
     degen: {
-      minBetApe: 10,
+      minBetApe: 1,
       targetBetPct: 0.2,
       maxBetPct: 0.35,
       baseCooldownMs: 10 * 1000, // 10 seconds
@@ -856,25 +856,37 @@ program
       console.log('You can retry later with: apechurch register --username <NAME>');
     }
 
-    // 4. The Handshake (Replacing the Claim Link)
+    // 4. The Handshake
     console.log('\nSETUP COMPLETE');
     console.log('---------------------------------------');
     console.log(`AGENT ADDRESS: ${address}`);
     console.log(`USERNAME: ${username}`);
-    if (!usernameWasProvided) {
-      console.log('  (Change anytime: apechurch register --username <YOUR_NAME>)');
-    }
     console.log(`PERSONA: ${persona}`);
     console.log('');
-    console.log('ACTION REQUIRED: Send APE (ApeChain) to this address.');
-    console.log('FUNDING GUIDE:');
-    console.log(
-      '1) Open https://relay.link/bridge/apechain?toCurrency=0x0000000000000000000000000000000000000000'
-    );
-    console.log('2) Connect your wallet.');
-    console.log('3) Paste the agent address in ApeChain buy area:');
-    console.log('   Select wallet -> Paste wallet address');
-    console.log('The Agent will wake up automatically once funded.');
+    console.log('Change username anytime: apechurch register --username <YOUR_NAME>');
+    console.log('');
+    console.log('STEP 1: Fund your agent');
+    console.log('  Send APE (on ApeChain) to the address above.');
+    console.log('  Bridge: https://relay.link/bridge/apechain');
+    console.log('');
+    console.log('STEP 2: Start playing');
+    console.log('  Check balance:    apechurch status');
+    console.log('  Single bet:       apechurch heartbeat --strategy balanced');
+    console.log('  Continuous play:  apechurch heartbeat --strategy balanced --loop');
+    console.log('');
+    console.log('AVAILABLE GAMES:');
+    console.log('  Jungle Plinko:    apechurch bet --game jungle-plinko --amount 5 --mode 2 --balls 50');
+    console.log('  Dino Dough:       apechurch bet --game dino-dough --amount 5 --spins 10');
+    console.log('  Bubblegum Heist:  apechurch bet --game bubblegum-heist --amount 5 --spins 8');
+    console.log('');
+    console.log('STEP 3: Control');
+    console.log('  Pause anytime:    apechurch pause');
+    console.log('  Resume play:      apechurch resume');
+    console.log('  Stop loop:        Ctrl+C');
+    console.log('');
+    console.log('HELP:');
+    console.log('  List all games:     apechurch games');
+    console.log('  List all commands:  apechurch commands');
     console.log('---------------------------------------');
   });
 
@@ -1083,163 +1095,353 @@ program
 // --- COMMAND: HEARTBEAT (Autonomous Loop) ---
 program
   .command('heartbeat')
-  .option('--strategy <name>', 'conservative | balanced | aggressive')
+  .option('--strategy <name>', 'conservative | balanced | aggressive | degen')
   .option('--cooldown <ms>', 'Minimum ms between plays (0 = use strategy cooldown)', '0')
   .option('--timeout <ms>', 'Max ms to wait for GameEnded event. Use 0 to wait indefinitely.', '0')
+  .option('--loop', 'Run continuously until paused or stopped (Ctrl+C)')
   .option('--json', 'Output JSON only')
   .action(async (opts) => {
     const account = getWallet();
-    const state = loadState();
-    const profile = loadProfile();
-    const now = Date.now();
-
-    // Check if paused - skip gracefully without fetching balance
-    if (profile.paused) {
-      state.lastHeartbeat = now;
-      saveState(state);
-      const response = {
-        action: 'heartbeat',
-        status: 'skipped',
-        reason: 'paused',
-        message: 'Autonomous play is paused. Run `apechurch resume` to continue.',
-        address: account.address,
-        paused: true,
-      };
-      if (opts.json) console.log(JSON.stringify(response));
-      else console.log(JSON.stringify(response, null, 2));
-      return;
-    }
-
-    state.lastHeartbeat = now;
-    if (opts.strategy) state.strategy = normalizeStrategy(opts.strategy);
-    else if (profile.persona) state.strategy = normalizeStrategy(profile.persona);
     const requestedCooldown = parseNonNegativeInt(opts.cooldown, 'cooldown');
-    if (requestedCooldown > 0) state.cooldownMs = requestedCooldown;
     const timeoutMs = parseNonNegativeInt(opts.timeout, 'timeout');
+    const loopMode = Boolean(opts.loop);
 
-    const { publicClient } = createClients();
-    let balance;
-    try {
-      balance = await publicClient.getBalance({ address: account.address });
-    } catch (error) {
-      console.error(JSON.stringify({ error: `Failed to fetch balance: ${sanitizeError(error)}` }));
-      process.exit(1);
+    if (loopMode && !opts.json) {
+      console.log('🎰 Starting continuous play mode (Ctrl+C to stop)...\n');
     }
 
-    const balanceApe = parseFloat(formatEther(balance));
-    const availableApe = Math.max(balanceApe - GAS_RESERVE_APE, 0);
-    const strategy = normalizeStrategy(state.strategy);
-    const strategyConfig = applyProfileOverrides(
-      getStrategyConfig(strategy),
-      profile.overrides
-    );
-    const dynamicCooldownMs = computeCooldownMs(strategyConfig, state);
-    const cooldownMs =
-      requestedCooldown > 0 ? requestedCooldown : dynamicCooldownMs;
+    // Main play function - returns cooldown to wait (0 = no wait needed)
+    async function runHeartbeat() {
+      const state = loadState();
+      const profile = loadProfile();
+      const now = Date.now();
+
+      // Check if paused
+      if (profile.paused) {
+        state.lastHeartbeat = now;
+        saveState(state);
+        const response = {
+          action: 'heartbeat',
+          status: 'skipped',
+          reason: 'paused',
+          message: 'Autonomous play is paused. Run `apechurch resume` to continue.',
+          address: account.address,
+          paused: true,
+        };
+        if (opts.json) console.log(JSON.stringify(response));
+        else console.log(JSON.stringify(response, null, 2));
+        return { shouldStop: true, waitMs: 0 };
+      }
 
-    const baseResponse = {
-      action: 'heartbeat',
-      strategy,
-      address: account.address,
-      balance_ape: balanceApe.toFixed(6),
-      available_ape: availableApe.toFixed(6),
-      gas_reserve_ape: GAS_RESERVE_APE.toFixed(6),
-      paused: false,
-      last_play: state.lastPlay,
-      cooldown_ms: cooldownMs,
-      consecutive_wins: state.consecutiveWins,
-      consecutive_losses: state.consecutiveLosses,
-    };
+      state.lastHeartbeat = now;
+      if (opts.strategy) state.strategy = normalizeStrategy(opts.strategy);
+      else if (profile.persona) state.strategy = normalizeStrategy(profile.persona);
+      if (requestedCooldown > 0) state.cooldownMs = requestedCooldown;
+
+      const { publicClient } = createClients();
+      let balance;
+      try {
+        balance = await publicClient.getBalance({ address: account.address });
+      } catch (error) {
+        console.error(JSON.stringify({ error: `Failed to fetch balance: ${sanitizeError(error)}` }));
+        return { shouldStop: true, waitMs: 0 };
+      }
 
-    if (availableApe <= 0 || availableApe < strategyConfig.minBetApe) {
-      saveState(state);
-      const response = {
-        ...baseResponse,
-        status: 'skipped',
-        reason: 'insufficient_available_ape',
+      const balanceApe = parseFloat(formatEther(balance));
+      const availableApe = Math.max(balanceApe - GAS_RESERVE_APE, 0);
+      const strategy = normalizeStrategy(state.strategy);
+      const strategyConfig = applyProfileOverrides(
+        getStrategyConfig(strategy),
+        profile.overrides
+      );
+      const dynamicCooldownMs = computeCooldownMs(strategyConfig, state);
+      const cooldownMs = requestedCooldown > 0 ? requestedCooldown : dynamicCooldownMs;
+
+      const baseResponse = {
+        action: 'heartbeat',
+        strategy,
+        address: account.address,
+        balance_ape: balanceApe.toFixed(6),
+        available_ape: availableApe.toFixed(6),
+        gas_reserve_ape: GAS_RESERVE_APE.toFixed(6),
+        paused: false,
+        last_play: state.lastPlay,
+        cooldown_ms: cooldownMs,
+        consecutive_wins: state.consecutiveWins,
+        consecutive_losses: state.consecutiveLosses,
       };
-      if (opts.json) console.log(JSON.stringify(response));
-      else console.log(JSON.stringify(response, null, 2));
-      return;
-    }
 
-    if (state.lastPlay && cooldownMs > 0 && now - state.lastPlay < cooldownMs) {
-      saveState(state);
-      const response = {
-        ...baseResponse,
-        status: 'skipped',
-        reason: 'cooldown',
-        next_play_after_ms: Math.max(cooldownMs - (now - state.lastPlay), 0),
-      };
-      if (opts.json) console.log(JSON.stringify(response));
-      else console.log(JSON.stringify(response, null, 2));
-      return;
-    }
+      if (availableApe <= 0 || availableApe < strategyConfig.minBetApe) {
+        saveState(state);
+        const response = {
+          ...baseResponse,
+          status: 'skipped',
+          reason: 'insufficient_available_ape',
+        };
+        if (opts.json) console.log(JSON.stringify(response));
+        else console.log(JSON.stringify(response, null, 2));
+        return { shouldStop: true, waitMs: 0 };
+      }
 
-    const wagerApe = calculateWager(availableApe, strategyConfig);
-    if (wagerApe < strategyConfig.minBetApe) {
-      saveState(state);
-      const response = {
-        ...baseResponse,
-        status: 'skipped',
-        reason: 'wager_below_minimum',
-        wager_ape: formatApeAmount(wagerApe),
-      };
-      if (opts.json) console.log(JSON.stringify(response));
-      else console.log(JSON.stringify(response, null, 2));
-      return;
-    }
+      if (state.lastPlay && cooldownMs > 0 && now - state.lastPlay < cooldownMs) {
+        const waitMs = Math.max(cooldownMs - (now - state.lastPlay), 0);
+        saveState(state);
+        const response = {
+          ...baseResponse,
+          status: 'skipped',
+          reason: 'cooldown',
+          next_play_after_ms: waitMs,
+        };
+        if (opts.json) console.log(JSON.stringify(response));
+        else console.log(JSON.stringify(response, null, 2));
+        return { shouldStop: false, waitMs };
+      }
 
-    const selection = selectGameAndConfig(strategyConfig);
-    const wagerApeString = formatApeAmount(wagerApe);
+      const wagerApe = calculateWager(availableApe, strategyConfig);
+      if (wagerApe < strategyConfig.minBetApe) {
+        saveState(state);
+        const response = {
+          ...baseResponse,
+          status: 'skipped',
+          reason: 'wager_below_minimum',
+          wager_ape: formatApeAmount(wagerApe),
+        };
+        if (opts.json) console.log(JSON.stringify(response));
+        else console.log(JSON.stringify(response, null, 2));
+        return { shouldStop: true, waitMs: 0 };
+      }
 
-    try {
-      const playResponse = await playGame({
-        account,
-        game: selection.game,
-        amountApe: wagerApeString,
-        mode: selection.mode,
-        balls: selection.balls,
-        spins: selection.spins,
-        timeoutMs,
+      const selection = selectGameAndConfig(strategyConfig);
+      const wagerApeString = formatApeAmount(wagerApe);
+
+      try {
+        const playResponse = await playGame({
+          account,
+          game: selection.game,
+          amountApe: wagerApeString,
+          mode: selection.mode,
+          balls: selection.balls,
+          spins: selection.spins,
+          timeoutMs,
+        });
+
+        state.lastPlay = Date.now();
+        if (playResponse?.result) {
+          const pnlWei = (BigInt(playResponse.result.payout_wei) -
+            BigInt(playResponse.result.buy_in_wei)).toString();
+          state.totalPnLWei = addBigIntStrings(state.totalPnLWei, pnlWei);
+          if (BigInt(pnlWei) >= 0n) {
+            state.sessionWins += 1;
+            state.consecutiveWins += 1;
+            state.consecutiveLosses = 0;
+          } else {
+            state.sessionLosses += 1;
+            state.consecutiveLosses += 1;
+            state.consecutiveWins = 0;
+          }
+        }
+
+        saveState(state);
+        
+        // Recalculate cooldown after state update (may change due to win/loss streaks)
+        const newCooldownMs = requestedCooldown > 0 
+          ? requestedCooldown 
+          : computeCooldownMs(strategyConfig, state);
+
+        const response = {
+          ...baseResponse,
+          cooldown_ms: newCooldownMs,
+          consecutive_wins: state.consecutiveWins,
+          consecutive_losses: state.consecutiveLosses,
+          status: playResponse.status,
+          wager_ape: wagerApeString,
+          game: playResponse.game,
+          config: playResponse.config,
+          tx: playResponse.tx,
+          gameId: playResponse.gameId,
+          game_url: playResponse.game_url,
+          result: playResponse.result,
+        };
+
+        if (opts.json) console.log(JSON.stringify(response));
+        else console.log(JSON.stringify(response, null, 2));
+
+        return { shouldStop: false, waitMs: newCooldownMs };
+      } catch (error) {
+        saveState(state);
+        console.error(JSON.stringify({ error: error.message }));
+        return { shouldStop: true, waitMs: 0 };
+      }
+    }
+
+    // Run once or loop
+    if (!loopMode) {
+      const result = await runHeartbeat();
+      if (result.shouldStop && result.waitMs === 0) {
+        // Error or fatal skip - exit with appropriate code
+        const state = loadState();
+        const profile = loadProfile();
+        if (profile.paused) process.exit(0);
+      }
+    } else {
+      // Loop mode
+      let running = true;
+      process.on('SIGINT', () => {
+        if (!opts.json) console.log('\n👋 Stopping continuous play...');
+        running = false;
       });
+      process.on('SIGTERM', () => {
+        running = false;
+      });
+
+      while (running) {
+        const result = await runHeartbeat();
+        
+        if (!running) break;
+        
+        if (result.shouldStop) {
+          if (!opts.json) console.log('\n⏹️  Stopped: cannot continue playing.');
+          break;
+        }
 
-      state.lastPlay = now;
-      if (playResponse?.result) {
-        const pnlWei = (BigInt(playResponse.result.payout_wei) -
-          BigInt(playResponse.result.buy_in_wei)).toString();
-        state.totalPnLWei = addBigIntStrings(state.totalPnLWei, pnlWei);
-        if (BigInt(pnlWei) >= 0n) {
-          state.sessionWins += 1;
-          state.consecutiveWins += 1;
-          state.consecutiveLosses = 0;
-        } else {
-          state.sessionLosses += 1;
-          state.consecutiveLosses += 1;
-          state.consecutiveWins = 0;
+        if (result.waitMs > 0) {
+          if (!opts.json) {
+            console.log(`\n⏳ Waiting ${(result.waitMs / 1000).toFixed(0)}s until next bet...\n`);
+          }
+          await new Promise((resolve) => {
+            const timeout = setTimeout(resolve, result.waitMs);
+            const checkStop = setInterval(() => {
+              if (!running) {
+                clearTimeout(timeout);
+                clearInterval(checkStop);
+                resolve();
+              }
+            }, 500);
+          });
         }
       }
+    }
+  });
 
-      saveState(state);
-      const response = {
-        ...baseResponse,
-        status: playResponse.status,
-        wager_ape: wagerApeString,
-        game: playResponse.game,
-        config: playResponse.config,
-        tx: playResponse.tx,
-        gameId: playResponse.gameId,
-        game_url: playResponse.game_url,
-        result: playResponse.result,
+// --- COMMAND: GAMES (Show available games and parameters) ---
+program
+  .command('games')
+  .description('List all available games and their parameters')
+  .option('--json', 'Output JSON only')
+  .action((opts) => {
+    const games = GAME_REGISTRY.map((game) => {
+      const params = [];
+      if (game.type === 'plinko') {
+        params.push({
+          name: 'mode',
+          type: 'integer',
+          min: game.config.mode.min,
+          max: game.config.mode.max,
+          default: game.config.mode.default,
+          description: 'Risk level (higher = riskier, bigger payouts)',
+        });
+        params.push({
+          name: 'balls',
+          type: 'integer',
+          min: game.config.balls.min,
+          max: game.config.balls.max,
+          default: game.config.balls.default,
+          description: 'Number of balls to drop',
+        });
+      } else if (game.type === 'slots') {
+        params.push({
+          name: 'spins',
+          type: 'integer',
+          min: game.config.spins.min,
+          max: game.config.spins.max,
+          default: game.config.spins.default,
+          description: 'Number of spins per bet',
+        });
+      }
+      return {
+        key: game.key,
+        name: game.name,
+        type: game.type,
+        aliases: game.aliases || [],
+        contract: game.contract,
+        parameters: params,
       };
+    });
 
-      if (opts.json) console.log(JSON.stringify(response));
-      else console.log(JSON.stringify(response, null, 2));
-    } catch (error) {
-      saveState(state);
-      console.error(JSON.stringify({ error: error.message }));
-      process.exit(1);
+    if (opts.json) {
+      console.log(JSON.stringify({ games }, null, 2));
+    } else {
+      console.log('\n🎰 AVAILABLE GAMES\n');
+      for (const game of games) {
+        console.log(`${game.name} (${game.key})`);
+        console.log(`  Type: ${game.type}`);
+        console.log(`  Aliases: ${game.aliases.join(', ') || 'none'}`);
+        console.log('  Parameters:');
+        for (const param of game.parameters) {
+          console.log(`    --${param.name} <${param.min}-${param.max}>  ${param.description} (default: ${param.default})`);
+        }
+        console.log('');
+      }
+      console.log('EXAMPLE BETS:');
+      console.log('  apechurch bet --game jungle-plinko --amount 5 --mode 2 --balls 50');
+      console.log('  apechurch bet --game dino-dough --amount 10 --spins 8');
+      console.log('  apechurch bet --game bubblegum-heist --amount 5 --spins 12');
+      console.log('');
     }
   });
 
+// --- COMMAND: COMMANDS (Show all commands overview) ---
+program
+  .command('commands')
+  .description('Show all available commands with examples')
+  .action(() => {
+    console.log(`
+🎰 APE CHURCH CLI - COMMAND REFERENCE
+
+SETUP
+  apechurch install [--username NAME] [--persona TYPE]
+    Set up your agent wallet and register.
+    Personas: conservative, balanced, aggressive, degen
+
+  apechurch register --username <NAME>
+    Change your username.
+
+STATUS
+  apechurch status [--json]
+    Check your wallet balance and agent status.
+
+  apechurch games [--json]
+    List all available games and their parameters.
+
+PLAYING
+  apechurch heartbeat [--strategy TYPE] [--loop] [--json]
+    Place a bet using your strategy. Use --loop to play continuously.
+    Strategies: conservative (60s), balanced (30s), aggressive (15s), degen (10s)
+
+  apechurch bet --game <NAME> --amount <APE> [--mode 0-4] [--balls 1-100] [--spins 1-15]
+    Place a manual bet on a specific game.
+    Games: jungle-plinko, dino-dough, bubblegum-heist
+
+CONTROL
+  apechurch pause
+    Pause autonomous play.
+
+  apechurch resume
+    Resume autonomous play.
+
+PROFILE
+  apechurch profile show [--json]
+    View your current profile settings.
+
+  apechurch profile set [--persona TYPE] [--username NAME]
+    Update your profile.
+
+EXAMPLES
+  apechurch install --username CoolBot --persona balanced
+  apechurch heartbeat --strategy aggressive --loop
+  apechurch bet --game jungle-plinko --amount 10 --mode 3 --balls 25
+  apechurch bet --game dino-dough --amount 5 --spins 10
+`);
+  });
+
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ape-church/skill",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Autonomous agent skill for Ape Church on ApeChain.",
   "main": "index.js",
   "scripts": {