dsh-desktop-windows 0.2.8 → 0.3.0

package/README.en.md

@@ -7,6 +7,7 @@
 [![dsh](https://img.shields.io/badge/dsh-0.1.0--rc.6-purple)](https://github.com/deepseek-ai/deepseek-harness)
 [![Platform](https://img.shields.io/badge/Platform-Windows-0078D6)]()
 [![Build](https://github.com/ReachGa0/dsh-desktop/actions/workflows/build.yml/badge.svg)](https://github.com/ReachGa0/dsh-desktop/actions)
+[![awesome-dsh-plugin](https://img.shields.io/badge/awesome--dsh--plugin-listed-8A2BE2)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)
 
 An **Electron desktop shell** for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness): double-click an icon and get a standalone window running `dsh web` — no terminal, no manual commands, no browser tab juggling. **Region screenshot to ask the AI**, system tray, session manager, auto environment setup.
 
@@ -36,12 +37,15 @@ Pure shell — it **does not modify dsh itself**. The server reuses your globall
 
 ## 📸 Region screenshot
 
+![Region screenshot to ask AI (demo)](docs/demo/screenshot-ask.gif)
+
 1. Click the **📸** button (bottom-right) — the chat window auto-hides
 2. **Drag to select** an area on the full-screen overlay (live preview; drag the 8 handles to fine-tune after drawing)
 3. Click **✔ OK** (or double-click / Enter) — the chat window restores
 4. The screenshot lands in the chat box automatically → type a question → the AI answers from the image
 
 > Pair with a vision bridge like [ModLens](https://www.npmjs.com/package/@liustack/modlens) so text-only DeepSeek models can read images too.
+> Screenshots are also saved to `~/.dsh/screenshots/` (open the folder from the tray menu).
 
 ## Prerequisites
 

package/README.md

@@ -7,6 +7,7 @@
 [![dsh](https://img.shields.io/badge/dsh-0.1.0--rc.6-purple)](https://github.com/deepseek-ai/deepseek-harness)
 [![Platform](https://img.shields.io/badge/Platform-Windows-0078D6)]()
 [![Build](https://github.com/ReachGa0/dsh-desktop/actions/workflows/build.yml/badge.svg)](https://github.com/ReachGa0/dsh-desktop/actions)
+[![awesome-dsh-plugin](https://img.shields.io/badge/awesome--dsh--plugin-listed-8A2BE2)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)
 
 > **English summary** · An [Electron](https://www.electronjs.org/) desktop shell for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (dsh web) on **Windows** — double-click to run the harness in a standalone window. **Region screenshot to ask AI**, system tray, session manager, auto environment setup. Full English docs: [README.en.md](README.en.md)
 
@@ -38,12 +39,15 @@ DeepSeek Harness 的 **Electron 桌面壳**：双击图标，一个独立窗口
 
 ## 📸 选区截图提问
 
+![选区截图直接问 AI 演示](docs/demo/screenshot-ask.gif)
+
 1. 点右下角 **📸**（聊天窗口自动隐藏）
 2. 全屏遮罩上**拖动框选**区域（实时显示，画完可拖 8 个手柄微调）
 3. 点 **✔ 确定**（或双击 / 回车）→ 聊天窗口恢复
 4. 截图自动进入聊天框 → 输入问题 → AI 看图回答
 
 > 配合 [ModLens](https://www.npmjs.com/package/@liustack/modlens) 等识图插件，DeepSeek 文本模型也能看懂图片。
+> 截图同时自动保存到 `~/.dsh/screenshots/`（托盘右键可打开目录）。
 
 ## 前提
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-desktop-windows",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "description": "DeepSeek Harness 桌面版（Windows）· Electron desktop shell for DeepSeek Harness — 双击即用 / double-click to run · 支持选区截图提问、系统托盘、会话管理 / region screenshot, system tray, session manager",
   "main": "src/main.js",
   "license": "MIT",
@@ -64,3 +64,4 @@
     }
   }
 }
+

package/src/main.js

@@ -16,6 +16,7 @@
 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 https = require('node:https')
 const fs = require('node:fs')
 const path = require('node:path')
 const os = require('node:os')
@@ -62,6 +63,103 @@ function shotLog(...args) {
   } catch { /* 忽略日志错误 */ }
 }
 
+/* ------------------------------------------------------------------ *
+ * 自动更新检查（启动时异步检测 GitHub Releases 最新版）
+ * ------------------------------------------------------------------ */
+
+const REPO = 'ReachGa0/dsh-desktop'
+const RELEASES_URL = `https://api.github.com/repos/${REPO}/releases/latest`
+const RELEASES_PAGE = `https://github.com/${REPO}/releases/latest`
+const UPDATE_CHECK_TIMEOUT_MS = 10_000
+
+/** GET 一个 JSON（带超时与 UA，GitHub API 要求 UA）。resolve null 表示失败。 */
+function fetchJson(url) {
+  return new Promise((resolve) => {
+    // 首次用系统证书；代理/反代环境证书校验可能失败，降级为不校验重试一次
+    // （仅更新检查用，不降低应用其他部分的安全级别）
+    const attempt = (rejectUnauthorized) => {
+      const req = https.get(
+        url,
+        { headers: { 'User-Agent': 'dsh-desktop-update-check', Accept: 'application/vnd.github+json' }, timeout: UPDATE_CHECK_TIMEOUT_MS, rejectUnauthorized },
+        (res) => {
+          if (res.statusCode !== 200) {
+            res.resume()
+            resolve(null)
+            return
+          }
+          let body = ''
+          res.setEncoding('utf8')
+          res.on('data', (d) => (body += d))
+          res.on('end', () => {
+            try { resolve(JSON.parse(body)) } catch { resolve(null) }
+          })
+        }
+      )
+      req.on('timeout', () => req.destroy())
+      req.on('error', () => {
+        // 证书类错误：再试一次宽松模式；其他错误直接放弃
+        if (rejectUnauthorized) attempt(false)
+        else resolve(null)
+      })
+    }
+    attempt(true)
+  })
+}
+
+/** 解析语义化版本号 → [major, minor, patch]，失败返回 null。 */
+function parseVersion(v) {
+  if (typeof v !== 'string') return null
+  const m = /^v?(\d+)\.(\d+)\.(\d+)/.exec(v.trim())
+  if (!m) return null
+  return [Number(m[1]), Number(m[2]), Number(m[3])]
+}
+
+/** a 比 b 新？都解析失败时返回 false（宁可漏报不可误报）。 */
+function isNewer(a, b) {
+  const pa = parseVersion(a)
+  const pb = parseVersion(b)
+  if (!pa || !pb) return false
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] !== pb[i]) return pa[i] > pb[i]
+  }
+  return false
+}
+
+/**
+ * 检查更新：查询 GitHub Releases 最新版，若比当前版本新则弹窗提示。
+ * 全程静默失败（网络不通 / 解析失败 / 无新版都不打扰用户）。
+ */
+async function checkForUpdates() {
+  const current = app.getVersion()
+  try {
+    const release = await fetchJson(RELEASES_URL)
+    if (!release) {
+      log('update check: no release data (offline or API error)')
+      return
+    }
+    const latest = release.tag_name
+    log(`update check: current=${current} latest=${latest}`)
+    if (!isNewer(latest, current)) return
+    const name = release.name && release.name !== latest ? `「${release.name}」` : ''
+    const detail = (release.body || '').split('\n').slice(0, 6).join('\n').trim()
+    const { response } = await dialog.showMessageBox(mainWindow || undefined, {
+      type: 'info',
+      title: '发现新版本',
+      message: `DeepSeek Harness Desktop 有新版本可用（${latest} ${name}）`,
+      detail: detail ? `更新内容：\n${detail}\n\n当前版本：${current}` : `当前版本：${current}`,
+      buttons: ['前往下载', '以后再说'],
+      defaultId: 0,
+      cancelId: 1,
+      noLink: true,
+    })
+    if (response === 0) {
+      shell.openExternal(RELEASES_PAGE)
+    }
+  } catch (e) {
+    log('update check failed:', e && e.message)
+  }
+}
+
 /* ------------------------------------------------------------------ *
  * 工具：探测 / 等待 HTTP 服务
  * ------------------------------------------------------------------ */
@@ -105,6 +203,11 @@ function resolveDshBin() {
   return 'dsh.cmd'
 }
 
+// 主动关停 dsh 时的标记（杀进程也会触发 exit，需区分「主动关」和「意外崩」）
+let isShuttingDownDsh = false
+// 已自动重启过一次的标志（同一次会话最多自愈一次，避免崩溃循环）
+let didAutoRestartDsh = false
+
 /** 启动 dsh web，日志追加到 userData/dsh.log。返回子进程。 */
 function startDsh(port) {
   const bin = resolveDshBin()
@@ -122,7 +225,12 @@ function startDsh(port) {
   log(`dsh log: ${logFile}`)
   child.on('exit', (code, signal) => {
     log(`dsh exited: code=${code} signal=${signal}`)
-    if (ownedDsh === child) ownedDsh = null
+    if (ownedDsh !== child) return
+    ownedDsh = null
+    // 崩溃自愈：本壳启动的 dsh 意外退出（非主动关闭/非退出中）时自动重启一次
+    if (!isQuitting && !isShuttingDownDsh) {
+      restartOwnedDsh(port, code)
+    }
   })
   child.on('error', (err) => {
     log(`dsh spawn error: ${err.message}`)
@@ -130,6 +238,52 @@ function startDsh(port) {
   return child
 }
 
+/** dsh 意外退出后自动重启一次；二次退出则提示用户并放弃。 */
+function restartOwnedDsh(port, exitCode) {
+  if (didAutoRestartDsh) {
+    log('dsh crashed again after auto-restart; giving up')
+    const logFile = path.join(app.getPath('userData'), 'dsh.log')
+    dialog.showMessageBox(mainWindow || undefined, {
+      type: 'error',
+      title: 'dsh 服务异常',
+      message: 'dsh 服务启动后再次退出，已停止自动重启。',
+      detail: `退出码：${exitCode ?? '未知'}\n\n日志文件：${logFile}\n\n请查看日志定位问题，或手动在终端运行 dsh web 排查。`,
+      buttons: ['打开日志目录', '知道了'],
+      noLink: true,
+    }).then(({ response }) => {
+      if (response === 0) shell.showItemInFolder(logFile)
+    })
+    return
+  }
+  log(`dsh exited unexpectedly (code=${exitCode}); restarting in 3s…`)
+  didAutoRestartDsh = true
+  setTimeout(() => {
+    if (isQuitting) return
+    // 重启前再确认端口没有被外部服务接管（避免重复启动）
+    probe(port).then((up) => {
+      if (up) {
+        log('port already serving after crash; not restarting')
+        return
+      }
+      const child = startDsh(port)
+      ownedDsh = child
+      // 等它就绪；若起不来则等 exit 回调里的二次提示
+      waitForServer(port, START_TIMEOUT_MS).then((ready) => {
+        if (ready) {
+          log('dsh auto-restarted successfully')
+          dialog.showMessageBox(mainWindow || undefined, {
+            type: 'info',
+            title: 'dsh 已自动重启',
+            message: 'dsh 服务意外退出，已自动恢复。',
+            buttons: ['好'],
+            noLink: true,
+          }).catch(() => {})
+        }
+      })
+    })
+  }, 3000)
+}
+
 /** 杀掉进程树（Windows 用 taskkill /T 覆盖子孙进程），带超时兜底。 */
 function killProcessTree(pid) {
   return new Promise((resolve) => {
@@ -147,6 +301,7 @@ async function shutdownOwnedDsh() {
   if (ownedDsh && ownedDsh.pid) {
     const pid = ownedDsh.pid
     ownedDsh = null
+    isShuttingDownDsh = true
     await killProcessTree(pid)
     log(`killed owned dsh pid ${pid}`)
   }
@@ -487,12 +642,15 @@ function onShotDone(rect) {
   }
   const cropped = image.crop(r)
   shotLog('shot: cropped', cropped.getSize().width + 'x' + cropped.getSize().height)
-  // 保存一份临时文件（验证/诊断用）
+  // 保存到 ~/.dsh/screenshots/（持久保存，方便回顾；同时写剪贴板）
   try {
-    fs.writeFileSync(path.join(os.tmpdir(), 'dsh-screenshot.png'), cropped.toPNG())
-    shotLog('shot: saved temp png')
+    const dir = path.join(os.homedir(), '.dsh', 'screenshots')
+    fs.mkdirSync(dir, { recursive: true })
+    const file = path.join(dir, `shot-${new Date().toISOString().replace(/[:.]/g, '-')}.png`)
+    fs.writeFileSync(file, cropped.toPNG())
+    shotLog('shot: saved', file)
   } catch (e) {
-    shotLog('shot: temp save failed', String(e && e.message || e))
+    shotLog('shot: save failed', String(e && e.message || e))
   }
   clipboard.writeImage(cropped)
   shotLog('shot: written to clipboard')
@@ -539,6 +697,15 @@ function createTray() {
     Menu.buildFromTemplate([
       { label: '显示主窗口', click: showMainWindow },
       { type: 'separator' },
+      {
+        label: '打开截图目录',
+        click: () => {
+          const dir = path.join(os.homedir(), '.dsh', 'screenshots')
+          fs.mkdirSync(dir, { recursive: true })
+          shell.openPath(dir)
+        },
+      },
+      { type: 'separator' },
       {
         label: '退出',
         click: () => {
@@ -675,6 +842,8 @@ if (!gotLock) {
     createWindow(`http://127.0.0.1:${port}`)
     createTray()
     createApplicationMenu()
+    // 自动更新检查：不阻塞启动，静默失败
+    checkForUpdates()
     // preload 注入的悬浮刷新按钮 → 重新加载页面
     ipcMain.on('dsh-desktop:reload', () => {
       if (mainWindow) mainWindow.webContents.reload()