@ramarivera/coding-buddy 0.8.0 → 0.9.0

package/server/state.ts

@@ -31,6 +31,9 @@ import {
 } from "fs";
 import { join } from "path";
 import type { Companion } from "../core/engine.ts"
+import type * as CoreEngine from "../core/engine.ts";
+import type * as Art from "./art.ts";
+import { configuredSharedUserId } from "../core/identity.ts";
 import {
   buddyStateDir,
   claudeSettingsPath,
@@ -278,32 +281,63 @@ function migrateIfNeeded(): void {
 
 // ─── Reaction state (session-scoped for tmux isolation) ──────────────────────
 
+/**
+ * Where a reaction came from. Proves the bubble content isn't canned when
+ * source === "tool" or "comment"; "fallback" means a hook picked a pool line
+ * because no model-authored text surfaced; "none" is the default for legacy
+ * files written before the field existed.
+ *
+ *   tool      — buddy_react MCP tool call (Claude wrote it; renders nowhere)
+ *   comment   — old `<!-- buddy: ... -->` HTML comment (legacy / older CC)
+ *   fallback  — Stop hook generated it from the canned pool
+ *   none      — unknown / legacy file without a source field
+ */
+export type ReactionSource = "tool" | "comment" | "fallback" | "none";
+
 export interface ReactionState {
   reaction: string;
   timestamp: number;
   reason: string;
+  /** Provenance — see ReactionSource. Defaults to "none" on legacy files. */
+  source?: ReactionSource;
 }
 
 export function loadReaction(): ReactionState | null {
   try {
     const data: ReactionState = JSON.parse(readFileSync(reactionFile(), "utf8"));
     const { reactionTTL } = loadConfig();
-    if (reactionTTL > 0 && Date.now() - data.timestamp > reactionTTL * 1000) return null;
+if (reactionTTL > 0 && Date.now() - data.timestamp > reactionTTL * 1000) {
+  rmSync(reactionFile(), { force: true });
+  return null;
+}
+if (data.source === undefined) data.source = "none";
     return data;
   } catch {
     return null;
   }
 }
 
-export function saveReaction(reaction: string, reason: string): void {
+export function saveReaction(
+  reaction: string,
+  reason: string,
+  source: ReactionSource = "fallback",
+): void {
   mkdirSync(STATE_DIR, { recursive: true });
-  const state: ReactionState = { reaction, timestamp: Date.now(), reason };
-  writeFileSync(reactionFile(), JSON.stringify(state));
+  const state: ReactionState = { reaction, timestamp: Date.now(), reason, source };
+  // Atomic via tmp + rename — torn reads on the reaction file would
+  // make the Stop hook's freshness check see an absent file, pinning
+  // a stale tool reaction into the bubble forever.
+  const target = reactionFile();
+  const tmp = `${target}.tmp.${process.pid}.${Date.now()}`;
+  writeFileSync(tmp, JSON.stringify(state));
+  renameSync(tmp, target);
 }
 
 // ─── Identity resolution ─────────────────────────────────────────────────────
 
 export function resolveUserId(): string {
+  const sharedUserId = configuredSharedUserId();
+  if (sharedUserId) return sharedUserId;
   try {
     const claudeJson = JSON.parse(readFileSync(claudeUserConfigPath(), "utf8"));
     return claudeJson.oauthAccount?.accountUuid ?? claudeJson.userID ?? "anon";
@@ -311,9 +345,7 @@ export function resolveUserId(): string {
     return "anon";
   }
 }
-
 // ─── Config persistence (PR #6: tmux popup settings) ─────────────────────────
-
 export interface BuddyConfig {
   commentCooldown: number;
   reactionTTL: number;
@@ -321,6 +353,7 @@ export interface BuddyConfig {
   bubblePosition: "top" | "left";
   showRarity: boolean;
   statusLineEnabled: boolean;
+  statuslineWidthAdjust: number;
   bubbleWidth: number;
   bubbleMargin: number;
   useCombinedStatus: boolean;
@@ -336,11 +369,15 @@ export interface BuddyConfig {
 
 const DEFAULT_CONFIG: BuddyConfig = {
   commentCooldown: 30,
-  reactionTTL: 0,
+  // Long enough that a reaction survives the turn you were reading when it was
+  // written, short enough that yesterday's bubble is never still on screen.
+  // Set to 0 to opt out and keep reactions until they are replaced.
+  reactionTTL: 900,
   bubbleStyle: "classic",
   bubblePosition: "top",
   showRarity: true,
   statusLineEnabled: false,
+  statuslineWidthAdjust: 0,
   bubbleWidth: 28,
   bubbleMargin: 8,
   useCombinedStatus: false,
@@ -363,6 +400,12 @@ export function normalizeConfig(data: unknown): BuddyConfig {
   if (!Number.isInteger(config.subStatusRefreshSeconds) || config.subStatusRefreshSeconds <= 0) {
     config.subStatusRefreshSeconds = DEFAULT_CONFIG.subStatusRefreshSeconds;
   }
+  if (!Number.isInteger(config.reactionTTL) || config.reactionTTL < 0) {
+    config.reactionTTL = DEFAULT_CONFIG.reactionTTL;
+  }
+  if (!Number.isInteger(config.statuslineWidthAdjust)) {
+    config.statuslineWidthAdjust = DEFAULT_CONFIG.statuslineWidthAdjust;
+  }
   return config;
 }
 
@@ -412,10 +455,11 @@ export function writeStatusState(
   xp?: number,
 ): void {
   mkdirSync(STATE_DIR, { recursive: true });
-  const { renderFace, RARITY_STARS } =
-    require("../core/engine.ts") as typeof import("../core/engine.ts");
+  const { renderFace, RARITY_STARS, resolveEyeGlyph } =
+    require("../core/engine.ts") as typeof CoreEngine;
   const { getStatusFrames } =
-    require("./art.ts") as typeof import("./art.ts");
+    require("./art.ts") as typeof Art;
+  const safeEye = resolveEyeGlyph(companion.bones.eye);
   const { frames, frameSequence } = getStatusFrames(companion.bones);
   let xpLevel = level ?? 1;
   let xpTotal = xp ?? 0;
@@ -439,8 +483,8 @@ export function writeStatusState(
     species: companion.bones.species,
     rarity: companion.bones.rarity,
     stars: RARITY_STARS[companion.bones.rarity],
-    face: renderFace(companion.bones.species, companion.bones.eye),
-    eye: companion.bones.eye,
+    face: renderFace(companion.bones.species, safeEye),
+    eye: safeEye,
     shiny: companion.bones.shiny,
     hat: companion.bones.hat,
     reaction: "",
@@ -452,14 +496,16 @@ export function writeStatusState(
     xp: xpTotal,
     mood: moodStr,
   };
-  writeFileSync(join(STATE_DIR, "status.json"), JSON.stringify(state));
-  if (reaction) saveReaction(reaction, "mcp");
+  // writeStatusState no longer calls saveReaction implicitly. Callers
+  // that need a reaction file do so explicitly with the correct
+  // `source` tag — the old implicit save had no source argument and
+  // its default later flipped from "tool" to "fallback", either way
+  // overwriting provenance of hatch / pet / unmute writes with whatever
+  // happened to be the default. /buddy stats stopped lying when
+  // this call was removed.
 }
 
-// ─── Claude Code settings.json patching (for buddy_statusline tool) ──────────
-
 export const CLAUDE_SETTINGS_PATH = claudeSettingsPath();
-
 /**
  * Write settings.statusLine pointing to the given buddy-status script.
  * Atomic via tmp + rename. Returns false if settings.json is unreachable.

package/skills/buddy/SKILL.md

@@ -86,7 +86,7 @@ The MCP tools return pre-formatted ASCII art with ANSI colors, box-drawing chara
 
 **Just output the raw text content from the tool result. Nothing else.** The ASCII art IS the response.
 
-If the user mentions the buddy's name in normal conversation, call `buddy_react` with reason "turn" and display the result verbatim.
+If the user mentions the buddy's name in normal conversation, call `buddy_react` with reason "turn". Do NOT echo or quote the tool result — the reaction reaches the user only via the statusline speech bubble.
 
 ## Uninstall Orchestration