buddy-reroll 0.3.0 → 0.3.2

package/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { readFileSync, writeFileSync, existsSync, copyFileSync, renameSync, unlinkSync } from "fs";
+import { readFileSync, writeFileSync, existsSync, copyFileSync, renameSync, unlinkSync, statSync, chmodSync } from "fs";
 import { platform } from "os";
-import { execFileSync } from "child_process";
+import { execFileSync, spawnSync } from "child_process";
 import { parseArgs } from "util";
 import chalk from "chalk";
 import { renderSprite, colorizeSprite, RARITY_STARS, RARITY_COLORS } from "./sprites.js";
@@ -27,8 +27,16 @@ import { installHook, removeHook, storeSalt, readStoredSalt } from "./lib/hooks.
 
 const IS_BUN = typeof Bun !== "undefined";
 const IS_APPLY_HOOK = process.argv.includes("--apply-hook");
+
 if (!IS_BUN && !IS_APPLY_HOOK) {
-  console.warn("⚠ Running without Bun — searching will be a bit slower. For the speediest experience: https://bun.sh");
+  try {
+    const cmd = platform() === "win32" ? "where.exe" : "which";
+    const bunPath = execFileSync(cmd, ["bun"], { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim().split("\n")[0];
+    if (bunPath) {
+      const result = spawnSync(bunPath, process.argv.slice(1), { stdio: "inherit" });
+      process.exit(result.status ?? 0);
+    }
+  } catch {}
 }
 
 function getUserId(configPath) {
@@ -67,6 +75,7 @@ function patchBinary(binaryPath, oldSalt, newSalt) {
     throw new Error(`Salt length mismatch: "${oldSalt}" (${oldSalt.length}) vs "${newSalt}" (${newSalt.length})`);
   }
 
+  const originalMode = statSync(binaryPath).mode;
   const data = readFileSync(binaryPath);
   const oldBuf = Buffer.from(oldSalt);
   const newBuf = Buffer.from(newSalt);
@@ -88,8 +97,22 @@ function patchBinary(binaryPath, oldSalt, newSalt) {
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     try {
       const tmpPath = binaryPath + ".tmp";
-      writeFileSync(tmpPath, data);
-      renameSync(tmpPath, binaryPath);
+      writeFileSync(tmpPath, data, { mode: originalMode });
+      try {
+        renameSync(tmpPath, binaryPath);
+      } catch {
+        if (existsSync(binaryPath + ".backup")) {
+          try { unlinkSync(binaryPath); } catch {}
+        }
+        renameSync(tmpPath, binaryPath);
+      }
+
+      chmodSync(binaryPath, originalMode);
+
+      const verify = readFileSync(binaryPath);
+      const found = verify.indexOf(Buffer.from(newSalt));
+      if (found === -1) throw new Error("Patch verification failed — new salt not found after write");
+
       return count;
     } catch (err) {
       try { unlinkSync(binaryPath + ".tmp"); } catch {}
@@ -97,7 +120,10 @@ function patchBinary(binaryPath, oldSalt, newSalt) {
         sleepMs(2000);
         continue;
       }
-      throw new Error(`Failed to write binary: ${err.message}${isWin ? " (ensure Claude Code is fully closed)" : ""}`);
+      if (isWin && (err.code === "EPERM" || err.code === "EBUSY")) {
+        throw new Error("Can't write — Claude Code might still be running. Close it and try again.");
+      }
+      throw new Error(`Failed to write: ${err.message}`);
     }
   }
 }
@@ -106,10 +132,12 @@ function resignBinary(binaryPath) {
   if (platform() !== "darwin") return false;
   try {
     execFileSync("codesign", ["-s", "-", "--force", binaryPath], {
-      stdio: "ignore",
+      stdio: ["ignore", "pipe", "pipe"],
+      timeout: 30000,
     });
     return true;
-  } catch {
+  } catch (err) {
+    console.warn(`  ⚠ Code signing failed: ${err.message}\n    Try manually: codesign --force --sign - "${binaryPath}"`);
     return false;
   }
 }
@@ -130,7 +158,32 @@ function fail(message) {
 
 function readCurrentCompanion(binaryPath, userId) {
   const binaryData = readFileSync(binaryPath);
-  const currentSalt = findCurrentSalt(binaryData);
+  let currentSalt = findCurrentSalt(binaryData);
+
+  if (!currentSalt) {
+    const stored = readStoredSalt();
+    if (stored) {
+      const storedBuf = Buffer.from(stored.salt);
+      if (binaryData.includes(storedBuf)) {
+        currentSalt = stored.salt;
+      }
+    }
+  }
+
+  if (!currentSalt) {
+    const backupPath = binaryPath + ".backup";
+    if (existsSync(backupPath)) {
+      console.log("  ⚠ Can't find salt in binary — restoring from backup...");
+      try {
+        copyFileSync(backupPath, binaryPath);
+        resignBinary(binaryPath);
+        const restored = readFileSync(binaryPath);
+        currentSalt = findCurrentSalt(restored);
+        if (currentSalt) console.log("  ✓ Restored successfully.");
+      } catch {}
+    }
+  }
+
   if (!currentSalt) fail("  ✗ Couldn't read your current buddy from the Claude binary.");
   return { currentSalt, currentRoll: rollFrom(currentSalt, userId) };
 }
@@ -216,7 +269,7 @@ async function interactiveMode(binaryPath, configPath, userId) {
     binaryPath,
     configPath,
     userId,
-    bruteForce,
+    bruteForce: parallelBruteForce,
     patchBinary,
     resignBinary,
     clearCompanion,
@@ -230,6 +283,8 @@ async function interactiveMode(binaryPath, configPath, userId) {
     EYES,
     HATS,
     STAT_NAMES,
+    storeSalt,
+    installHook,
   };
 
   try {
@@ -277,25 +332,30 @@ async function nonInteractiveMode(args, binaryPath, configPath, userId) {
   const target = buildTargetFromArgs(args);
   if (Object.keys(target).length === 0) fail("  ✗ Tell me what kind of buddy you want! Use --help to see options.");
 
-  const expected = estimateAttempts(target);
-  console.log(`  Target:  ${Object.entries(target).map(([k, v]) => `${k}=${v}`).join(" ")}`);
-  console.log(`  This might take ~${expected.toLocaleString()} tries\n`);
+  const patchability = assertPatchable(binaryPath);
 
   if (matches(currentRoll, target)) {
     console.log("  ✓ Your buddy already looks like that!\n" + formatCompanionCard(currentRoll));
     return;
   }
 
-  const patchability = assertPatchable(binaryPath);
+  const expected = estimateAttempts(target);
+  console.log(`  Target:  ${Object.entries(target).map(([k, v]) => `${k}=${v}`).join(" ")}`);
+  console.log(`  This might take ~${expected.toLocaleString()} tries\n`);
 
   if (isClaudeRunning()) {
     console.warn("  ⚠ Claude Code is still running — close it first so the changes stick.");
   }
 
   console.log("  Looking for your buddy...");
-  const found = await parallelBruteForce(userId, target, (attempts, elapsed, est, workers) => {
-    process.stdout.write(`\r  ${formatProgress(attempts, elapsed, est, workers)}`);
-  });
+  let found;
+  try {
+    found = await parallelBruteForce(userId, target, (attempts, elapsed, est, workers) => {
+      process.stdout.write(`\r  ${formatProgress(attempts, elapsed, est, workers)}`);
+    });
+  } catch (err) {
+    fail(`\n  ✗ ${err.message}`);
+  }
   if (!found) fail("\n  ✗ Couldn't find a match. Try being less picky!");
   console.log(`\n  ✓ Found it! (${found.checked.toLocaleString()} tries, ${(found.elapsed / 1000).toFixed(1)}s)`);
   console.log(formatCompanionCard(found.result));
@@ -316,8 +376,9 @@ async function nonInteractiveMode(args, binaryPath, configPath, userId) {
     if (resignBinary(binaryPath)) console.log("  Re-signed for macOS ✓");
     clearCompanion(configPath);
     storeSalt(found.salt);
+    try { installHook(); } catch {}
     console.log("  Cleaned up old buddy data ✓");
-    console.log("\n  All set! Restart Claude Code and say /buddy to meet your new friend.\n");
+    console.log("\n  All set! Your buddy will stick around even after Claude updates.\n  Restart Claude Code and say /buddy to meet your new friend.\n");
   } catch (err) {
     fail(`  ✗ ${err.message}`);
   }
@@ -365,8 +426,7 @@ async function main() {
     buddy-reroll --current                           Show current buddy
     buddy-reroll --doctor                            Check setup
     buddy-reroll --restore                           Undo changes
-    buddy-reroll --hook                              Keep my buddy after updates
-    buddy-reroll --unhook                            Stop keeping after updates
+    buddy-reroll --unhook                            Stop auto-keeping after updates
 
   Appearance (all optional — skip to leave random):
     --species <name>    ${SPECIES.join(", ")}
@@ -413,8 +473,17 @@ async function main() {
       if (currentSalt === stored.salt) process.exit(0);
       const patchability = getPatchability(bp);
       if (!patchability.ok) process.exit(0);
+      const backupPath = patchability.backupPath;
+      if (!existsSync(backupPath)) copyFileSync(bp, backupPath);
       patchBinary(bp, currentSalt, stored.salt);
-      resignBinary(bp);
+      if (platform() === "darwin") {
+        try {
+          execFileSync("codesign", ["-s", "-", "--force", bp], { stdio: "ignore", timeout: 30000 });
+        } catch {
+          copyFileSync(backupPath, bp);
+          process.exit(1);
+        }
+      }
       clearCompanion(cp);
     } catch {}
     process.exit(0);

package/lib/estimator.js

@@ -8,7 +8,7 @@ export function estimateAttempts(target) {
   if (target.species) probability *= 1 / 18;
   if (target.rarity) probability *= RARITY_WEIGHTS[target.rarity] / 100;
   if (target.eye) probability *= 1 / 6;
-  if (target.hat && target.rarity !== "common") probability *= 1 / 8;
+  if (target.hat && target.hat !== "none" && target.rarity !== "common") probability *= 1 / 8;
   if (target.shiny === true) probability *= 0.01;
   if (target.peak) probability *= 1 / 5;
   if (target.dump) probability *= 1 / 4;

package/lib/finder.js

@@ -14,6 +14,7 @@ export async function parallelBruteForce(userId, target, onProgress) {
   return new Promise((resolve, reject) => {
     const children = [];
     const workerStdout = [];
+    const workerStderr = [];
     const workerAttempts = [];
     let resolved = false;
     let exited = 0;
@@ -26,6 +27,7 @@ export async function parallelBruteForce(userId, target, onProgress) {
 
     for (let i = 0; i < numWorkers; i++) {
       workerStdout[i] = "";
+      workerStderr[i] = "";
       workerAttempts[i] = 0;
 
       const child = spawn(process.execPath, [WORKER_SCRIPT, userId, JSON.stringify(target)], {
@@ -38,7 +40,9 @@ export async function parallelBruteForce(userId, target, onProgress) {
       });
 
       child.stderr.on("data", (chunk) => {
-        const lines = chunk.toString().split("\n").filter(Boolean);
+        const text = chunk.toString();
+        workerStderr[i] += text;
+        const lines = text.split("\n").filter(Boolean);
         for (const line of lines) {
           try {
             const progress = JSON.parse(line);
@@ -80,14 +84,17 @@ export async function parallelBruteForce(userId, target, onProgress) {
         }
 
         if (exited === numWorkers && !resolved) {
-          resolve(null);
+          const totalAttempts = workerAttempts.reduce((a, b) => a + b, 0);
+          const stderr = workerStderr.filter(Boolean).join("\n").trim();
+          const detail = stderr ? `\n  Worker output: ${stderr.slice(0, 200)}` : "";
+          reject(new Error(`All ${numWorkers} workers exited without finding a match (${totalAttempts.toLocaleString()} tries).${detail}`));
         }
       });
 
-      child.on("error", () => {
+      child.on("error", (err) => {
         exited++;
         if (exited === numWorkers && !resolved) {
-          resolve(null);
+          reject(new Error(`Worker failed to start: ${err.message}`));
         }
       });
     }
@@ -97,7 +104,8 @@ export async function parallelBruteForce(userId, target, onProgress) {
       if (!resolved) {
         resolved = true;
         killAll();
-        resolve(null);
+        const totalAttempts = workerAttempts.reduce((a, b) => a + b, 0);
+        reject(new Error(`Timed out after ${Math.round(timeoutMs / 1000)}s (${totalAttempts.toLocaleString()} tries). This combination might be extremely rare — try fewer constraints.`));
       }
     }, timeoutMs);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buddy-reroll",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Reroll your Claude Code buddy companion to any species/rarity/eye/hat/shiny combo",
   "type": "module",
   "bin": {

package/scripts/worker.js

@@ -14,7 +14,13 @@ function randomSalt() {
 }
 
 const userId = process.argv[2];
-const target = JSON.parse(process.argv[3]);
+let target;
+try {
+  target = JSON.parse(process.argv[3]);
+} catch {
+  process.stderr.write("Invalid target JSON\n");
+  process.exit(1);
+}
 
 if (!userId || !target) {
   process.stderr.write("Usage: worker.js <userId> '<targetJSON>'\n");

package/ui-fallback.js

@@ -30,6 +30,7 @@ export async function runInteractiveUI(opts) {
     currentRoll, currentSalt, binaryPath, configPath, userId,
     bruteForce, patchBinary, resignBinary, clearCompanion, getPatchability, isClaudeRunning,
     rollFrom, matches, SPECIES, RARITIES, RARITY_LABELS, EYES, HATS, STAT_NAMES,
+    storeSalt, installHook,
   } = opts;
 
   console.log(chalk.bold.dim("\n  buddy-reroll\n"));
@@ -151,9 +152,19 @@ export async function runInteractiveUI(opts) {
   if (!proceed) return;
 
   console.log("  Looking for your buddy...");
-  const found = await bruteForce(userId, target, (checked, elapsed) => {
-    process.stdout.write(`\r  ${(checked / 1e6).toFixed(1)}M tries (${(elapsed / 1000).toFixed(1)}s)`);
-  });
+  let found;
+  try {
+    found = await bruteForce(userId, target, (attempts, elapsed, expected, workers) => {
+      const pct = Math.min(100, Math.round((attempts / expected) * 100));
+      const rate = attempts / (elapsed / 1000);
+      const rateStr = rate >= 1e6 ? `${(rate / 1e6).toFixed(1)}M` : `${(rate / 1e3).toFixed(1)}k`;
+      const eta = Math.max(0, (expected - attempts) / rate);
+      process.stdout.write(`\r  ${pct}% | ${rateStr} tries/s | ~${Math.round(eta)}s left | ${workers} cores`);
+    });
+  } catch (err) {
+    console.log(chalk.red(`\n✗ ${err.message}`));
+    return;
+  }
 
   if (!found) {
     console.log(chalk.red("\n✗ Couldn't find a match. Try being less picky!"));
@@ -174,7 +185,9 @@ export async function runInteractiveUI(opts) {
     if (resignBinary(binaryPath)) console.log("  Re-signed for macOS ✓");
     clearCompanion(configPath);
     console.log("  Cleaned up old buddy data ✓");
-    console.log(chalk.bold("\n  All set! Restart Claude Code and say /buddy to meet your new friend.\n"));
+    if (storeSalt) storeSalt(found.salt);
+    if (installHook) installHook();
+    console.log(chalk.bold("\n  All set! Your buddy will stick around even after Claude updates.\n  Restart Claude Code and say /buddy to meet your new friend.\n"));
   } catch (err) {
     console.log(chalk.red(`\n✗ ${err.message}`));
   }

package/ui.jsx

@@ -130,6 +130,7 @@ function ShowCurrentStep({ isActive }) {
 
   useInput(() => {
     exit();
+    setTimeout(() => process.exit(0), 100);
   }, { isActive });
 
   return (
@@ -183,11 +184,21 @@ function SearchStep({ userId, target, bruteForce, onFound, onFail, isActive }) {
     if (hasStarted.current) return;
     hasStarted.current = true;
     (async () => {
-      const found = await bruteForce(userId, target, (checked, elapsed) => {
-        if (!cancelRef.current) {
-          setProgress(`${(checked / 1e6).toFixed(0)}M salts checked (${(elapsed / 1000).toFixed(1)}s)`);
-        }
-      });
+      let found;
+      try {
+        found = await bruteForce(userId, target, (attempts, elapsed, expected, workers) => {
+          if (!cancelRef.current) {
+            const pct = Math.min(100, Math.round((attempts / expected) * 100));
+            const rate = attempts / (elapsed / 1000);
+            const rateStr = rate >= 1e6 ? `${(rate / 1e6).toFixed(1)}M` : `${(rate / 1e3).toFixed(1)}k`;
+            const eta = Math.max(0, (expected - attempts) / rate);
+            setProgress(`${pct}% | ${rateStr} tries/s | ~${Math.round(eta)}s left | ${workers} cores`);
+          }
+        });
+      } catch {
+        if (!cancelRef.current) onFail();
+        return;
+      }
       if (cancelRef.current) return;
       if (found) onFound(found);
       else onFail();
@@ -208,6 +219,7 @@ function DoneStep({ messages, isActive }) {
 
   useInput(() => {
     exit();
+    setTimeout(() => process.exit(0), 100);
   }, { isActive });
 
   return (
@@ -221,7 +233,7 @@ function DoneStep({ messages, isActive }) {
         <Text bold>
           {hasErrors
             ? "Something went wrong — check the issue above and try again."
-            : "All set! Restart Claude Code and say /buddy to meet your new friend."}
+            : "All set! Your buddy will stick around even after updates. Restart Claude Code and say /buddy!"}
         </Text>
       </Box>
       <KeyHint>Press any key to exit</KeyHint>
@@ -236,8 +248,7 @@ function getPrevStep(current, rarity, peak) {
   if (idx <= 0) return null;
   let prev = STEP_ORDER[idx - 1];
   if (prev === "hat" && rarity === "common") prev = "eye";
-  if (prev === "dump" && peak === null) prev = "shiny";
-  if (prev === "peak") prev = "shiny";
+  if (prev === "dump" && !peak) prev = "peak";
   return prev;
 }
 
@@ -247,6 +258,7 @@ function App({ opts }) {
     currentRoll, currentSalt, binaryPath, configPath, userId,
     bruteForce, patchBinary, resignBinary, clearCompanion, getPatchability, isClaudeRunning,
     rollFrom, matches, SPECIES, RARITIES, RARITY_LABELS, EYES, HATS, STAT_NAMES,
+    storeSalt, installHook,
   } = opts;
 
   const [step, setStep] = useState("action");
@@ -394,21 +406,11 @@ function App({ opts }) {
             isActive={step === "shiny"}
             onConfirm={() => {
               setShiny(true);
-              if (matches(currentRoll, buildTarget(true))) {
-                setDoneMessages([{ type: "success", text: "Your buddy already looks like that!" }]);
-                setStep("done");
-              } else {
-                setStep("peak");
-              }
+              setStep("peak");
             }}
             onCancel={() => {
               setShiny(false);
-              if (matches(currentRoll, buildTarget(false))) {
-                setDoneMessages([{ type: "success", text: "Your buddy already looks like that!" }]);
-                setStep("done");
-              } else {
-                setStep("peak");
-              }
+              setStep("peak");
             }}
             onBack={() => goBack()}
           />
@@ -416,7 +418,7 @@ function App({ opts }) {
 
         {step === "peak" && (
           <ListSelect
-            label="Peak stat (highest)"
+            label="Best at"
             options={[
               { label: "Any (random)", value: "any" },
               ...(STAT_NAMES || []).map(s => ({ label: s, value: s })),
@@ -437,7 +439,7 @@ function App({ opts }) {
 
         {step === "dump" && (
           <ListSelect
-            label="Dump stat (lowest)"
+            label="Worst at"
             options={[
               { label: "Any (random)", value: "any" },
               ...(STAT_NAMES || []).filter(s => s !== peak).map(s => ({ label: s, value: s })),
@@ -490,7 +492,7 @@ function App({ opts }) {
 
         {step === "result" && (
           <Box flexDirection="column">
-            <Text bold color="green">✓ Found in {found.checked.toLocaleString()} attempts ({(found.elapsed / 1000).toFixed(1)}s)</Text>
+            <Text bold color="green">✓ Found your buddy! ({found.checked.toLocaleString()} tries, {(found.elapsed / 1000).toFixed(1)}s)</Text>
             <ConfirmSelect
               label="Apply patch?"
               isActive={step === "result"}
@@ -514,6 +516,8 @@ function App({ opts }) {
                   msgs.push({ type: "success", text: "Applied!" });
                   if (resignBinary(binaryPath)) msgs.push({ type: "success", text: "Re-signed for macOS" });
                   clearCompanion(configPath);
+                  if (storeSalt) storeSalt(found.salt);
+                  if (installHook) installHook();
                   msgs.push({ type: "success", text: "Cleaned up old buddy data" });
                 } catch (err) {
                   msgs.push({ type: "error", text: err.message });