dsh-desktop-windows 0.1.7 → 0.1.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-desktop-windows",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "DeepSeek Harness 桌面版（Windows）· Electron desktop shell for DeepSeek Harness (dsh web) — 双击即用，无需终端 / double-click to run the harness in a standalone window",
   "main": "src/main.js",
   "license": "MIT",

package/src/main.js

@@ -13,7 +13,7 @@
  * 不修改 dsh 任何代码；服务端用全局安装的 dsh（可用 DSH_BIN 环境变量覆盖路径）。
  */
 
-const { app, BrowserWindow, dialog, shell, Tray, Menu, nativeImage, ipcMain } = require('electron')
+const { app, BrowserWindow, dialog, shell, Tray, Menu, nativeImage, ipcMain, desktopCapturer, clipboard, screen } = require('electron')
 const { spawn, execFile } = require('node:child_process')
 const http = require('node:http')
 const fs = require('node:fs')
@@ -552,6 +552,39 @@ if (!gotLock) {
     ipcMain.on('dsh-desktop:reload', () => {
       if (mainWindow) mainWindow.webContents.reload()
     })
+    // 截图：截当前屏幕 → 写剪贴板 → 聚焦聊天输入框并粘贴
+    ipcMain.handle('dsh-desktop:capture', async () => {
+      try {
+        const display = screen.getPrimaryDisplay()
+        const size = display.size
+        const sources = await desktopCapturer.getSources({
+          types: ['screen'],
+          thumbnailSize: { width: size.width, height: size.height },
+        })
+        if (!sources.length) return { ok: false, error: '未找到屏幕源' }
+        const image = sources[0].thumbnail
+        if (image.isEmpty()) return { ok: false, error: '截图为空' }
+        clipboard.writeImage(image)
+        // 聚焦聊天输入框并触发粘贴
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          const focused = await mainWindow.webContents
+            .executeJavaScript(
+              `(() => { const el = document.querySelector('textarea, [contenteditable="true"]'); if (el) { el.focus(); return true } return false })()`
+            )
+            .catch(() => false)
+          if (focused) mainWindow.webContents.paste()
+        }
+        return { ok: true }
+      } catch (e) {
+        return { ok: false, error: String((e && e.message) || e) }
+      }
+    })
+    // 轻提示（截图失败等）
+    ipcMain.on('dsh-desktop:toast', (_e, msg) => {
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        dialog.showMessageBox(mainWindow, { type: 'info', message: String(msg), buttons: ['好'] })
+      }
+    })
     if (external) log('reusing external dsh service on port ' + port)
   })
 

package/src/preload.js

@@ -1,38 +1,68 @@
 'use strict'
 
-// 最小 preload：为将来扩展保留的桥接点 + 注入悬浮刷新按钮。
+// preload：注入底部工具条（截图 + 刷新）。
 // 页面（dsh Web UI）直接走 HTTP/WebSocket 与本地服务通信，无需 IPC。
 
 const { ipcRenderer } = require('electron')
 
-// 注入一个悬浮"刷新"按钮（右下角，半透明，鼠标悬停变清晰）
 window.addEventListener('DOMContentLoaded', () => {
   setTimeout(() => {
     if (!document.body) return
-    const btn = document.createElement('button')
-    btn.textContent = '⟳'
-    btn.title = '刷新页面（等价 F5）'
-    btn.style.cssText = `
+
+    // 底部工具条容器
+    const bar = document.createElement('div')
+    bar.style.cssText = `
       position: fixed;
-      right: 14px;
-      bottom: 14px;
-      width: 34px;
-      height: 34px;
-      border-radius: 10px;
-      border: none;
-      background: rgba(30, 41, 59, 0.72);
-      color: #fff;
-      font-size: 18px;
-      line-height: 1;
-      cursor: pointer;
-      box-shadow: 0 2px 10px rgba(0, 0, 0, 0.35);
-      opacity: 0.45;
-      transition: opacity 0.2s;
+      right: 12px;
+      bottom: 12px;
+      display: flex;
+      gap: 8px;
       z-index: 2147483647;
     `
-    btn.onmouseenter = () => (btn.style.opacity = '1')
-    btn.onmouseleave = () => (btn.style.opacity = '0.45')
-    btn.onclick = () => ipcRenderer.send('dsh-desktop:reload')
-    document.body.appendChild(btn)
+
+    const makeBtn = (text, title, onClick) => {
+      const b = document.createElement('button')
+      b.textContent = text
+      b.title = title
+      b.style.cssText = `
+        width: 34px;
+        height: 34px;
+        border-radius: 10px;
+        border: none;
+        background: rgba(30, 41, 59, 0.72);
+        color: #fff;
+        font-size: 17px;
+        line-height: 1;
+        cursor: pointer;
+        box-shadow: 0 2px 10px rgba(0, 0, 0, 0.35);
+        opacity: 0.45;
+        transition: opacity 0.2s;
+      `
+      b.onmouseenter = () => (b.style.opacity = '1')
+      b.onmouseleave = () => (b.style.opacity = '0.45')
+      b.onclick = onClick
+      return b
+    }
+
+    // 截图按钮：截屏 → 剪贴板 → 自动粘贴到聊天框
+    const shotBtn = makeBtn('📸', '截图并提问（截取当前屏幕，自动粘贴到聊天框）', () => {
+      shotBtn.style.opacity = '1'
+      shotBtn.textContent = '⏳'
+      ipcRenderer.invoke('dsh-desktop:capture').then((r) => {
+        shotBtn.textContent = '📸'
+        if (!r || !r.ok) {
+          ipcRenderer.send('dsh-desktop:toast', (r && r.error) || '截图失败')
+        }
+      })
+    })
+
+    // 刷新按钮
+    const reloadBtn = makeBtn('⟳', '刷新页面（等价 F5）', () => {
+      ipcRenderer.send('dsh-desktop:reload')
+    })
+
+    bar.appendChild(shotBtn)
+    bar.appendChild(reloadBtn)
+    document.body.appendChild(bar)
   }, 1500)
 })