dsh-desktop-windows 0.1.9 → 0.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-desktop-windows",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "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

@@ -411,11 +411,13 @@ function openShotWindow() {
     return
   }
   shotWindow = new BrowserWindow({
-    fullscreen: true,
     frame: false,
     resizable: false,
+    movable: false,
+    fullscreen: true,
     alwaysOnTop: true,
     skipTaskbar: true,
+    show: false, // 截图加载完成后再显示，避免黑屏闪烁
     webPreferences: {
       contextIsolation: true,
       nodeIntegration: false,
@@ -425,10 +427,6 @@ function openShotWindow() {
   })
   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())
@@ -439,11 +437,20 @@ function openShotWindow() {
   })
 }
 
-/** 选区确认：裁剪 → 剪贴板 → 主窗口粘贴。 */
+// 截图在选区窗口内加载完成 → 再显示窗口（避免黑屏"小窗口"）
+function onShotLoaded() {
+  if (shotWindow && !shotWindow.isDestroyed()) {
+    shotWindow.show()
+    shotWindow.focus()
+  }
+}
+
+/** 选区确认：裁剪 → 剪贴板 → 恢复主窗口并粘贴。 */
 function onShotDone(rect) {
   const image = pendingShot
   pendingShot = null
   if (shotWindow && !shotWindow.isDestroyed()) shotWindow.destroy()
+  showMainWindow() // 恢复显示聊天窗口
   if (!image || !rect) return
   const sf = screen.getPrimaryDisplay().scaleFactor || 1
   const r = {
@@ -455,23 +462,34 @@ function onShotDone(rect) {
   if (r.width <= 0 || r.height <= 0) return
   const cropped = image.crop(r)
   clipboard.writeImage(cropped)
+  // 等主窗口就绪后再聚焦输入框并粘贴（失败则提示手动 Ctrl+V）
   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(() => {})
+    setTimeout(async () => {
+      let focused = false
+      try {
+        focused = await mainWindow.webContents.executeJavaScript(
+          `(() => { const el = document.querySelector('textarea, [contenteditable="true"]'); if (el) { el.focus(); return true } return false })()`
+        )
+      } catch {
+        focused = false
+      }
+      if (focused) {
+        mainWindow.webContents.paste()
+      } else {
+        dialog.showMessageBox(mainWindow, {
+          type: 'info',
+          message: '截图已复制到剪贴板，请在聊天输入框按 Ctrl+V 粘贴',
+          buttons: ['好'],
+        })
+      }
+    }, 400)
   }
 }
 
 function onShotCancel() {
   pendingShot = null
   if (shotWindow && !shotWindow.isDestroyed()) shotWindow.destroy()
+  showMainWindow() // 恢复显示聊天窗口
 }
 
 /* ------------------------------------------------------------------ *
@@ -627,9 +645,12 @@ if (!gotLock) {
     ipcMain.on('dsh-desktop:reload', () => {
       if (mainWindow) mainWindow.webContents.reload()
     })
-    // 选区截图：截全屏 → 打开选区窗口 → 用户框选 → 裁剪 → 剪贴板 → 粘贴聊天框
+    // 选区截图：隐藏主窗口 → 截全屏 → 选区窗口 → 裁剪 → 剪贴板 → 粘贴
     ipcMain.handle('dsh-desktop:capture', async () => {
       try {
+        // 先隐藏主窗口，避免截到聊天框本身
+        if (mainWindow && !mainWindow.isDestroyed()) mainWindow.hide()
+        await new Promise((r) => setTimeout(r, 250))
         const display = screen.getPrimaryDisplay()
         const sf = display.scaleFactor || 1
         const sources = await desktopCapturer.getSources({
@@ -639,12 +660,19 @@ if (!gotLock) {
             height: Math.round(display.size.height * sf),
           },
         })
-        if (!sources.length) return { ok: false, error: '未找到屏幕源' }
+        if (!sources.length) {
+          showMainWindow()
+          return { ok: false, error: '未找到屏幕源' }
+        }
         pendingShot = sources[0].thumbnail
-        if (pendingShot.isEmpty()) return { ok: false, error: '截图为空' }
+        if (pendingShot.isEmpty()) {
+          showMainWindow()
+          return { ok: false, error: '截图为空' }
+        }
         openShotWindow()
         return { ok: true }
       } catch (e) {
+        showMainWindow()
         return { ok: false, error: String((e && e.message) || e) }
       }
     })
@@ -657,6 +685,7 @@ if (!gotLock) {
     // 选区截图结果
     ipcMain.on('screenshot:done', (_e, rect) => onShotDone(rect))
     ipcMain.on('screenshot:cancel', () => onShotCancel())
+    ipcMain.on('screenshot:loaded', () => onShotLoaded())
     if (external) log('reusing external dsh service on port ' + port)
   })
 

package/src/screenshot-preload.js

@@ -12,4 +12,6 @@ contextBridge.exposeInMainWorld('__screenshot', {
   done: (rect) => ipcRenderer.send('screenshot:done', rect),
   // 取消
   cancel: () => ipcRenderer.send('screenshot:cancel'),
+  // 截图已加载完成（可显示窗口了）
+  loaded: () => ipcRenderer.send('screenshot:loaded'),
 })

package/src/screenshot.html

@@ -58,8 +58,11 @@
 
   // 接收主进程传来的截图 dataURL
   window.__screenshot.onData((dataUrl) => {
+    bg.onload = () => {
+      window.__screenshot.loaded()
+      setTimeout(() => (hint.style.opacity = '0.9'), 100)
+    }
     bg.src = dataUrl
-    setTimeout(() => (hint.style.opacity = '0.9'), 100)
   })
 
   const updateMask = () => {