buddy-reroll 0.2.0 → 0.3.0

package/ui.jsx

@@ -1,6 +1,8 @@
 import React, { useState, useEffect, useRef } from "react";
 import { render, Box, Text, useApp, useInput } from "ink";
-// Simple spinner — avoids @inkjs/ui dependency for one component
+import { renderSprite, RARITY_STARS, RARITY_COLORS } from "./sprites.js";
+import { existsSync, copyFileSync } from "fs";
+
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 function Spinner({ label }) {
   const [frame, setFrame] = useState(0);
@@ -10,10 +12,8 @@ function Spinner({ label }) {
   }, []);
   return <Text><Text color="cyan">{SPINNER_FRAMES[frame]}</Text> {label}</Text>;
 }
-import { renderSprite, RARITY_STARS, RARITY_COLORS } from "./sprites.js";
-import { existsSync, copyFileSync } from "fs";
 
-// ── Shared Components ───────────────────────────────────────────────────
+// ── Components ──────────────────────────────────────────────────────────
 
 function KeyHint({ children }) {
   return <Text italic dimColor>{children}</Text>;
@@ -86,8 +86,6 @@ function ConfirmSelect({ label, onConfirm, onCancel, onBack, isActive }) {
   );
 }
 
-// ── PreviewCard ─────────────────────────────────────────────────────────
-
 function PreviewCard({ species, rarity, eye, hat, shiny, stats }) {
   const color = RARITY_COLORS[rarity] ?? "white";
   const stars = RARITY_STARS[rarity] ?? "";
@@ -97,8 +95,8 @@ function PreviewCard({ species, rarity, eye, hat, shiny, stats }) {
     <Box flexDirection="column" borderStyle="round" borderColor={color} paddingX={1}>
       <Box>
         <Box flexDirection="column">
-          {sprite.map((line, i) => (
-            <Text key={i} color={color}>{line}</Text>
+          {sprite.map((line, lineIdx) => (
+            <Text key={`sprite-${lineIdx}-${line.trim()}`} color={color}>{line}</Text>
           ))}
         </Box>
         <Box flexDirection="column" marginLeft={2}>
@@ -127,8 +125,6 @@ function PreviewCard({ species, rarity, eye, hat, shiny, stats }) {
   );
 }
 
-// ── Step Components ─────────────────────────────────────────────────────
-
 function ShowCurrentStep({ isActive }) {
   const { exit } = useApp();
 
@@ -172,8 +168,8 @@ function SpeciesStep({ speciesList, current, onChange, onSubmit, onBack, isActiv
 
 function SearchStep({ userId, target, bruteForce, onFound, onFail, isActive }) {
   const [progress, setProgress] = useState("");
-  const [error, setError] = useState(null);
   const cancelRef = useRef(false);
+  const hasStarted = useRef(false);
   const { exit } = useApp();
 
   useInput((input, key) => {
@@ -184,6 +180,8 @@ function SearchStep({ userId, target, bruteForce, onFound, onFail, isActive }) {
   }, { isActive });
 
   useEffect(() => {
+    if (hasStarted.current) return;
+    hasStarted.current = true;
     (async () => {
       const found = await bruteForce(userId, target, (checked, elapsed) => {
         if (!cancelRef.current) {
@@ -192,22 +190,13 @@ function SearchStep({ userId, target, bruteForce, onFound, onFail, isActive }) {
       });
       if (cancelRef.current) return;
       if (found) onFound(found);
-      else setError("No matching salt found. Try relaxing constraints.");
+      else onFail();
     })();
-  }, []);
-
-  if (error) {
-    return (
-      <Box flexDirection="column">
-        <Text color="red">✗ {error}</Text>
-        <KeyHint>Press esc to exit</KeyHint>
-      </Box>
-    );
-  }
+  }, [bruteForce, userId, target, onFound, onFail]);
 
   return (
     <Box flexDirection="column">
-      <Spinner label={progress || "Searching for matching salt..."} />
+      <Spinner label={progress || "Looking for your buddy..."} />
       <KeyHint>esc to cancel</KeyHint>
     </Box>
   );
@@ -215,6 +204,7 @@ function SearchStep({ userId, target, bruteForce, onFound, onFail, isActive }) {
 
 function DoneStep({ messages, isActive }) {
   const { exit } = useApp();
+  const hasErrors = messages.some((msg) => msg.type === "error");
 
   useInput(() => {
     exit();
@@ -222,38 +212,41 @@ function DoneStep({ messages, isActive }) {
 
   return (
     <Box flexDirection="column">
-      {messages.map((msg, i) => (
-        <Text key={i} color="green">✓ {msg}</Text>
+      {messages.map((msg) => (
+        <Text key={`${msg.type}-${msg.text}`} color={msg.type === "error" ? "red" : "green"}>
+          {msg.type === "error" ? "✗ " : "✓ "}{msg.text}
+        </Text>
       ))}
       <Box marginTop={1}>
-        <Text bold>Done! Restart Claude Code and run /buddy to hatch your new companion.</Text>
+        <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."}
+        </Text>
       </Box>
       <KeyHint>Press any key to exit</KeyHint>
     </Box>
   );
 }
 
-// ── Step Flow ───────────────────────────────────────────────────────────
-
-const STEP_ORDER = ["action", "species", "rarity", "eye", "hat", "shiny", "confirm"];
+const STEP_ORDER = ["action", "species", "rarity", "eye", "hat", "shiny", "peak", "dump", "confirm"];
 
-function getPrevStep(current, rarity) {
+function getPrevStep(current, rarity, peak) {
   const idx = STEP_ORDER.indexOf(current);
   if (idx <= 0) return null;
   let prev = STEP_ORDER[idx - 1];
-  // Skip hat when going back if common
   if (prev === "hat" && rarity === "common") prev = "eye";
+  if (prev === "dump" && peak === null) prev = "shiny";
+  if (prev === "peak") prev = "shiny";
   return prev;
 }
 
-// ── Main App ────────────────────────────────────────────────────────────
-
 function App({ opts }) {
   const { exit } = useApp();
   const {
     currentRoll, currentSalt, binaryPath, configPath, userId,
-    bruteForce, patchBinary, resignBinary, clearCompanion, isClaudeRunning,
-    rollFrom, matches, SPECIES, RARITIES, RARITY_LABELS, EYES, HATS,
+    bruteForce, patchBinary, resignBinary, clearCompanion, getPatchability, isClaudeRunning,
+    rollFrom, matches, SPECIES, RARITIES, RARITY_LABELS, EYES, HATS, STAT_NAMES,
   } = opts;
 
   const [step, setStep] = useState("action");
@@ -262,14 +255,23 @@ function App({ opts }) {
   const [eye, setEye] = useState(currentRoll.eye);
   const [hat, setHat] = useState(currentRoll.hat);
   const [shiny, setShiny] = useState(currentRoll.shiny);
+  const [peak, setPeak] = useState(null);
+  const [dump, setDump] = useState(null);
   const [found, setFound] = useState(null);
   const [doneMessages, setDoneMessages] = useState([]);
 
   const showStats = step === "showCurrent" || step === "result" || step === "done";
   const displayRoll = found ? found.result : { species, rarity, eye, hat, shiny, stats: currentRoll.stats };
+  const effectiveHat = rarity === "common" ? "none" : hat;
+  const buildTarget = (s = shiny) => {
+    const t = { species, rarity, eye, hat: effectiveHat, shiny: s };
+    if (peak) t.peak = peak;
+    if (dump) t.dump = dump;
+    return t;
+  };
 
   const goBack = (toStep) => {
-    const prev = toStep || getPrevStep(step, rarity);
+    const prev = toStep || getPrevStep(step, rarity, peak);
     if (prev) setStep(prev);
     else exit();
   };
@@ -301,16 +303,29 @@ function App({ opts }) {
               if (action === "current") {
                 setStep("showCurrent");
               } else if (action === "restore") {
-                const backupPath = binaryPath + ".backup";
+                const patchability = getPatchability(binaryPath);
+                if (!patchability.ok) {
+                  setDoneMessages([{ type: "error", text: patchability.message }]);
+                  setStep("done");
+                  return;
+                }
+
+                const { backupPath } = patchability;
                 if (!existsSync(backupPath)) {
-                  setDoneMessages(["No backup found. Nothing to restore."]);
+                  setDoneMessages([{ type: "info", text: "No backup found — nothing to undo." }]);
                   setStep("done");
                   return;
                 }
-                copyFileSync(backupPath, binaryPath);
-                resignBinary(binaryPath);
-                clearCompanion(configPath);
-                setDoneMessages(["Restored! Restart Claude Code and run /buddy."]);
+
+                try {
+                  copyFileSync(backupPath, binaryPath);
+                  resignBinary(binaryPath);
+                  clearCompanion(configPath);
+                  setDoneMessages([{ type: "success", text: "Restored! Restart Claude Code and say /buddy to see your original friend." }]);
+                } catch (err) {
+                  setDoneMessages([{ type: "error", text: err.message }]);
+                }
+
                 setStep("done");
               } else {
                 setStep("species");
@@ -379,36 +394,80 @@ function App({ opts }) {
             isActive={step === "shiny"}
             onConfirm={() => {
               setShiny(true);
-              const target = { species, rarity, eye, hat: rarity === "common" ? "none" : hat, shiny: true };
-              if (matches(currentRoll, target)) {
-                setDoneMessages(["Already matching! No changes needed."]);
+              if (matches(currentRoll, buildTarget(true))) {
+                setDoneMessages([{ type: "success", text: "Your buddy already looks like that!" }]);
                 setStep("done");
               } else {
-                setStep("confirm");
+                setStep("peak");
               }
             }}
             onCancel={() => {
               setShiny(false);
-              const target = { species, rarity, eye, hat: rarity === "common" ? "none" : hat, shiny: false };
-              if (matches(currentRoll, target)) {
-                setDoneMessages(["Already matching! No changes needed."]);
+              if (matches(currentRoll, buildTarget(false))) {
+                setDoneMessages([{ type: "success", text: "Your buddy already looks like that!" }]);
                 setStep("done");
               } else {
+                setStep("peak");
+              }
+            }}
+            onBack={() => goBack()}
+          />
+        )}
+
+        {step === "peak" && (
+          <ListSelect
+            label="Peak stat (highest)"
+            options={[
+              { label: "Any (random)", value: "any" },
+              ...(STAT_NAMES || []).map(s => ({ label: s, value: s })),
+            ]}
+            defaultValue="any"
+            onSubmit={(v) => {
+              setPeak(v === "any" ? null : v);
+              if (v === "any") {
                 setStep("confirm");
+              } else {
+                setStep("dump");
               }
             }}
             onBack={() => goBack()}
+            isActive={step === "peak"}
+          />
+        )}
+
+        {step === "dump" && (
+          <ListSelect
+            label="Dump stat (lowest)"
+            options={[
+              { label: "Any (random)", value: "any" },
+              ...(STAT_NAMES || []).filter(s => s !== peak).map(s => ({ label: s, value: s })),
+            ]}
+            defaultValue="any"
+            onSubmit={(v) => {
+              setDump(v === "any" ? null : v);
+              setStep("confirm");
+            }}
+            onBack={() => goBack()}
+            isActive={step === "dump"}
           />
         )}
 
         {step === "confirm" && (
           <Box flexDirection="column">
-            <Text>Target: <Text bold>{species}</Text> / <Text bold>{rarity}</Text> / eye:{eye} / hat:{rarity === "common" ? "none" : hat}{shiny ? " / shiny" : ""}</Text>
+            <Text>Target: <Text bold>{species}</Text> / <Text bold>{rarity}</Text> / eye:{eye} / hat:{effectiveHat}{shiny ? " / shiny" : ""}{peak ? ` / peak:${peak}` : ""}{dump ? ` / dump:${dump}` : ""}</Text>
             {isClaudeRunning() && <Text color="yellow">⚠ Claude Code appears to be running. Quit it before patching.</Text>}
             <ConfirmSelect
               label="Search and apply?"
               isActive={step === "confirm"}
-              onConfirm={() => setStep("search")}
+              onConfirm={() => {
+                const patchability = getPatchability(binaryPath);
+                if (!patchability.ok) {
+                  setDoneMessages([{ type: "error", text: patchability.message }]);
+                  setStep("done");
+                  return;
+                }
+                setStep("search");
+              }}
               onCancel={() => exit()}
               onBack={() => goBack()}
             />
@@ -418,11 +477,11 @@ function App({ opts }) {
         {step === "search" && (
           <SearchStep
             userId={userId}
-            target={{ species, rarity, eye, hat: rarity === "common" ? "none" : hat, shiny }}
+            target={buildTarget()}
             bruteForce={bruteForce}
             onFound={(f) => { setFound(f); setStep("result"); }}
             onFail={() => {
-              setDoneMessages(["No matching salt found. Try relaxing constraints."]);
+              setDoneMessages([{ type: "error", text: "Couldn't find a match. Try being less picky!" }]);
               setStep("done");
             }}
             isActive={step === "search"}
@@ -436,17 +495,30 @@ function App({ opts }) {
               label="Apply patch?"
               isActive={step === "result"}
               onConfirm={() => {
+                const patchability = getPatchability(binaryPath);
+                if (!patchability.ok) {
+                  setDoneMessages([{ type: "error", text: patchability.message }]);
+                  setStep("done");
+                  return;
+                }
+
                 const msgs = [];
-                const backupPath = binaryPath + ".backup";
-                if (!existsSync(backupPath)) {
-                  copyFileSync(binaryPath, backupPath);
-                  msgs.push(`Backup saved to ${backupPath}`);
+                const { backupPath } = patchability;
+
+                try {
+                  if (!existsSync(backupPath)) {
+                    copyFileSync(binaryPath, backupPath);
+                    msgs.push({ type: "success", text: `Saved a backup just in case` });
+                  }
+                  const count = patchBinary(binaryPath, currentSalt, found.salt);
+                  msgs.push({ type: "success", text: "Applied!" });
+                  if (resignBinary(binaryPath)) msgs.push({ type: "success", text: "Re-signed for macOS" });
+                  clearCompanion(configPath);
+                  msgs.push({ type: "success", text: "Cleaned up old buddy data" });
+                } catch (err) {
+                  msgs.push({ type: "error", text: err.message });
                 }
-                const count = patchBinary(binaryPath, currentSalt, found.salt);
-                msgs.push(`Patched ${count} occurrence(s)`);
-                if (resignBinary(binaryPath)) msgs.push("Binary re-signed (ad-hoc codesign)");
-                clearCompanion(configPath);
-                msgs.push("Companion data cleared");
+
                 setDoneMessages(msgs);
                 setStep("done");
               }}
@@ -461,8 +533,6 @@ function App({ opts }) {
   );
 }
 
-// ── Export ───────────────────────────────────────────────────────────────
-
 export async function runInteractiveUI(opts) {
   const { waitUntilExit } = render(<App opts={opts} />);
   await waitUntilExit();