@ramarivera/coding-buddy 0.7.0 → 0.7.2

package/.claude-plugin/marketplace.json

@@ -5,14 +5,14 @@
     },
     "metadata": {
         "description": "Persistent coding companion for Claude Code, Pi, and Oh My Pi (requires bun: https://bun.sh/install)",
-        "version": "0.7.0"
+        "version": "0.7.2"
     },
     "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.7.0",
+            "version": "0.7.2",
             "author": {
                 "name": "ramarivera"
             },

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
     "name": "coding-buddy",
-    "version": "0.7.0",
+    "version": "0.7.2",
     "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": "ramarivera"

package/README.md

@@ -103,7 +103,7 @@ The `claude-buddy` package ended at **v0.5.2**.
 npx -y @ramarivera/coding-buddy
 ```
 
-This installs the MCP server, skill, hooks, and status line. Restart Claude Code and type `/buddy`.
+This installs the MCP server, skill, hooks, and status line. Claude Code hooks are registered as thin bash wrappers with 15s timeouts; the wrappers locate Bun in bare hook environments and delegate behavior to TypeScript or the phase-2 legacy bash bridge. Restart Claude Code and type `/buddy`.
 
 ### Pi
 
@@ -255,7 +255,8 @@ MCP is an industry-standard protocol. Skills are Markdown files. Hooks and statu
 coding-buddy/
 ├── server/          # MCP server — tools, engine, art, reactions, state
 ├── skills/buddy/    # /buddy slash command
-├── hooks/           # PostToolUse + Stop hooks (error & comment detection)
+├── hooks/           # Thin Claude Code hook wrappers and phase-2 legacy bash hooks
+├── server/hooks/    # Hook behavior implemented in TypeScript
 ├── statusline/      # Animated right-aligned buddy display
 └── cli/             # install, show, hunt, verify, doctor, backup, uninstall
 ```

package/adapters/omp/renderers.ts

@@ -2,47 +2,143 @@ import { RARITY_STARS } from "../../core/engine.ts";
 import { getArtFrame, HAT_ART } from "../../core/render-model.ts";
 import type { Companion, ReactionState } from "../../core/model.ts";
 import type { Achievement } from "../../core/achievements.ts";
