dsh-capyreporter 0.1.3 → 0.1.5

package/README.md

@@ -45,7 +45,7 @@ Restart `dsh web` (or just refresh the page). Requires DSH web 0.1.0-rc.6 or new
 | Mouse wheel over her | Resize |
 | Single click the bubble | Expand / collapse the step log |
 | Double-click the bubble | Dismiss until the next update |
-| Left-click the capybara | Return to DeepSeek Harness |
+| Double-click the capybara | Return to DeepSeek Harness (single click does nothing — it fires too easily) |
 | Right-click the capybara | Menu: Restore bubble · Open DSH · Hide desktop pet |
 
 ## 🎨 Art & licensing

package/README.zh.md

@@ -42,7 +42,7 @@ dsh plugin --profile web add dsh-capyreporter
 | 在水豚上滚轮 | 缩放 |
 | 单击气泡 | 展开 / 收起步骤日志 |
 | 双击气泡 | 先藏起来，有新动静再冒出来 |
-| 左键点水豚 | 回到 DeepSeek Harness |
+| 双击水豚 | 回到 DeepSeek Harness（单击不做事，太容易误触了） |
 | 右键水豚 | 菜单：恢复气泡 · 打开 DSH · 隐藏桌面宠物 |
 
 ## 已知限制

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-capyreporter",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "CapyReporter — an always-on-top capybara task reporter for the DeepSeek Harness Web UI. A transparent floating pet that narrates each trajectory step in a speech bubble, tells you which project is reporting, alerts you when a task completes while you are away, and lets you upload your own pet art.",
   "keywords": [
     "dsh",

package/runtime/electron-helper/index.html

@@ -23,8 +23,8 @@
       #bubble {
         position: absolute;
         /* JS pins this just above the pet image on every size change;
-           the default covers the unscaled 182px pet. */
-        bottom: 190px;
+           the default covers the unscaled 132px-wide pet. */
+        bottom: 143px;
         left: 50%;
         transform: translateX(-50%);
         min-width: 90px;
@@ -103,8 +103,10 @@
         bottom: 0;
         left: 50%;
         transform: translateX(-50%);
-        height: 182px;
-        width: auto;
+        /* width is the base metric (132 * scale), the same as the in-page pet;
+           JS keeps it in sync and height follows the image aspect ratio */
+        width: 132px;
+        height: auto;
         pointer-events: auto;
         cursor: grab;
         touch-action: none;

package/runtime/electron-helper/main.js

@@ -19,10 +19,20 @@ app.disableHardwareAcceleration();
 
 let win = null;
 let topmostTimer = null;
+let dragTimer = null;
+let dragState = null;
 const baseUrl = process.env.DSH_CAPYREP_BASE_URL || 'http://127.0.0.1:3080';
 const W = 220;
 const H = 250;
 
+function stopDrag() {
+  if (dragTimer) {
+    clearInterval(dragTimer);
+    dragTimer = null;
+  }
+  dragState = null;
+}
+
 function reassertTopmost() {
   if (!win || win.isDestroyed()) return;
   try {
@@ -72,6 +82,7 @@ function createWindow() {
   win.on('blur', () => reassertTopmost());
   win.on('closed', () => {
     win = null;
+    stopDrag();
     if (topmostTimer) {
       clearInterval(topmostTimer);
       topmostTimer = null;
@@ -126,16 +137,37 @@ app.whenReady().then(() => {
     reassertTopmost();
   });
 
-  ipcMain.on('homura:move', (event, p) => {
+  // ---- dragging ----------------------------------------------------------
+  // The drag loop lives here and reads the OS cursor position
+  // (screen.getCursorScreenPoint) instead of renderer pointer coordinates.
+  // A window that moves under the cursor feeds its own movement back into the
+  // next pointer coordinate the renderer sees, which makes the pet drift away
+  // from the cursor; the OS cursor position cannot be affected by our window.
+  ipcMain.on('homura:drag-start', (event) => {
     const w = BrowserWindow.fromWebContents(event.sender);
     if (!w || w.isDestroyed()) return;
-    const x = Number(p && p.x);
-    const y = Number(p && p.y);
-    if (Number.isFinite(x) && Number.isFinite(y)) w.setPosition(Math.round(x), Math.round(y), false);
+    const c = screen.getCursorScreenPoint();
+    const b = w.getBounds();
+    dragState = { win: w, cx: c.x, cy: c.y, wx: b.x, wy: b.y };
+    if (dragTimer) clearInterval(dragTimer);
+    dragTimer = setInterval(() => {
+      if (!dragState) return stopDrag();
+      const win = dragState.win;
+      if (!win || win.isDestroyed()) return stopDrag();
+      const p = screen.getCursorScreenPoint();
+      const area = screen.getDisplayNearestPoint(p).workArea;
+      const x = Math.min(Math.max(area.x, dragState.wx + (p.x - dragState.cx)), area.x + Math.max(0, area.width - 60));
+      const y = Math.min(Math.max(area.y, dragState.wy + (p.y - dragState.cy)), area.y + Math.max(0, area.height - 60));
+      const cur = win.getBounds();
+      if (cur.x !== x || cur.y !== y) win.setPosition(x, y, false);
+    }, 16);
   });
+
+  ipcMain.on('homura:drag-end', () => stopDrag());
 });
 
 app.on('window-all-closed', () => {
+  stopDrag();
   if (topmostTimer) {
     clearInterval(topmostTimer);
     topmostTimer = null;

package/runtime/electron-helper/preload.js

@@ -8,8 +8,14 @@ contextBridge.exposeInMainWorld('petBridge', {
   openSite(url) {
     ipcRenderer.send('homura:open-site', url);
   },
-  move(x, y) {
-    ipcRenderer.send('homura:move', { x, y });
+  // Dragging is owned by the main process: it tracks the OS cursor position and
+  // moves the window itself, so a moving window can never feed back into the
+  // coordinates the renderer sees.
+  dragStart() {
+    ipcRenderer.send('homura:drag-start');
+  },
+  dragEnd() {
+    ipcRenderer.send('homura:drag-end');
   },
   resize(size) {
     ipcRenderer.send('homura:resize', size);

package/runtime/electron-helper/renderer.js

@@ -1,5 +1,5 @@
 // renderer for the always-on-top CapyReporter window. Fetches image + activity from the
-// DSH host over HTTP; drags to move; left-click opens DSH; right-click shows a menu.
+// DSH host over HTTP; drags to move; double-click opens DSH; right-click shows a menu.
 //
 // Bubble UX: compact by default (headline + latest status line); single click
 // expands into a scrollable step log; double click dismisses; the right-click
@@ -51,22 +51,26 @@
   }
 
   // Pet size: a uniform multiplier owned by the host config (shared with the
-  // in-page pet and the Settings slider). Plain wheel over the window resizes;
-  // the image keeps its aspect ratio, the bubble is re-pinned just above it.
+  // in-page pet and the Settings slider). Plain wheel over the window resizes.
+  // The base metric is the WIDTH (132 * scale) — the same base the in-page pet
+  // uses — so the pet is exactly the same size in both modes; height follows the
+  // image's aspect ratio.
   // refit() fits the window around BOTH the pet and the bubble, so the bubble
   // can report a fuller status (expanded step log) without the window blowing up.
-  const BASE_IMG_H = 182;
+  const BASE_IMG_W = 132;
   let scale = 1;
   // Only resize when the size actually changed: re-issuing an identical resize
   // every tick makes Windows' fractional-DPI bounds round-trip walk the window
   // down the screen a pixel at a time.
   const lastFit = { w: 0, h: 0 };
   function refit() {
-    const imgH = Math.round(BASE_IMG_H * scale);
-    img.style.height = imgH + 'px';
+    const imgW = Math.max(40, Math.round(BASE_IMG_W * scale));
+    img.style.width = imgW + 'px';
+    img.style.height = 'auto';
+    const aspect = img.naturalWidth && img.naturalHeight ? img.naturalWidth / img.naturalHeight : 0.9;
+    const imgH = Math.round(imgW / aspect);
     bubble.style.bottom = (imgH + 8) + 'px';
-    const aspect = img.naturalWidth && img.naturalHeight ? img.naturalWidth / img.naturalHeight : 0.65;
-    let w = Math.max(150, Math.round(220 * scale), Math.round(imgH * aspect) + 24);
+    let w = Math.max(150, imgW + 24);
     let h = Math.max(120, imgH + Math.max(Math.round(72 * scale), 96));
     if (bubble.style.display !== 'none' && bubble.scrollWidth > 0) {
       const bw = Math.min(Math.ceil(bubble.scrollWidth) + 28, 1060); // bubble is capped at 1000px; grow the window with it
@@ -211,28 +215,29 @@
     hideBubble();
   });
 
-  // drag — pointer capture keeps the move stream alive even when the cursor
-  // outruns the small window, and we hold the window interactive for the whole
-  // drag (a mouseleave during a fast drag would otherwise flip it click-through
-  // mid-drag and drop the trail).
-  let drag = null;
+  // drag — the main process owns the motion: it follows the OS cursor position
+  // (screen.getCursorScreenPoint), which cannot be perturbed by our own window
+  // moving. The renderer only opens/closes the drag and keeps the window
+  // interactive for its whole duration (pointer capture guarantees we still get
+  // the pointerup even if the cursor leaves the window).
+  let drag = false;
   img.addEventListener('pointerdown', (e) => {
     if (e.button !== 0) return;
     try { img.setPointerCapture(e.pointerId); } catch (err) {}
-    drag = { sx: e.screenX, sy: e.screenY, wx: window.screenX, wy: window.screenY };
+    drag = true;
     window.petBridge.setInteractive(true);
+    window.petBridge.dragStart();
     e.preventDefault();
   });
-  window.addEventListener('pointermove', (e) => {
-    if (drag) window.petBridge.move(drag.wx + (e.screenX - drag.sx), drag.wy + (e.screenY - drag.sy));
-  });
   const endDrag = () => {
     if (!drag) return;
-    drag = null;
+    drag = false;
+    window.petBridge.dragEnd();
     window.petBridge.setInteractive(true); // pointer is still over the pet when a drag ends
   };
   window.addEventListener('pointerup', endDrag);
   window.addEventListener('pointercancel', endDrag);
+  window.addEventListener('blur', endDrag); // alt-tab mid-drag must not leave the pet glued to the cursor
 
   // hover -> interactive (so clicks work); leave -> click-through (never mid-drag)
   root.addEventListener('mouseenter', () => window.petBridge.setInteractive(true));
@@ -240,8 +245,9 @@
     if (!drag) window.petBridge.setInteractive(false);
   });
 
-  // left-click (not a drag) -> open DSH in default browser
-  img.addEventListener('click', () => window.petBridge.openSite(base));
+  // double-click (not a drag) -> return to DeepSeek Harness. A single click must
+  // stay inert: it fires on every stray click and on drags that barely move.
+  img.addEventListener('dblclick', () => window.petBridge.openSite(base));
 
   // right-click menu
   img.addEventListener('contextmenu', (e) => {