@hayasaka7/haya-pet 0.3.12 → 0.3.13

package/CHANGELOG.md

@@ -7,6 +7,16 @@ 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

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/package.json

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