@ramarivera/coding-buddy 0.4.0-alpha.8 → 0.4.0-alpha.9

package/README.md

@@ -72,6 +72,12 @@
 <!-- QUICK START                                                  -->
 <!-- ============================================================ -->
 
+## 📋 Requirements
+
+- **[bun](https://bun.sh/install)** on `PATH` — claude-buddy's MCP server runs on bun. Install once: `curl -fsSL https://bun.sh/install | bash`
+- **Claude Code v2.1.80+**
+- **Linux or macOS** (Windows is experimental)
+
 ## 🚀 Quick Start
 
 ```bash
@@ -83,12 +89,21 @@ bun run install-buddy
 
 Then restart Claude Code and type `/buddy`. That's it.
 
-<sub>💡 Need Bun? → `curl -fsSL https://bun.sh/install | bash`</sub>
-<br>
 <sub>💡 Want a global `claude-buddy` command? → `bun link`</sub>
 <br>
 <sub>💡 Need help? → `bun run help` or `claude-buddy help` (if linked) in terminal · `/buddy help` in Claude Code</sub>
 
+### Multiple Claude profiles?
+
+If you run Claude Code with `CLAUDE_CONFIG_DIR` set (e.g. separate work and personal accounts), pass the same env var to install so buddy lands in the active profile and gets its own menagerie:
+
+```bash
+CLAUDE_CONFIG_DIR=~/.claude-personal bun run install-buddy
+CLAUDE_CONFIG_DIR=~/.claude-personal bun run uninstall
+```
+
+The installer prints `Target profile: <path>` at the top so you can see at a glance which profile you're targeting. Each profile gets its own MCP entry, skill, hooks, status line, and `$CLAUDE_CONFIG_DIR/buddy-state/` menagerie — installs in one profile don't touch another. With `CLAUDE_CONFIG_DIR` unset, behaviour is identical to single-profile (`~/.claude/`, `~/.claude-buddy/`).
+
 <br>
 
 ---
@@ -338,41 +353,6 @@ bun run cli/uninstall.ts    # full clean removal
 
 ---
 
-<details>
-<summary><b>🖥️ &nbsp; tmux Popup Mode</b></summary>
-
-<br>
-
-Inside tmux, buddy appears as a floating popup overlay in the bottom-right corner instead of the status line.
-
-**Features:** animated ASCII art with speech bubbles · ESC passthrough · dynamic resizing · full keyboard forwarding
-
-| tmux version | Support |
-|---|---|
-| **3.4+** | Full support (borderless) |
-| **3.2 – 3.3** | Supported with border |
-| **< 3.2** | Falls back to status line |
-
-### Recommended `~/.tmux.conf`
-
-```
-set -g set-titles on
-set -g set-titles-string "#{pane_title}"
-set -g mouse on
-set -g history-limit 10000
-```
-
-### Scrolling
-
-The popup is modal. To scroll:
-1. Press **F12** → scroll mode (popup hides, copy-mode activates)
-2. Scroll with **mouse wheel** or **arrows**
-3. Press **q** → exit scroll mode
-
-</details>
-
----
-
 <details>
 <summary><b>📋 &nbsp; Requirements</b></summary>
 
@@ -382,7 +362,7 @@ The popup is modal. To scroll:
 |---|---|
 | **[Bun](https://bun.sh)** | `curl -fsSL https://bun.sh/install \| bash` |
 | **Claude Code** v2.1.80+ | Any version with MCP support |
-| **jq** | `apt install jq` / `brew install jq` |
+| **jq** | `apt install jq` / `brew install jq` / [`windows: download and add 'jq.exe' from jqlang/jq to path`](https://github.com/jqlang/jq/releases/latest)|
 
 > **Will I get the same buddy I had?** Yes. claude-buddy uses the exact same algorithm as the original (`wyhash + mulberry32`, same salt, same identity resolution). If your `~/.claude.json` still has your `accountUuid`, you'll get the identical species, rarity, stats, and cosmetics.
 
@@ -395,7 +375,6 @@ The popup is modal. To scroll:
 ## 🗺️ Roadmap
 
 - [x] **Multi-buddy support** — menagerie system with named slots, interactive TUI picker 💜[@doctor-ew](https://github.com/doctor-ew)💜
-- [x] **tmux popup mode** — floating overlay via `tmux display-popup` 💜[@gzenz](https://github.com/gzenz)💜
 - [ ] **Leveling system** — XP from coding sessions, unlockable reactions and upgrades
 - [ ] **Buddy pair-programming** — active help during sessions, pattern detection
 - [ ] **Cross-session memory** — remembers past projects and earlier conversations

package/adapters/claude/hooks/buddy-comment.sh

@@ -5,7 +5,10 @@
 # This hook extracts it and updates the status line bubble.
 # The HTML comment is invisible in rendered markdown output.
 
-STATE_DIR="$HOME/.claude-buddy"
+# shellcheck source=../scripts/paths.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
+
+STATE_DIR="$BUDDY_STATE_DIR"
 # Session ID: sanitized tmux pane number, or "default" outside tmux
 SID="${TMUX_PANE#%}"
 SID="${SID:-default}"

package/adapters/claude/hooks/name-react.sh

@@ -3,7 +3,10 @@
 # Detects the buddy's name in the user's message → status line reaction.
 # No cooldown — name mentions are intentional.
 
-STATE_DIR="$HOME/.claude-buddy"
+# shellcheck source=../scripts/paths.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
+
+STATE_DIR="$BUDDY_STATE_DIR"
 STATUS_FILE="$STATE_DIR/status.json"
 # Session ID: sanitized tmux pane number, or "default" outside tmux
 SID="${TMUX_PANE#%}"

package/adapters/claude/hooks/react.sh

@@ -4,7 +4,10 @@
 #
 # Combined: PR #4 species reactions + PR #6 session isolation + PR #13 field fix
 
-STATE_DIR="$HOME/.claude-buddy"
+# shellcheck source=../scripts/paths.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
+
+STATE_DIR="$BUDDY_STATE_DIR"
 # Session ID: sanitized tmux pane number, or "default" outside tmux
 SID="${TMUX_PANE#%}"
 SID="${SID:-default}"

package/adapters/claude/install/backup.ts

@@ -1,24 +1,6 @@
 #!/usr/bin/env bun
 /**
  * claude-buddy backup — snapshot all claude-buddy related state
- *
- * Usage:
- *   bun run backup                 Create a new snapshot
- *   bun run backup list            List all backups
- *   bun run backup show <ts>       Show what's in a backup
- *   bun run backup restore         Restore the latest backup
- *   bun run backup restore <ts>    Restore a specific backup
- *   bun run backup delete <ts>     Delete a specific backup
- *
- * Backups are stored in ~/.claude-buddy/backups/YYYY-MM-DD-HHMMSS/
- *
- * What gets backed up:
- *   - ~/.claude/settings.json (full file)
- *   - ~/.claude.json mcpServers["claude-buddy"] block (only our entry)
- *   - ~/.claude/skills/buddy/SKILL.md
- *   - ~/.claude-buddy/companion.json
- *   - ~/.claude-buddy/status.json
- *   - ~/.claude-buddy/reaction.json
  */
 
 import {
@@ -26,15 +8,13 @@ import {
   readdirSync, statSync, rmSync, copyFileSync,
 } from "fs";
 import { dirname, join } from "path";
-import { homedir } from "os";
-import { getBuddySkillDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
+import { getBuddySkillDir, getBuddyStateDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
 
-const HOME = homedir();
-const BACKUPS_DIR = join(HOME, ".claude-buddy", "backups");
 const SETTINGS = getClaudeSettingsPath();
 const CLAUDE_JSON = getClaudeJsonPath();
 const SKILL = join(getBuddySkillDir(), "SKILL.md");
-const STATE_DIR = join(HOME, ".claude-buddy");
+const STATE_DIR = getBuddyStateDir();
+const BACKUPS_DIR = join(STATE_DIR, "backups");
 
 const RED = "\x1b[31m";
 const GREEN = "\x1b[32m";
@@ -62,13 +42,11 @@ function tryRead(path: string): string | null {
 function listBackups(): string[] {
   if (!existsSync(BACKUPS_DIR)) return [];
   return readdirSync(BACKUPS_DIR)
-    .filter(f => /^\d{4}-\d{2}-\d{2}-\d{6}$/.test(f))
-    .filter(f => statSync(join(BACKUPS_DIR, f)).isDirectory())
+    .filter((f) => /^\d{4}-\d{2}-\d{2}-\d{6}$/.test(f))
+    .filter((f) => statSync(join(BACKUPS_DIR, f)).isDirectory())
     .sort();
 }
 
-// ─── Create backup ──────────────────────────────────────────────────────────
-
 function createBackup(): string {
   const ts = timestamp();
   const dir = join(BACKUPS_DIR, ts);
@@ -76,17 +54,15 @@ function createBackup(): string {
 
   const manifest: { timestamp: string; files: string[] } = { timestamp: ts, files: [] };
 
-  // 1. settings.json
   const settings = tryRead(SETTINGS);
   if (settings) {
     writeFileSync(join(dir, "settings.json"), settings);
     manifest.files.push("settings.json");
-    ok(`Backed up: ~/.claude/settings.json`);
+    ok(`Backed up: ${SETTINGS}`);
   } else {
-    warn(`Skipped: ~/.claude/settings.json (not found)`);
+    warn(`Skipped: ${SETTINGS} (not found)`);
   }
 
-  // 2. claude.json mcpServers["claude-buddy"]
   const claudeJsonRaw = tryRead(CLAUDE_JSON);
   if (claudeJsonRaw) {
     try {
@@ -95,45 +71,40 @@ function createBackup(): string {
       if (ourMcp) {
         writeFileSync(join(dir, "mcpserver.json"), JSON.stringify(ourMcp, null, 2));
         manifest.files.push("mcpserver.json");
-        ok(`Backed up: ~/.claude.json → mcpServers["claude-buddy"]`);
+        ok(`Backed up: ${CLAUDE_JSON} → mcpServers["claude-buddy"]`);
       } else {
-        warn(`Skipped: ~/.claude.json mcpServers["claude-buddy"] (not registered)`);
+        warn(`Skipped: ${CLAUDE_JSON} mcpServers["claude-buddy"] (not registered)`);
       }
     } catch {
-      err(`Failed to parse ~/.claude.json`);
+      err(`Failed to parse ${CLAUDE_JSON}`);
     }
   }
 
-  // 3. SKILL.md
   const skill = tryRead(SKILL);
   if (skill) {
     writeFileSync(join(dir, "SKILL.md"), skill);
     manifest.files.push("SKILL.md");
-    ok(`Backed up: ~/.claude/skills/buddy/SKILL.md`);
+    ok(`Backed up: ${SKILL}`);
   } else {
-    warn(`Skipped: ~/.claude/skills/buddy/SKILL.md (not found)`);
+    warn(`Skipped: ${SKILL} (not found)`);
   }
 
-  // 4-6. ~/.claude-buddy/ state files (don't back up the backups dir itself)
   const stateDestDir = join(dir, "claude-buddy");
   mkdirSync(stateDestDir, { recursive: true });
-  const stateFiles = ["companion.json", "status.json", "reaction.json"];
-  for (const f of stateFiles) {
-    const src = join(STATE_DIR, f);
+  const stateFiles = ["menagerie.json", "config.json", "status.json", "events.json", "unlocked.json", "active_days.json"];
+  for (const file of stateFiles) {
+    const src = join(STATE_DIR, file);
     if (existsSync(src)) {
-      copyFileSync(src, join(stateDestDir, f));
-      manifest.files.push(`claude-buddy/${f}`);
-      ok(`Backed up: ~/.claude-buddy/${f}`);
+      copyFileSync(src, join(stateDestDir, file));
+      manifest.files.push(`claude-buddy/${file}`);
+      ok(`Backed up: ${join(STATE_DIR, file)}`);
     }
   }
 
   writeFileSync(join(dir, "manifest.json"), JSON.stringify(manifest, null, 2));
-
   return ts;
 }
 
-// ─── List backups ───────────────────────────────────────────────────────────
-
 function cmdList() {
   const backups = listBackups();
   if (backups.length === 0) {
@@ -147,9 +118,7 @@ function cmdList() {
     const manifest = tryRead(manifestPath);
     let count = "?";
     if (manifest) {
-      try {
-        count = String(JSON.parse(manifest).files?.length ?? 0);
-      } catch {}
+      try { count = String(JSON.parse(manifest).files?.length ?? 0); } catch {}
     }
     const isLatest = ts === backups[backups.length - 1];
     const tag = isLatest ? `${GREEN}(latest)${NC}` : "";
@@ -158,8 +127,6 @@ function cmdList() {
   console.log("");
 }
 
-// ─── Show backup contents ───────────────────────────────────────────────────
-
 function cmdShow(ts: string) {
   const dir = join(BACKUPS_DIR, ts);
   if (!existsSync(dir)) {
@@ -174,14 +141,10 @@ function cmdShow(ts: string) {
   const data = JSON.parse(manifest);
   console.log(`\n${BOLD}Backup ${ts}${NC}\n`);
   console.log(`  ${DIM}Files:${NC}`);
-  for (const f of data.files) {
-    console.log(`    - ${f}`);
-  }
+  for (const file of data.files) console.log(`    - ${file}`);
   console.log("");
 }
 
-// ─── Restore backup ─────────────────────────────────────────────────────────
-
 function restoreBackup(ts: string) {
   const dir = join(BACKUPS_DIR, ts);
   if (!existsSync(dir)) {
@@ -191,51 +154,46 @@ function restoreBackup(ts: string) {
 
   info(`Restoring backup ${ts}...\n`);
 
-  // 1. settings.json — overwrite
   const settingsBak = join(dir, "settings.json");
   if (existsSync(settingsBak)) {
     mkdirSync(dirname(SETTINGS), { recursive: true });
     copyFileSync(settingsBak, SETTINGS);
-    ok("Restored: ~/.claude/settings.json");
+    ok(`Restored: ${SETTINGS}`);
   }
 
-  // 2. claude.json mcpServers — merge our entry back in
   const mcpBak = join(dir, "mcpserver.json");
   if (existsSync(mcpBak)) {
     const ourMcp = JSON.parse(readFileSync(mcpBak, "utf8"));
     let claudeJson: { mcpServers?: Record<string, unknown> } = {};
     try {
       claudeJson = JSON.parse(readFileSync(CLAUDE_JSON, "utf8")) as { mcpServers?: Record<string, unknown> };
-    } catch { /* empty */ }
+    } catch {}
     if (!claudeJson.mcpServers) claudeJson.mcpServers = {};
     claudeJson.mcpServers["claude-buddy"] = ourMcp;
+    mkdirSync(dirname(CLAUDE_JSON), { recursive: true });
     writeFileSync(CLAUDE_JSON, JSON.stringify(claudeJson, null, 2));
-    ok("Restored: ~/.claude.json → mcpServers[\"claude-buddy\"]");
+    ok(`Restored: ${CLAUDE_JSON} → mcpServers["claude-buddy"]`);
   }
 
-  // 3. SKILL.md
   const skillBak = join(dir, "SKILL.md");
   if (existsSync(skillBak)) {
     mkdirSync(dirname(SKILL), { recursive: true });
     copyFileSync(skillBak, SKILL);
-    ok("Restored: ~/.claude/skills/buddy/SKILL.md");
+    ok(`Restored: ${SKILL}`);
   }
 
-  // 4. ~/.claude-buddy/ state files
   const stateDir = join(dir, "claude-buddy");
   if (existsSync(stateDir)) {
     mkdirSync(STATE_DIR, { recursive: true });
-    for (const f of readdirSync(stateDir)) {
-      copyFileSync(join(stateDir, f), join(STATE_DIR, f));
-      ok(`Restored: ~/.claude-buddy/${f}`);
+    for (const file of readdirSync(stateDir)) {
+      copyFileSync(join(stateDir, file), join(STATE_DIR, file));
+      ok(`Restored: ${join(STATE_DIR, file)}`);
     }
   }
 
   console.log(`\n${GREEN}Restore complete.${NC} Restart Claude Code to apply.\n`);
 }
 
-// ─── Delete backup ──────────────────────────────────────────────────────────
-
 function cmdDelete(ts: string) {
   const dir = join(BACKUPS_DIR, ts);
   if (!existsSync(dir)) {
@@ -246,14 +204,11 @@ function cmdDelete(ts: string) {
   ok(`Deleted backup ${ts}`);
 }
 
-// ─── Main ───────────────────────────────────────────────────────────────────
-
 const action = process.argv[2] || "create";
 const arg = process.argv[3];
 
 switch (action) {
-  case "create":
-  case undefined: {
+  case "create": {
     console.log(`\n${BOLD}Creating claude-buddy backup...${NC}\n`);
     const ts = createBackup();
     console.log(`\n${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}`);
@@ -264,74 +219,37 @@ switch (action) {
     console.log(`${DIM}  Or:           bun run backup restore ${ts}${NC}\n`);
     break;
   }
-
   case "list":
   case "ls":
     cmdList();
     break;
-
-  case "show": {
+  case "show":
     if (!arg) {
       err("Usage: bun run backup show <timestamp>");
       process.exit(1);
     }
     cmdShow(arg);
     break;
-  }
-
   case "restore": {
-    let ts = arg;
+    const backups = listBackups();
+    const ts = arg ?? backups[backups.length - 1];
     if (!ts) {
-      const all = listBackups();
-      if (all.length === 0) {
-        err("No backups to restore");
-        process.exit(1);
-      }
-      ts = all[all.length - 1];
-      info(`Restoring latest backup: ${ts}`);
+      err("No backups found to restore");
+      process.exit(1);
     }
     restoreBackup(ts);
     break;
   }
-
   case "delete":
-  case "rm": {
+  case "rm":
     if (!arg) {
       err("Usage: bun run backup delete <timestamp>");
       process.exit(1);
     }
     cmdDelete(arg);
     break;
-  }
-
-  case "--help":
-  case "-h":
-    console.log(`
-${BOLD}claude-buddy backup${NC} — snapshot and restore all claude-buddy state
-
-${BOLD}Commands:${NC}
-  bun run backup                 Create a new snapshot
-  bun run backup list            List all backups
-  bun run backup show <ts>       Show what's in a backup
-  bun run backup restore         Restore the latest backup
-  bun run backup restore <ts>    Restore a specific backup
-  bun run backup delete <ts>     Delete a specific backup
-
-${BOLD}What gets backed up:${NC}
-  - ~/.claude/settings.json (full)
-  - ~/.claude.json mcpServers["claude-buddy"] (only our entry)
-  - ~/.claude/skills/buddy/SKILL.md
-  - ~/.claude-buddy/companion.json
-  - ~/.claude-buddy/status.json
-  - ~/.claude-buddy/reaction.json
-
-${BOLD}Backup location:${NC}
-  ${BACKUPS_DIR}/<timestamp>/
-`);
-    break;
-
   default:
     err(`Unknown action: ${action}`);
-    console.log(`Run 'bun run backup --help' for usage.`);
+    console.log("Usage: bun run backup [list|show <ts>|restore [ts]|delete <ts>]");
     process.exit(1);
 }

package/adapters/claude/install/disable.ts

@@ -8,10 +8,8 @@
  * Re-enable with: bun run install-buddy
  */
 
-import { readFileSync, writeFileSync, existsSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
-import { getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
+import { readFileSync, writeFileSync } from "fs";
+import { getBuddyStateDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
 
 interface HookCommand {
   type: "command";
@@ -42,13 +40,12 @@ const NC = "\x1b[0m";
 function ok(msg: string) { console.log(`${GREEN}✓${NC}  ${msg}`); }
 function warn(msg: string) { console.log(`${YELLOW}⚠${NC}  ${msg}`); }
 
-const HOME = homedir();
 const CLAUDE_JSON = getClaudeJsonPath();
 const SETTINGS = getClaudeSettingsPath();
+const STATE_DIR = getBuddyStateDir();
 
 console.log(`\n${BOLD}Disabling claude-buddy...${NC}\n`);
 
-// 1. Remove MCP server from ~/.claude.json
 try {
   const claudeJson = JSON.parse(readFileSync(CLAUDE_JSON, "utf8"));
   if (claudeJson.mcpServers?.["claude-buddy"]) {
@@ -63,7 +60,6 @@ try {
   warn(`Could not update ${CLAUDE_JSON}`);
 }
 
-// 2. Remove status line + hooks from settings.json
 try {
   const settings = JSON.parse(readFileSync(SETTINGS, "utf8")) as ClaudeSettings;
   let changed = false;
@@ -75,12 +71,10 @@ try {
   }
 
   if (settings.hooks) {
-    for (const hookType of ["PostToolUse", "Stop", "SessionStart", "SessionEnd"]) {
+    for (const hookType of ["PostToolUse", "Stop", "SessionStart", "SessionEnd", "UserPromptSubmit"]) {
       if (settings.hooks[hookType]) {
         const before = settings.hooks[hookType].length;
-        settings.hooks[hookType] = settings.hooks[hookType].filter(
-          (h) => !hasBuddyHook(h),
-        );
+        settings.hooks[hookType] = settings.hooks[hookType].filter((h) => !hasBuddyHook(h));
         if (settings.hooks[hookType].length < before) changed = true;
         if (settings.hooks[hookType].length === 0) delete settings.hooks[hookType];
       }
@@ -96,18 +90,19 @@ try {
   warn("Could not update settings.json");
 }
 
-// 3. Stop tmux popup if running
 try {
   if (process.env.TMUX) {
     const { execSync } = await import("child_process");
     execSync("tmux display-popup -C 2>/dev/null", { stdio: "ignore" });
   }
-} catch { /* not in tmux */ }
+} catch {
+  // noop
+}
 
 console.log(`
 ${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}
 ${GREEN}  Buddy disabled.${NC}
-${GREEN}  Companion data is preserved at ~/.claude-buddy/${NC}
+${GREEN}  Companion data is preserved at ${STATE_DIR}${NC}
 ${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}
 
 ${DIM}  Restart Claude Code for changes to take effect.