dsh-desktop-windows 0.1.7 → 0.1.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-desktop-windows",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "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')
@@ -41,6 +41,8 @@ let tray = null // 系统托盘
 let isQuitting = false // 用户从托盘选择退出时置 true，放行窗口关闭
 let setupWindow = null // 首次环境引导窗口
 let sessionsWin = null // 会话管理窗口
+let shotWindow = null // 选区截图窗口
+let pendingShot = null // 全屏截图（nativeImage），选区确认后裁剪
 
 /* ------------------------------------------------------------------ *
  * 工具：日志
@@ -399,6 +401,79 @@ function openSessionsWindow() {
   ipcMain.handle('sessions:remove', (_e, id) => deleteSession(id))
 }
 
+/* ------------------------------------------------------------------ *
+ * 选区截图窗口
+ * ------------------------------------------------------------------ */
+
+function openShotWindow() {
+  if (shotWindow && !shotWindow.isDestroyed()) {
+    shotWindow.focus()
+    return
+  }
+  shotWindow = new BrowserWindow({
+    fullscreen: true,
+    frame: false,
+    resizable: false,
+    alwaysOnTop: true,
+    skipTaskbar: true,
+    webPreferences: {
+      contextIsolation: true,
+      nodeIntegration: false,
+      sandbox: true,
+      preload: path.join(__dirname, 'screenshot-preload.js'),
+    },
+  })
+  shotWindow.setAlwaysOnTop(true, 'screen-saver')
+  shotWindow.loadFile(path.join(__dirname, 'screenshot.html'))
+  shotWindow.once('ready-to-show', () => {
+    shotWindow.show()
+    shotWindow.focus()
+  })
+  shotWindow.webContents.once('did-finish-load', () => {
+    if (pendingShot && !shotWindow.isDestroyed()) {
+      shotWindow.webContents.send('screenshot:data', pendingShot.toDataURL())
+    }
+  })
+  shotWindow.on('closed', () => {
+    shotWindow = null
+  })
+}
+
+/** 选区确认：裁剪 → 剪贴板 → 主窗口粘贴。 */
+function onShotDone(rect) {
+  const image = pendingShot
+  pendingShot = null
+  if (shotWindow && !shotWindow.isDestroyed()) shotWindow.destroy()
+  if (!image || !rect) return
+  const sf = screen.getPrimaryDisplay().scaleFactor || 1
+  const r = {
+    x: Math.round(rect.x * sf),
+    y: Math.round(rect.y * sf),
+    width: Math.round(rect.w * sf),
+    height: Math.round(rect.h * sf),
+  }
+  if (r.width <= 0 || r.height <= 0) return
+  const cropped = image.crop(r)
+  clipboard.writeImage(cropped)
+  if (mainWindow && !mainWindow.isDestroyed()) {
+    mainWindow.show()
+    mainWindow.focus()
+    mainWindow.webContents
+      .executeJavaScript(
+        `(() => { const el = document.querySelector('textarea, [contenteditable="true"]'); if (el) { el.focus(); return true } return false })()`
+      )
+      .then((focused) => {
+        if (focused) mainWindow.webContents.paste()
+      })
+      .catch(() => {})
+  }
+}
+
+function onShotCancel() {
+  pendingShot = null
+  if (shotWindow && !shotWindow.isDestroyed()) shotWindow.destroy()
+}
+
 /* ------------------------------------------------------------------ *
  * 系统托盘
  * ------------------------------------------------------------------ */
@@ -552,6 +627,36 @@ if (!gotLock) {
     ipcMain.on('dsh-desktop:reload', () => {
       if (mainWindow) mainWindow.webContents.reload()
     })
+    // 选区截图：截全屏 → 打开选区窗口 → 用户框选 → 裁剪 → 剪贴板 → 粘贴聊天框
+    ipcMain.handle('dsh-desktop:capture', async () => {
+      try {
+        const display = screen.getPrimaryDisplay()
+        const sf = display.scaleFactor || 1
+        const sources = await desktopCapturer.getSources({
+          types: ['screen'],
+          thumbnailSize: {
+            width: Math.round(display.size.width * sf),
+            height: Math.round(display.size.height * sf),
+          },
+        })
+        if (!sources.length) return { ok: false, error: '未找到屏幕源' }
+        pendingShot = sources[0].thumbnail
+        if (pendingShot.isEmpty()) return { ok: false, error: '截图为空' }
+        openShotWindow()
+        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: ['好'] })
+      }
+    })
+    // 选区截图结果
+    ipcMain.on('screenshot:done', (_e, rect) => onShotDone(rect))
+    ipcMain.on('screenshot:cancel', () => onShotCancel())
     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)
 })

package/src/screenshot-preload.js

@@ -0,0 +1,15 @@
+'use strict'
+
+// 选区截图窗口的 preload：把主进程的 IPC 桥接给页面（contextBridge 隔离）
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('__screenshot', {
+  // 订阅截图数据（主进程发来的 dataURL）
+  onData: (cb) => {
+    ipcRenderer.on('screenshot:data', (_e, dataUrl) => cb(dataUrl))
+  },
+  // 提交选区（页面坐标）
+  done: (rect) => ipcRenderer.send('screenshot:done', rect),
+  // 取消
+  cancel: () => ipcRenderer.send('screenshot:cancel'),
+})

