any-buddy 1.0.3 → 1.0.5

package/README.md

@@ -85,6 +85,9 @@ claude-code-any-buddy apply --silent
 # Restore original pet
 claude-code-any-buddy restore
 
+# Delete companion so Claude Code re-hatches a fresh one on next /buddy
+claude-code-any-buddy rehatch
+
 # Non-interactive with flags (skip prompts you already know the answer to)
 claude-code-any-buddy --species dragon --rarity legendary --eye '✦' --hat wizard --name Draco --yes
 ```

package/bin/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { runInteractive, runPreview, runCurrent, runApply, runRestore } from '../lib/tui.mjs';
+import { runInteractive, runPreview, runCurrent, runApply, runRestore, runRehatch } from '../lib/tui.mjs';
 
 function parseArgs(argv) {
   const args = argv.slice(2);
@@ -43,6 +43,9 @@ try {
     case 'restore':
       await runRestore();
       break;
+    case 'rehatch':
+      await runRehatch();
+      break;
     case 'help':
       printHelp();
       break;
@@ -78,6 +81,7 @@ Usage:
   claude-code-any-buddy current                  Show your current pet
   claude-code-any-buddy apply [--silent]         Re-apply saved pet after update
   claude-code-any-buddy restore                  Restore original pet
+  claude-code-any-buddy rehatch                  Delete companion to re-hatch via /buddy
 
 Options:
   -s, --species <name>   Species (duck, goose, blob, cat, dragon, octopus, owl,

package/lib/config.mjs

@@ -104,6 +104,17 @@ export function setCompanionPersonality(personality) {
   writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', { mode: 0o600 });
 }
 
+// Delete the companion from ~/.claude.json so Claude Code re-hatches on next /buddy
+export function deleteCompanion() {
+  const configPath = getClaudeConfigPath();
+  if (!existsSync(configPath)) return false;
+  const config = JSON.parse(readFileSync(configPath, 'utf-8'));
+  if (!config.companion) return false;
+  delete config.companion;
+  writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', { mode: 0o600 });
+  return true;
+}
+
 // Read or write Claude Code's settings.json for hooks
 const SETTINGS_PATH = join(homedir(), '.claude', 'settings.json');
 

package/lib/finder-worker.mjs

@@ -109,7 +109,7 @@ while (true) {
     process.exit(0);
   }
 
-  if (attempts % 500000 === 0) {
-    process.stderr.write(`${(attempts / 1000).toFixed(0)}k seeds tried...\n`);
+  if (attempts % 25000 === 0) {
+    process.stderr.write(JSON.stringify({ attempts, elapsed: Date.now() - start }) + '\n');
   }
 }

package/lib/finder.mjs

@@ -1,28 +1,105 @@
-import { execFileSync } from 'child_process';
+import { spawn } from 'child_process';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
+import { RARITY_WEIGHTS } from './constants.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const WORKER_PATH = join(__dirname, 'finder-worker.mjs');
 
+// Calculate expected attempts based on probability of matching all desired traits.
+export function estimateAttempts(desired) {
+  // Species: 1/18
+  let p = 1 / 18;
+
+  // Rarity: weight / 100
+  p *= RARITY_WEIGHTS[desired.rarity] / 100;
+
+  // Eye: 1/6
+  p *= 1 / 6;
+
+  // Hat: common is always 'none' (guaranteed), otherwise 1/8
+  if (desired.rarity !== 'common') {
+    p *= 1 / 8;
+  }
+
+  // Shiny: 1/100
+  if (desired.shiny) {
+    p *= 0.01;
+  }
+
+  // Peak stat: 1/5
+  if (desired.peak) {
+    p *= 1 / 5;
+  }
+
+  // Dump stat: ~1/4 (picked from remaining 4, but rerolls on collision)
+  if (desired.dump) {
+    p *= 1 / 4;
+  }
+
+  // Expected attempts = 1/p (geometric distribution)
+  return Math.round(1 / p);
+}
+
 // Spawns a Bun subprocess that brute-forces salts using native Bun.hash.
-// Returns { salt, attempts, elapsed }.
-export function findSalt(userId, desired) {
-  const result = execFileSync('bun', [
-    WORKER_PATH,
-    userId,
-    desired.species,
-    desired.rarity,
-    desired.eye,
-    desired.hat,
-    String(desired.shiny ?? false),
-    desired.peak ?? 'any',
-    desired.dump ?? 'any',
-  ], {
-    encoding: 'utf-8',
-    timeout: 120000, // 2 minute timeout
-    stdio: ['pipe', 'pipe', 'inherit'], // stderr passes through for progress
-  });
+// Calls onProgress with { attempts, elapsed, rate, expected, pct, eta } on each tick.
+// Returns a promise resolving to { salt, attempts, elapsed }.
+export function findSalt(userId, desired, { onProgress } = {}) {
+  const expected = estimateAttempts(desired);
+
+  return new Promise((resolve, reject) => {
+    const child = spawn('bun', [
+      WORKER_PATH,
+      userId,
+      desired.species,
+      desired.rarity,
+      desired.eye,
+      desired.hat,
+      String(desired.shiny ?? false),
+      desired.peak ?? 'any',
+      desired.dump ?? 'any',
+    ], {
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 300000,
+    });
+
+    let stdout = '';
 
-  return JSON.parse(result.trim());
+    child.stdout.on('data', (chunk) => {
+      stdout += chunk.toString();
+    });
+
+    child.stderr.on('data', (chunk) => {
+      if (!onProgress) return;
+      // Worker writes JSON progress lines to stderr
+      const lines = chunk.toString().split('\n').filter(Boolean);
+      for (const line of lines) {
+        try {
+          const progress = JSON.parse(line);
+          const rate = progress.attempts / (progress.elapsed / 1000); // attempts/sec
+          const pct = Math.min(100, (progress.attempts / expected) * 100);
+          // ETA based on expected remaining attempts at current rate
+          const remaining = Math.max(0, expected - progress.attempts);
+          const eta = rate > 0 ? remaining / rate : Infinity;
+          onProgress({ ...progress, rate, expected, pct, eta });
+        } catch {
+          // Not JSON — ignore
+        }
+      }
+    });
+
+    child.on('close', (code) => {
+      if (code === 0 && stdout.trim()) {
+        try {
+          resolve(JSON.parse(stdout.trim()));
+        } catch (err) {
+          reject(new Error(`Failed to parse finder result: ${stdout.trim()}`));
+        }
+      } else {
+        reject(new Error(`Salt finder exited with code ${code}`));
+      }
+    });
+
+    child.on('error', reject);
+  });
 }

package/lib/tui.mjs

@@ -3,11 +3,23 @@ import chalk from 'chalk';
 import { SPECIES, EYES, HATS, RARITIES, RARITY_STARS, RARITY_WEIGHTS, STAT_NAMES, ORIGINAL_SALT } from './constants.mjs';
 import { roll } from './generation.mjs';
 import { renderSprite, renderFace } from './sprites.mjs';
-import { findSalt } from './finder.mjs';
+import { findSalt, estimateAttempts } from './finder.mjs';
 import { findClaudeBinary, getCurrentSalt, patchBinary, verifySalt, restoreBinary, isClaudeRunning } from './patcher.mjs';
-import { getClaudeUserId, savePetConfig, loadPetConfig, isHookInstalled, installHook, removeHook, getCompanionName, renameCompanion, getCompanionPersonality, setCompanionPersonality } from './config.mjs';
+import { getClaudeUserId, savePetConfig, loadPetConfig, isHookInstalled, installHook, removeHook, getCompanionName, renameCompanion, getCompanionPersonality, setCompanionPersonality, deleteCompanion } from './config.mjs';
 import { DEFAULT_PERSONALITIES } from './personalities.mjs';
 
+function progressBar(pct, width) {
+  const filled = Math.min(width, Math.round((pct / 100) * width));
+  const empty = width - filled;
+  return chalk.cyan('█'.repeat(filled)) + chalk.dim('░'.repeat(empty));
+}
+
+function formatCount(n) {
+  if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
+  if (n >= 1e3) return `${(n / 1e3).toFixed(0)}k`;
+  return String(n);
+}
+
 const RARITY_CHALK = {
   common: chalk.gray,
   uncommon: chalk.green,
@@ -180,6 +192,37 @@ export async function runRestore() {
   console.log();
 }
 
+export async function runRehatch() {
+  banner();
+
+  const name = getCompanionName();
+  if (!name) {
+    console.log(chalk.dim('  No companion found — nothing to delete.\n'));
+    return;
+  }
+
+  const personality = getCompanionPersonality();
+  console.log(chalk.dim(`  Current companion: "${name}"`));
+  if (personality) {
+    console.log(chalk.dim(`  Personality: "${personality}"`));
+  }
+  console.log();
+
+  const proceed = await confirm({
+    message: `Delete "${name}" so Claude Code generates a fresh companion on next /buddy?`,
+    default: false,
+  });
+
+  if (!proceed) {
+    console.log(chalk.dim('\n  Cancelled.\n'));
+    return;
+  }
+
+  deleteCompanion();
+  console.log(chalk.green(`\n  Companion "${name}" deleted.`));
+  console.log(chalk.dim('  Run /buddy in Claude Code to hatch a new one.\n'));
+}
+
 export async function runInteractive(flags = {}) {
   banner();
 
@@ -241,15 +284,23 @@ export async function runInteractive(flags = {}) {
   }
 
   // ─── Find salt ───
-  console.log(chalk.dim('\n  Searching for matching salt...'));
-
-  const result = findSalt(userId, desired, {
-    onProgress: (attempts, ms) => {
-      process.stdout.write(chalk.dim(`\r  Tried ${(attempts / 1000).toFixed(0)}k seeds (${(ms / 1000).toFixed(1)}s)...`));
+  const expected = estimateAttempts(desired);
+  console.log(chalk.dim(`\n  Searching (~${formatCount(expected)} expected attempts)...`));
+
+  const result = await findSalt(userId, desired, {
+    onProgress: ({ attempts, elapsed, rate, pct, eta }) => {
+      const bar = progressBar(pct, 20);
+      const etaStr = eta < 1 ? '<1s' : eta < 60 ? `${Math.ceil(eta)}s` : `${(eta / 60).toFixed(1)}m`;
+      const rateStr = rate > 1e6 ? `${(rate / 1e6).toFixed(1)}M/s` : `${(rate / 1e3).toFixed(0)}k/s`;
+      process.stdout.write(
+        `\r  ${bar} ${chalk.dim(`${Math.min(99, Math.floor(pct))}%`)}  ${chalk.cyan(formatCount(attempts))} tried  ${chalk.dim(rateStr)}  ${chalk.dim(`ETA ${etaStr}`)}   `
+      );
     },
   });
 
-  console.log(chalk.green(`\r  Found salt "${result.salt}" in ${result.attempts.toLocaleString()} attempts (${(result.elapsed / 1000).toFixed(1)}s)`));
+  // Clear the progress line and show result
+  process.stdout.write('\r' + ' '.repeat(80) + '\r');
+  console.log(chalk.green(`  Found in ${result.attempts.toLocaleString()} attempts (${(result.elapsed / 1000).toFixed(1)}s)`));
   const foundBones = roll(userId, result.salt).bones;
   showPet(foundBones, 'Your new pet');
 
@@ -352,8 +403,10 @@ export async function runInteractive(flags = {}) {
   // ─── Rename & Personality ───
   const currentName = getCompanionName();
   const currentPersonality = getCompanionPersonality();
+  const hasCompanion = !!(currentName && currentPersonality);
 
-  if (currentName) {
+  if (hasCompanion) {
+    // ── Name ──
     const newName = flags.name ?? await input({
       message: `Rename your companion? (current: "${currentName}", leave blank to keep)`,
       default: '',
@@ -367,14 +420,10 @@ export async function runInteractive(flags = {}) {
         console.log(chalk.yellow(`  Could not rename: ${err.message}`));
       }
     }
-  } else if (flags.name) {
-    console.log(chalk.dim('  No companion hatched yet — name will be set when you run /buddy'));
-  }
 
-  if (currentPersonality) {
+    // ── Personality ──
     console.log(chalk.dim(`\n  Current personality: "${currentPersonality}"`));
 
-    // Determine the species — use the desired species from the selection above
     const selectedSpecies = desired.species;
     const speciesDefault = DEFAULT_PERSONALITIES[selectedSpecies] || null;
 
@@ -407,8 +456,13 @@ export async function runInteractive(flags = {}) {
         console.log(chalk.yellow(`  Could not update personality: ${err.message}`));
       }
     }
-  } else if (flags.personality) {
-    console.log(chalk.dim('  No companion hatched yet — personality will be set when you run /buddy'));
+  } else {
+    console.log(chalk.dim('\n  No companion hatched yet — the visual patch has been applied.'));
+    console.log(chalk.dim('  Run /buddy in Claude Code to hatch your companion and get a name & personality.'));
+    console.log(chalk.dim('  Then run any-buddy again to customize the name and personality.'));
+    if (flags.name || flags.personality) {
+      console.log(chalk.yellow('  --name and --personality are ignored until after hatching.'));
+    }
   }
 
   if (running) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "any-buddy",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Pick any Claude Code companion pet you want",
   "type": "module",
   "bin": {