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

package/adapters/claude/plugin/plugin.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-buddy",
-    "version": "0.4.0-alpha.7"
+    "version": "0.4.0-alpha.9",
     "description": "Permanent coding companion for Claude Code \u2014 survives any update. MCP-based terminal pet with ASCII art, stats, reactions, and personality.",
     "author": {
         "name": "1270011"
@@ -19,10 +19,8 @@
     "mcpServers": {
         "claude-buddy": {
             "type": "stdio",
-            "command": "bun",
-            "args": [
-                "adapters/claude/server/index.ts"
-            ]
+            "command": "${CLAUDE_PLUGIN_ROOT}/server/mcp-launcher.sh",
+            "args": []
         }
     }
 }

package/adapters/claude/server/index.ts

@@ -41,7 +41,12 @@ import {
   listCompanionSlots,
 } from "../storage/state.ts";
 import { resolveUserId } from "../storage/identity.ts";
-import { setBuddyStatusLine, unsetBuddyStatusLine } from "../storage/settings.ts";
+import { cleanupPluginState, setBuddyStatusLine, unsetBuddyStatusLine } from "../storage/settings.ts";
+import {
+  buddyStateDir,
+  claudeConfigDir,
+  claudeSettingsPath,
+} from "./path.ts";
 import {
   getReaction, generatePersonalityPrompt,
 } from "../../../core/reactions.ts";
