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

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

@@ -1,19 +1,26 @@
 /**
- * claude-buddy installer
+ * coding-buddy installer
  *
- * Registers: MCP server (in ~/.claude.json), skill, hooks, status line (in settings.json)
- * Checks: bun, jq, ~/.claude/ directory
+ * 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
+ * targets the active Claude profile ($CLAUDE_CONFIG_DIR) or the default
+ * ~/.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, getClaudeConfigDir, getClaudeJsonPath, getClaudeSettingsPath } 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";
@@ -23,16 +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 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}
 `);
@@ -67,28 +74,25 @@ function preflight(): boolean {
       execSync("sudo apt-get install -y jq 2>/dev/null || brew install jq 2>/dev/null", { stdio: "ignore" });
       ok("jq installed");
     } catch {
-      err("Could not install jq. Install manually: apt install jq / brew install jq");
+      err("Could not install jq. Install manually: apt install jq / brew install jq / windows: install from https://github.com/jqlang/jq/releases/latest and add to PATH");
       pass = false;
     }
   }
 
-  // Check Claude config dir exists and is actually a directory
+  // Check Claude config dir exists
   if (!existsSync(CLAUDE_DIR)) {
-    err(`Claude config dir not found: ${CLAUDE_DIR}`);
-    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`);
   }
 
-  // Check .claude.json exists in the active Claude config location
-  if (!existsSync(CLAUDE_JSON)) {
-    err(`Claude config file not found: ${CLAUDE_JSON}`);
+  // 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;
@@ -96,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");
 }
@@ -147,30 +116,29 @@ 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 = {};
 
   claudeJson.mcpServers["claude-buddy"] = {
     command: "bun",
-    args: [serverPath],
-    cwd: PROJECT_ROOT,
+    args: [toUnixPath(serverPath)],
+    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")}`);
@@ -178,12 +146,12 @@ 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",
-    command: statusScript,
+    command: toUnixPath(statusScript),
     padding: 1,
     refreshInterval: 1,  // 1 second — drives the buddy animation
   };
@@ -191,90 +159,83 @@ function installStatusLine(settings: ClaudeSettings) {
   ok("Status line configured (with animation refresh)");
 }
 
-// ─── Step 3b: Configure tmux popup mode (if in tmux) ────────────────────────
-
-function detectTmux(): boolean {
-  if (!process.env.TMUX) return false;
-  try {
-    const ver = execSync("tmux -V 2>/dev/null", { encoding: "utf8" }).trim();
-    const match = ver.match(/(\d+)\.(\d+)/);
-    if (!match) return false;
-    const major = parseInt(match[1]), minor = parseInt(match[2]);
-    return major > 3 || (major === 3 && minor >= 2);
-  } catch {
-    return false;
+// The tmux popup mode was removed in favour of the status line / buddy-shell
+// — its modal `tmux display-popup` intercepted the `Ctrl+b` prefix, breaking
+// every tmux binding while the buddy was visible (issue #57). For backwards
+// compatibility any legacy SessionStart/SessionEnd hooks that reference the
+// popup manager are stripped out below when re-installing.
+
+function stripLegacyPopupHooks(settings: Record<string, any>) {
+  if (!settings.hooks) return;
+  for (const hookType of ["SessionStart", "SessionEnd"] as const) {
+    if (!settings.hooks[hookType]) continue;
+    settings.hooks[hookType] = settings.hooks[hookType].filter(
+      (h: any) => !h.hooks?.some((hh: any) =>
+        hh.command?.includes("popup-manager") || hh.command?.includes("claude-buddy/popup"),
+      ),
+    );
+    if (settings.hooks[hookType].length === 0) delete settings.hooks[hookType];
   }
 }
 
-function installPopupHooks(settings: ClaudeSettings) {
-  const popupManager = join(PROJECT_ROOT, "adapters", "claude", "popup", "popup-manager.sh");
-
-  if (!settings.hooks) settings.hooks = {};
-
-  // SessionStart: open popup
-  if (!settings.hooks.SessionStart) settings.hooks.SessionStart = [];
-  settings.hooks.SessionStart = settings.hooks.SessionStart.filter(
-    (h) => !hasBuddyHook(h),
-  );
-  settings.hooks.SessionStart.push({
-    hooks: [{ type: "command", command: `${popupManager} start` }],
-  });
-
-  // SessionEnd: close popup
-  if (!settings.hooks.SessionEnd) settings.hooks.SessionEnd = [];
-  settings.hooks.SessionEnd = settings.hooks.SessionEnd.filter(
-    (h) => !hasBuddyHook(h),
-  );
-  settings.hooks.SessionEnd.push({
-    hooks: [{ type: "command", command: `${popupManager} stop` }],
-  });
-
-  ok("Popup hooks registered: SessionStart + SessionEnd");
-}
-
 // ─── 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: reactHook }],
+    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: commentHook }],
+    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: nameHook }],
+    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 = [];
 
@@ -319,6 +280,11 @@ function initCompanion() {
 
 banner();
 
+const profileSource = process.env.CLAUDE_CONFIG_DIR
+  ? "from CLAUDE_CONFIG_DIR"
+  : "CLAUDE_CONFIG_DIR unset — single-profile default";
+info(`Target profile: ${CLAUDE_DIR}  ${DIM}(${profileSource})${NC}\n`);
+
 info("Checking requirements...\n");
 if (!preflight()) {
   console.log(`\n${RED}Installation aborted. Fix the issues above and retry.${NC}\n`);
@@ -326,25 +292,15 @@ if (!preflight()) {
 }
 
 console.log("");
-info("Installing claude-buddy...\n");
+info("Installing coding-buddy...\n");
 
 const settings = loadSettings();
 
 installMcp();
 installSkill();
 
-const useTmuxPopup = detectTmux();
-if (useTmuxPopup) {
-  info("tmux detected (>= 3.2) -- using popup overlay mode");
-  installPopupHooks(settings);
-  // Disable status line to avoid duplicate buddy rendering
-  if (settings.statusLine?.command?.includes("buddy")) {
-    delete settings.statusLine;
-    ok("Status line disabled (popup replaces it)");
-  }
-} else {
-  installStatusLine(settings);
-}
+stripLegacyPopupHooks(settings);
+installStatusLine(settings);
 
 installHooks(settings);
 ensurePermissions(settings);
@@ -359,10 +315,9 @@ console.log("");
 console.log(`  ${BOLD}${companion.name}${NC} -- ${companion.personality}`);
 console.log("");
 
-const modeMsg = useTmuxPopup ? "popup overlay" : "status line";
 console.log(`${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}`);
 console.log(`${GREEN}  Done! Restart Claude Code and type /buddy${NC}`);
-console.log(`${GREEN}  Display mode: ${modeMsg}${NC}`);
+console.log(`${GREEN}  Display mode: status line${NC}`);
 console.log(`${GREEN}  Your companion is now permanent -- survives any update.${NC}`);
 console.log(`${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}`);
 console.log("");