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

package/{adapters/claude/plugin → .claude-plugin}/marketplace.json

@@ -1,18 +1,18 @@
 {
-    "name": "claude-buddy",
+    "name": "coding-buddy",
     "owner": {
         "name": "1270011"
     },
     "metadata": {
-        "description": "Permanent coding companion for Claude Code",
-        "version": "0.4.0-alpha.8"
+        "description": "Persistent coding companion for Claude Code, Pi, and Oh My Pi (requires bun: https://bun.sh/install)",
+        "version": "0.6.0"
     },
     "plugins": [
         {
-            "name": "claude-buddy",
+            "name": "coding-buddy",
             "source": "./",
-            "description": "Permanent coding companion for Claude Code \u2014 survives any update. MCP-based terminal pet with ASCII art, stats, reactions, and personality.",
-            "version": "0.4.0-alpha.8",
+            "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.6.0",
             "author": {
                 "name": "1270011"
             },
@@ -20,7 +20,11 @@
             "repository": "https://github.com/1270011/claude-buddy",
             "license": "MIT",
             "keywords": [
+                "coding-buddy",
                 "claude-code",
+                "pi",
+                "oh-my-pi",
+                "omp",
                 "buddy",
                 "companion",
                 "mcp",
@@ -29,6 +33,7 @@
             ],
             "category": "companion",
             "tags": [
+                "coding-buddy",
                 "buddy",
                 "companion",
                 "mcp",

package/{adapters/claude/plugin → .claude-plugin}/plugin.json

@@ -1,7 +1,7 @@
 {
-    "name": "claude-buddy",
-    "version": "0.4.0-alpha.8"
-    "description": "Permanent coding companion for Claude Code \u2014 survives any update. MCP-based terminal pet with ASCII art, stats, reactions, and personality.",
+    "name": "coding-buddy",
+    "version": "0.6.0",
+    "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": "1270011"
     },
@@ -9,7 +9,11 @@
     "repository": "https://github.com/1270011/claude-buddy",
     "homepage": "https://github.com/1270011/claude-buddy#readme",
     "keywords": [
+        "coding-buddy",
         "claude-code",
+        "pi",
+        "oh-my-pi",
+        "omp",
         "buddy",
         "companion",
         "mcp",
@@ -19,10 +23,8 @@
     "mcpServers": {
         "claude-buddy": {
             "type": "stdio",
-            "command": "bun",
-            "args": [
-                "adapters/claude/server/index.ts"
-            ]
+            "command": "${CLAUDE_PLUGIN_ROOT}/server/mcp-launcher.sh",
+            "args": []
         }
     }
 }

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 claude-buddy contributors
+Copyright (c) 2026 coding-buddy contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -4,11 +4,10 @@
 <!-- LOGO / HERO                                                  -->
 <!-- Later replace with: docs/logo.png                            -->
 <!-- ============================================================ -->
-<img src="https://placehold.co/120x120/6366f1/ffffff?text=%F0%9F%A6%89" alt="claude-buddy logo" width="120" />
+<img src="https://placehold.co/120x120/6366f1/ffffff?text=%F0%9F%A6%89" alt="coding-buddy logo" width="120" />
 
-# Claude Code Buddy
-
-### Your Claude Code buddy — permanently. Survives every update.
+# Coding Buddy
+### Your persistent coding companion — for Claude Code, Pi, and Oh My Pi. Survives every update.
 
 <!-- ============================================================ -->
 <!-- BADGES                                                        -->
@@ -27,7 +26,7 @@
 
 <br>
 
-<img src="docs/hero.gif" alt="claude-buddy in action" width="800" />
+<img src="docs/hero.gif" alt="coding-buddy in action" width="800" />
 
 <br><br>
 
@@ -48,7 +47,7 @@
 </td>
 <td align="center" width="25%">
 <h3>🎨</h3>
-<b>18 Species</b><br>
+<b>19 Species</b><br>
 <sub>From ducks to dragons — each with animated ASCII art and rarity colors.</sub>
 </td>
 <td align="center" width="25%">
@@ -72,22 +71,80 @@
 <!-- QUICK START                                                  -->
 <!-- ============================================================ -->
 
+<!-- ============================================================ -->
+<!-- CONTINUITY / MIGRATION                                      -->
+<!-- ============================================================ -->
+
+## 📦 Continuity / Migration
+
+The `claude-buddy` package ended at **v0.5.2**.  
+**`@ramarivera/coding-buddy` begins at v0.6.0** and is its continuation.
+
+- Your existing buddy identity, menagerie, stats, and unlocks remain fully compatible.
+- Legacy state and config identifiers (for example `~/.claude-buddy/`, `mcpServers["claude-buddy"]`) are intentionally preserved so current installs keep working without reconfiguration.
+
+<!-- ============================================================ -->
+## 📋 Requirements
+
+- **[bun](https://bun.sh/install)** on `PATH` — the MCP server and extension runtime require Bun. Install once: `curl -fsSL https://bun.sh/install | bash`
+- **Linux or macOS** (Windows is experimental)
+
+| Host | Minimum version | Identity source |
+|---|---|---|
+| **Claude Code** | v2.1.80+ | `accountUuid` from `~/.claude.json` |
+| **Pi** | `mariozechner/pi-coding-agent` workspace | Stable random UUID persisted in `~/.pi/agent/buddy/identity.json` |
+| **Oh My Pi (OMP)** | OMP harness with `omp.extensions` support | Stable random UUID persisted in `~/.omp/agent/buddy/identity.json` |
+
 ## 🚀 Quick Start
 
+### Claude Code
+
+```bash
+npx -y @ramarivera/coding-buddy
+```
+
+This installs the MCP server, skill, hooks, and status line. Restart Claude Code and type `/buddy`.
+
+### Pi
+
+```bash
+pi install npm:@ramarivera/coding-buddy
+```
+
+Pi registers the package's native extension and stores companion state under `~/.pi/agent/buddy`.
+
+### Oh My Pi
+
 ```bash
-git clone https://github.com/1270011/claude-buddy
-cd claude-buddy
+omp plugin install @ramarivera/coding-buddy
+```
+
+OMP registers the package's native extension and stores companion state under `~/.omp/agent/buddy`.
+
+### From source
+
+```bash
+git clone https://github.com/1270011/claude-buddy coding-buddy
+cd coding-buddy
 bun install
 bun run install-buddy
 ```
 
-Then restart Claude Code and type `/buddy`. That's it.
-
-<sub>💡 Need Bun? → `curl -fsSL https://bun.sh/install | bash`</sub>
+<sub>💡 Want a global `coding-buddy` command? → `bun link`</sub>
 <br>
-<sub>💡 Want a global `claude-buddy` command? → `bun link`</sub>
-<br>
-<sub>💡 Need help? → `bun run help` or `claude-buddy help` (if linked) in terminal · `/buddy help` in Claude Code</sub>
+<sub>💡 Need help? → `bun run help`, `npx -y @ramarivera/coding-buddy help`, or `coding-buddy help` (if linked) · `/buddy help` in Claude Code</sub>
+
+
+### Multiple Claude profiles?
+
+If you run Claude Code with `CLAUDE_CONFIG_DIR` set (e.g. separate work and personal accounts), pass the same env var to install so buddy lands in the active profile and gets its own menagerie:
+
+```bash
+CLAUDE_CONFIG_DIR=~/.claude-personal npx -y @ramarivera/coding-buddy install
+CLAUDE_CONFIG_DIR=~/.claude-personal npx -y @ramarivera/coding-buddy uninstall
+```
+
+The installer prints `Target profile: <path>` at the top so you can see at a glance which profile you're targeting. Each profile gets its own MCP entry, skill, hooks, status line, and `$CLAUDE_CONFIG_DIR/buddy-state/` menagerie — installs in one profile don't touch another. With `CLAUDE_CONFIG_DIR` unset, behaviour is identical to single-profile (`~/.claude/`, `~/.claude-buddy/`).
 
 <br>
 
@@ -98,11 +155,11 @@ Then restart Claude Code and type `/buddy`. That's it.
 <!-- ============================================================ -->
 
 <details>
-<summary><b>🐙 &nbsp; Meet the 18 Species</b></summary>
+<summary><b>🐙 &nbsp; Meet the 19 Species</b></summary>
 
 <br>
 
-Every buddy is uniquely generated from your Claude Code account — same species, same stats, same personality every time. 18 species, each with 3 idle animation frames + a blink.
+Every buddy is uniquely generated — same species, same stats, same personality every time. On **Claude Code** the seed is derived from your `accountUuid` in `~/.claude.json`; on **Pi** and **Oh My Pi** a stable random UUID is generated once and persisted in `~/.pi/agent/buddy/identity.json` or `~/.omp/agent/buddy/identity.json` (deleting the file and letting it regenerate will change your buddy). 19 species, each with 3 idle animation frames + a blink.
 
 <!-- Later replace with: docs/species-grid.png -->
 <p align="center">
@@ -156,7 +213,7 @@ High SNARK buddies are sarcastic. High WISDOM ones are insightful. High CHAOS on
 
 <br>
 
-Five integration points, zero binary dependencies. When Claude Code updates, your buddy stays.
+Five integration points, zero binary dependencies. When Claude Code, Pi, or Oh My Pi updates, your buddy stays.
 
 ```
 ┌────────────── Claude Code (any version) ──────────────┐
@@ -166,7 +223,7 @@ Five integration points, zero binary dependencies. When Claude Code updates, you
 └───────────────────────┬────────────────────────────────┘
                         │ stable extension points
              ┌──────────┴──────────┐
-             │    claude-buddy     │
+             │    coding-buddy     │
              │                     │
              │  wyhash + mulberry32│
              │  18 species, 3 anim │
@@ -188,18 +245,19 @@ Five integration points, zero binary dependencies. When Claude Code updates, you
 |---|:---:|:---:|:---:|---|
 | Binary patching | ❌ | ❌ | ❌ | Breaks on update |
 | Pin old version | ❌ | ✅ | ✅ | No security fixes |
-| **claude-buddy** | **✅** | **✅** | **✅** | **None** |
+| **coding-buddy** | **✅** | **✅** | **✅** | **None** |
 
 MCP is an industry-standard protocol. Skills are Markdown files. Hooks and status line are shell scripts. Nothing depends on Claude Code's binary internals.
 
 ### Repository Layout
 
 ```
-claude-buddy/
-├── core/                  # shared buddy domain logic — engine, reactions, achievements, models
-├── adapters/claude/       # Claude adapter — MCP server, storage, skills, hooks, UI, installer
-├── adapters/pi/           # pi adapter — native pi extension (planned)
-└── cli/                   # host-agnostic CLI entrypoints/utilities
+coding-buddy/
+├── server/          # MCP server — tools, engine, art, reactions, state
+├── skills/buddy/    # /buddy slash command
+├── hooks/           # PostToolUse + Stop hooks (error & comment detection)
+├── statusline/      # Animated right-aligned buddy display
+└── cli/             # install, show, hunt, verify, doctor, backup, uninstall
 ```
 
 </details>
@@ -225,18 +283,26 @@ claude-buddy/
 | `/buddy save [slot]` | Save current buddy to a named slot |
 | `/buddy list` | List all saved buddies |
 | `/buddy dismiss <slot>` | Remove a saved buddy slot |
-| `/buddy pick` | Launch interactive TUI picker (`! bun run pick`) |
+| `/buddy pick` | Launch interactive TUI picker (`! npx -y @ramarivera/coding-buddy pick`) |
 | `/buddy frequency [seconds]` | Show or set comment cooldown |
 | `/buddy style [classic\|round]` | Bubble border style (tmux only) |
 | `/buddy position [top\|left]` | Bubble position (tmux only) |
 | `/buddy rarity [on\|off]` | Show or hide stars + rarity line (tmux only) |
+| `/buddy width [10-60]` | Set bubble text width in chars (tmux only) |
+| `/buddy margin [0-20]` | Set right-side margin (tmux only) |
+| `/buddy statusline [on\|off]` | Enable or disable buddy in the status line |
+| `/buddy statusline combined` | Show rate-limit usage bars alongside buddy (needs python3) |
+| `/buddy statusline basic` | Switch back to buddy-only status line |
 | `/buddy help` | Show all buddy commands |
 
 ### CLI
+You can run any command with `npx -y @ramarivera/coding-buddy <command>` from anywhere, or `bun run <script>` from a local clone.
+
 
 | Command | Description |
 |---|---|
 | `bun run install-buddy` | Automated setup |
+| `bun run upgrade` | Pull latest version and reinstall integrations |
 | `bun run show` | Show buddy in terminal |
 | `bun run pick` | Interactive TUI to find and save your dream buddy |
 | `bun run hunt` | Legacy search (use `pick` instead) |
@@ -247,16 +313,16 @@ claude-buddy/
 | `bun run disable` | Temporarily deactivate buddy |
 | `bun run enable` | Re-enable buddy |
 | `bun run help` | Full CLI reference |
-| `bun run cli/uninstall.ts` | Clean removal |
+| `bun run uninstall` | Clean removal |
 
-<sub>💡 Want a global `claude-buddy` command? → `cd claude-buddy && bun link`</sub>
+<sub>💡 Want a global `coding-buddy` command? → `cd coding-buddy && bun link`</sub>
 
 ### 🎯 Buddy Pick
 
 Want a specific species, rarity, or stat distribution?
 
 ```bash
-bun run pick
+npx -y @ramarivera/coding-buddy pick
 ```
 
 Interactive TUI with saved buddies, criteria search, vim keys, and two-pane preview. Uses the exact same `wyhash + mulberry32` algorithm as Claude Code.
@@ -270,7 +336,7 @@ Interactive TUI with saved buddies, criteria search, vim keys, and two-pane prev
 
 <br>
 
-claude-buddy ships with built-in diagnostics for debugging across terminals and platforms.
+coding-buddy ships with built-in diagnostics for debugging across terminals and platforms.
 
 ### `bun run doctor`
 Complete diagnostic — environment, terminal info, state, settings, padding test, live status line output. **Always run this first when filing a bug report.**
@@ -285,7 +351,7 @@ bun run test-statusline restore  # restore buddy
 ```
 
 ### `bun run backup`
-Snapshot all claude-buddy state to a timestamped backup. Use before experiments.
+Snapshot all coding-buddy state to a timestamped backup. Use before experiments.
 
 ```bash
 bun run backup              # create snapshot
@@ -312,7 +378,7 @@ bun run backup restore <ts> # restore specific
 
 ### Buddy comments not showing
 
-The buddy comment mechanism uses an MCP server `instructions` field that Claude only reads at **session start**. If you installed claude-buddy in an existing session, restart Claude Code.
+The buddy comment mechanism uses an MCP server `instructions` field that Claude only reads at **session start**. If you installed coding-buddy in an existing session, restart Claude Code.
 
 ```bash
 jq '.mcpServers["claude-buddy"]' ~/.claude.json
@@ -331,48 +397,13 @@ To help us fix it:
 
 ```bash
 bun run backup restore      # restore latest backup
-bun run cli/uninstall.ts    # full clean removal
+bun run uninstall           # full clean removal
 ```
 
 </details>
 
 ---
 
-<details>
-<summary><b>🖥️ &nbsp; tmux Popup Mode</b></summary>
-
-<br>
-
-Inside tmux, buddy appears as a floating popup overlay in the bottom-right corner instead of the status line.
-
-**Features:** animated ASCII art with speech bubbles · ESC passthrough · dynamic resizing · full keyboard forwarding
-
-| tmux version | Support |
-|---|---|
-| **3.4+** | Full support (borderless) |
-| **3.2 – 3.3** | Supported with border |
-| **< 3.2** | Falls back to status line |
-
-### Recommended `~/.tmux.conf`
-
-```
-set -g set-titles on
-set -g set-titles-string "#{pane_title}"
-set -g mouse on
-set -g history-limit 10000
-```
-
-### Scrolling
-
-The popup is modal. To scroll:
-1. Press **F12** → scroll mode (popup hides, copy-mode activates)
-2. Scroll with **mouse wheel** or **arrows**
-3. Press **q** → exit scroll mode
-
-</details>
-
----
-
 <details>
 <summary><b>📋 &nbsp; Requirements</b></summary>
 
@@ -382,9 +413,9 @@ The popup is modal. To scroll:
 |---|---|
 | **[Bun](https://bun.sh)** | `curl -fsSL https://bun.sh/install \| bash` |
 | **Claude Code** v2.1.80+ | Any version with MCP support |
-| **jq** | `apt install jq` / `brew install jq` |
+| **jq** | `apt install jq` / `brew install jq` / [`windows: download and add 'jq.exe' from jqlang/jq to path`](https://github.com/jqlang/jq/releases/latest)|
 
-> **Will I get the same buddy I had?** Yes. claude-buddy uses the exact same algorithm as the original (`wyhash + mulberry32`, same salt, same identity resolution). If your `~/.claude.json` still has your `accountUuid`, you'll get the identical species, rarity, stats, and cosmetics.
+> **Will I get the same buddy I had?** Yes. coding-buddy uses the exact same algorithm as the original (`wyhash + mulberry32`, same salt, same identity resolution). For Claude Code, if your `~/.claude.json` still has your `accountUuid`, you'll get the identical species, rarity, stats, and cosmetics. For Pi/OMP, keep `~/.pi/agent/buddy/identity.json` or `~/.omp/agent/buddy/identity.json`; the same stable UUID produces the same buddy. Resetting (deleting) that identity file generates a new random UUID and changes your buddy.
 
 </details>
 
@@ -395,15 +426,14 @@ The popup is modal. To scroll:
 ## 🗺️ Roadmap
 
 - [x] **Multi-buddy support** — menagerie system with named slots, interactive TUI picker 💜[@doctor-ew](https://github.com/doctor-ew)💜
-- [x] **tmux popup mode** — floating overlay via `tmux display-popup` 💜[@gzenz](https://github.com/gzenz)💜
 - [ ] **Leveling system** — XP from coding sessions, unlockable reactions and upgrades
 - [ ] **Buddy pair-programming** — active help during sessions, pattern detection
 - [ ] **Cross-session memory** — remembers past projects and earlier conversations
 - [ ] **Mood system** — shifts based on code quality, tests, time of day
 - [x] **Achievement badges** — "1000 lines reviewed", "week streak", etc. 💜[ndcorder](https://github.com/ndcorder)💜
 - [ ] **Light theme colors** — auto-detect and match light theme RGB
-- [ ] **New species + community art** — submit your own designs
-- [ ] **`npx claude-buddy`** — one-command install without cloning
+- [x] **New species + community art** — wyvern added 💜[@jpmalone0](https://github.com/jpmalone0)💜 (community contributions welcome)
+- [ ] **`npx -y @ramarivera/coding-buddy <command>`** — one-command usage without cloning
 
 <br>
 

package/adapters/omp/commands.ts

@@ -0,0 +1,201 @@
+import type { ExtensionAPI } from "@oh-my-pi/pi-coding-agent";
+import { BuddyCommandService, mergeAchievements } from "../../core/command-service.ts";
+import { renderBuddyStats } from "./renderers.ts";
+import { OmpBuddyStorage, slugifySlot } from "./storage.ts";
+import { OmpBuddyUI } from "./ui.ts";
+import type { OmpBuddyUiContext } from "./context.ts";
+
+interface RegisterBuddyCommandsDeps {
+  service: BuddyCommandService;
+  storage: OmpBuddyStorage;
+  ui: OmpBuddyUI;
+}
+
+export function registerBuddyCommands(pi: ExtensionAPI, deps: RegisterBuddyCommandsDeps): void {
+  pi.registerCommand("buddy", {
+    description: "Manage your coding companion",
+    handler: async (args: string, ctx: OmpBuddyUiContext) => {
+      const input = args.trim();
+      const [command, ...rest] = input ? input.split(/\s+/) : [];
+      const remainder = rest.join(" ").trim();
+
+      try {
+        switch (command) {
+          case undefined:
+          case "show": {
+            const ensured = deps.service.ensureCompanion();
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const achievements = mergeAchievements(ensured.achievements, commandAchievements);
+            const reaction = deps.storage.loadLatest();
+            deps.ui.refresh(ctx, ensured.companion, reaction, achievements);
+            if (ensured.created) {
+              ctx.ui.notify(`Meet ${ensured.companion.name}!`, "info");
+            } else {
+              ctx.ui.notify(deps.service.formatCompanionSummary(ensured.companion), "info");
+            }
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "pet": {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const result = deps.service.petBuddy();
+            const achievements = mergeAchievements(commandAchievements, result.achievements);
+            deps.ui.refresh(ctx, result.companion, result.state, achievements);
+            ctx.ui.notify(`${result.companion.name} seems pleased.`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "stats": {
+            const ensured = deps.service.ensureCompanion();
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const achievements = mergeAchievements(ensured.achievements, commandAchievements);
+            ctx.ui.setWidget("buddy", renderBuddyStats(ensured.companion));
+            ctx.ui.notify(`${ensured.companion.name}'s stats`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "rename": {
+            if (!remainder) throw new Error("Usage: /buddy rename <name>");
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const companion = deps.service.renameBuddy(remainder);
+            const ensured = deps.service.ensureCompanion();
+            const achievements = mergeAchievements(commandAchievements, ensured.achievements);
+            deps.ui.refresh(ctx, companion, deps.storage.loadLatest(), achievements);
+            ctx.ui.notify(`Buddy renamed to ${companion.name}.`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "personality": {
+            if (!remainder) throw new Error("Usage: /buddy personality <text>");
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const companion = deps.service.setPersonality(remainder);
+            const ensured = deps.service.ensureCompanion();
+            const achievements = mergeAchievements(commandAchievements, ensured.achievements);
+            deps.ui.refresh(ctx, companion, deps.storage.loadLatest(), achievements);
+            ctx.ui.notify(`${companion.name}'s personality was updated.`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "off": {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            deps.storage.setMuted(true);
+            const ensured = deps.service.ensureCompanion();
+            const achievements = mergeAchievements(commandAchievements, ensured.achievements);
+            deps.ui.refresh(ctx, ensured.companion, null, achievements);
+            ctx.ui.notify(`${ensured.companion.name} goes quiet.`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "on": {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            deps.storage.setMuted(false);
+            const result = deps.service.recordComment("*stretches* I'm back!");
+            const achievements = mergeAchievements(commandAchievements, result.achievements);
+            deps.ui.refresh(ctx, result.companion, result.state, achievements);
+            ctx.ui.notify(`${result.companion.name} is back.`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "save": {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const result = deps.service.saveBuddy(remainder || undefined);
+            const ensured = deps.service.ensureCompanion();
+            const achievements = mergeAchievements(commandAchievements, ensured.achievements);
+            deps.ui.refresh(ctx, result.companion, deps.storage.loadLatest(), achievements);
+            ctx.ui.notify(`Saved ${result.companion.name} to [${result.slot}].`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "summon": {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const result = deps.service.summonBuddy(remainder || undefined);
+            if (!result) throw new Error("No saved buddy found for that slot.");
+            const ensured = deps.service.ensureCompanion();
+            const achievements = mergeAchievements(commandAchievements, ensured.achievements);
+            deps.ui.refresh(ctx, result.companion, deps.storage.loadLatest(), achievements);
+            ctx.ui.notify(`${result.companion.name} arrives from [${result.slot}].`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "list": {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const active = deps.storage.loadActiveSlot();
+            const companions = deps.service.listCompanions();
+            if (companions.length === 0) {
+              ctx.ui.notify("No saved buddies yet.", "info");
+              deps.ui.notifyAchievements(ctx, commandAchievements);
+              return;
+            }
+            ctx.ui.setWidget(
+              "buddy",
+              companions.map(({ slot, companion }) => {
+                const marker = slot === active ? " <- active" : "";
+                return `${companion.name} [${slot}] - ${companion.bones.rarity} ${companion.bones.species}${marker}`;
+              }),
+            );
+            ctx.ui.notify(`Saved buddies: ${companions.length}`, "info");
+            deps.ui.notifyAchievements(ctx, commandAchievements);
+            return;
+          }
+
+          case "dismiss": {
+            if (!remainder) throw new Error("Usage: /buddy dismiss <slot>");
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const result = deps.service.dismissBuddy(remainder);
+            const ensured = deps.service.ensureCompanion();
+            const achievements = mergeAchievements(commandAchievements, ensured.achievements);
+            deps.ui.refresh(ctx, ensured.companion, deps.storage.loadLatest(), achievements);
+            ctx.ui.notify(`Dismissed ${result.companion.name} [${result.slot}].`, "info");
+            deps.ui.notifyAchievements(ctx, achievements);
+            return;
+          }
+
+          case "achievements": {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            const activeSlot = deps.storage.loadActiveSlot() ?? undefined;
+            const progress = deps.service.getAchievementProgress(activeSlot);
+            deps.ui.showAchievements(ctx, progress.unlocked, progress.remaining);
+            deps.ui.notifyAchievements(ctx, commandAchievements);
+            return;
+          }
+
+          case "help":
+          default: {
+            const commandAchievements = deps.service.incrementCommandsRun();
+            ctx.ui.setWidget("buddy", [
+              "/buddy",
+              "/buddy pet",
+              "/buddy stats",
+              "/buddy rename <name>",
+              "/buddy personality <text>",
+              "/buddy off | on",
+              "/buddy save [slot]",
+              "/buddy summon [slot]",
+              "/buddy list",
+              "/buddy dismiss <slot>",
+              "/buddy achievements",
+            ]);
+            ctx.ui.notify("Buddy commands ready.", "info");
+            deps.ui.notifyAchievements(ctx, commandAchievements);
+            return;
+          }
+        }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        ctx.ui.notify(message, "error");
+        if (command === "save" && remainder) {
+          ctx.ui.notify(`Try a different slot, for example: ${slugifySlot(remainder)}-2`, "info");
+        }
+      }
+    },
+  });
+}

package/adapters/omp/context.ts

@@ -0,0 +1,22 @@
+import type { ExtensionContext } from "@oh-my-pi/pi-coding-agent";
+
+export interface OmpBuddyUi {
+  notify(message: string, type?: "info" | "warning" | "error"): void;
+  setStatus(key: string, text: string | undefined): void;
+  setWidget(key: string, content: string[] | undefined): void;
+}
+
+export interface OmpBuddyUiContext {
+  ui: OmpBuddyUi;
+  setTimeout?: (callback: () => void, ms?: number) => Timer;
+  clearTimer?: (timer: Timer) => void;
+}
+
+export interface OmpBuddyContext extends OmpBuddyUiContext {
+  model: ExtensionContext["model"];
+  modelRegistry: Pick<
+    ExtensionContext["modelRegistry"],
+    "find" | "getApiKey" | "getProviderHeaders"
+  >;
+  sessionManager: Pick<ExtensionContext["sessionManager"], "getBranch">;
+}