@ramarivera/coding-buddy 0.6.0 → 0.7.0

package/.claude-plugin/marketplace.json

@@ -1,23 +1,23 @@
 {
     "name": "coding-buddy",
     "owner": {
-        "name": "1270011"
+        "name": "ramarivera"
     },
     "metadata": {
         "description": "Persistent coding companion for Claude Code, Pi, and Oh My Pi (requires bun: https://bun.sh/install)",
-        "version": "0.6.0"
+        "version": "0.7.0"
     },
     "plugins": [
         {
             "name": "coding-buddy",
             "source": "./",
             "description": "Persistent coding companion for Claude Code, Pi, and Oh My Pi. MCP-based terminal pet with ASCII art, stats, reactions, and personality. Requires bun runtime (https://bun.sh/install).",
-            "version": "0.6.0",
+            "version": "0.7.0",
             "author": {
-                "name": "1270011"
+                "name": "ramarivera"
             },
-            "homepage": "https://github.com/1270011/claude-buddy#readme",
-            "repository": "https://github.com/1270011/claude-buddy",
+            "homepage": "https://github.com/ramarivera/coding-buddy#readme",
+            "repository": "https://github.com/ramarivera/coding-buddy",
             "license": "MIT",
             "keywords": [
                 "coding-buddy",

package/.claude-plugin/plugin.json

@@ -1,13 +1,13 @@
 {
     "name": "coding-buddy",
-    "version": "0.6.0",
+    "version": "0.7.0",
     "description": "Persistent coding companion for Claude Code, Pi, and Oh My Pi. MCP-based terminal pet with ASCII art, stats, reactions, and personality.",
     "author": {
-        "name": "1270011"
+        "name": "ramarivera"
     },
     "license": "MIT",
-    "repository": "https://github.com/1270011/claude-buddy",
-    "homepage": "https://github.com/1270011/claude-buddy#readme",
+    "repository": "https://github.com/ramarivera/coding-buddy",
+    "homepage": "https://github.com/ramarivera/coding-buddy#readme",
     "keywords": [
         "coding-buddy",
         "claude-code",

package/README.md

@@ -13,9 +13,9 @@
 <!-- BADGES                                                        -->
 <!-- ============================================================ -->
 
-[![Version](https://img.shields.io/github/v/release/1270011/claude-buddy?style=flat-square&color=6366f1)](https://github.com/1270011/claude-buddy/releases)
-[![License](https://img.shields.io/github/license/1270011/claude-buddy?style=flat-square&color=10b981)](LICENSE)
-[![Stars](https://img.shields.io/github/stars/1270011/claude-buddy?style=flat-square&color=f59e0b)](https://github.com/1270011/claude-buddy/stargazers)
+[![Version](https://img.shields.io/github/v/release/ramarivera/coding-buddy?style=flat-square&color=6366f1)](https://github.com/ramarivera/coding-buddy/releases)
+[![License](https://img.shields.io/github/license/ramarivera/coding-buddy?style=flat-square&color=10b981)](LICENSE)
+[![Stars](https://img.shields.io/github/stars/ramarivera/coding-buddy?style=flat-square&color=f59e0b)](https://github.com/ramarivera/coding-buddy/stargazers)
 [![Claude Code](https://img.shields.io/badge/Claude%20Code-v2.1.80%2B-8b5cf6?style=flat-square)](https://claude.ai/code)
 [![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macOS-blue?style=flat-square)](#requirements)
 [![MCP](https://img.shields.io/badge/powered%20by-MCP-ec4899?style=flat-square)](https://modelcontextprotocol.io)
@@ -124,7 +124,7 @@ OMP registers the package's native extension and stores companion state under `~
 ### From source
 
 ```bash
-git clone https://github.com/1270011/claude-buddy coding-buddy
+git clone https://github.com/ramarivera/coding-buddy coding-buddy
 cd coding-buddy
 bun install
 bun run install-buddy
@@ -389,7 +389,7 @@ jq '.mcpServers["claude-buddy"]' ~/.claude.json
 Known MVP issue on some terminal/platform combos — different terminals render Braille Pattern Blank (U+2800) at different widths.
 
 To help us fix it:
-1. Run `bun run doctor` and paste output in a [new issue](https://github.com/1270011/claude-buddy/issues/new)
+1. Run `bun run doctor` and paste output in a [new issue](https://github.com/ramarivera/coding-buddy/issues/new)
 2. Run `bun run test-statusline` and screenshot the result
 3. Then `bun run test-statusline restore`
 
@@ -443,15 +443,15 @@ bun run uninstall           # full clean removal
 
 Thank you to everyone who helped bring buddies back to life.
 
-<a href="https://github.com/1270011/claude-buddy/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=1270011/claude-buddy" alt="Contributors" />
+<a href="https://github.com/ramarivera/coding-buddy/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=ramarivera/coding-buddy" alt="Contributors" />
 </a>
 
-<sub>Automatically generated from the [contributors graph](https://github.com/1270011/claude-buddy/graphs/contributors) via [contrib.rocks](https://contrib.rocks).</sub>
+<sub>Automatically generated from the [contributors graph](https://github.com/ramarivera/coding-buddy/graphs/contributors) via [contrib.rocks](https://contrib.rocks).</sub>
 
 <br>
 
-Want to help? New species, better reactions, bugfixes, wild new features — [PRs welcome](https://github.com/1270011/claude-buddy/pulls).
+Want to help? New species, better reactions, bugfixes, wild new features — [PRs welcome](https://github.com/ramarivera/coding-buddy/pulls).
 
 <br>
 

package/cli/pick.ts

@@ -17,7 +17,7 @@
 
 import {
   loadActiveSlot, saveActiveSlot, listCompanionSlots,
-  loadCompanionSlot, saveCompanionSlot, slugify, unusedName, writeStatusState,
+  loadCompanionSlot, saveCompanionSlot, deleteCompanionSlot, slugify, unusedName, writeStatusState,
 } from "../server/state.ts";
 import { generateBones, generatePersonality, SPECIES, RARITIES, STAT_NAMES, RARITY_STARS, EYES, HATS,
 type Species, type Rarity, type StatName, type Eye, type Hat,
@@ -123,6 +123,7 @@ interface State {
   searchStatus:  string;
   nameInput:     string;
   pendingResult: BuddyResult | null;
+  confirmDelete: boolean;
   message:       string;
 }
 
@@ -141,6 +142,7 @@ function fresh(): State {
     searchStatus:  "",
     nameInput:     "",
     pendingResult: null,
+    confirmDelete: false,
     message:       "",
   };
 }
@@ -151,7 +153,7 @@ const LEFT_W = 36;
 
 function savedPane(s: State): string[] {
   const lines: string[] = [];
-  lines.push(`${B}  Your Menagerie${N}  ${GR}[s] search${N}`);
+  lines.push(`${B}  Your Menagerie${N}  ${GR}[s] search  [d] remove${N}`);
   lines.push(GR + "  " + "─".repeat(LEFT_W - 2) + N);
 
   if (s.savedSlots.length === 0) {
@@ -174,6 +176,10 @@ function savedPane(s: State): string[] {
   }
 
   lines.push(GR + "  " + "─".repeat(LEFT_W - 2) + N);
+  if (s.confirmDelete) {
+    const entry = s.savedSlots[s.savedCursor];
+    lines.push(`  ${YL}remove ${B}${entry?.companion.name ?? "?"}${N}${YL}? [d/y] yes  [any] no${N}`);
+  }
   return lines;
 }
 
@@ -273,9 +279,7 @@ function previewPane(s: State): string[] {
   }
 
   if (!c) return [`  ${GR}no preview${N}`];
-  // Calculate available width for the right pane (total cols - left pane - separator)
-  const cols = Math.max(80, process.stdout.columns || 80);
-  const rightW = cols - LEFT_W - 3;
+  const rightW = 34;
   return renderCompanionCard(c.bones, c.name, c.personality, undefined, 0, rightW).split("\n");
 }
 
@@ -309,7 +313,7 @@ function drawScreen(s: State): void {
 
   // Footer — mode-specific help
   const helpText =
-    s.mode === "saved"     ? "↑↓ navigate  enter summon  r random  s search  q quit" :
+    s.mode === "saved"     ? "↑↓ navigate  enter summon  r random  s search  d remove  q quit" :
     s.mode === "criteria"  ? "↑↓ field  ←→ value  enter search  esc back" :
     s.mode === "searching" ? "any key to stop and show results so far" :
     s.mode === "results"   ? "↑↓ navigate  enter name+save  esc back  q quit" :
@@ -349,7 +353,7 @@ async function runSearch(s: State): Promise<void> {
 
   // Scale attempt budget to rarity difficulty
   const maxAttempts =
-    wantRa === "legendary" ? 200_000_000 :
+    wantRa === "legendary" ? 10_000_000_000 :
     wantRa === "epic"      ?  50_000_000 :
     wantRa === "rare"      ?  20_000_000 : 10_000_000;
 
@@ -438,12 +442,26 @@ function onKey(key: string, s: State): boolean {
     }
 
     case "saved": {
+      if (s.confirmDelete) {
+        if (key === "d" || key === "y") {
+          const entry = s.savedSlots[s.savedCursor];
+          if (entry) {
+            deleteCompanionSlot(entry.slot);
+            s.savedSlots  = listCompanionSlots();
+            s.activeSlot  = loadActiveSlot();
+            s.savedCursor = clamp(s.savedCursor, 0, Math.max(0, s.savedSlots.length - 1));
+            s.message     = `✗ ${entry.companion.name} removed`;
+          }
+        }
+        s.confirmDelete = false;
+        break;
+      }
       if (key === "q")                          return true;
       if (key === "s")                          { s.mode = "criteria"; break; }
+      if (key === "d" && s.savedSlots.length > 0) { s.confirmDelete = true; break; }
       if (key === "\x1b[A" || key === "k")      s.savedCursor = clamp(s.savedCursor - 1, 0, s.savedSlots.length - 1);
       else if (key === "\x1b[B" || key === "j") s.savedCursor = clamp(s.savedCursor + 1, 0, s.savedSlots.length - 1);
       else if (key === "r") {
-        // Random pick from menagerie
         if (s.savedSlots.length > 0) {
           const entry = s.savedSlots[Math.floor(Math.random() * s.savedSlots.length)];
           s.savedCursor = s.savedSlots.indexOf(entry);

package/cli/upgrade.ts

@@ -1,9 +1,8 @@
 #!/usr/bin/env bun
 
 import { readFileSync } from "fs";
-import { execSync } from "child_process";
+import { execSync, spawnSync } from "child_process";
 import { join, resolve, dirname } from "path";
-import { homedir } from "os";
 
 const CYAN = "\x1b[36m";
 const GREEN = "\x1b[32m";
@@ -28,6 +27,37 @@ function tryExec(cmd: string, fallback = ""): string {
   }
 }
 
+function trySpawn(
+  command: string,
+  args: string[],
+  fallback = "",
+  cwd: string = PROJECT_ROOT,
+): string {
+  const result = spawnSync(command, args, {
+    cwd,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"],
+  });
+  if (result.status !== 0) return fallback;
+  return result.stdout.trim();
+}
+
+function runCommand(
+  command: string,
+  args: string[],
+  options: {
+    cwd?: string;
+    stdio?: "ignore" | "inherit";
+  } = {},
+): boolean {
+  const result = spawnSync(command, args, {
+    cwd: options.cwd ?? PROJECT_ROOT,
+    encoding: "utf8",
+    stdio: ["ignore", options.stdio ?? "ignore", options.stdio ?? "ignore"],
+  });
+  return result.status === 0;
+}
+
 function getCurrentVersion(): string {
   try {
     const pkg = JSON.parse(readFileSync(join(PROJECT_ROOT, "package.json"), "utf8"));
@@ -61,15 +91,13 @@ function getRemoteBranch(): string {
 
 function checkForUpdates(branch: string): { hasUpdate: boolean; local: string; remote: string; commits: string[] } {
   info("Fetching latest from remote...\n");
-  try {
-    execSync("git fetch --quiet 2>/dev/null", { cwd: PROJECT_ROOT, stdio: "ignore" });
-  } catch {
+  if (!runCommand("git", ["fetch", "--quiet"])) {
     warn("git fetch failed — proceeding with cached remote state");
   }
 
   const local = tryExec("git rev-parse HEAD 2>/dev/null");
   const upstream = tryExec(`git rev-parse '@{upstream}' 2>/dev/null`);
-  const remote = upstream || tryExec(`git rev-parse origin/${branch} 2>/dev/null`);
+  const remote = upstream || trySpawn("git", ["rev-parse", `origin/${branch}`]);
 
   if (!local || !remote) {
     warn("Could not determine remote HEAD — no tracking branch configured");
@@ -81,8 +109,9 @@ function checkForUpdates(branch: string): { hasUpdate: boolean; local: string; r
     return { hasUpdate: false, local, remote, commits: [] };
   }
 
-  const commits = tryExec(
-    `git log --oneline ${local}..origin/${branch} 2>/dev/null`,
+  const commits = trySpawn(
+    "git",
+    ["log", "--oneline", `${local}..origin/${branch}`],
   ).split("\n").filter(Boolean);
 
   return { hasUpdate: true, local, remote, commits };
@@ -91,10 +120,12 @@ function checkForUpdates(branch: string): { hasUpdate: boolean; local: string; r
 function pullLatest(branch: string): boolean {
   info(`Pulling latest from origin/${branch}...`);
   try {
-    const output = execSync(`git pull --ff-only origin ${branch} 2>&1`, {
+    const result = spawnSync("git", ["pull", "--ff-only", "origin", branch], {
       cwd: PROJECT_ROOT,
       encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
     });
+    if (result.status !== 0) throw new Error(result.stderr || result.stdout || "unknown error");
     ok("Git pull successful");
     return true;
   } catch (e: any) {
@@ -108,7 +139,7 @@ function pullLatest(branch: string): boolean {
 function installDeps(): boolean {
   info("Installing dependencies...");
   try {
-    execSync("bun install 2>&1", { cwd: PROJECT_ROOT, stdio: "ignore" });
+    if (!runCommand("bun", ["install"])) throw new Error("bun install failed");
     ok("Dependencies installed");
     return true;
   } catch {
@@ -120,7 +151,9 @@ function installDeps(): boolean {
 function reinstallBuddy(): boolean {
   info("Re-running install-buddy to update integrations...\n");
   try {
-    execSync("bun run install-buddy 2>&1", { cwd: PROJECT_ROOT, stdio: "inherit" });
+    if (!runCommand("bun", ["run", "install-buddy"], { stdio: "inherit" })) {
+      throw new Error("install-buddy failed");
+    }
     return true;
   } catch {
     err("install-buddy failed");

package/hooks/buddy-comment.sh

@@ -9,9 +9,8 @@
 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}"
+# Per-session ID resolved by paths.sh (CLAUDE_CODE_SESSION_ID > TMUX_PANE > default)
+SID="$BUDDY_SID"
 STATUS_FILE="$STATE_DIR/status.json"
 COOLDOWN_FILE="$STATE_DIR/.last_comment.$SID"
 CONFIG_FILE="$STATE_DIR/config.json"
@@ -47,11 +46,7 @@ fi
 mkdir -p "$STATE_DIR"
 date +%s > "$COOLDOWN_FILE"
 
-# Update status.json with the reaction
-TMP=$(mktemp)
-jq --arg r "$COMMENT" '.reaction = $r' "$STATUS_FILE" > "$TMP" 2>/dev/null && mv "$TMP" "$STATUS_FILE"
-
-# Also write reaction file (use jq for safe JSON encoding)
+# Write reaction to per-session file (read by the statusline via $SID)
 jq -n --arg r "$COMMENT" --arg ts "$(date +%s)000" \
   '{reaction: $r, timestamp: ($ts | tonumber), reason: "turn"}' \
   > "$STATE_DIR/reaction.$SID.json"

package/hooks/file-type-react.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
-STATE_DIR="$HOME/.claude-buddy"
-SID="${TMUX_PANE#%}"
-SID="${SID:-default}"
+# shellcheck source=../scripts/paths.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
+
+STATE_DIR="$BUDDY_STATE_DIR"
+SID="$BUDDY_SID"
 REACTION_FILE="$STATE_DIR/reaction.$SID.json"
 STATUS_FILE="$STATE_DIR/status.json"
 COOLDOWN_FILE="$STATE_DIR/.last_reaction.$SID"

package/hooks/mood-react.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
-STATE_DIR="$HOME/.claude-buddy"
-SID="${TMUX_PANE#%}"
-SID="${SID:-default}"
+# shellcheck source=../scripts/paths.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
+
+STATE_DIR="$BUDDY_STATE_DIR"
+SID="$BUDDY_SID"
 REACTION_FILE="$STATE_DIR/reaction.$SID.json"
 STATUS_FILE="$STATE_DIR/status.json"
 COOLDOWN_FILE="$STATE_DIR/.last_mood.$SID"

package/hooks/name-react.sh

@@ -8,9 +8,8 @@ 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#%}"
-SID="${SID:-default}"
+# Per-session ID resolved by paths.sh (CLAUDE_CODE_SESSION_ID > TMUX_PANE > default)
+SID="$BUDDY_SID"
 
 [ -f "$STATUS_FILE" ] || exit 0
 

package/hooks/react.sh

@@ -4,9 +4,8 @@
 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}"
+# Per-session ID resolved by paths.sh (CLAUDE_CODE_SESSION_ID > TMUX_PANE > default)
+SID="$BUDDY_SID"
 REACTION_FILE="$STATE_DIR/reaction.$SID.json"
 STATUS_FILE="$STATE_DIR/status.json"
 COOLDOWN_FILE="$STATE_DIR/.last_reaction.$SID"
@@ -1310,9 +1309,6 @@ if [ -n "$REASON" ] && [ -n "$REACTION" ]; then
       '{reaction: $r, timestamp: ($ts | tonumber), reason: $reason}' \
       > "$REACTION_FILE"
 
-    TMP=$(mktemp)
-    jq --arg r "$REACTION" '.reaction = $r' "$STATUS_FILE" > "$TMP" 2>/dev/null && mv "$TMP" "$STATUS_FILE"
-
     if command -v jq >/dev/null 2>&1; then
         XP_EVENT=""
         if [ ! -f "$EVENTS_FILE" ]; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramarivera/coding-buddy",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Persistent coding companion for Claude Code, Pi, and Oh My Pi",
   "type": "module",
   "omp": {
@@ -66,9 +66,9 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/1270011/claude-buddy.git"
+    "url": "git+https://github.com/ramarivera/coding-buddy.git"
   },
-  "homepage": "https://github.com/1270011/claude-buddy#readme",
+  "homepage": "https://github.com/ramarivera/coding-buddy#readme",
   "license": "MIT",
   "dependencies": {
     "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",

package/scripts/paths.sh

@@ -37,7 +37,22 @@ else
   BUDDY_STATE_DIR="$HOME/.claude-buddy"
 fi
 
-export CLAUDE_CFG_DIR CLAUDE_SETTINGS_FILE CLAUDE_USER_CONFIG BUDDY_STATE_DIR
+# Per-session ID for namespacing transient buddy state files
+# (reaction.$SID.json, .last_reaction.$SID, etc.). Precedence:
+#   1. $CLAUDE_CODE_SESSION_ID — Claude Code sets a UUID per session and
+#      propagates it to every child process (hooks, MCP server, statusline).
+#      Shortened to first 8 chars for filename hygiene.
+#   2. $TMUX_PANE — legacy tmux-pane isolation, kept as a fallback.
+#   3. "default" — single-session world.
+if [[ -n "${CLAUDE_CODE_SESSION_ID:-}" ]]; then
+  BUDDY_SID="${CLAUDE_CODE_SESSION_ID:0:8}"
+elif [[ -n "${TMUX_PANE:-}" ]]; then
+  BUDDY_SID="${TMUX_PANE#%}"
+else
+  BUDDY_SID="default"
+fi
+
+export CLAUDE_CFG_DIR CLAUDE_SETTINGS_FILE CLAUDE_USER_CONFIG BUDDY_STATE_DIR BUDDY_SID
 
 # Windows: Chocolatey installs a PowerShell shim for jq that doesn't work in
 # Git Bash. If jq is not found on PATH, check the real Chocolatey binary path

package/server/art.ts

@@ -116,7 +116,7 @@ export const SPECIES_ART: Record<Species, string[][]> = {
      "\\ {E}' '{E} /", 
      " \\ } { /",
      " ≈(° °)≈",
-     "  \x1b[38;2;255;120;0m//|\\\\\x1b[0m"],
+     "  \x1b[38;2;255;120;0m/\x1b[0m'\x1b[38;2;255;120;0m|\x1b[0m'\x1b[38;2;255;120;0m\\\x1b[0m"],
     ["}       {", 
      "|\\^```^/|",
      "\\ {E}' '{E} /", 

package/server/state.ts

@@ -42,9 +42,20 @@ export const STATE_DIR = buddyStateDir();
 const MANIFEST_FILE = join(STATE_DIR, "menagerie.json");
 const CONFIG_FILE = join(STATE_DIR, "config.json");
 
-// ─── Session ID (PR #6: tmux session isolation) ─────────────────────────────
+// ─── Session ID (Claude Code session isolation, tmux pane fallback) ─────────
+//
+// Precedence:
+//   1. $CLAUDE_CODE_SESSION_ID — Claude Code sets a UUID per session and
+//      propagates it to the MCP server, hooks, and statusline. Shortened
+//      to first 8 chars to keep filenames readable.
+//   2. $TMUX_PANE — legacy tmux-pane isolation kept as a fallback.
+//   3. "default" — single-session world.
+//
+// Must match the bash equivalent in scripts/paths.sh.
 
 function sessionId(): string {
+  const ccSid = process.env.CLAUDE_CODE_SESSION_ID;
+  if (ccSid && ccSid.length > 0) return ccSid.slice(0, 8);
   const pane = process.env.TMUX_PANE;
   if (!pane) return "default";
   return pane.replace(/^%/, "");
@@ -416,7 +427,7 @@ export function writeStatusState(
     eye: companion.bones.eye,
     shiny: companion.bones.shiny,
     hat: companion.bones.hat,
-    reaction: reaction ?? "",
+    reaction: "",
     muted: muted ?? false,
     achievement: achievement ?? "",
     frames,
@@ -426,6 +437,7 @@ export function writeStatusState(
     mood: moodStr,
   };
   writeFileSync(join(STATE_DIR, "status.json"), JSON.stringify(state));
+  if (reaction) saveReaction(reaction, "mcp");
 }
 
 // ─── Claude Code settings.json patching (for buddy_statusline tool) ──────────

package/statusline/buddy-status.sh

@@ -19,9 +19,8 @@ source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
 
 STATE="$BUDDY_STATE_DIR/status.json"
 CONFIG_FILE="$BUDDY_STATE_DIR/config.json"
-# Session ID: sanitized tmux pane number, or "default" outside tmux
-SID="${TMUX_PANE#%}"
-SID="${SID:-default}"
+# Per-session ID resolved by paths.sh (CLAUDE_CODE_SESSION_ID > TMUX_PANE > default)
+SID="$BUDDY_SID"
 
 [ -f "$STATE" ] || exit 0
 
@@ -33,7 +32,8 @@ NAME=$(jq -r '.name // ""' "$STATE" 2>/dev/null)
 
 RARITY=$(jq -r '.rarity // "common"' "$STATE" 2>/dev/null)
 SHINY=$(jq -r '.shiny // false' "$STATE" 2>/dev/null)
-REACTION=$(jq -r '.reaction // ""' "$STATE" 2>/dev/null)
+REACTION_FILE="$BUDDY_STATE_DIR/reaction.$SID.json"
+REACTION=$(jq -r '.reaction // ""' "$REACTION_FILE" 2>/dev/null)
 ACHIEVEMENT=$(jq -r '.achievement // ""' "$STATE" 2>/dev/null)
 LEVEL=$(jq -r '.level // 1' "$STATE" 2>/dev/null)
 MOOD=$(jq -r '.mood // "focused"' "$STATE" 2>/dev/null)
@@ -150,7 +150,6 @@ BUBBLE=""
 if [ -n "$ACHIEVEMENT" ] && [ "$ACHIEVEMENT" != "null" ] && [ "$ACHIEVEMENT" != "" ]; then
     BUBBLE=$'\xf0\x9f\x8f\x86'" $ACHIEVEMENT"
 fi
-REACTION_FILE="$BUDDY_STATE_DIR/reaction.$SID.json"
 REACTION_TTL=0
 INNER_W=44
 MARGIN=8
@@ -221,7 +220,13 @@ for line in "${ART_LINES[@]}"; do
 done
 ALL_LINES+=("$NAME_LINE"); ALL_COLORS+=("$DIM")
 
-ART_W=14
+case "$SPECIES" in
+  axolotl|capybara|rabbit|mushroom|chonk) ART_W=10 ;;
+  duck|blob|cat|dragon|robot|wyvern)      ART_W=9  ;;
+  octopus|owl|turtle|snail|ghost|cactus)  ART_W=8  ;;
+  goose|penguin)                          ART_W=7  ;;
+  *)                                      ART_W=10 ;;
+esac
 ART_COUNT=${#ALL_LINES[@]}
 
 # ─── Speech bubble (left of art, word-wrapped) ──────────────────────────────

package/statusline/combined-status.sh

@@ -99,9 +99,11 @@ def fmt_stat(label, pct, reset):
     c = color_for(pct)
     pct_str = f'{round(pct):3d}%' if pct is not None else '  -%'
     bar = build_bar(pct)
-    text = f'{DIM}{label}{NC} {c}{pct_str}{NC} {bar} {c}↻{reset}{NC}'
-    visual_width = 2 + 1 + 4 + 1 + 10 + 1 + 1 + len(reset)
-    return text, visual_width
+    bar_text = f'{DIM}{label}{NC} {c}{pct_str}{NC} {bar}'
+    bar_width = 2 + 1 + 4 + 1 + 10
+    timer_text = f'   {c}↻{reset}{NC}'
+    timer_width = 3 + 1 + len(reset)
+    return (bar_text, bar_width), (timer_text, timer_width)
 
 try:
     stats = json.loads(os.environ.get('STATS_JSON', '{}'))
@@ -112,14 +114,13 @@ lines = sys.stdin.read().splitlines()
 n = len(lines)
 center = 1 
 
-stat_items = [
-    fmt_stat('5h', stats.get('sess_pct'), stats.get('sess_reset', '--')),
-    fmt_stat('7d', stats.get('week_pct'), stats.get('week_reset', '--')),
-]
+sess = fmt_stat('5h', stats.get('sess_pct'), stats.get('sess_reset', '--'))
+week = fmt_stat('7d', stats.get('week_pct'), stats.get('week_reset', '--'))
+stat_items = [sess[0], sess[1], week[0], week[1]]
 
 for i, line in enumerate(lines):
     si = i - center
-    if 0 <= si < 2 and line.startswith(BRAILLE):
+    if 0 <= si < 4 and line.startswith(BRAILLE):
         stat_text, stat_width = stat_items[si]
         after_braille = line[1:]
         num_spaces = len(after_braille) - len(after_braille.lstrip(' '))