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

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,60 +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 upgrade     Pull latest + reinstall
- *   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":
@@ -69,14 +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
@@ -94,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
@@ -113,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
 `);
 }

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

@@ -1,5 +1,5 @@
 /**
- * claude-buddy installer
+ * coding-buddy installer
  *
  * Registers: MCP server (in Claude's user config), skill, hooks, status line
  * (in settings.json). All paths resolve via server/paths.ts, so the installer
@@ -7,15 +7,20 @@
  * ~/.claude/ layout when the env var is unset.
  */
 
-import { readFileSync, writeFileSync, mkdirSync, existsSync, cpSync, statSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync, cpSync } from "fs";
 import { execSync } from "child_process";
-import { join, resolve } from "path";
-
-import { generateBones, renderBuddy, renderFace, RARITY_STARS } from "../../../core/engine.ts";
-import { loadCompanion, saveCompanion, writeStatusState } from "../storage/state.ts";
-import { resolveUserId } from "../storage/identity.ts";
-import { generateFallbackName } from "../../../core/reactions.ts";
-import { getBuddySkillDir, getBuddyStateDir, getClaudeConfigDir, getClaudeJsonPath, getClaudeSettingsPath, toUnixPath } from "../storage/paths.ts";
+import { resolve, dirname, join } from "path";
+
+import { generateBones, renderBuddy, renderFace, RARITY_STARS } from "../core/engine.ts"
+import {
+  claudeConfigDir,
+  claudeSettingsPath,
+  claudeSkillDir,
+  claudeUserConfigPath,
+  toUnixPath,
+} from "../server/path.ts";
+import { loadCompanion, saveCompanion, resolveUserId, writeStatusState } from "../server/state.ts";
+import { generateFallbackName } from "../core/reactions.ts"
 
 const CYAN = "\x1b[36m";
 const GREEN = "\x1b[32m";
@@ -25,17 +30,16 @@ const BOLD = "\x1b[1m";
 const DIM = "\x1b[2m";
 const NC = "\x1b[0m";
 
-const CLAUDE_DIR = getClaudeConfigDir();
-const SETTINGS_FILE = getClaudeSettingsPath();
-const BUDDY_DIR = getBuddySkillDir();
-const CLAUDE_JSON = getClaudeJsonPath();
-const STATE_DIR = getBuddyStateDir();
-const PROJECT_ROOT = resolve(import.meta.dir, "../../..");
+const CLAUDE_DIR = claudeConfigDir();
+const SETTINGS_FILE = claudeSettingsPath();
+const BUDDY_DIR = claudeSkillDir("buddy");
+const CLAUDE_JSON_PATH = claudeUserConfigPath();
+const PROJECT_ROOT = resolve(dirname(import.meta.dir));
 
 function banner() {
   console.log(`
 ${CYAN}╔══════════════════════════════════════════════════════════╗${NC}