@@ -329,8 +334,8 @@ server.tool(
       "  /buddy summon     Summon a saved buddy (omit slot for random)",
       "  /buddy save       Save current buddy to a named slot",
       "  /buddy list       List all saved buddies",
+      "  /buddy pick       Generate a new random buddy (optional: species, rarity)",
       "  /buddy dismiss    Remove a saved buddy slot",
-      "  /buddy pick       Launch interactive TUI picker (! bun run pick)",
       "  /buddy frequency  Show or set comment cooldown (tmux only)",
       "  /buddy style      Show or set bubble style (tmux only)",
       "  /buddy position   Show or set bubble position (tmux only)",
@@ -386,7 +391,7 @@ server.tool(
 
 server.tool(
   "buddy_style",
-  "Configure the popup appearance. Returns current settings if called without arguments.",
+  "Configure the buddy bubble appearance. Returns current settings if called without arguments.",
   {
     style: z
       .enum(["classic", "round"])
@@ -403,7 +408,7 @@ server.tool(
     showRarity: z
       .boolean()
       .optional()
-      .describe("Show or hide the stars + rarity line in the popup"),
+      .describe("Show or hide the stars + rarity line in the status line"),
   },
   async ({ style, position, showRarity }) => {
     if (
@@ -500,7 +505,10 @@ server.tool(
         content: [
           {
             type: "text",
-            text: "Status line enabled! Restart Claude Code to see your buddy in the status line.",
+            text:
+              "Status line enabled! Restart Claude Code to see your buddy in the status line.\n\n" +
+              `Note: this writes an entry to ${claudeSettingsPath()} that \`claude plugin uninstall\` does not remove. ` +
+              "Run `/buddy uninstall` before uninstalling the plugin to clean it up.",
           },
         ],
       };
@@ -518,6 +526,51 @@ server.tool(
   },
 );
 
+// ─── Tool: buddy_uninstall ───────────────────────────────────────────────────
+
+server.tool(
+  "buddy_uninstall",
+  "Clean up claude-buddy's writes to Claude Code's settings.json and transient session files in the buddy state dir (resolved via CLAUDE_CONFIG_DIR), in preparation for `claude plugin uninstall`. Companion data (menagerie, status, config) is intentionally preserved so reinstalling restores the buddy. The tool only cleans the plugin's own settings — it never removes a foreign statusLine.",
+  {},
+  async () => {
+    const result = cleanupPluginState();
+
+    const settingsPath = claudeSettingsPath();
+    const stateDir = buddyStateDir();
+    const pluginsCacheDir = join(claudeConfigDir(), "plugins", "cache", "claude-buddy");
+
+    const lines: string[] = [];
+    lines.push("claude-buddy: settings.json cleanup complete.");
+    lines.push("");
+    lines.push(
+      result.statusLineRemoved
+        ? `  \u2713 statusLine entry removed from ${settingsPath}`
+        : "  \u2014 no buddy statusLine was present (nothing to remove)",
+    );
+    if (result.foreignStatusLineKept) {
+      lines.push(
+        "  \u2713 a non-buddy statusLine was detected and left untouched",
+      );
+    }
+    lines.push(
+      `  \u2713 ${result.transientFilesRemoved} transient session file(s) removed from ${stateDir}`,
+    );
+    lines.push(`  \u2014 companion data at ${stateDir} preserved`);
+    lines.push("");
+    lines.push("Now run these commands via the Bash tool, in order:");
+    lines.push("");
+    lines.push("  claude plugin uninstall claude-buddy@claude-buddy");
+    lines.push("  claude plugin marketplace remove claude-buddy");
+    lines.push(`  rm -rf ${pluginsCacheDir}`);
+    lines.push("");
+    lines.push(
+      "After those three commands the plugin is fully removed. Restart Claude Code to apply.",
+    );
+
+    return { content: [{ type: "text", text: lines.join("\n") }] };
+  },
+);
+
 // ─── Tool: buddy_achievements ────────────────────────────────────────────────
 
 server.tool(
@@ -704,6 +757,80 @@ server.tool(
   },
 );
 
+// ─── Tool: buddy_pick ────────────────────────────────────────────────────────
+
+server.tool(
+  "buddy_pick",
+  "Generate a new random buddy and add it to the menagerie. Optionally filter by species and/or rarity. The new buddy becomes the active one.",
+  {
+    species: z.enum(SPECIES).optional().describe(
+      "Desired species (e.g. 'turtle', 'cat', 'dragon'). If omitted, any species.",
+    ),
+    rarity: z.enum(RARITIES).optional().describe(
+      "Desired rarity (e.g. 'legendary', 'epic', 'rare'). If omitted, any rarity. Higher rarities need more attempts and may take a moment.",
+    ),
+    name: z.string().min(1).max(14).optional().describe(
+      "Name for the new buddy (1-14 chars). If omitted, a random name is chosen.",
+    ),
+  },
+  async ({ species, rarity, name }) => {
+    const { randomBytes } = await import("crypto");
+
+    const maxAttempts =
+      rarity === "legendary" ? 5_000_000 :
+      rarity === "epic"      ? 2_000_000 :
+      rarity === "rare"      ? 1_000_000 : 500_000;
+
+    let bones = null;
+    let userId = "";
+
+    for (let i = 0; i < maxAttempts; i++) {
+      userId = randomBytes(16).toString("hex");
+      const candidate = generateBones(userId);
+      if (species && candidate.species !== species) continue;
+      if (rarity && candidate.rarity !== rarity) continue;
+      bones = candidate;
+      break;
+    }
+
+    if (!bones) {
+      return {
+        content: [{ type: "text", text: `No match found after ${maxAttempts.toLocaleString()} attempts. Try broader criteria (e.g. drop the rarity filter, or pick a different species).` }],
+      };
+    }
+
+    const buddyName = name ?? unusedName();
+    const slot = slugify(buddyName);
+
+    if (loadCompanionSlot(slot)) {
+      return {
+        content: [{ type: "text", text: `A buddy in slot "${slot}" already exists. Pick a different name.` }],
+      };
+    }
+
+    const companion: Companion = {
+      bones,
+      name: buddyName,
+      personality: `A ${bones.rarity} ${bones.species} who watches code with quiet intensity.`,
+      hatchedAt: Date.now(),
+      userId,
+    };
+
+    saveCompanionSlot(companion, slot);
+    saveActiveSlot(slot);
+    writeStatusState(companion, `*${buddyName} hatches*`);
+
+    const card = renderCompanionCardMarkdown(
+      companion.bones,
+      companion.name,
+      companion.personality,
+      `*${buddyName} hatches*`,
+    );
+
+    return { content: [{ type: "text", text: card }] };
+  },
+);
+
 // ─── Resource: buddy://companion ────────────────────────────────────────────
 
 server.resource(

package/adapters/claude/server/path.ts

@@ -0,0 +1,12 @@
+export {
+  getBuddyStateDir as buddyStateDir,
+  getClaudeConfigDir as claudeConfigDir,
+  getClaudeJsonPath as claudeUserConfigPath,
+  getClaudeSettingsPath as claudeSettingsPath,
+  toUnixPath,
+} from "../storage/paths.ts";
+
+export function claudeSkillDir(_name: string): string {
+  const { getBuddySkillDir } = require("../storage/paths.ts") as typeof import("../storage/paths.ts");
+  return getBuddySkillDir();
+}

package/adapters/claude/skills/buddy/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: buddy
 description: "Show, pet, or manage your coding companion. Use when the user types /buddy or mentions their companion by name."
-argument-hint: "[show|pet|stats|help|off|on|rename <name>|personality <text>|achievements|summon [slot]|save [slot]|list|dismiss <slot>|pick|frequency [seconds]|style [classic|round]|position [top|left]|rarity [on|off]|statusline [on|off]]"
+argument-hint: "[show|pet|stats|help|off|on|rename <name>|personality <text>|achievements|summon [slot]|save [slot]|list|dismiss <slot>|pick|frequency [seconds]|style [classic|round]|position [top|left]|rarity [on|off]|statusline [on|off]|uninstall]"
 allowed-tools: mcp__claude_buddy__*
 ---
 
@@ -41,6 +41,7 @@ Based on `$ARGUMENTS`:
 | `statusline`             | Call `buddy_statusline` with no args (show current)                                          |
 | `statusline on`          | Call `buddy_statusline` with enabled=true                                                    |
 | `statusline off`         | Call `buddy_statusline` with enabled=false                                                   |
+| `uninstall`              | Run the uninstall sequence (see **Uninstall Orchestration** below)                           |
 
 ## CRITICAL OUTPUT RULES
 
@@ -57,3 +58,17 @@ The MCP tools return pre-formatted ASCII art with ANSI colors, box-drawing chara
 **Just output the raw text content from the tool result. Nothing else.** The ASCII art IS the response.
 
 If the user mentions the buddy's name in normal conversation, call `buddy_react` with reason "turn" and display the result verbatim.
+
+## Uninstall Orchestration
+
+When the user invokes `/buddy uninstall`, run this sequence **in order** — do not skip steps, do not ask for confirmation between steps:
+
+1. Call the MCP tool `buddy_uninstall`. Display its output verbatim.
+2. Run via Bash tool: `claude plugin uninstall claude-buddy@claude-buddy`
+3. Run via Bash tool: `claude plugin marketplace remove claude-buddy`
+4. Run via Bash tool: `rm -rf ~/.claude/plugins/cache/claude-buddy`
+5. Tell the user: uninstall is complete; companion data is kept at `~/.claude-buddy/`; restart Claude Code to release the plugin.
+
+If any Bash step fails (non-zero exit), report the error but continue with the remaining steps — each step is independent and always-safe to run.
+
+Do not call `buddy_uninstall` for any other command than `/buddy uninstall`. Never call it proactively.

package/adapters/claude/statusline/buddy-status.sh

@@ -8,8 +8,15 @@
 #   - refreshInterval: 1s in settings.json cycles the animation
 #
 # Uses Braille Blank (U+2800) for padding — survives JS .trim()
+#
+# When running inside buddy-shell (the PTY wrapper), skip status line rendering
+# so the buddy doesn't show up twice (once in status line, once in wrapper panel).
+[ "$BUDDY_SHELL" = "1" ] && exit 0
+
+# shellcheck source=../scripts/paths.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
 
-STATE="$HOME/.claude-buddy/status.json"
+STATE="$BUDDY_STATE_DIR/status.json"
 # Session ID: sanitized tmux pane number, or "default" outside tmux
 SID="${TMUX_PANE#%}"
 SID="${SID:-default}"
@@ -66,11 +73,23 @@ PID=$$
 for _ in 1 2 3 4 5; do
     PID=$(ps -o ppid= -p "$PID" 2>/dev/null | tr -d ' ')
     [ -z "$PID" ] || [ "$PID" = "1" ] && break
+
+    # Linux: read PTY device from /proc
     PTY=$(readlink "/proc/${PID}/fd/0" 2>/dev/null)
     if [ -c "$PTY" ] 2>/dev/null; then
         COLS=$(stty size < "$PTY" 2>/dev/null | awk '{print $2}')
         [ "${COLS:-0}" -gt 40 ] 2>/dev/null && break
     fi
+
+    # macOS: /proc doesn't exist — get TTY name from process table
+    TTY_NAME=$(ps -o tty= -p "$PID" 2>/dev/null | tr -d ' ')
+    if [ -n "$TTY_NAME" ] && [ "$TTY_NAME" != "??" ] && [ "$TTY_NAME" != "?" ]; then
+        TTY_DEV="/dev/$TTY_NAME"
+        if [ -c "$TTY_DEV" ] 2>/dev/null; then
+            COLS=$(stty size < "$TTY_DEV" 2>/dev/null | awk '{print $2}')
+            [ "${COLS:-0}" -gt 40 ] 2>/dev/null && break
+        fi
+    fi
 done
 [ "${COLS:-0}" -lt 40 ] 2>/dev/null && COLS=${COLUMNS:-0}
 [ "${COLS:-0}" -lt 40 ] 2>/dev/null && COLS=125
@@ -215,9 +234,9 @@ BUBBLE=""
 if [ -n "$ACHIEVEMENT" ] && [ "$ACHIEVEMENT" != "null" ] && [ "$ACHIEVEMENT" != "" ]; then
     BUBBLE=$'\xf0\x9f\x8f\x86'" $ACHIEVEMENT"
 fi
-REACTION_FILE="$HOME/.claude-buddy/reaction.$SID.json"
+REACTION_FILE="$BUDDY_STATE_DIR/reaction.$SID.json"
 REACTION_TTL=0
-CONFIG_FILE="$HOME/.claude-buddy/config.json"
+CONFIG_FILE="$BUDDY_STATE_DIR/config.json"
 if [ -f "$CONFIG_FILE" ]; then
     _ttl=$(jq -r '.reactionTTL // 0' "$CONFIG_FILE" 2>/dev/null || echo 0)
     case "$_ttl" in ''|*[!0-9]*) ;; *) REACTION_TTL="$_ttl" ;; esac

package/adapters/claude/storage/paths.ts

@@ -1,6 +1,10 @@
 import { homedir } from "os";
 import { join, resolve } from "path";
 
+export function toUnixPath(path: string): string {
+  return path.replace(/\\/g, "/");
+}
+
 function claudeConfigDirEnv(): string | null {
   const value = process.env.CLAUDE_CONFIG_DIR?.trim();
   return value ? resolve(value) : null;
@@ -22,3 +26,8 @@ export function getClaudeSettingsPath(): string {
 export function getBuddySkillDir(): string {
   return join(getClaudeConfigDir(), "skills", "buddy");
 }
+
+export function getBuddyStateDir(): string {
+  const configDir = claudeConfigDirEnv();
+  return configDir ? join(configDir, "buddy-state") : join(homedir(), ".claude-buddy");
+}

package/adapters/claude/storage/settings.ts

@@ -1,5 +1,6 @@
-import { readFileSync, writeFileSync, renameSync } from "fs";
-import { getClaudeSettingsPath } from "./paths.ts";
+import { existsSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "fs";
+import { join } from "path";
+import { getBuddyStateDir, getClaudeSettingsPath, toUnixPath } from "./paths.ts";
 
 export const CLAUDE_SETTINGS_PATH = getClaudeSettingsPath();
 
@@ -11,7 +12,7 @@ export function setBuddyStatusLine(
     const settings = JSON.parse(readFileSync(settingsPath, "utf8"));
     settings.statusLine = {
       type: "command",
-      command: statusScript,
+      command: toUnixPath(statusScript),
       padding: 1,
       refreshInterval: 1,
     };
@@ -39,3 +40,52 @@ export function unsetBuddyStatusLine(
     return false;
   }
 }
+
+export interface CleanupResult {
+  statusLineRemoved: boolean;
+  foreignStatusLineKept: boolean;
+  transientFilesRemoved: number;
+}
+
+const TRANSIENT_PREFIXES = [
+  "popup-stop.",
+  "popup-resize.",
+  "popup-env.",
+  "popup-scroll.",
+  "popup-reopen-pid.",
+  "reaction.",
+  ".last_reaction.",
+  ".last_comment.",
+];
+
+export function cleanupPluginState(
+  settingsPath: string = CLAUDE_SETTINGS_PATH,
+  stateDir: string = getBuddyStateDir(),
+): CleanupResult {
+  const statusLineRemoved = unsetBuddyStatusLine(settingsPath);
+
+  let foreignStatusLineKept = false;
+  try {
+    const settings = JSON.parse(readFileSync(settingsPath, "utf8"));
+    const cmd = settings.statusLine?.command;
+    if (cmd && !cmd.includes("buddy-status.sh")) foreignStatusLineKept = true;
+  } catch {
+    // ignore missing settings
+  }
+
+  let transientFilesRemoved = 0;
+  try {
+    if (existsSync(stateDir)) {
+      for (const file of readdirSync(stateDir)) {
+        if (TRANSIENT_PREFIXES.some((prefix) => file.startsWith(prefix))) {
+          rmSync(join(stateDir, file), { force: true });
+          transientFilesRemoved++;
+        }
+      }
+    }
+  } catch {
+    // ignore unreadable state dir
+  }
+
+  return { statusLineRemoved, foreignStatusLineKept, transientFilesRemoved };
+}

package/adapters/claude/storage/state.ts

@@ -1,8 +1,12 @@
 /**
- * State management — reads/writes companion data to ~/.claude-buddy/
+ * State management — reads/writes companion data to the buddy state dir.
+ *
+ * The state dir resolves via server/paths.ts (honors CLAUDE_CONFIG_DIR).
+ * Default: ~/.claude-buddy/. With CLAUDE_CONFIG_DIR set:
+ * $CLAUDE_CONFIG_DIR/buddy-state/.
  *
  * Storage layout (v3 — single manifest):
- *   ~/.claude-buddy/
+ *   <state-dir>/
  *     menagerie.json   <- SSOT: { active, companions: { [slot]: Companion } }
  *     reaction.$SID.json  <- transient reaction state (session-scoped)
  *     status.json      <- compact state for the status-line shell script
@@ -23,12 +27,13 @@ import {
   existsSync,
   readdirSync,
   renameSync,
+  rmSync,
 } from "fs";
 import { join } from "path";
-import { homedir } from "os";
 import type { Companion } from "../../../core/engine.ts";
+import { getBuddyStateDir } from "./paths.ts";
 
-const STATE_DIR = join(homedir(), ".claude-buddy");
+export const STATE_DIR = getBuddyStateDir();
 const MANIFEST_FILE = join(STATE_DIR, "menagerie.json");
 const CONFIG_FILE = join(STATE_DIR, "config.json");
 
@@ -145,6 +150,19 @@ export function saveCompanionSlot(companion: Companion, slot: string): void {
   saveManifest(m);
 }
 
+/**
+ * UPDATE an existing (possibly non-active) companion slot.
+ * Throws if the slot does not exist.
+ */
+export function updateCompanionSlot(slot: string, companion: Companion): void {
+  const m = loadManifest();
+  if (!m.companions[slot]) {
+    throw new Error(`Slot "${slot}" does not exist.`);
+  }
+  m.companions[slot] = companion;
+  saveManifest(m);
+}
+
 export function deleteCompanionSlot(slot: string): void {
   const m = loadManifest();
   delete m.companions[slot];

package/adapters/pi/README.md

@@ -62,3 +62,22 @@ Passive behavior:
 Persistence lives under:
 
 - `~/.pi/agent/buddy/`
+
+## Config
+
+Buddy config is stored in:
+
+- `~/.pi/agent/buddy/config.json`
+
+You can optionally force the end-of-turn buddy comment generator to use a different model than the main pi session:
+
+```json
+{
+  "turnCommentModel": {
+    "provider": "google",
+    "model": "gemini-2.5-flash"
+  }
+}
+```
+
+If `turnCommentModel` is unset, or the configured model cannot be found, buddy falls back to the active session model.