@hayasaka7/haya-pet 0.3.11 → 0.3.13

package/CHANGELOG.md

@@ -7,6 +7,28 @@ All notable changes to HAYA Pet are documented here. This project adheres to
 > 0.2.0 npm publish; they are listed under 0.2.1, which is the first version that
 > ships them.
 
+## [0.3.13]
+
+### Added
+- **Right-clicking the pet now opens the tray menu.** A right-click used to behave
+  like a left-click (wave + fold/unfold the bubbles). It now pops up the same
+  menu as the system-tray icon — Show/Hide Pet, Active Sessions, Installed Pets,
+  Reset Position, update, Quit — which is far more discoverable than the tray icon
+  (often hidden in the Windows overflow). The menu is built from the one pure tray
+  model, so both entry points always match. Left-click behaviour is unchanged.
+
+## [0.3.12]
+
+### Fixed
+- **A long status or tool-call name no longer stretches the session bubble.** The
+  activity line is `white-space: nowrap`, and the bubble sizes to its content, so
+  a long summary (e.g. a tool call like `Read packages/session-core/src/...`)
+  dragged the bubble out to its max width before the CSS ellipsis could engage.
+  The status/activity text is now length-capped in the view model (`summaryLabel`,
+  32 chars + `...`) exactly like the project name (`projectLabel`), so it can't
+  widen the bubble; the full summary stays reachable on hover and in the expanded
+  task-talk popup.
+
 ## [0.3.11]
 
 ### Fixed

package/README.md

@@ -220,6 +220,7 @@ non-observe mode keeps terminal input native.
 |---|---|
 | Single click | Wave and fold or unfold session bubbles. |
 | Double click | Jump and expand session bubbles. |
+| Right click | Open the same menu as the tray icon (sessions, pets, reset, updates, quit). |
 | Drag | Move the pet; position is saved. |
 | Drag corner grip | Resize from 0.5x to 2x; size is saved. |
 | Double-click grip | Reset to normal size. |

package/apps/companion/src/main/index.js

@@ -291,17 +291,15 @@ function loadTrayIcon() {
   return fileIcon.isEmpty() ? nativeImage.createFromDataURL(TRAY_ICON_DATA_URL) : fileIcon;
 }
 
