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

package/{adapters/claude/install → cli}/disable.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 /**
- * claude-buddy disable — temporarily deactivate buddy without losing data
+ * coding-buddy disable — temporarily deactivate buddy without losing data
  *
  * Removes: MCP server, status line, hooks
  * Keeps: companion data, backups, skill files
@@ -9,29 +9,11 @@
  */
 
 import { readFileSync, writeFileSync, existsSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
-import { getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
-
-interface HookCommand {
-  type: "command";
-  command: string;
-}
-
-interface HookMatcherEntry {
-  matcher?: string;
-  hooks?: HookCommand[];
-}
-
-interface ClaudeSettings {
-  statusLine?: { command?: string };
-  hooks?: Record<string, HookMatcherEntry[]>;
-  [key: string]: unknown;
-}
-
-function hasBuddyHook(entry: HookMatcherEntry): boolean {
-  return (entry.hooks ?? []).some((hook) => hook.command.includes("claude-buddy"));
-}
+import {
+  buddyStateDir,
+  claudeSettingsPath,
+  claudeUserConfigPath,
+} from "../server/path.ts";
 
 const GREEN = "\x1b[32m";
 const YELLOW = "\x1b[33m";
@@ -42,11 +24,11 @@ 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 CLAUDE_JSON = claudeUserConfigPath();
+const SETTINGS = claudeSettingsPath();
+const STATE_DIR = buddyStateDir();
 
-console.log(`\n${BOLD}Disabling claude-buddy...${NC}\n`);
+console.log(`\n${BOLD}Disabling coding-buddy...${NC}\n`);
 
 // 1. Remove MCP server from ~/.claude.json
 try {
@@ -65,7 +47,7 @@ try {
 
 // 2. Remove status line + hooks from settings.json
 try {
-  const settings = JSON.parse(readFileSync(SETTINGS, "utf8")) as ClaudeSettings;
+  const settings = JSON.parse(readFileSync(SETTINGS, "utf8"));
   let changed = false;
 
   if (settings.statusLine?.command?.includes("buddy")) {
@@ -75,11 +57,11 @@ 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),
+          (h: any) => !h.hooks?.some((hh: any) => hh.command?.includes("coding-buddy") || hh.command?.includes("claude-buddy")),
         );
         if (settings.hooks[hookType].length < before) changed = true;
         if (settings.hooks[hookType].length === 0) delete settings.hooks[hookType];
@@ -107,7 +89,7 @@ try {
 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.

package/{adapters/claude/install → cli}/doctor.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 /**
- * claude-buddy doctor — comprehensive diagnostic report
+ * coding-buddy doctor — comprehensive diagnostic report
  *
  * Run: bun run doctor
  *
@@ -10,17 +10,22 @@
 
 import { readFileSync, existsSync, statSync } from "fs";
 import { execSync } from "child_process";
-import { join, resolve } from "path";
-import { homedir } from "os";
-import { getBuddySkillDir, getClaudeConfigDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
-
-const PROJECT_ROOT = resolve(import.meta.dir, "../../..");
-const HOME = homedir();
-const CLAUDE_DIR = getClaudeConfigDir();
-const CLAUDE_JSON = getClaudeJsonPath();
-const SETTINGS = getClaudeSettingsPath();
-const SKILL_PATH = join(getBuddySkillDir(), "SKILL.md");
-const STATUS_SCRIPT = join(PROJECT_ROOT, "adapters", "claude", "statusline", "buddy-status.sh");
+import { join, resolve, dirname } from "path";
+import {
+  buddyStateDir,
+  claudeConfigDir,
+  claudeSettingsPath,
+  claudeSkillDir,
+  claudeUserConfigPath,
+} from "../server/path.ts";
+
+const PROJECT_ROOT = resolve(dirname(import.meta.dir));
+const CLAUDE_DIR = claudeConfigDir();
+const CLAUDE_JSON = claudeUserConfigPath();
+const STATE_DIR = buddyStateDir();
+const SETTINGS = claudeSettingsPath();
+const SKILL_DIR = claudeSkillDir("buddy");
+const STATUS_SCRIPT = join(PROJECT_ROOT, "statusline", "buddy-status.sh");
 
 const RED = "\x1b[31m";
 const GREEN = "\x1b[32m";
@@ -54,20 +59,16 @@ function tryRead(path: string): string | null {
   try { return readFileSync(path, "utf8"); } catch { return null; }
 }
 
-function tryParseJson(text: string | null): unknown {
+function tryParseJson(text: string | null): any | null {
   if (!text) return null;
-  try { return JSON.parse(text) as unknown; } catch { return null; }
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
+  try { return JSON.parse(text); } catch { return null; }
 }
 
 // ─── Header ─────────────────────────────────────────────────────────────────
 
 console.log(`${CYAN}${BOLD}
 ╔══════════════════════════════════════════════════════════╗
-║  claude-buddy doctor — diagnostic report                 ║
+║  coding-buddy doctor — diagnostic report                 ║
 ╚══════════════════════════════════════════════════════════╝${NC}`);
 
 console.log(`\n${DIM}Copy this entire output into your GitHub issue.${NC}`);
@@ -100,46 +101,43 @@ row("tput cols", tryExec("tput cols 2>/dev/null", "(failed)"));
 section("Filesystem");
 const procExists = existsSync("/proc");
 row("/proc exists", procExists ? `${GREEN}yes${NC} (Linux)` : `${RED}no${NC} (macOS/BSD)`);
-row("Claude config dir", CLAUDE_DIR);
-row("Claude config dir exists", existsSync(CLAUDE_DIR) ? "yes" : "no");
-row("Claude config file", CLAUDE_JSON);
-row("Claude config file exists", existsSync(CLAUDE_JSON) ? "yes" : "no");
-row("~/.claude-buddy/ exists", existsSync(join(HOME, ".claude-buddy")) ? "yes" : "no");
+row("CLAUDE_CONFIG_DIR", process.env.CLAUDE_CONFIG_DIR ?? "(unset)");
+row(`${CLAUDE_DIR} exists`, existsSync(CLAUDE_DIR) ? "yes" : "no");
+row(`${CLAUDE_JSON} exists`, existsSync(CLAUDE_JSON) ? "yes" : "no");
+row(`${STATE_DIR} exists`, existsSync(STATE_DIR) ? "yes" : "no");
 row("Project root", PROJECT_ROOT);
 row("Status script exists", existsSync(STATUS_SCRIPT) ? "yes" : `${RED}no${NC}`);
 
-// ─── claude-buddy state ─────────────────────────────────────────────────────
+// ─── coding-buddy state ─────────────────────────────────────────────────────
 
-section("claude-buddy state");
-const menagerie = tryParseJson(tryRead(join(HOME, ".claude-buddy", "menagerie.json")));
-const status = tryParseJson(tryRead(join(HOME, ".claude-buddy", "status.json")));
+section("coding-buddy state");
+const menagerie = tryParseJson(tryRead(join(STATE_DIR, "menagerie.json")));
+const status = tryParseJson(tryRead(join(STATE_DIR, "status.json")));
 
-if (isRecord(menagerie)) {
-  const activeSlot = typeof menagerie.active === "string" ? menagerie.active : "buddy";
-  const companions = isRecord(menagerie.companions) ? menagerie.companions : {};
-  const companion = companions[activeSlot];
+if (menagerie) {
+  const activeSlot = menagerie.active ?? "buddy";
+  const companion = menagerie.companions?.[activeSlot];
   row("Active slot", activeSlot);
-  row("Total slots", String(Object.keys(companions).length));
-  if (isRecord(companion)) {
-    const bones = isRecord(companion.bones) ? companion.bones : {};
-    row("Companion name", typeof companion.name === "string" ? companion.name : "(none)");
-    row("Species", typeof bones.species === "string" ? bones.species : "(none)");
-    row("Rarity", typeof bones.rarity === "string" ? bones.rarity : "(none)");
-    row("Hat", typeof bones.hat === "string" ? bones.hat : "(none)");
-    row("Eye", typeof bones.eye === "string" ? bones.eye : "(none)");
-    row("Shiny", String(typeof bones.shiny === "boolean" ? bones.shiny : false));
+  row("Total slots", String(Object.keys(menagerie.companions ?? {}).length));
+  if (companion) {
+    row("Companion name", companion.name ?? "(none)");
+    row("Species", companion.bones?.species ?? "(none)");
+    row("Rarity", companion.bones?.rarity ?? "(none)");
+    row("Hat", companion.bones?.hat ?? "(none)");
+    row("Eye", companion.bones?.eye ?? "(none)");
+    row("Shiny", String(companion.bones?.shiny ?? false));
   } else {
     err(`No companion found in active slot "${activeSlot}"`);
   }
 } else {
-  err("No manifest found at ~/.claude-buddy/menagerie.json");
+  err(`No manifest found at ${join(STATE_DIR, "menagerie.json")}`);
 }
 
-if (isRecord(status)) {
-  row("Status muted", String(typeof status.muted === "boolean" ? status.muted : false));
-  row("Current reaction", typeof status.reaction === "string" && status.reaction.length > 0 ? status.reaction : "(none)");
+if (status) {
+  row("Status muted", String(status.muted ?? false));
+  row("Current reaction", status.reaction || "(none)");
 } else {
-  warn("No status state at ~/.claude-buddy/status.json");
+  warn(`No status state at ${join(STATE_DIR, "status.json")}`);
 }
 
 // ─── settings.json ──────────────────────────────────────────────────────────
@@ -148,35 +146,35 @@ section("Claude Code config");
 const settings = tryParseJson(tryRead(SETTINGS));
 const claudeJson = tryParseJson(tryRead(CLAUDE_JSON));
 
-if (isRecord(settings) && "statusLine" in settings && settings.statusLine !== undefined) {
+if (settings?.statusLine) {
   console.log(`  ${DIM}statusLine:${NC}`);
   console.log(`    ${JSON.stringify(settings.statusLine, null, 2).split("\n").join("\n    ")}`);
 } else {
-  warn("No statusLine in ~/.claude/settings.json");
+  warn(`No statusLine in ${SETTINGS}`);
 }
 
-if (isRecord(settings) && isRecord(settings.hooks)) {
+if (settings?.hooks) {
   console.log(`  ${DIM}hooks:${NC}`);
   for (const event of Object.keys(settings.hooks)) {
-    const hookEntries = settings.hooks[event];
-    const count = Array.isArray(hookEntries) ? hookEntries.length : 0;
+    const count = settings.hooks[event]?.length ?? 0;
     row(`  ${event}`, `${count} entr${count === 1 ? "y" : "ies"}`);
   }
 } else {
   warn("No hooks configured");
 }
 
-if (isRecord(claudeJson) && isRecord(claudeJson.mcpServers) && isRecord(claudeJson.mcpServers["claude-buddy"])) {
-  ok("MCP server registered in ~/.claude.json");
+if (claudeJson?.mcpServers?.["claude-buddy"]) {
+  ok(`MCP server registered in ${CLAUDE_JSON}`);
   console.log(`    ${JSON.stringify(claudeJson.mcpServers["claude-buddy"], null, 2).split("\n").join("\n    ")}`);
 } else {
-  err("MCP server NOT registered in ~/.claude.json");
+  err(`MCP server NOT registered in ${CLAUDE_JSON}`);
 }
 
-if (existsSync(SKILL_PATH)) {
-  ok(`Skill installed: ${SKILL_PATH}`);
+const skillPath = join(SKILL_DIR, "SKILL.md");
+if (existsSync(skillPath)) {
+  ok(`Skill installed: ${skillPath}`);
 } else {
-  err(`Skill missing: ${SKILL_PATH}`);
+  err(`Skill missing: ${skillPath}`);
 }
 
 // ─── Live status line test ──────────────────────────────────────────────────

package/{adapters/claude/install → cli}/hunt.ts

@@ -1,5 +1,5 @@
 /**
- * claude-buddy hunt — brute-force search for a specific buddy
+ * coding-buddy hunt — brute-force search for a specific buddy
  *
  * Rules:
  *   - Asks for a name before saving
@@ -7,14 +7,12 @@
  *   - Appends to the manifest — never overwrites an existing slot
  */
 
-import {
-  searchBuddy, renderBuddy, SPECIES, RARITIES, STAT_NAMES,
-  type Species, type Rarity, type StatName, type SearchCriteria,
-} from "../../../core/engine.ts";
+import { searchBuddy, renderBuddy, SPECIES, RARITIES, STAT_NAMES,
+type Species, type Rarity, type StatName, type SearchCriteria, } from "../core/engine.ts"
 import {
   saveCompanionSlot, saveActiveSlot, writeStatusState,
   slugify, unusedName, listCompanionSlots,
-} from "../storage/state.ts";
+} from "../server/state.ts";
 import { createInterface } from "readline";
 
 const CYAN  = "\x1b[36m";
@@ -47,7 +45,7 @@ function pickFromList<T extends string>(label: string, items: readonly T[]): Pro
 async function main() {
   console.log(`
 ${CYAN}╔══════════════════════════════════════════════════════════╗${NC}
-${CYAN}║${NC}  ${BOLD}claude-buddy hunt${NC} — find your perfect companion          ${CYAN}║${NC}
+${CYAN}║${NC}  ${BOLD}coding-buddy hunt${NC} — find your perfect companion          ${CYAN}║${NC}
 ${CYAN}╚══════════════════════════════════════════════════════════╝${NC}
 `);
 
@@ -67,8 +65,8 @@ ${CYAN}╚═══════════════════════
   const statsAns = await ask(`\n  Configure stats? [Y/n]: `);
   if (statsAns.toLowerCase() !== "n") {
     wantPeak = await pickFromList("Peak stat (highest):", STAT_NAMES);
-    const dumpOptions = STAT_NAMES.filter((s): s is Exclude<StatName, typeof wantPeak> => s !== wantPeak);
-    wantDump = await pickFromList("Dump stat (lowest):", dumpOptions);
+    const dumpOptions = STAT_NAMES.filter((s) => s !== wantPeak);
+    wantDump = await pickFromList("Dump stat (lowest):", dumpOptions as any);
     console.log(`${GREEN}✓${NC} peak=${wantPeak} dump=${wantDump}`);
   }
 

package/cli/index.ts

@@ -1,56 +1,62 @@
 #!/usr/bin/env bun
 /**
- * claude-buddy CLI
+ * coding-buddy CLI
  *
  * Usage:
- *   npx claude-buddy              Interactive install
- *   npx claude-buddy install      Install MCP + skill + hooks + statusline
- *   npx claude-buddy show         Show current buddy
- *   npx claude-buddy pick         Interactive two-pane buddy picker (saved + search)
- *   npx claude-buddy hunt         Search for a specific buddy (non-interactive)
- *   npx claude-buddy uninstall    Remove all integrations
- *   npx claude-buddy verify       Verify what buddy your ID produces
+ *   npx -y @ramarivera/coding-buddy              Interactive install
+ *   npx -y @ramarivera/coding-buddy install      Install MCP + skill + hooks + statusline
+ *   npx -y @ramarivera/coding-buddy show         Show current buddy
+ *   npx -y @ramarivera/coding-buddy pick         Interactive two-pane buddy picker (saved + search)
+ *   npx -y @ramarivera/coding-buddy hunt         Search for a specific buddy (non-interactive)
+ *   npx -y @ramarivera/coding-buddy upgrade      Pull latest + reinstall
+ *   npx -y @ramarivera/coding-buddy uninstall     Remove all integrations
+ *   npx -y @ramarivera/coding-buddy verify       Verify what buddy your ID produces
  */
 
+export {}; // Make this file a module for TypeScript top-level await
+
 const args = process.argv.slice(2);
 const command = args[0] || "install";
 
 switch (command) {
   case "install":
-    await import("../adapters/claude/install/install.ts");
+    await import("./install.ts");
     break;
   case "show":
-    await import("../adapters/claude/install/show.ts");
+    await import("./show.ts");
     break;
   case "pick":
-    await import("../adapters/claude/install/pick.ts");
+    await import("./pick.ts");
     break;
   case "hunt":
-    await import("../adapters/claude/install/hunt.ts");
+    await import("./hunt.ts");
     break;
   case "uninstall":
-    await import("../adapters/claude/install/uninstall.ts");
+    await import("./uninstall.ts");
     break;
   case "verify":
     await import("./verify.ts");
     break;
   case "doctor":
-    await import("../adapters/claude/install/doctor.ts");
+    await import("./doctor.ts");
     break;
   case "test-statusline":
-    await import("../adapters/claude/install/test-statusline.ts");
+    await import("./test-statusline.ts");
     break;
   case "backup":
-    await import("../adapters/claude/install/backup.ts");
+    await import("./backup.ts");
     break;
   case "settings":
-    await import("../adapters/claude/install/settings.ts");
+    await import("./settings.ts");
     break;
   case "disable":
-    await import("../adapters/claude/install/disable.ts");
+    await import("./disable.ts");
+    break;
+  case "upgrade":
+    await import("./upgrade.ts");
     break;
   case "enable":
-    await import("../adapters/claude/install/install.ts");
+    await import("./install.ts");
     break;
   case "help":
   case "--help":
@@ -65,13 +71,14 @@ switch (command) {
 
 function showHelp() {
   console.log(`
-claude-buddy — permanent coding companion for Claude Code
+coding-buddy — permanent coding companion for Claude Code, Pi, and Oh My Pi
 
 Setup:
   install-buddy     Set up MCP server, skill, hooks, and status line
+  upgrade           Pull latest version and reinstall integrations
   enable            Same as install-buddy (re-enable after disable)
   disable           Temporarily deactivate buddy (data preserved)
-  uninstall         Remove all claude-buddy integrations
+  uninstall         Remove all coding-buddy integrations
 
 Buddy:
   show              Display your current buddy
@@ -79,6 +86,8 @@ Buddy:
   hunt              Search for a specific buddy (non-interactive)
   verify            Verify what buddy your current ID produces
 
+  upgrade           Pull latest version + reinstall (add --check to just check)
+
 Settings:
   settings          Show current settings
   settings cooldown <n>  Set comment cooldown (0-300 seconds)
@@ -87,7 +96,7 @@ Settings:
 Diagnostics:
   doctor            Run diagnostic report (paste output in bug reports)
   test-statusline   Test status line rendering in Claude Code
-  backup            Snapshot or restore all claude-buddy state
+  backup            Snapshot or restore all coding-buddy state
 
 In Claude Code:
   /buddy            Show companion card with ASCII art + stats
@@ -106,10 +115,12 @@ In Claude Code:
   /buddy style      Show or set bubble style (tmux only)
   /buddy position   Show or set bubble position (tmux only)
   /buddy rarity     Show or hide rarity stars (tmux only)
+  /buddy width      Set bubble text width in chars (10-60, tmux only)
 
 Usage:
-  bun run <command>           e.g. bun run show, bun run doctor
-  claude-buddy <command>      if globally linked (bun link)
-  bun run help                Show this help
+  npx -y @ramarivera/coding-buddy <command>  Run from the registry without cloning
+  bun run <command>                           e.g. bun run show, bun run doctor (in repo)
+  coding-buddy <command>                      if globally linked (bun link)
+  bun run help                                Show this help
 `);
 }