-${CYAN}║${NC}  ${BOLD}claude-buddy${NC} — permanent coding companion              ${CYAN}║${NC}
+${CYAN}║${NC}  ${BOLD}coding-buddy${NC} — permanent coding companion              ${CYAN}║${NC}
 ${CYAN}║${NC}  ${DIM}MCP + Skill + StatusLine + Hooks${NC}                        ${CYAN}║${NC}
 ${CYAN}╚══════════════════════════════════════════════════════════╝${NC}
 `);
@@ -75,21 +79,20 @@ function preflight(): boolean {
     }
   }
 
+  // Check Claude config dir exists
   if (!existsSync(CLAUDE_DIR)) {
-    err(`Claude config dir not found: ${CLAUDE_DIR}. Start Claude Code once first, then re-run.`);
-    pass = false;
-  } else if (!statSync(CLAUDE_DIR).isDirectory()) {
-    err(`Claude config path is not a directory: ${CLAUDE_DIR}`);
+    err(`${CLAUDE_DIR} not found. Start Claude Code once first, then re-run.`);
     pass = false;
   } else {
-    ok(`Claude config dir found: ${CLAUDE_DIR}`);
+    ok(`${CLAUDE_DIR} found`);
   }
 
-  if (!existsSync(CLAUDE_JSON)) {
-    err(`Claude config file not found: ${CLAUDE_JSON}. Start Claude Code once first, then re-run.`);
+  // Check Claude user config (.claude.json) exists
+  if (!existsSync(CLAUDE_JSON_PATH)) {
+    err(`${CLAUDE_JSON_PATH} not found. Start Claude Code once first, then re-run.`);
     pass = false;
   } else {
-    ok(`Claude config file found: ${CLAUDE_JSON}`);
+    ok(`${CLAUDE_JSON_PATH} found`);
   }
 
   return pass;
@@ -97,50 +100,15 @@ function preflight(): boolean {
 
 // ─── Load / update settings.json ────────────────────────────────────────────
 
-interface HookCommand {
-  type: "command";
-  command: string;
-}
-
-interface HookMatcherEntry {
-  matcher?: string;
-  hooks?: HookCommand[];
-}
-
-interface ClaudeStatusLineConfig {
-  type: "command";
-  command: string;
-  padding: number;
-  refreshInterval: number;
-}
-
-interface ClaudeSettings {
-  statusLine?: ClaudeStatusLineConfig;
-  hooks?: Partial<Record<"SessionStart" | "SessionEnd" | "PostToolUse" | "Stop" | "UserPromptSubmit", HookMatcherEntry[]>>;
-  permissions?: {
-    allow?: string[];
-  };
-  [key: string]: unknown;
-}
-
-interface ClaudeJsonConfig {
-  mcpServers?: Record<string, { command: string; args: string[]; cwd: string }>;
-  [key: string]: unknown;
-}
-
-function hasBuddyHook(entry: HookMatcherEntry): boolean {
-  return (entry.hooks ?? []).some((hook) => hook.command.includes("claude-buddy"));
-}
-
-function loadSettings(): ClaudeSettings {
+function loadSettings(): Record<string, any> {
   try {
-    return JSON.parse(readFileSync(SETTINGS_FILE, "utf8")) as ClaudeSettings;
+    return JSON.parse(readFileSync(SETTINGS_FILE, "utf8"));
   } catch {
     return {};
   }
 }
 
-function saveSettings(settings: ClaudeSettings) {
+function saveSettings(settings: Record<string, any>) {
   mkdirSync(CLAUDE_DIR, { recursive: true });
   writeFileSync(SETTINGS_FILE, JSON.stringify(settings, null, 2) + "\n");
 }
@@ -148,12 +116,11 @@ function saveSettings(settings: ClaudeSettings) {
 // ─── Step 1: Register MCP server (in ~/.claude.json) ────────────────────────
 
 function installMcp() {
-  const serverPath = join(PROJECT_ROOT, "adapters", "claude", "server", "index.ts");
-  const claudeJsonPath = CLAUDE_JSON;
+  const serverPath = join(PROJECT_ROOT, "server", "index.ts");
 
-  let claudeJson: ClaudeJsonConfig = {};
+  let claudeJson: Record<string, any> = {};
   try {
-    claudeJson = JSON.parse(readFileSync(claudeJsonPath, "utf8")) as ClaudeJsonConfig;
+    claudeJson = JSON.parse(readFileSync(CLAUDE_JSON_PATH, "utf8"));
   } catch { /* fresh config */ }
 
   if (!claudeJson.mcpServers) claudeJson.mcpServers = {};
@@ -164,14 +131,14 @@ function installMcp() {
     cwd: toUnixPath(PROJECT_ROOT),
   };
 
-  writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2));
-  ok(`MCP server registered in ${claudeJsonPath}`);
+  writeFileSync(CLAUDE_JSON_PATH, JSON.stringify(claudeJson, null, 2));
+  ok(`MCP server registered in ${CLAUDE_JSON_PATH}`);
 }
 
 // ─── Step 2: Install skill ──────────────────────────────────────────────────
 
 function installSkill() {
-  const srcSkill = join(PROJECT_ROOT, "adapters", "claude", "skills", "buddy", "SKILL.md");
+  const srcSkill = join(PROJECT_ROOT, "skills", "buddy", "SKILL.md");
   mkdirSync(BUDDY_DIR, { recursive: true });
   cpSync(srcSkill, join(BUDDY_DIR, "SKILL.md"), { force: true });
   ok(`Skill installed: ${join(BUDDY_DIR, "SKILL.md")}`);
@@ -179,8 +146,8 @@ function installSkill() {
 
 // ─── Step 3: Configure status line (with animation refresh) ─────────────────
 
-function installStatusLine(settings: ClaudeSettings) {
-  const statusScript = join(PROJECT_ROOT, "adapters", "claude", "statusline", "buddy-status.sh");
+function installStatusLine(settings: Record<string, any>) {
+  const statusScript = join(PROJECT_ROOT, "statusline", "buddy-status.sh");
 
   settings.statusLine = {
     type: "command",
@@ -213,47 +180,62 @@ function stripLegacyPopupHooks(settings: Record<string, any>) {
 
 // ─── Step 4: Register hooks ─────────────────────────────────────────────────
 
-function installHooks(settings: ClaudeSettings) {
-  const reactHook    = join(PROJECT_ROOT, "adapters", "claude", "hooks", "react.sh");
-  const commentHook  = join(PROJECT_ROOT, "adapters", "claude", "hooks", "buddy-comment.sh");
-  const nameHook     = join(PROJECT_ROOT, "adapters", "claude", "hooks", "name-react.sh");
+function installHooks(settings: Record<string, any>) {
+  const reactHook     = join(PROJECT_ROOT, "hooks", "react.sh");
+  const fileTypeHook  = join(PROJECT_ROOT, "hooks", "file-type-react.sh");
+  const commentHook   = join(PROJECT_ROOT, "hooks", "buddy-comment.sh");
+  const suggestHook   = join(PROJECT_ROOT, "hooks", "suggest.sh");
+  const nameHook      = join(PROJECT_ROOT, "hooks", "name-react.sh");
+  const moodHook      = join(PROJECT_ROOT, "hooks", "mood-react.sh");
 
   if (!settings.hooks) settings.hooks = {};
 
-  // PostToolUse: detect errors/test failures/successes in Bash output
+  // PostToolUse: detect errors/test failures/successes in Bash output,
+  // plus file-type specific reactions on Write/Edit.
   if (!settings.hooks.PostToolUse) settings.hooks.PostToolUse = [];
   settings.hooks.PostToolUse = settings.hooks.PostToolUse.filter(
-    (h) => !hasBuddyHook(h),
+    (h: any) => !h.hooks?.some((hh: any) => hh.command?.includes("coding-buddy") || hh.command?.includes("claude-buddy")),
   );
   settings.hooks.PostToolUse.push({
     matcher: "Bash",
     hooks: [{ type: "command", command: toUnixPath(reactHook) }],
   });
+  settings.hooks.PostToolUse.push({
+    matcher: "Write|Edit",
+    hooks: [{ type: "command", command: toUnixPath(fileTypeHook) }],
+  });
 
   // Stop: extract <!-- buddy: --> comment from Claude's response
   if (!settings.hooks.Stop) settings.hooks.Stop = [];
   settings.hooks.Stop = settings.hooks.Stop.filter(
-    (h) => !hasBuddyHook(h),
+    (h: any) => !h.hooks?.some((hh: any) => hh.command?.includes("coding-buddy") || hh.command?.includes("claude-buddy")),
   );
   settings.hooks.Stop.push({
     hooks: [{ type: "command", command: toUnixPath(commentHook) }],
   });
+  settings.hooks.Stop.push({
+    hooks: [{ type: "command", command: toUnixPath(suggestHook) }],
+  });
 
-  // UserPromptSubmit: detect buddy's name in user message → instant status line reaction
+  // UserPromptSubmit: detect buddy's name in user message → instant status line
+  // reaction, plus mood-react based on prompt content.
   if (!settings.hooks.UserPromptSubmit) settings.hooks.UserPromptSubmit = [];
   settings.hooks.UserPromptSubmit = settings.hooks.UserPromptSubmit.filter(
-    (h) => !hasBuddyHook(h),
+    (h: any) => !h.hooks?.some((hh: any) => hh.command?.includes("coding-buddy") || hh.command?.includes("claude-buddy")),
   );
   settings.hooks.UserPromptSubmit.push({
     hooks: [{ type: "command", command: toUnixPath(nameHook) }],
   });
+  settings.hooks.UserPromptSubmit.push({
+    hooks: [{ type: "command", command: toUnixPath(moodHook) }],
+  });
 
-  ok("Hooks registered: PostToolUse + Stop + UserPromptSubmit");
+  ok("Hooks registered: PostToolUse (Bash + Write/Edit) + Stop (comment + suggest) + UserPromptSubmit (name + mood)");
 }
 
 // ─── Step 5: Ensure MCP tools are allowed ───────────────────────────────────
 
-function ensurePermissions(settings: ClaudeSettings) {
+function ensurePermissions(settings: Record<string, any>) {
   if (!settings.permissions) settings.permissions = {};
   if (!settings.permissions.allow) settings.permissions.allow = [];
 
@@ -310,7 +292,7 @@ if (!preflight()) {
 }
 
 console.log("");
-info("Installing claude-buddy...\n");
+info("Installing coding-buddy...\n");
 
 const settings = loadSettings();