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

package/cli/upgrade.ts

@@ -0,0 +1,213 @@
+#!/usr/bin/env bun
+
+import { readFileSync } from "fs";
+import { execSync } from "child_process";
+import { join, resolve, dirname } from "path";
+import { homedir } from "os";
+
+const CYAN = "\x1b[36m";
+const GREEN = "\x1b[32m";
+const YELLOW = "\x1b[33m";
+const RED = "\x1b[31m";
+const BOLD = "\x1b[1m";
+const DIM = "\x1b[2m";
+const NC = "\x1b[0m";
+
+const PROJECT_ROOT = resolve(dirname(import.meta.dir));
+
+function ok(msg: string) { console.log(`${GREEN}✓${NC}  ${msg}`); }
+function info(msg: string) { console.log(`${CYAN}→${NC}  ${msg}`); }
+function warn(msg: string) { console.log(`${YELLOW}⚠${NC}  ${msg}`); }
+function err(msg: string) { console.log(`${RED}✗${NC}  ${msg}`); }
+
+function tryExec(cmd: string, fallback = ""): string {
+  try {
+    return execSync(cmd, { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+  } catch {
+    return fallback;
+  }
+}
+
+function getCurrentVersion(): string {
+  try {
+    const pkg = JSON.parse(readFileSync(join(PROJECT_ROOT, "package.json"), "utf8"));
+    return pkg.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+
+function banner() {
+  console.log(`
+${CYAN}╔══════════════════════════════════════════════════════════╗${NC}
+${CYAN}║${NC}  ${BOLD}claude-buddy upgrade${NC}                                    ${CYAN}║${NC}
+${CYAN}╚══════════════════════════════════════════════════════════╝${NC}
+`);
+}
+
+function checkGitRepo(): boolean {
+  const isRepo = tryExec("git rev-parse --is-inside-work-tree 2>/dev/null");
+  if (isRepo !== "true") {
+    err("Not inside a git repository. Upgrade requires a git clone of claude-buddy.");
+    return false;
+  }
+  return true;
+}
+
+function getRemoteBranch(): string {
+  const branch = tryExec("git rev-parse --abbrev-ref HEAD 2>/dev/null", "main");
+  return branch === "HEAD" ? "main" : branch;
+}
+
+function checkForUpdates(branch: string): { hasUpdate: boolean; local: string; remote: string; commits: string[] } {
+  info("Fetching latest from remote...\n");
+  try {
+    execSync("git fetch --quiet 2>/dev/null", { cwd: PROJECT_ROOT, stdio: "ignore" });
+  } catch {
+    warn("git fetch failed — proceeding with cached remote state");
+  }
+
+  const local = tryExec("git rev-parse HEAD 2>/dev/null");
+  const upstream = tryExec(`git rev-parse '@{upstream}' 2>/dev/null`);
+  const remote = upstream || tryExec(`git rev-parse origin/${branch} 2>/dev/null`);
+
+  if (!local || !remote) {
+    warn("Could not determine remote HEAD — no tracking branch configured");
+    info(`To set one: git branch --set-upstream-to=origin/${branch} ${branch}`);
+    return { hasUpdate: false, local, remote, commits: [] };
+  }
+
+  if (local === remote) {
+    return { hasUpdate: false, local, remote, commits: [] };
+  }
+
+  const commits = tryExec(
+    `git log --oneline ${local}..origin/${branch} 2>/dev/null`,
+  ).split("\n").filter(Boolean);
+
+  return { hasUpdate: true, local, remote, commits };
+}
+
+function pullLatest(branch: string): boolean {
+  info(`Pulling latest from origin/${branch}...`);
+  try {
+    const output = execSync(`git pull --ff-only origin ${branch} 2>&1`, {
+      cwd: PROJECT_ROOT,
+      encoding: "utf8",
+    });
+    ok("Git pull successful");
+    return true;
+  } catch (e: any) {
+    err("git pull failed — you may have local changes that conflict");
+    err(e.message?.split("\n")[0] || "unknown error");
+    info("Stash or commit your local changes, then re-run upgrade");
+    return false;
+  }
+}
+
+function installDeps(): boolean {
+  info("Installing dependencies...");
+  try {
+    execSync("bun install 2>&1", { cwd: PROJECT_ROOT, stdio: "ignore" });
+    ok("Dependencies installed");
+    return true;
+  } catch {
+    err("bun install failed");
+    return false;
+  }
+}
+
+function reinstallBuddy(): boolean {
+  info("Re-running install-buddy to update integrations...\n");
+  try {
+    execSync("bun run install-buddy 2>&1", { cwd: PROJECT_ROOT, stdio: "inherit" });
+    return true;
+  } catch {
+    err("install-buddy failed");
+    return false;
+  }
+}
+
+function printSummary(oldVersion: string, commits: string[]) {
+  const newVersion = getCurrentVersion();
+
+  console.log("");
+  console.log(`${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}`);
+  console.log(`${GREEN}  Upgrade complete!${NC}`);
+  console.log(`${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}`);
+  console.log("");
+  console.log(`  ${BOLD}Version:${NC}  ${oldVersion} → ${BOLD}${newVersion}${NC}`);
+
+  if (commits.length > 0) {
+    console.log(`  ${BOLD}Changes:${NC}`);
+    const display = commits.slice(0, 15);
+    for (const c of display) {
+      console.log(`    ${DIM}${c}${NC}`);
+    }
+    if (commits.length > 15) {
+      console.log(`    ${DIM}... and ${commits.length - 15} more${NC}`);
+    }
+  }
+
+  console.log("");
+  console.log(`${DIM}  Restart Claude Code for changes to take effect.${NC}`);
+  console.log("");
+}
+
+const args = process.argv.slice(2);
+const checkOnly = args.includes("--check");
+
+banner();
+
+const oldVersion = getCurrentVersion();
+info(`Current version: ${oldVersion}\n`);
+
+if (!checkGitRepo()) {
+  process.exit(1);
+}
+
+const branch = getRemoteBranch();
+const { hasUpdate, commits } = checkForUpdates(branch);
+
+if (!hasUpdate) {
+  ok(`Already up to date (v${oldVersion})`);
+  console.log("");
+  process.exit(0);
+}
+
+if (checkOnly) {
+  warn(`Update available! ${commits.length} new commit${commits.length === 1 ? "" : "s"}:`);
+  for (const c of commits.slice(0, 10)) {
+    console.log(`  ${DIM}${c}${NC}`);
+  }
+  if (commits.length > 10) {
+    console.log(`  ${DIM}... and ${commits.length - 10} more${NC}`);
+  }
+  console.log("");
+  info("Run without --check to apply the update");
+  console.log("");
+  process.exit(0);
+}
+
+info(`${commits.length} new commit${commits.length === 1 ? "" : ""} available:`);
+for (const c of commits.slice(0, 10)) {
+  console.log(`  ${DIM}${c}${NC}`);
+}
+if (commits.length > 10) {
+  console.log(`  ${DIM}... and ${commits.length - 10} more${NC}`);
+}
+console.log("");
+
+if (!pullLatest(branch)) {
+  process.exit(1);
+}
+
+if (!installDeps()) {
+  process.exit(1);
+}
+
+if (!reinstallBuddy()) {
+  process.exit(1);
+}
+
+printSummary(oldVersion, commits);

package/core/model.ts

@@ -26,6 +26,11 @@ export interface ReactionState {
   reason: string;
 }
 
+export interface BuddyTurnCommentModelConfig {
+  provider: string;
+  model: string;
+}
+
 export interface BuddyConfig {
   commentCooldown: number;
   reactionTTL: number;
@@ -33,6 +38,7 @@ export interface BuddyConfig {
   bubblePosition: "top" | "left";
   showRarity: boolean;
   statusLineEnabled: boolean;
+  turnCommentModel?: BuddyTurnCommentModelConfig;
 }
 
 export interface GlobalCounters {

package/package.json

@@ -1,64 +1,80 @@
 {
-    "name": "@ramarivera/coding-buddy",
-    "version": "0.4.0-alpha.7",
-    "description": "Persistent coding companion for Claude Code and pi",
-    "type": "module",
-    "bin": {
-        "coding-buddy": "./cli/index.ts"
-    },
-    "scripts": {
-        "server": "bun run adapters/claude/server/index.ts",
-        "pick": "bun run adapters/claude/install/pick.ts",
-        "hunt": "bun run adapters/claude/install/hunt.ts",
-        "install-buddy": "bun run adapters/claude/install/install.ts",
-        "show": "bun run adapters/claude/install/show.ts",
-        "doctor": "bun run adapters/claude/install/doctor.ts",
-        "test-statusline": "bun run adapters/claude/install/test-statusline.ts",
-        "backup": "bun run adapters/claude/install/backup.ts",
-        "settings": "bun run adapters/claude/install/settings.ts",
-        "disable": "bun run adapters/claude/install/disable.ts",
-        "enable": "bun run adapters/claude/install/install.ts",
-        "uninstall": "bun run adapters/claude/install/uninstall.ts",
-        "help": "bun run cli/index.ts help",
-        "test": "bun test",
-        "typecheck": "tsc --noEmit"
-    },
-    "files": [
-        "core/",
-        "adapters/",
-        "cli/",
-        "!**/*.test.ts"
-    ],
-    "keywords": [
-        "claude-code",
-        "buddy",
-        "companion",
-        "mcp",
-        "terminal-pet",
-        "tamagotchi",
-        "pi-package"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/ramarivera/claude-buddy.git"
-    },
-    "homepage": "https://github.com/ramarivera/claude-buddy#readme",
-    "license": "MIT",
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org/"
-    },
-    "pi": {
-        "extensions": [
-            "./adapters/pi/index.ts"
-        ]
-    },
-    "dependencies": {
-        "@mariozechner/pi-coding-agent": "0.66.1",
-        "@modelcontextprotocol/sdk": "^1.12.1"
-    },
-    "devDependencies": {
-        "bun-types": "^1.3.11",
-        "typescript": "^6.0.2"
-    }
+  "name": "@ramarivera/coding-buddy",
+  "version": "0.4.0-alpha.9",
+  "description": "Persistent coding companion for Claude Code and pi",
+  "type": "module",
+  "bin": {
+    "coding-buddy": "./cli/index.ts"
+  },
+  "scripts": {
+    "server": "bun run adapters/claude/server/index.ts",
+    "pick": "bun run adapters/claude/install/pick.ts",
+    "hunt": "bun run adapters/claude/install/hunt.ts",
+    "install-buddy": "bun run adapters/claude/install/install.ts",
+    "show": "bun run adapters/claude/install/show.ts",
+    "doctor": "bun run adapters/claude/install/doctor.ts",
+    "test-statusline": "bun run adapters/claude/install/test-statusline.ts",
+    "backup": "bun run adapters/claude/install/backup.ts",
+    "settings": "bun run adapters/claude/install/settings.ts",
+    "disable": "bun run adapters/claude/install/disable.ts",
+    "enable": "bun run adapters/claude/install/install.ts",
+    "upgrade": "bun run cli/upgrade.ts",
+    "uninstall": "bun run adapters/claude/install/uninstall.ts",
+    "help": "bun run cli/index.ts help",
+    "buddy-shell": "npx tsx cli/buddy-shell.ts",
+    "tui": "bun run cli/tui.tsx",
+    "test": "bun test",
+    "typecheck": "tsc --noEmit"
+  },
+  "files": [
+    "core/",
+    "adapters/",
+    "cli/",
+    "scripts/",
+    "server/",
+    "!**/*.test.ts"
+  ],
+  "keywords": [
+    "claude-code",
+    "buddy",
+    "companion",
+    "mcp",
+    "terminal-pet",
+    "tamagotchi",
+    "pi-package"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ramarivera/claude-buddy.git"
+  },
+  "homepage": "https://github.com/ramarivera/claude-buddy#readme",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "pi": {
+    "extensions": [
+      "./adapters/pi/index.ts"
+    ]
+  },
+  "dependencies": {
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
+    "@mariozechner/pi-coding-agent": "0.66.1",
+    "@modelcontextprotocol/sdk": "^1.12.1",
+    "@xterm/addon-serialize": "^0.14.0",
+    "@xterm/headless": "^6.0.0",
+    "ink": "^7.0.0",
+    "pino": "^10.3.1",
+    "react": "^19.2.5"
+  },
+  "devDependencies": {
+    "@types/react": "^19.2.14",
+    "bun-types": "^1.3.11",
+    "tsx": "^4.21.0",
+    "typescript": "^6.0.2"
+  },
+  "trustedDependencies": [
+    "@homebridge/node-pty-prebuilt-multiarch"
+  ]
 }

package/scripts/paths.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Path resolvers for claude-buddy shell scripts.
+#
+# Must stay in sync with server/path.ts. Source this file early:
+#   source "$(dirname "$0")/../scripts/paths.sh"
+# …and consumers get BUDDY_STATE_DIR, CLAUDE_CFG_DIR, CLAUDE_SETTINGS_FILE,
+# and CLAUDE_USER_CONFIG.
+#
+# Resolution rules (must match server/path.ts):
+#   - If CLAUDE_CONFIG_DIR is set → everything lives under it
+#     (settings.json, skills/, .claude.json inside the config dir, and
+#      buddy state at $CLAUDE_CONFIG_DIR/buddy-state).
+#   - Else (single-profile default) → $HOME/.claude, $HOME/.claude.json,
+#     $HOME/.claude-buddy.
+
+if [[ -n "${CLAUDE_CONFIG_DIR:-}" ]]; then
+  CLAUDE_CFG_DIR="$CLAUDE_CONFIG_DIR"
+else
+  CLAUDE_CFG_DIR="$HOME/.claude"
+fi
+
+CLAUDE_SETTINGS_FILE="$CLAUDE_CFG_DIR/settings.json"
+
+# .claude.json: inside CLAUDE_CONFIG_DIR when set, else $HOME. We never
+# fall back to $HOME when CLAUDE_CONFIG_DIR is set — doing so would break
+# profile isolation (enabling buddy in one profile could mutate the
+# home-level file that a different profile reads).
+if [[ -n "${CLAUDE_CONFIG_DIR:-}" ]]; then
+  CLAUDE_USER_CONFIG="$CLAUDE_CONFIG_DIR/.claude.json"
+else
+  CLAUDE_USER_CONFIG="$HOME/.claude.json"
+fi
+
+if [[ -n "${CLAUDE_CONFIG_DIR:-}" ]]; then
+  BUDDY_STATE_DIR="$CLAUDE_CONFIG_DIR/buddy-state"
+else
+  BUDDY_STATE_DIR="$HOME/.claude-buddy"
+fi
+
+export CLAUDE_CFG_DIR CLAUDE_SETTINGS_FILE CLAUDE_USER_CONFIG BUDDY_STATE_DIR

package/server/achievements.ts

@@ -0,0 +1,15 @@
+export {
+  ACHIEVEMENTS,
+  type Achievement,
+  type EventCounters,
+} from "../core/achievements.ts";
+export type { UnlockedAchievement } from "../core/model.ts";
+export {
+  loadUnlocked,
+  loadEvents,
+  incrementEvent,
+  checkAndAward,
+  trackActiveDay,
+  renderAchievementsCard,
+  renderAchievementsCardMarkdown,
+} from "../adapters/claude/storage/achievements.ts";

package/server/art.ts

@@ -0,0 +1 @@
+export * from "../core/render-model.ts";

package/server/engine.ts

@@ -0,0 +1 @@
+export * from "../core/engine.ts";

package/server/mcp-launcher.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -eu
+if ! command -v bun >/dev/null 2>&1; then
+  cat >&2 <<'MSG'
+[claude-buddy] ERROR: 'bun' was not found on PATH.
+
+claude-buddy's MCP server runs on bun. Install it with:
+
+    curl -fsSL https://bun.sh/install | bash
+
+Then open a new shell and restart Claude Code.
+MSG
+  exit 127
+fi
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+exec bun "$SCRIPT_DIR/../adapters/claude/server/index.ts"

package/server/path.ts

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

package/server/reactions.ts

@@ -0,0 +1 @@
+export * from "../core/reactions.ts";

package/server/state.ts

@@ -0,0 +1,3 @@
+export * from "../adapters/claude/storage/state.ts";
+export { resolveUserId } from "../adapters/claude/storage/identity.ts";
+export { setBuddyStatusLine, unsetBuddyStatusLine, cleanupPluginState } from "../adapters/claude/storage/settings.ts";

package/adapters/claude/popup/buddy-popup.sh

@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-# claude-buddy popup entry point -- runs INSIDE the tmux popup
-#
-# Architecture:
-#   - Render loop runs in BACKGROUND (only writes to stdout, never reads stdin)
-#   - Input forwarder runs in FOREGROUND (owns stdin exclusively)
-#
-# The reopen loop in popup-manager.sh handles:
-#   - ESC forwarding (when tmux closes popup on ESC)
-#   - CC pane death detection
-#   - Dynamic resizing on reopen
-#
-# Env vars (set by popup-manager.sh via -e):
-#   CC_PANE    -- tmux pane ID for Claude Code (e.g. %0)
-#   BUDDY_DIR  -- ~/.claude-buddy
-#   BUDDY_SID  -- session ID (sanitized pane number, e.g. "0")
-# Args: $1 = SID (fallback for tmux < 3.4 without -e support)
-
-set -uo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-
-# Session ID: from env (tmux 3.4+), $1 arg, or "default"
-BUDDY_SID="${BUDDY_SID:-${1:-default}}"
-
-# On tmux 3.2-3.3, env vars are passed via file (no -e flag support)
-ENV_FILE="${HOME}/.claude-buddy/popup-env.$BUDDY_SID"
-if [ -z "${CC_PANE:-}" ] && [ -f "$ENV_FILE" ]; then
-  . "$ENV_FILE"
-fi
-
-if [ -z "${CC_PANE:-}" ]; then
-  echo "Error: CC_PANE not set" >&2
-  sleep 2
-  exit 1
-fi
-
-# ─── Cleanup on exit ─────────────────────────────────────────────────────────
-cleanup() {
-  [ -n "${RENDER_PID:-}" ] && kill "$RENDER_PID" 2>/dev/null
-  tput cnorm 2>/dev/null
-  stty sane 2>/dev/null
-}
-trap cleanup EXIT INT TERM HUP
-
-# Hide cursor
-tput civis 2>/dev/null
-
-# ─── Render loop in BACKGROUND (stdout only, no stdin) ───────────────────────
-"$SCRIPT_DIR/buddy-render.sh" </dev/null &
-RENDER_PID=$!
-
-# ─── Input forwarder in FOREGROUND ───────────────────────────────────────────
-# Raw mode: all bytes pass through without terminal interpretation.
-# No SIGINT on Ctrl-C, no EOF on Ctrl-D, no CR-to-NL on Enter.
-stty raw -echo 2>/dev/null
-
-# Use perl for raw byte forwarding. bash's read -n1 internally overrides
-# terminal settings on each call (saves/restores tty mode), which undoes
-# stty raw and re-enables signal processing. perl's sysread doesn't touch
-# the terminal at all -- it reads raw bytes from the file descriptor.
-#
-# Batching: first byte is a blocking read, then non-blocking drain of any
-# remaining bytes (paste arrives as a burst). The batch is sent to CC in
-# a single tmux send-keys call for efficiency.
-exec perl -e '
-  use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
-  my $pane = $ENV{CC_PANE};
-  while (1) {
-    my $buf;
-    my $n = sysread(STDIN, $buf, 1);
-    last unless $n;
-    # Non-blocking drain for paste batching
-    my $flags = fcntl(STDIN, F_GETFL, 0);
-    fcntl(STDIN, F_SETFL, $flags | O_NONBLOCK);
-    while (sysread(STDIN, my $more, 4096)) {
-      $buf .= $more;
-    }
-    fcntl(STDIN, F_SETFL, $flags);
-
-    # F12 (\e[24~) = close popup and enter scroll mode
-    if ($buf =~ /\e\[24~/) {
-      my $buddy_dir = $ENV{BUDDY_DIR} || "$ENV{HOME}/.claude-buddy";
-      my $sid = $ENV{BUDDY_SID} // "default";
-      open(my $fh, ">", "$buddy_dir/popup-scroll.$sid");
-      close($fh) if $fh;
-      exit 0;
-    }
-
-    system("tmux", "send-keys", "-t", $pane, "-l", "--", $buf);
-  }
-'