any-buddy 1.0.5 → 1.0.7

package/README.md

@@ -2,7 +2,7 @@
 Pick any Claude Code companion pet you want.
 
 ```bash
-npx any-buddy
+npx any-buddy@latest
 ```
 
 That's it. Follow the prompts to choose your species, rarity, eyes, hat, and name.
@@ -37,7 +37,7 @@ The patch is safe — it uses `rename()` to atomically swap the binary, which is
 | Platform | Status | Binary location (auto-detected) |
 |---|---|---|
 | Linux | Tested | `~/.local/share/claude/versions/<ver>` |
-| macOS | Should work | `~/.local/bin/claude`, `/opt/homebrew/bin/claude`, `~/.claude/local/claude` |
+| macOS | Tested | `~/.local/bin/claude`, `/opt/homebrew/bin/claude`, `~/.claude/local/claude` |
 | Windows | Should work | `%LOCALAPPDATA%\Programs\claude\claude.exe`, npm global shim |
 
 The binary is found automatically via `which`/`where` and platform-specific known paths. If auto-detection fails, set `CLAUDE_BINARY=/path/to/binary` manually.
@@ -202,14 +202,21 @@ When you choose to install the hook, it adds this to `~/.claude/settings.json`:
   "hooks": {
     "SessionStart": [
       {
-        "type": "command",
-        "command": "claude-code-any-buddy apply --silent"
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "claude-code-any-buddy apply --silent"
+          }
+        ]
       }
     ]
   }
 }
 ```
 
+The hook is **optional and defaults to No** — you'll be asked during the interactive flow. If you prefer, just run `any-buddy apply` manually after Claude Code updates.
+
 On every Claude Code session start, this runs `apply --silent` which:
 1. Reads your saved salt from `~/.claude-code-any-buddy.json`
 2. Checks if the current binary already has the correct salt (fast `Buffer.indexOf`)
@@ -255,7 +262,7 @@ This patches the salt back to the original, removes the SessionStart hook, and c
 
 ## Limitations
 
-- **Tested on Linux** — macOS and Windows should work but are not yet tested. Please [open an issue](https://github.com/cpaczek/any-buddy/issues) if you hit problems
+- **Tested on Linux and macOS** — Windows should work but is not yet tested. Please [open an issue](https://github.com/cpaczek/any-buddy/issues) if you hit problems
 - **Requires Bun** — needed for matching Claude Code's wyhash implementation
 - **Salt string dependent** — if Anthropic changes the salt from `friend-2026-401` in a future version, the patch logic would need updating (but the tool will detect this and warn you)
 - **Stats partially selectable** — you can pick which stat is highest (peak) and lowest (dump), but not exact values

package/lib/config.mjs

@@ -135,11 +135,17 @@ export function saveClaudeSettings(settings) {
 
 const HOOK_COMMAND = 'claude-code-any-buddy apply --silent';
 
+// Claude Code hooks schema: { "SessionStart": [{ "matcher": "", "hooks": [{ "type": "command", "command": "..." }] }] }
+function findHookEntry(matchers) {
+  if (!Array.isArray(matchers)) return null;
+  return matchers.find(m =>
+    Array.isArray(m.hooks) && m.hooks.some(h => h.command === HOOK_COMMAND)
+  ) ?? null;
+}
+
 export function isHookInstalled() {
   const settings = getClaudeSettings();
-  const hooks = settings.hooks?.SessionStart;
-  if (!Array.isArray(hooks)) return false;
-  return hooks.some(h => h.command === HOOK_COMMAND);
+  return findHookEntry(settings.hooks?.SessionStart) !== null;
 }
 
 export function installHook() {
@@ -147,10 +153,10 @@ export function installHook() {
   if (!settings.hooks) settings.hooks = {};
   if (!Array.isArray(settings.hooks.SessionStart)) settings.hooks.SessionStart = [];
 
-  if (!settings.hooks.SessionStart.some(h => h.command === HOOK_COMMAND)) {
+  if (!findHookEntry(settings.hooks.SessionStart)) {
     settings.hooks.SessionStart.push({
-      type: 'command',
-      command: HOOK_COMMAND,
+      matcher: '',
+      hooks: [{ type: 'command', command: HOOK_COMMAND }],
     });
   }
 
@@ -161,7 +167,7 @@ export function removeHook() {
   const settings = getClaudeSettings();
   if (!settings.hooks?.SessionStart) return;
   settings.hooks.SessionStart = settings.hooks.SessionStart.filter(
-    h => h.command !== HOOK_COMMAND
+    m => !Array.isArray(m.hooks) || !m.hooks.some(h => h.command === HOOK_COMMAND)
   );
   if (settings.hooks.SessionStart.length === 0) delete settings.hooks.SessionStart;
   if (Object.keys(settings.hooks).length === 0) delete settings.hooks;

package/lib/preflight.mjs

@@ -0,0 +1,125 @@
+import { existsSync, readFileSync, statSync } from 'fs';
+import { execSync } from 'child_process';
+import { platform } from 'os';
+import chalk from 'chalk';
+import { ORIGINAL_SALT } from './constants.mjs';
+import { findClaudeBinary, verifySalt } from './patcher.mjs';
+import { getClaudeUserId } from './config.mjs';
+
+const ISSUE_URL = 'https://github.com/cpaczek/any-buddy/issues';
+
+// Run all preflight checks before doing anything destructive.
+// Returns { ok, binaryPath, userId, saltCount } or throws with a helpful message.
+export function runPreflight({ requireBinary = true } = {}) {
+  const errors = [];
+  const warnings = [];
+
+  // ── 1. Check bun is installed ──
+  let bunVersion = null;
+  try {
+    bunVersion = execSync('bun --version', { encoding: 'utf-8', timeout: 5000 }).trim();
+  } catch {
+    errors.push(
+      'Bun is not installed or not on PATH.\n' +
+      '  any-buddy needs Bun to compute the correct hash (Claude Code uses Bun.hash/wyhash).\n' +
+      '  Install Bun: https://bun.sh'
+    );
+  }
+
+  // ── 2. Check Claude config exists and has a userId ──
+  const userId = getClaudeUserId();
+  if (userId === 'anon') {
+    warnings.push(
+      'No user ID found in ~/.claude.json (using "anon").\n' +
+      '  This usually means Claude Code hasn\'t been set up yet.\n' +
+      '  The generated pet may not match what Claude Code shows.'
+    );
+  }
+
+  // ── 3. Find and validate the binary ──
+  let binaryPath = null;
+  let saltCount = 0;
+
+  if (requireBinary) {
+    try {
+      binaryPath = findClaudeBinary();
+    } catch (err) {
+      errors.push(err.message);
+    }
+
+    if (binaryPath) {
+      // Check binary size — should be substantial (>1MB), not a shell script or shim
+      try {
+        const size = statSync(binaryPath).size;
+        if (size < 1_000_000) {
+          warnings.push(
+            `Binary at ${binaryPath} is only ${(size / 1024).toFixed(0)}KB.\n` +
+            '  This might be a shell script, symlink wrapper, or npm shim rather than the actual binary.\n' +
+            '  If patching fails, try setting CLAUDE_BINARY to the real compiled binary.'
+          );
+        }
+      } catch { /* ignore */ }
+
+      // Check that the salt exists in the binary
+      try {
+        const result = verifySalt(binaryPath, ORIGINAL_SALT);
+        saltCount = result.found;
+
+        if (saltCount === 0) {
+          // Check if it might already be patched with a different salt
+          errors.push(
+            `Salt "${ORIGINAL_SALT}" not found in ${binaryPath}.\n` +
+            '  Possible reasons:\n' +
+            '  - Binary is already patched with a custom salt (run `any-buddy restore` first)\n' +
+            '  - This binary format doesn\'t contain the salt as a plain string\n' +
+            '  - Claude Code changed the salt in a new version\n' +
+            `\n  Platform: ${platform()}, binary: ${binaryPath}` +
+            `\n  Please report this at: ${ISSUE_URL}`
+          );
+        } else if (saltCount < 2) {
+          warnings.push(
+            `Salt found only ${saltCount} time(s) in binary (expected 3 on Linux).\n` +
+            '  This might work but the patch may be incomplete.\n' +
+            `  Platform: ${platform()}`
+          );
+        }
+      } catch (err) {
+        errors.push(
+          `Could not read binary at ${binaryPath}: ${err.message}\n` +
+          '  Check file permissions.'
+        );
+      }
+
+      // Platform-specific warnings
+      const plat = platform();
+      if (plat === 'win32') {
+        warnings.push(
+          'Windows support is experimental.\n' +
+          '  You must close all Claude Code windows before patching.\n' +
+          '  If you encounter issues, please report them at: ' + ISSUE_URL
+        );
+      } else if (plat === 'darwin') {
+        warnings.push(
+          'macOS support is experimental.\n' +
+          '  If the binary is code-signed, patching may invalidate the signature.\n' +
+          '  If Claude Code won\'t launch after patching, run `any-buddy restore`.\n' +
+          '  Please report issues at: ' + ISSUE_URL
+        );
+      }
+    }
+  }
+
+  // ── Print results ──
+  for (const w of warnings) {
+    console.log(chalk.yellow(`  Warning: ${w}\n`));
+  }
+
+  if (errors.length > 0) {
+    for (const e of errors) {
+      console.log(chalk.red(`  Error: ${e}\n`));
+    }
+    return { ok: false, binaryPath, userId, saltCount, bunVersion };
+  }
+
+  return { ok: true, binaryPath, userId, saltCount, bunVersion };
+}

package/lib/tui.mjs

@@ -5,6 +5,7 @@ import { roll } from './generation.mjs';
 import { renderSprite, renderFace } from './sprites.mjs';
 import { findSalt, estimateAttempts } from './finder.mjs';
 import { findClaudeBinary, getCurrentSalt, patchBinary, verifySalt, restoreBinary, isClaudeRunning } from './patcher.mjs';
+import { runPreflight } from './preflight.mjs';
 import { getClaudeUserId, savePetConfig, loadPetConfig, isHookInstalled, installHook, removeHook, getCompanionName, renameCompanion, getCompanionPersonality, setCompanionPersonality, deleteCompanion } from './config.mjs';
 import { DEFAULT_PERSONALITIES } from './personalities.mjs';
 
@@ -69,7 +70,9 @@ function showPet(bones, label = 'Your pet') {
 
 export async function runCurrent() {
   banner();
-  const userId = getClaudeUserId();
+  const preflight = runPreflight({ requireBinary: false });
+  if (!preflight.ok) process.exit(1);
+  const userId = preflight.userId;
   console.log(chalk.dim(`  User ID: ${userId.slice(0, 12)}...`));
 
   // Show what the original salt produces
@@ -86,6 +89,8 @@ export async function runCurrent() {
 
 export async function runPreview(flags = {}) {
   banner();
+  const preflight = runPreflight({ requireBinary: false });
+  if (!preflight.ok) process.exit(1);
 
   const species = validateFlag('species', flags.species, SPECIES) ?? await selectSpecies();
   const eye = validateFlag('eye', flags.eye, EYES) ?? await selectEyes(species);
@@ -226,13 +231,18 @@ export async function runRehatch() {
 export async function runInteractive(flags = {}) {
   banner();
 
-  const userId = getClaudeUserId();
-  if (userId === 'anon') {
-    console.log(chalk.yellow('  Warning: No Claude Code user ID found. Using "anon".'));
-    console.log(chalk.yellow('  Make sure Claude Code is installed and you\'ve logged in.\n'));
-  } else {
-    console.log(chalk.dim(`  User ID: ${userId.slice(0, 12)}...\n`));
+  // ─── Preflight checks ───
+  const preflight = runPreflight({ requireBinary: true });
+  if (!preflight.ok) {
+    process.exit(1);
+  }
+  const userId = preflight.userId;
+  console.log(chalk.dim(`  User ID: ${userId.slice(0, 12)}...`));
+  console.log(chalk.dim(`  Binary:  ${preflight.binaryPath} (salt found ${preflight.saltCount}x)`));
+  if (preflight.bunVersion) {
+    console.log(chalk.dim(`  Bun:     v${preflight.bunVersion}`));
   }
+  console.log();
 
   // Show current pet
   const currentBones = roll(userId, ORIGINAL_SALT).bones;
@@ -304,25 +314,8 @@ export async function runInteractive(flags = {}) {
   const foundBones = roll(userId, result.salt).bones;
   showPet(foundBones, 'Your new pet');
 
-  // ─── Patch binary ───
-  let binaryPath;
-  try {
-    binaryPath = findClaudeBinary();
-  } catch (err) {
-    console.error(chalk.red(`\n  ${err.message}`));
-    console.log(chalk.dim(`  Salt saved. You can manually apply later with: claude-code-any-buddy apply\n`));
-    savePetConfig({
-      salt: result.salt,
-      species: desired.species,
-      rarity: desired.rarity,
-      eye: desired.eye,
-      hat: desired.hat,
-      appliedAt: new Date().toISOString(),
-    });
-    return;
-  }
-
-  console.log(chalk.dim(`  Binary: ${binaryPath}`));
+  // ─── Patch binary (path already validated by preflight) ───
+  const binaryPath = preflight.binaryPath;
 
   // Find what's currently in the binary
   const current = getCurrentSalt(binaryPath);
@@ -387,14 +380,20 @@ export async function runInteractive(flags = {}) {
 
   // ─── Hook setup ───
   if (!isHookInstalled() && !flags.noHook) {
-    const setupHook = flags.yes || await confirm({
-      message: 'Install SessionStart hook to auto-re-apply after updates?',
-      default: true,
+    console.log(chalk.dim('\n  Optional: install a SessionStart hook to auto-re-apply after Claude Code updates.'));
+    console.log(chalk.yellow('  Note: this modifies ~/.claude/settings.json. If you have issues, run:'));
+    console.log(chalk.yellow('  any-buddy restore'));
+
+    const setupHook = await confirm({
+      message: 'Install auto-patch hook?',
+      default: false,
     });
 
     if (setupHook) {
       installHook();
       console.log(chalk.green('  Hook installed in ~/.claude/settings.json'));
+    } else {
+      console.log(chalk.dim('  No hook installed. Run `any-buddy apply` manually after updates.'));
     }
   } else if (isHookInstalled()) {
     console.log(chalk.dim('  SessionStart hook already installed.'));

package/package.json

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