package/src/screenshot.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="UTF-8">
+<title>截图选区</title>
+<style>
+  * { margin: 0; padding: 0; box-sizing: border-box; user-select: none; }
+  html, body { width: 100%; height: 100%; overflow: hidden; background: #000; cursor: crosshair; }
+  #stage { position: fixed; inset: 0; }
+  #stage img { width: 100%; height: 100%; object-fit: fill; display: block; }
+  #mask { position: fixed; inset: 0; pointer-events: none; }
+  #sel { position: fixed; border: 1.5px solid #2563eb; background: rgba(37, 99, 235, 0.12); display: none; pointer-events: none; }
+  #sel .sz { position: absolute; left: 0; top: -22px; background: #2563eb; color: #fff; font: 11px/18px sans-serif; padding: 0 6px; border-radius: 4px; white-space: nowrap; }
+  #toolbar {
+    position: fixed; display: none; align-items: center; gap: 8px;
+    background: rgba(15, 23, 42, 0.92); border: 1px solid #334155;
+    border-radius: 10px; padding: 8px 12px; z-index: 10;
+    box-shadow: 0 4px 20px rgba(0,0,0,.5);
+  }
+  #toolbar .tip { color: #94a3b8; font: 12px/1 sans-serif; margin-right: 4px; }
+  #toolbar button {
+    border: none; border-radius: 6px; padding: 6px 14px; cursor: pointer;
+    font: 600 12px/1 sans-serif;
+  }
+  #okBtn { background: #2563eb; color: #fff; }
+  #okBtn:hover { background: #1d4ed8; }
+  #cancelBtn { background: #334155; color: #e2e8f0; }
+  #cancelBtn:hover { background: #475569; }
+  #hint {
+    position: fixed; left: 50%; top: 20px; transform: translateX(-50%);
+    background: rgba(15, 23, 42, 0.85); color: #e2e8f0;
+    font: 13px/1 sans-serif; padding: 8px 16px; border-radius: 8px;
+    z-index: 5; pointer-events: none;
+  }
+</style>
+</head>
+<body>
+  <div id="stage"><img id="bg" alt=""></div>
+  <div id="mask"></div>
+  <div id="sel"><div class="sz"></div></div>
+  <div id="toolbar">
+    <span class="tip">拖动鼠标框选区域</span>
+    <button id="okBtn">✔ 确定</button>
+    <button id="cancelBtn">✕ 取消 (Esc)</button>
+  </div>
+  <div id="hint">拖动鼠标框选要截取的区域 · Esc 取消</div>
+
+<script>
+  const bg = document.getElementById('bg')
+  const mask = document.getElementById('mask')
+  const sel = document.getElementById('sel')
+  const toolbar = document.getElementById('toolbar')
+  const hint = document.getElementById('hint')
+  const sz = sel.querySelector('.sz')
+
+  let startX = 0, startY = 0, drawing = false
+  let rect = null
+
+  // 接收主进程传来的截图 dataURL
+  window.__screenshot.onData((dataUrl) => {
+    bg.src = dataUrl
+    setTimeout(() => (hint.style.opacity = '0.9'), 100)
+  })
+
+  const updateMask = () => {
+    if (!rect) { mask.style.background = 'rgba(0,0,0,0.45)'; return }
+    const { x, y, w, h } = rect
+    mask.style.background =
+      `linear-gradient(rgba(0,0,0,0.45) ${y}px, transparent ${y}px ${y + h}px, rgba(0,0,0,0.45) ${y + h}px),` +
+      `linear-gradient(90deg, rgba(0,0,0,0.45) ${x}px, transparent ${x}px ${x + w}px, rgba(0,0,0,0.45) ${x + w}px)`
+  }
+
+  document.addEventListener('mousedown', (e) => {
+    if (e.button !== 0) return
+    startX = e.clientX; startY = e.clientY
+    drawing = true
+    rect = null
+    sel.style.display = 'none'
+    toolbar.style.display = 'none'
+  })
+
+  document.addEventListener('mousemove', (e) => {
+    if (!drawing) return
+    const x = Math.min(startX, e.clientX)
+    const y = Math.min(startY, e.clientY)
+    const w = Math.abs(e.clientX - startX)
+    const h = Math.abs(e.clientY - startY)
+    rect = { x, y, w, h }
+    sel.style.display = 'block'
+    sel.style.left = x + 'px'; sel.style.top = y + 'px'
+    sel.style.width = w + 'px'; sel.style.height = h + 'px'
+    sz.textContent = Math.round(w) + ' × ' + Math.round(h)
+    updateMask()
+  })
+
+  document.addEventListener('mouseup', () => {
+    if (!drawing) return
+    drawing = false
+    if (rect && rect.w > 5 && rect.h > 5) {
+      const t = document.getElementById('toolbar')
+      t.style.display = 'flex'
+      t.style.left = Math.min(rect.x + rect.w + 10, window.innerWidth - 220) + 'px'
+      t.style.top = (rect.y + rect.h + 12 > window.innerHeight - 60 ? rect.y - 56 : rect.y + rect.h + 12) + 'px'
+      hint.style.opacity = '0'
+    } else {
+      rect = null; sel.style.display = 'none'
+    }
+  })
+
+  document.getElementById('okBtn').onclick = () => {
+    if (rect) window.__screenshot.done(rect)
+  }
+  document.getElementById('cancelBtn').onclick = () => window.__screenshot.cancel()
+
+  document.addEventListener('keydown', (e) => {
+    if (e.key === 'Escape') window.__screenshot.cancel()
+    if (e.key === 'Enter' && rect) window.__screenshot.done(rect)
+  })
+</script>
+</body>
+</html>