+import { getRarityColor } from "../../server/theme.ts";
+
+export const OMP_WIDGET_MAX_LINES = 10;
+
+const ANSI_PATTERN = /\x1b\[[0-?]*[ -/]*[@-~]/g;
+const RESET = "\x1b[0m";
+const DIM_ITALIC = "\x1b[2;3m";
+const ART_GAP = "  ";
+const DEFAULT_WIDGET_WIDTH = 78;
+
+function stripAnsi(text: string): string {
+  return text.replace(ANSI_PATTERN, "");
+}
+
+function characterWidth(character: string, next?: string): number {
+  if (character === "\u200d" || /[\uFE00-\uFE0F]/u.test(character)) return 0;
+  if (next === "\uFE0F" && /\p{Emoji}/u.test(character)) return 2;
+  return /\p{Emoji_Presentation}/u.test(character) ? 2 : 1;
+}
+
+export function displayWidth(text: string): number {
+  const characters = [...stripAnsi(text)];
+  let width = 0;
+  for (let index = 0; index < characters.length; index += 1) {
+    width += characterWidth(characters[index]!, characters[index + 1]);
+  }
+  return width;
+}
 
 function trimArt(line: string): string {
   return line.replace(/\s+$/g, "");
 }
 
-export function renderBuddyStatus(companion: Companion, reaction?: ReactionState | null): string {
-  const shiny = companion.bones.shiny ? " ✨" : "";
-  const stars = RARITY_STARS[companion.bones.rarity];
-  const suffix = reaction?.reaction ? ` — ${reaction.reaction}` : "";
-  return `${trimArt(getArtFrame(companion.bones.species, companion.bones.eye, Date.now())[0])} ${companion.name} ${stars}${shiny}${suffix}`;
+function truncateToWidth(text: string, width: number): string {
+  if (width <= 0) return "";
+  let result = "";
+  let currentWidth = 0;
+  for (const character of [...stripAnsi(text)]) {
+    const nextWidth = characterWidth(character);
+    if (currentWidth + nextWidth > width) break;
+    result += character;
+    currentWidth += nextWidth;
+  }
+  return result;
 }
 
-export function renderBuddyWidget(
+function wrapReaction(reaction: string, width: number, maxLines: number): string[] {
+  const lines: string[] = [];
+  let current = "";
+
+  for (const word of `💬 ${reaction.trim()}`.split(/\s+/)) {
+    if (!word) continue;
+    if (displayWidth(word) > width) {
+      if (current) lines.push(current);
+      lines.push(`${truncateToWidth(word, Math.max(1, width - 1))}…`);
+      current = "";
+      continue;
+    }
+
+    const candidate = current ? `${current} ${word}` : word;
+    if (displayWidth(candidate) > width) {
+      if (current) lines.push(current);
+      current = word;
+    } else {
+      current = candidate;
+    }
+  }
+
+  if (current) lines.push(current);
+  if (lines.length <= maxLines) return lines;
+
+  const bounded = lines.slice(0, maxLines);
+  const last = bounded[maxLines - 1] ?? "";
+  bounded[maxLines - 1] = `${truncateToWidth(last, Math.max(1, width - 1))}…`;
+  return bounded;
+}
+
+function getWidgetWidth(): number {
+  const columns = process.stdout.columns;
+  return columns && columns > 0 ? Math.max(24, columns - 2) : DEFAULT_WIDGET_WIDTH;
+}
+
+function getFullArtFrame(companion: Companion, frame: number): string[] {
+  const art = getArtFrame(companion.bones.species, companion.bones.eye, frame);
+  if (companion.bones.hat !== "none" && !stripAnsi(art[0] ?? "").trim()) {
+    art[0] = HAT_ART[companion.bones.hat];
+  }
+  return art.map(trimArt);
+}
+
+function renderDetails(
   companion: Companion,
-  reaction?: ReactionState | null,
-  achievements: Achievement[] = [],
+  reaction: ReactionState | null | undefined,
+  achievements: Achievement[],
+  sideWidth: number,
 ): string[] {
-  const frame = Math.floor(Date.now() / 700);
-  const art = getArtFrame(companion.bones.species, companion.bones.eye, frame).map(trimArt);
-  const hat = companion.bones.hat === "none" ? [] : [trimArt(HAT_ART[companion.bones.hat])];
+  const color = getRarityColor(companion.bones.rarity);
   const stars = RARITY_STARS[companion.bones.rarity];
   const shiny = companion.bones.shiny ? " ✨" : "";
   const lines = [
-    `buddy · ${companion.name}`,
-    `${companion.bones.rarity} ${companion.bones.species} ${stars}${shiny}`,
-    "",
-    ...hat,
-    ...art,
+    `${color}${companion.name} ${stars}${shiny}${RESET}`,
+    `${companion.bones.rarity} ${companion.bones.species}`,
   ];
 
   if (reaction?.reaction) {
-    lines.push("", `“${reaction.reaction}”`);
+    const remainingLines = Math.max(1, OMP_WIDGET_MAX_LINES - lines.length);
+    lines.push(...wrapReaction(reaction.reaction, sideWidth, remainingLines).map((line) => `${DIM_ITALIC}${line}${RESET}`));
   }
 
-  if (achievements.length > 0) {
-    lines.push("", ...achievements.map((achievement) => `🏆 ${achievement.name}`));
+  for (const achievement of achievements) {
+    if (lines.length >= OMP_WIDGET_MAX_LINES) break;
+    lines.push(`🏆 ${achievement.name}`);
   }
 
   return lines;
 }
 
+export function renderBuddyWidget(
+  companion: Companion,
+  reaction?: ReactionState | null,
+  achievements: Achievement[] = [],
+  width: number = getWidgetWidth(),
+): string[] {
+  const art = getFullArtFrame(companion, Math.floor(Date.now() / 700));
+  const artWidth = Math.max(...art.map(displayWidth), 0);
+  const widgetWidth = Math.max(24, width);
+  const sideWidth = Math.max(8, widgetWidth - artWidth - ART_GAP.length);
+  const details = renderDetails(companion, reaction, achievements, sideWidth);
+  const rows = Math.max(art.length, details.length);
+
+  return Array.from({ length: Math.min(OMP_WIDGET_MAX_LINES, rows) }, (_, index) => {
+    const artLine = art[index] ?? "";
+    const detailLine = details[index] ?? "";
+    return `${detailLine}${" ".repeat(Math.max(0, sideWidth - displayWidth(detailLine)))}${ART_GAP}${artLine}${" ".repeat(Math.max(0, artWidth - displayWidth(artLine)))}`;
+  });
+}
+
 export function renderBuddyStats(companion: Companion): string[] {
   return [
     `name: ${companion.name}`,

package/adapters/omp/ui.ts

@@ -1,7 +1,7 @@
 import type { OmpBuddyUiContext } from "./context.ts";
 import type { Achievement } from "../../core/achievements.ts";
 import type { Companion, ReactionState } from "../../core/model.ts";
-import { renderAchievementsSummary, renderBuddyStatus, renderBuddyWidget } from "./renderers.ts";
+import { renderAchievementsSummary, renderBuddyWidget } from "./renderers.ts";
 import { OmpBuddyStorage } from "./storage.ts";
 
 export class OmpBuddyUI {
@@ -27,8 +27,7 @@ export class OmpBuddyUI {
   ): void {
     const currentReaction = reaction ?? null;
     const muted = this.storage.isMuted();
-    const status = renderBuddyStatus(companion, muted ? null : currentReaction);
-    ctx.ui.setStatus("buddy", muted ? `${status} [muted]` : status);
+    ctx.ui.setStatus("buddy", undefined);
     ctx.ui.setWidget(
       "buddy",
       renderBuddyWidget(companion, muted ? null : currentReaction, achievements),

package/cli/install.ts

@@ -8,12 +8,13 @@
  */
 
 import { readFileSync, writeFileSync, mkdirSync, existsSync, cpSync } from "fs";
-import { execSync } from "child_process";
+import { execFileSync, execSync } from "child_process";
 import { resolve, dirname, join } from "path";
 
 import { generateBones, renderBuddy, renderFace, RARITY_STARS } from "../core/engine.ts"
 import {
   claudeConfigDir,
+  buddyStateDir,
   claudeSettingsPath,
   claudeSkillDir,
   claudeUserConfigPath,
@@ -21,6 +22,7 @@ import {
 } from "../server/path.ts";
 import { loadCompanion, saveCompanion, resolveUserId, writeStatusState } from "../server/state.ts";
 import { generateFallbackName } from "../core/reactions.ts"
+import { copyRuntimeApp, stableRuntimePaths } from "./runtime-app.ts";
 
 const CYAN = "\x1b[36m";
 const GREEN = "\x1b[32m";
@@ -35,6 +37,7 @@ const SETTINGS_FILE = claudeSettingsPath();
 const BUDDY_DIR = claudeSkillDir("buddy");
 const CLAUDE_JSON_PATH = claudeUserConfigPath();
 const PROJECT_ROOT = resolve(dirname(import.meta.dir));
+const HOOK_TIMEOUT_SECONDS = 15;
 
 function banner() {
   console.log(`
@@ -115,8 +118,8 @@ function saveSettings(settings: Record<string, any>) {
 
 // ─── Step 1: Register MCP server (in ~/.claude.json) ────────────────────────
 
-function installMcp() {
-  const serverPath = join(PROJECT_ROOT, "server", "index.ts");
+function installMcp(appDir: string) {
+  const serverPath = stableRuntimePaths(appDir).mcpServer;
 
   let claudeJson: Record<string, any> = {};
   try {
@@ -128,7 +131,7 @@ function installMcp() {
   claudeJson.mcpServers["claude-buddy"] = {
     command: "bun",
     args: [toUnixPath(serverPath)],
-    cwd: toUnixPath(PROJECT_ROOT),
+    cwd: toUnixPath(appDir),
   };
 
   writeFileSync(CLAUDE_JSON_PATH, JSON.stringify(claudeJson, null, 2));
@@ -146,8 +149,8 @@ function installSkill() {
 
 // ─── Step 3: Configure status line (with animation refresh) ─────────────────
 
-function installStatusLine(settings: Record<string, any>) {
-  const statusScript = join(PROJECT_ROOT, "statusline", "buddy-status.sh");
+function installStatusLine(settings: Record<string, any>, appDir: string) {
+  const statusScript = stableRuntimePaths(appDir).statusline;
 
   settings.statusLine = {
     type: "command",
@@ -180,13 +183,19 @@ function stripLegacyPopupHooks(settings: Record<string, any>) {
 
 // ─── Step 4: Register hooks ─────────────────────────────────────────────────
 
-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");
+function installHooks(settings: Record<string, any>, appDir: string) {
+  const hooksDir = stableRuntimePaths(appDir).hooks;
+  const reactHook     = join(hooksDir, "react.sh");
+  const fileTypeHook  = join(hooksDir, "file-type-react.sh");
+  const commentHook   = join(hooksDir, "buddy-comment.sh");
+  const suggestHook   = join(hooksDir, "suggest.sh");
+  const nameHook      = join(hooksDir, "name-react.sh");
+  const moodHook      = join(hooksDir, "mood-react.sh");
+  const commandHook = (command: string) => ({
+    type: "command",
+    command: toUnixPath(command),
+    timeout: HOOK_TIMEOUT_SECONDS,
+  });
 
   if (!settings.hooks) settings.hooks = {};
 
@@ -198,11 +207,11 @@ function installHooks(settings: Record<string, any>) {
   );
   settings.hooks.PostToolUse.push({
     matcher: "Bash",
-    hooks: [{ type: "command", command: toUnixPath(reactHook) }],
+    hooks: [commandHook(reactHook)],
   });
   settings.hooks.PostToolUse.push({
     matcher: "Write|Edit",
-    hooks: [{ type: "command", command: toUnixPath(fileTypeHook) }],
+    hooks: [commandHook(fileTypeHook)],
   });
 
   // Stop: extract <!-- buddy: --> comment from Claude's response
@@ -211,10 +220,10 @@ function installHooks(settings: Record<string, any>) {
     (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) }],
+    hooks: [commandHook(commentHook)],
   });
   settings.hooks.Stop.push({
-    hooks: [{ type: "command", command: toUnixPath(suggestHook) }],
+    hooks: [commandHook(suggestHook)],
   });
 
   // UserPromptSubmit: detect buddy's name in user message → instant status line
@@ -224,15 +233,24 @@ function installHooks(settings: Record<string, any>) {
     (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) }],
+    hooks: [commandHook(nameHook)],
   });
   settings.hooks.UserPromptSubmit.push({
-    hooks: [{ type: "command", command: toUnixPath(moodHook) }],
+    hooks: [commandHook(moodHook)],
   });
 
   ok("Hooks registered: PostToolUse (Bash + Write/Edit) + Stop (comment + suggest) + UserPromptSubmit (name + mood)");
 }
 
+function installRuntimeApp(): string {
+  const appDir = copyRuntimeApp(PROJECT_ROOT, buddyStateDir());
+  const installArgs = ["install", "--production", "--ignore-scripts"];
+  if (existsSync(join(appDir, "bun.lock"))) installArgs.push("--frozen-lockfile");
+  execFileSync("bun", installArgs, { cwd: appDir, stdio: "ignore" });
+  ok(`Stable runtime installed: ${appDir}`);
+  return appDir;
+}
+
 // ─── Step 5: Ensure MCP tools are allowed ───────────────────────────────────
 
 function ensurePermissions(settings: Record<string, any>) {
@@ -295,14 +313,15 @@ console.log("");
 info("Installing coding-buddy...\n");
 
 const settings = loadSettings();
+const appDir = installRuntimeApp();
 
-installMcp();
+installMcp(appDir);
 installSkill();
 
 stripLegacyPopupHooks(settings);
-installStatusLine(settings);
+installStatusLine(settings, appDir);
 
-installHooks(settings);
+installHooks(settings, appDir);
 ensurePermissions(settings);
 saveSettings(settings);
 

package/cli/runtime-app.ts

@@ -0,0 +1,49 @@
+import { cpSync, existsSync, mkdirSync, rmSync } from "fs";
+import { join } from "path";
+
+export const RUNTIME_DIRECTORIES = [
+  "core",
+  "server",
+  "hooks",
+  "statusline",
+  "scripts",
+] as const;
+
+export const RUNTIME_FILES = ["package.json", "bun.lock"] as const;
+
+export function stableRuntimeAppDir(stateDir: string): string {
+  return join(stateDir, "app");
+}
+
+export function stableRuntimePaths(appDir: string) {
+  return {
+    mcpServer: join(appDir, "server", "index.ts"),
+    mcpLauncher: join(appDir, "server", "mcp-launcher.sh"),
+    statusline: join(appDir, "statusline", "buddy-status.sh"),
+    combinedStatusline: join(appDir, "statusline", "combined-status.sh"),
+    hooks: join(appDir, "hooks"),
+  };
+}
+
+/**
+ * Replace the stable runtime copy. The app directory is owned by the
+ * installer, so removing it first also removes files deleted by an upgrade.
+ */
+export function copyRuntimeApp(sourceRoot: string, stateDir: string): string {
+  const appDir = stableRuntimeAppDir(stateDir);
+  rmSync(appDir, { recursive: true, force: true });
+  mkdirSync(appDir, { recursive: true });
+
+  for (const directory of RUNTIME_DIRECTORIES) {
+    const source = join(sourceRoot, directory);
+    if (!existsSync(source)) throw new Error(`Missing runtime directory: ${source}`);
+    cpSync(source, join(appDir, directory), { recursive: true, force: true });
+  }
+
+  for (const file of RUNTIME_FILES) {
+    const source = join(sourceRoot, file);
+    if (existsSync(source)) cpSync(source, join(appDir, file), { force: true });
+  }
+
+  return appDir;
+}

package/hooks/buddy-comment.sh

@@ -1,81 +1,11 @@
 #!/usr/bin/env bash
-# buddy-comment Stop hook
-# Extracts hidden buddy comment from Claude's response.
-# Claude writes: <!-- buddy: *adjusts tophat* nice code -->
-# This hook extracts it and updates the status line bubble.
-# The HTML comment is invisible in rendered markdown output.
-
-# shellcheck source=../scripts/paths.sh
-source "$(dirname "${BASH_SOURCE[0]}")/../scripts/paths.sh"
-
-STATE_DIR="$BUDDY_STATE_DIR"
-# 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"
-EVENTS_FILE="$STATE_DIR/events.json"
-
-[ -f "$STATUS_FILE" ] || exit 0
-
-# Read cooldown from config (default 30s, 0 = disabled)
-COOLDOWN=30
-if [ -f "$CONFIG_FILE" ]; then
-  _cd=$(jq -r '.commentCooldown // 30' "$CONFIG_FILE" 2>/dev/null || echo 30)
-  # Accept any non-negative integer (including 0 to disable cooldown)
-  [[ "$_cd" =~ ^[0-9]+$ ]] && COOLDOWN=$_cd
-fi
-
-INPUT=$(cat)
-
-# Extract last_assistant_message from hook input
-MSG=$(echo "$INPUT" | jq -r '.last_assistant_message // ""' 2>/dev/null)
-[ -z "$MSG" ] && exit 0
-
-# Extract <!-- buddy: ... --> comment (portable, no grep -P)
-COMMENT=$(echo "$MSG" | sed -n 's/.*<!-- *buddy: *\(.*[^ ]\) *-->.*/\1/p' | tail -1)
-[ -z "$COMMENT" ] && exit 0
-
-# Cooldown: configurable (default 30s)
-if [ -f "$COOLDOWN_FILE" ]; then
-    LAST=$(cat "$COOLDOWN_FILE" 2>/dev/null)
-    NOW=$(date +%s)
-    [ $(( NOW - ${LAST:-0} )) -lt "$COOLDOWN" ] && exit 0
-fi
-
-mkdir -p "$STATE_DIR"
-date +%s > "$COOLDOWN_FILE"
-
-# 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"
-
-# Increment achievement event counters and award XP
-if command -v jq >/dev/null 2>&1; then
-    if [ ! -f "$EVENTS_FILE" ]; then
-        echo '{}' > "$EVENTS_FILE"
-    fi
-    TMP=$(mktemp)
-    jq '.turns = (.turns // 0 + 1)' "$EVENTS_FILE" > "$TMP" 2>/dev/null && mv "$TMP" "$EVENTS_FILE"
-fi
-
-# Award XP for turn (async, non-blocking)
-if [ -x "$(command -v bun)" ]; then
-    PLUGIN_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-    bun run "$PLUGIN_ROOT/server/award-xp.ts" "turn" >/dev/null 2>&1 &
-fi
-
-# Consolidate memory (async, non-blocking)
-# Extract project, bug, and preference signals from conversation
-if [ -x "$(command -v bun)" ]; then
-    PLUGIN_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-    # Pass the assistant message for analysis (pass empty string for user prompt if unavailable)
-    USER_MSG=$(echo "$INPUT" | jq -r '.last_user_message // ""' 2>/dev/null)
-    bun run "$PLUGIN_ROOT/server/consolidate.ts" \
-        "$(echo "$MSG" | jq -Rs .)" \
-        "$(echo "$USER_MSG" | jq -Rs .)" \
-        >/dev/null 2>&1 &
-fi
-
-exit 0
+set +e
+SCRIPT_DIR="${BASH_SOURCE[0]%/*}"
+ROOT="$(cd "$SCRIPT_DIR/.." 2>/dev/null && pwd)" || exit 0
+[ -n "$ROOT" ] || exit 0
+BUN="$(command -v bun 2>/dev/null || true)"
+[ -x "$BUN" ] || BUN="$HOME/.bun/bin/bun"
+[ -x "$BUN" ] || BUN="/opt/homebrew/bin/bun"
+[ -x "$BUN" ] || BUN="/usr/local/bin/bun"
+[ -x "$BUN" ] || exit 0
+exec "$BUN" run "$ROOT/server/hooks/buddy-comment.ts" || exit 0