dsh-desktop-windows 0.2.0 → 0.2.2

package/package.json

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

@@ -410,12 +410,20 @@ function openShotWindow() {
     shotWindow.focus()
     return
   }
+  // 用显示器精确尺寸铺满屏幕（不用 fullscreen，Windows 上更可靠）
+  const display = screen.getPrimaryDisplay()
+  const bounds = display.bounds
   shotWindow = new BrowserWindow({
-    fullscreen: true,
+    x: bounds.x,
+    y: bounds.y,
+    width: bounds.width,
+    height: bounds.height,
     frame: false,
     resizable: false,
+    movable: false,
     alwaysOnTop: true,
     skipTaskbar: true,
+    show: false, // 截图加载完成后再显示，避免黑屏闪烁
     webPreferences: {
       contextIsolation: true,
       nodeIntegration: false,
@@ -424,11 +432,8 @@ function openShotWindow() {
     },
   })
   shotWindow.setAlwaysOnTop(true, 'screen-saver')
+  shotWindow.setBounds(bounds) // 再次确保铺满
   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,6 +444,14 @@ function openShotWindow() {
   })
 }
 
+// 截图在选区窗口内加载完成 → 再显示窗口（避免黑屏"小窗口"）
+function onShotLoaded() {
+  if (shotWindow && !shotWindow.isDestroyed()) {
+    shotWindow.show()
+    shotWindow.focus()
+  }
+}
+
 /** 选区确认：裁剪 → 剪贴板 → 恢复主窗口并粘贴。 */
 function onShotDone(rect) {
   const image = pendingShot
@@ -455,18 +468,32 @@ function onShotDone(rect) {
   }
   if (r.width <= 0 || r.height <= 0) return
   const cropped = image.crop(r)
+  // 保存一份临时文件（验证/诊断用）
+  try {
+    fs.writeFileSync(path.join(os.tmpdir(), 'dsh-screenshot.png'), cropped.toPNG())
+  } catch { /* 非致命 */ }
   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)
   }
 }
 
@@ -669,6 +696,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 = () => {