-function refreshTrayMenu() {
-  if (!tray) {
-    return;
-  }
-
+// Builds the native menu template from the pure tray model. Shared by the tray
+// icon and the pet's right-click context menu so both stay identical.
+function buildTrayMenuTemplate() {
   const sessions = (runtime?.listSessions() ?? []).map((session) => ({
     sessionId: session.sessionId,
     label: `${session.clientDisplayName} · ${session.projectName}`
   }));
 
-  const template = buildTrayMenu({
+  return buildTrayMenu({
     petVisible: petWindow?.isVisible() ?? true,
     displayMode: positionState.settings.displayMode,
     attachBubblesToTerminals: positionState.settings.attachBubblesToTerminals,
@@ -310,8 +308,14 @@ function refreshTrayMenu() {
     pets: pets.map((pet) => ({ id: pet.manifest.id, name: pet.manifest.name })),
     updateAvailable
   }).map(toElectronMenuItem);
+}
+
+function refreshTrayMenu() {
+  if (!tray) {
+    return;
+  }
 
-  tray.setContextMenu(Menu.buildFromTemplate(template));
+  tray.setContextMenu(Menu.buildFromTemplate(buildTrayMenuTemplate()));
 }
 
 function toElectronMenuItem(item) {
@@ -425,6 +429,16 @@ function registerRendererHandlers() {
     }
   });
 
+  // Right-click on the pet pops up the same menu as the tray icon (built from
+  // the one pure tray model), since the tray icon is often buried in the Windows
+  // overflow. Fire-and-forget: the native menu is shown and dispatched in main.
+  ipcMain.on("haya-pet:show-pet-menu", () => {
+    if (!petWindow || petWindow.isDestroyed()) {
+      return;
+    }
+    Menu.buildFromTemplate(buildTrayMenuTemplate()).popup({ window: petWindow });
+  });
+
   // The pet moves within the overlay (CSS), so the renderer reports its new
   // work-area-relative position instead of moving the window.
   ipcMain.handle("haya-pet:save-pet-position", async (_event, local) => {

package/apps/companion/src/main/preload.cjs

@@ -7,6 +7,7 @@ contextBridge.exposeInMainWorld("aiPet", {
   savePetPosition: (local) => ipcRenderer.invoke("haya-pet:save-pet-position", local),
   savePetScale: (scale) => ipcRenderer.invoke("haya-pet:save-pet-scale", scale),
   setMouseIgnore: (ignore) => ipcRenderer.send("haya-pet:set-mouse-ignore", ignore),
+  showPetMenu: () => ipcRenderer.send("haya-pet:show-pet-menu"),
   onConfig: (handler) => ipcRenderer.on("haya-pet:config", (_event, config) => handler(config)),
   onSessions: (handler) => ipcRenderer.on("haya-pet:sessions", (_event, payload) => handler(payload)),
   onPetPosition: (handler) => ipcRenderer.on("haya-pet:pet-position", (_event, pos) => handler(pos)),

package/apps/companion/src/renderer/pet-window.js

@@ -192,6 +192,11 @@ function playOneShot(action) {
 // --- Pointer interaction (click vs drag distinction lives in the controller) ---
 
 canvas.addEventListener("pointerdown", (event) => {
+  // Only the primary button drives click/drag; right-click pops the context menu
+  // (handled below) and must not also fire a wave/toggle or start a drag.
+  if (event.button !== 0) {
+    return;
+  }
   canvas.setPointerCapture(event.pointerId);
   // Hold click-through off for the whole press: a drag swaps to the running
   // frames, whose opaque pixels differ from the grabbed one, so re-running the
@@ -211,6 +216,11 @@ canvas.addEventListener("pointermove", (event) => {
 });
 
 canvas.addEventListener("pointerup", (event) => {
+  // Mirror pointerdown: ignore non-primary releases so a right-click never feeds
+  // the click controller (its pointerDown was skipped anyway).
+  if (event.button !== 0) {
+    return;
+  }
   // Click / double-click are delivered asynchronously via onAction; only the
   // synchronous drag-end is handled here.
   petPressed = false;
@@ -227,6 +237,15 @@ canvas.addEventListener("pointercancel", () => {
   animationState = clearDragAction(animationState);
 });
 
+// Right-click the pet to open the same menu as the tray icon. The native menu is
+// built and shown in the main process; preventDefault stops Electron's default
+// context menu. Only fires over opaque pet pixels (transparent areas are
+// click-through and the right-click falls to the desktop, like a left-click).
+canvas.addEventListener("contextmenu", (event) => {
+  event.preventDefault();
+  bridge?.showPetMenu?.();
+});
+
 // --- Resize grip: drag to scale the pet, double-click to reset ---
 
 let resizeDrag; // { startScale, startPointer } while a grip drag is active

package/apps/companion/src/renderer/session-bubbles.js

@@ -253,8 +253,10 @@ function applyBubble(el, bubble) {
   project.textContent = bubble.projectLabel ?? bubble.projectName;
   // Hover reveals the full, untruncated "Client · Project".
   title.title = bubble.projectName ? `${bubble.clientName} · ${bubble.projectName}` : bubble.clientName;
-  activity.textContent = bubble.summary;
-  activity.title = `${bubble.statusLabel} · ${bubble.elapsedLabel}`;
+  // Compact label keeps a long status/tool name from stretching the bubble; the
+  // full summary stays reachable on hover (like the project name above).
+  activity.textContent = bubble.summaryLabel ?? bubble.summary;
+  activity.title = `${bubble.summary ?? bubble.statusLabel} · ${bubble.elapsedLabel}`;
 }
 
 // Picks the kind that should win the collapsed-folder dot: a failure or a

package/apps/companion/test/session-bubbles.test.mjs

@@ -198,6 +198,34 @@ test("shows the compact project label and keeps the full name as a tooltip", ()
   }
 });
 
+test("shows the compact summary label and keeps the full summary as a tooltip", () => {
+  const restoreDocument = installFakeDocument();
+  try {
+    const container = new FakeElement("div");
+    const listView = createBubbleList(container, { onRender: createHostOnRender(container) });
+
+    listView.render([{
+      sessionId: "s1",
+      statusKind: "working",
+      statusLabel: "Running tools",
+      clientName: "Claude Code",
+      projectName: "haya-pet",
+      projectLabel: "haya-pet",
+      summary: "Read packages/session-core/src/summaries.js",
+      summaryLabel: "Read packages/session-core/src/s...",
+      elapsedLabel: "1s"
+    }]);
+
+    const activity = findActivity(findBubble(container, "s1"));
+    // The bubble renders the capped label so a long tool name can't widen it...
+    assert.equal(activity.textContent, "Read packages/session-core/src/s...");
+    // ...while the full summary stays reachable on hover.
+    assert.equal(activity.title, "Read packages/session-core/src/summaries.js · 1s");
+  } finally {
+    restoreDocument();
+  }
+});
+
 test("clears everything when no sessions remain", () => {
   const restoreDocument = installFakeDocument();
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hayasaka7/haya-pet",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "type": "module",
   "description": "Generic AI CLI pet runtime foundation.",
   "keywords": [

package/packages/session-core/src/bubble-view.js

@@ -1,5 +1,5 @@
 import { mapAiStateToPetAction } from "../../pet-core/src/atlas.js";
-import { buildSessionSummary, buildStatusLabel, formatElapsed, truncateProjectName } from "./summaries.js";
+import { buildSessionSummary, buildStatusLabel, formatElapsed, truncateProjectName, truncateSummary } from "./summaries.js";
 
 // Collapses the full AI-state vocabulary into the four progress kinds the
 // bubble panel renders: a spinning "working" circle, a "done" check mark (held
@@ -30,6 +30,7 @@ export function resolveBubbleStatusKind(state) {
 
 export function buildBubbleView(session, now = Date.now(), options = {}) {
   const elapsedMs = Math.max(0, numeric(now) - numeric(session.startedAt));
+  const summary = buildSessionSummary(session);
 
   return {
     sessionId: session.sessionId,
@@ -40,7 +41,11 @@ export function buildBubbleView(session, now = Date.now(), options = {}) {
     state: session.state,
     statusLabel: buildStatusLabel(session.state),
     statusKind: resolveBubbleStatusKind(session.state),
-    summary: buildSessionSummary(session),
+    // Full summary stays for the detail popup + hover tooltip; summaryLabel is
+    // the compact form the bubble renders so a long status/tool name can't
+    // stretch the bubble (mirrors projectName / projectLabel).
+    summary,
+    summaryLabel: truncateSummary(summary),
     petAction: safePetAction(session.state),
     elapsedMs,
     elapsedLabel: formatElapsed(elapsedMs),

package/packages/session-core/src/summaries.js

@@ -26,18 +26,34 @@ export function buildSessionSummary(session) {
   return buildStatusLabel(session?.state);
 }
 
+// Ellipsis truncation shared by the bubble's title and activity lines: text up
+// to `maxLength` characters shows whole; longer text is cut to `maxLength` and
+// marked with a trailing "...". Non-strings coerce to "". The full text is kept
+// elsewhere on the view model for a hover tooltip.
+function truncateWithEllipsis(text, maxLength) {
+  const value = typeof text === "string" ? text : "";
+  if (value.length <= maxLength) {
+    return value;
+  }
+  return `${value.slice(0, maxLength)}...`;
+}
+
 // Compacts a project name for the session bubble title, which sits beside the
-// (always-full) client name in a narrow overlay. Names up to `maxLength`
-// characters show whole; longer ones are cut to `maxLength` and marked with an
-// ellipsis. The full name is kept elsewhere on the view model for a tooltip.
+// (always-full) client name in a narrow overlay.
 const DEFAULT_PROJECT_NAME_LENGTH = 10;
 
 export function truncateProjectName(name, maxLength = DEFAULT_PROJECT_NAME_LENGTH) {
-  const text = typeof name === "string" ? name : "";
-  if (text.length <= maxLength) {
-    return text;
-  }
-  return `${text.slice(0, maxLength)}...`;
+  return truncateWithEllipsis(name, maxLength);
+}
+
+// Compacts the activity/status line the same way, so a long status or tool-call
+// summary can't stretch the bubble wider than its (already capped) title. The
+// budget comfortably clears the longest built-in status label so those always
+// show whole; only genuinely long custom summaries get the ellipsis.
+const DEFAULT_SUMMARY_LENGTH = 32;
+
+export function truncateSummary(text, maxLength = DEFAULT_SUMMARY_LENGTH) {
+  return truncateWithEllipsis(text, maxLength);
 }
 
 export function formatElapsed(ms) {

package/packages/session-core/test/bubble-view.test.mjs

@@ -25,6 +25,8 @@ test("builds a bubble view model with label, summary, action, and elapsed", () =
   assert.equal(view.state, "waiting_approval");
   assert.equal(view.statusLabel, "Waiting for approval");
   assert.equal(view.summary, "waiting for command approval");
+  // Fits the 32-char budget, so the compact label matches the full summary.
+  assert.equal(view.summaryLabel, "waiting for command approval");
   assert.equal(view.petAction, "waiting");
   assert.equal(view.elapsedMs, 64_000);
   assert.equal(view.elapsedLabel, "1m 4s");
@@ -72,6 +74,15 @@ test("keeps a short project name whole in projectLabel", () => {
   assert.equal(view.projectLabel, "api");
 });
 
+test("compacts a long status/tool summary into summaryLabel, keeping the full summary", () => {
+  const longSummary = "Read packages/session-core/src/summaries.js";
+  const view = buildBubbleView({ ...baseSession, state: "running_tool", summary: longSummary }, 6_000);
+  // Full text is preserved (for the detail popup + hover tooltip)...
+  assert.equal(view.summary, longSummary);
+  // ...while the bubble renders the capped form so it can't stretch the width.
+  assert.equal(view.summaryLabel, "Read packages/session-core/src/s...");
+});
+
 test("marks the selected/pinned session", () => {
   const views = buildBubbleViews([baseSession], 6_000, { selectedSessionId: "sess_a" });
   assert.equal(views[0].selected, true);

package/packages/session-core/test/summaries.test.mjs

@@ -4,7 +4,8 @@ import {
   buildStatusLabel,
   buildSessionSummary,
   formatElapsed,
-  truncateProjectName
+  truncateProjectName,
+  truncateSummary
 } from "../src/summaries.js";
 
 test("maps every normalized state to a human status label", () => {
@@ -59,3 +60,23 @@ test("coerces missing or non-string project names to an empty string", () => {
   assert.equal(truncateProjectName(null), "");
   assert.equal(truncateProjectName(123), "");
 });
+
+test("keeps built-in status labels whole in the summary budget", () => {
+  // The longest built-in label ("Waiting for approval", 20 chars) and a
+  // slightly longer custom message must both fit without an ellipsis.
+  assert.equal(truncateSummary("Waiting for approval"), "Waiting for approval");
+  assert.equal(truncateSummary("waiting for command approval"), "waiting for command approval");
+});
+
+test("truncates a long status or tool-call summary to 32 characters plus an ellipsis", () => {
+  assert.equal(
+    truncateSummary("Read packages/session-core/src/summaries.js"),
+    "Read packages/session-core/src/s..."
+  );
+});
+
+test("honours a custom summary max length and coerces non-strings", () => {
+  assert.equal(truncateSummary("running tools", 4), "runn...");
+  assert.equal(truncateSummary(undefined), "");
+  assert.equal(truncateSummary(123), "");
+});