dsh-desktop-windows 0.1.3 → 0.1.4

package/README.en.md

@@ -16,6 +16,7 @@ Pure shell — it **does not modify dsh itself**. The server reuses your globall
 
 - 🪟 **Standalone window**: native desktop window loading the Harness Web UI
 - 🍱 **System tray**: closing the window minimizes to the tray; right-click to show or quit
+- 🧭 **Auto environment setup**: on first launch it detects Node.js / dsh and guides a one-click install — friendly to non-technical users
 - 🧠 **Smart reuse**: reuses an already-running dsh service instead of starting a duplicate
 - 🧹 **Clean shutdown**: only kills the dsh process tree it started — never an external service
 - 🔒 **Single instance**: prevents double-launch conflicts

package/README.md

@@ -18,6 +18,7 @@ DeepSeek Harness 的 **Electron 桌面壳**：双击图标，一个独立窗口
 
 - 🪟 **独立窗口**：原生桌面窗口加载 Harness Web UI，可最小化到任务栏
 - 🍱 **系统托盘**：关窗口最小化到托盘常驻，右键菜单可随时显示/退出
+- 🧭 **环境自动引导**：首次启动自动检测 Node.js / dsh，缺失时引导一键安装，小白也能搞定
 - 🧠 **智能复用**：检测到已有的 dsh 服务就直接复用，不重复启动
 - 🧹 **干净退出**：关窗口只杀自己启动的 dsh 进程，绝不误杀外部服务
 - 🔒 **单实例锁**：防止双开冲突

package/package.json

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

@@ -39,6 +39,7 @@ let mainWindow = null
 let ownedDsh = null // 本壳启动的 dsh 子进程；null 表示复用了外部已有服务
 let tray = null // 系统托盘
 let isQuitting = false // 用户从托盘选择退出时置 true，放行窗口关闭
+let setupWindow = null // 首次环境引导窗口
 
 /* ------------------------------------------------------------------ *
  * 工具：日志
@@ -138,6 +139,106 @@ async function shutdownOwnedDsh() {
   }
 }
 
+/* ------------------------------------------------------------------ *
+ * 环境检测与首次引导
+ * ------------------------------------------------------------------ */
+
+/** 执行一条命令并收集输出（Windows 下经 shell 运行，参数均为常量）。 */
+function runCmd(cmd, args) {
+  return new Promise((resolve) => {
+    const full = args.length ? `"${cmd}" ${args.join(' ')}` : `"${cmd}"`
+    const child = spawn(full, { shell: true, windowsHide: true })
+    let out = ''
+    child.stdout.on('data', (d) => (out += d.toString()))
+    child.stderr.on('data', (d) => (out += d.toString()))
+    child.on('error', () => resolve(null))
+    child.on('close', (code) => resolve({ code, out: out.trim() }))
+  })
+}
+
+/** 检测 Node.js 与 dsh 是否可用。 */
+async function checkEnvironment() {
+  const node = await runCmd('node', ['--version'])
+  const dshBin = resolveDshBin()
+  const dsh = await runCmd(dshBin, ['--version'])
+  return {
+    node:
+      node && node.code === 0
+        ? { ok: true, version: node.out.replace(/^v/i, '') }
+        : { ok: false, error: '未检测到 Node.js，请先安装（≥ 22）' },
+    dsh:
+      dsh && dsh.code === 0
+        ? { ok: true, version: (dsh.out.split('\n')[0] || 'dsh').trim() }
+        : { ok: false, error: `未检测到 dsh（${dshBin}），点击右侧按钮自动安装` },
+  }
+}
+
+/** 自动安装 dsh（npm 全局安装），输出流式回传引导窗口。 */
+function installDsh() {
+  return new Promise((resolve) => {
+    const child = spawn('npm.cmd', ['i', '-g', '@deepseek-ai/dsh'], { shell: true, windowsHide: true })
+    const send = (line) => {
+      if (setupWindow && !setupWindow.isDestroyed()) {
+        setupWindow.webContents.send('setup:install-log', line)
+      }
+    }
+    child.stdout.on('data', (d) => send(d.toString().trim()))
+    child.stderr.on('data', (d) => send(d.toString().trim()))
+    child.on('error', (e) => resolve({ ok: false, error: e.message }))
+    child.on('close', (code) =>
+      resolve(code === 0 ? { ok: true } : { ok: false, error: `npm 退出码 ${code}` })
+    )
+  })
+}
+
+/** 打开首次环境引导窗口；resolve('ready')=环境就绪，resolve('closed')=用户关闭。 */
+function startSetupFlow() {
+  return new Promise((resolve) => {
+    setupWindow = new BrowserWindow({
+      width: 580,
+      height: 660,
+      resizable: false,
+      maximizable: false,
+      minimizable: false,
+      title: 'DeepSeek Harness 环境设置',
+      autoHideMenuBar: true,
+      icon: path.join(__dirname, '..', 'assets', 'icon.ico'),
+      webPreferences: {
+        contextIsolation: true,
+        nodeIntegration: false,
+        sandbox: true,
+        preload: path.join(__dirname, 'setup-preload.js'),
+      },
+    })
+    setupWindow.setMenuBarVisibility(false)
+    setupWindow.loadFile(path.join(__dirname, 'setup.html'))
+    setupWindow.on('closed', () => {
+      setupWindow = null
+      resolve('closed')
+    })
+
+    ipcMain.removeHandler('setup:check')
+    ipcMain.removeHandler('setup:install-dsh')
+    ipcMain.removeHandler('setup:open-node')
+    ipcMain.removeHandler('setup:open-settings')
+    ipcMain.removeHandler('setup:finish')
+
+    ipcMain.handle('setup:check', () => checkEnvironment())
+    ipcMain.handle('setup:install-dsh', () => installDsh())
+    ipcMain.handle('setup:open-node', () => shell.openExternal('https://nodejs.org'))
+    ipcMain.handle('setup:open-settings', () => shell.openExternal('https://platform.deepseek.com'))
+    ipcMain.handle('setup:finish', async () => {
+      const env = await checkEnvironment()
+      if (env.node.ok && env.dsh.ok) {
+        if (setupWindow && !setupWindow.isDestroyed()) setupWindow.destroy()
+        resolve('ready')
+        return { ok: true }
+      }
+      return { ok: false, env }
+    })
+  })
+}
+
 /* ------------------------------------------------------------------ *
  * 窗口
  * ------------------------------------------------------------------ */
@@ -294,6 +395,22 @@ if (!gotLock) {
   })
 
   app.whenReady().then(async () => {
+    // 0) 环境检查：Node / dsh 缺失时先走引导窗口
+    let env = await checkEnvironment()
+    if (!env.node.ok || !env.dsh.ok) {
+      const result = await startSetupFlow()
+      if (result !== 'ready') {
+        // 用户关闭引导窗口 → 退出
+        app.quit()
+        return
+      }
+      env = await checkEnvironment()
+      if (!env.node.ok || !env.dsh.ok) {
+        app.quit()
+        return
+      }
+    }
+
     // 1) 已有服务（可能是用户手动起的 dsh web）→ 直接复用
     let port = resolvePort()
     let external = await probe(port)

package/src/setup-preload.js

@@ -0,0 +1,22 @@
+'use strict'
+
+// 引导窗口（setup.html）的 preload：通过 contextBridge 暴露安全 API
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('setupAPI', {
+  // 返回环境检测结果 { node: {ok,version,error}, dsh: {ok,version,error} }
+  check: () => ipcRenderer.invoke('setup:check'),
+  // 自动安装 dsh，返回 { ok, error? }
+  installDsh: () => ipcRenderer.invoke('setup:install-dsh'),
+  // 安装过程的输出行（事件流）
+  onInstallLog: (cb) => {
+    const listener = (_event, line) => cb(line)
+    ipcRenderer.on('setup:install-log', listener)
+  },
+  // 打开 Node.js 下载页
+  openNode: () => ipcRenderer.invoke('setup:open-node'),
+  // 打开 DeepSeek 开放平台（API Key 指引）
+  openSettings: () => ipcRenderer.invoke('setup:open-settings'),
+  // 环境就绪，关闭引导窗口继续
+  finish: () => ipcRenderer.invoke('setup:finish'),
+})

package/src/setup.html

@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="UTF-8">
+<title>DeepSeek Harness 环境设置</title>
+<style>
+  * { margin: 0; padding: 0; box-sizing: border-box; }
+  body {
+    font-family: "Segoe UI", "Microsoft YaHei", system-ui, sans-serif;
+    background: #0f172a;
+    color: #e2e8f0;
+    min-height: 100vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 24px;
+  }
+  .card {
+    background: #1e293b;
+    border-radius: 16px;
+    padding: 32px;
+    width: 520px;
+    box-shadow: 0 8px 30px rgba(0,0,0,.4);
+  }
+  .logo { display: flex; align-items: center; gap: 12px; margin-bottom: 8px; }
+  .logo img { width: 40px; height: 40px; }
+  .logo h1 { font-size: 20px; font-weight: 600; }
+  .subtitle { color: #94a3b8; font-size: 13px; margin-bottom: 24px; line-height: 1.6; }
+  .item {
+    background: #0f172a;
+    border: 1px solid #334155;
+    border-radius: 10px;
+    padding: 14px 16px;
+    margin-bottom: 12px;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+  }
+  .item .icon { font-size: 20px; width: 28px; text-align: center; }
+  .item .info { flex: 1; }
+  .item .name { font-weight: 600; font-size: 14px; }
+  .item .desc { font-size: 12px; color: #94a3b8; margin-top: 2px; }
+  .ok { color: #4ade80; }
+  .missing { color: #f87171; }
+  .btn {
+    border: none; border-radius: 8px; padding: 8px 14px;
+    font-size: 13px; cursor: pointer; font-weight: 600;
+    background: #2563eb; color: #fff; transition: background .2s;
+    white-space: nowrap;
+  }
+  .btn:hover { background: #1d4ed8; }
+  .btn.secondary { background: #334155; }
+  .btn.secondary:hover { background: #475569; }
+  .btn:disabled { opacity: .5; cursor: not-allowed; }
+  .log {
+    background: #020617; border-radius: 8px; padding: 10px 12px;
+    font-family: Consolas, monospace; font-size: 11px; color: #7dd3fc;
+    max-height: 120px; overflow-y: auto; margin-bottom: 12px; display: none;
+    white-space: pre-wrap; word-break: break-all;
+  }
+  .footer { margin-top: 8px; display: flex; justify-content: flex-end; gap: 10px; }
+  .hint { font-size: 12px; color: #64748b; margin-top: 14px; line-height: 1.6; }
+  .ready-banner { display: none; background: #052e16; border: 1px solid #16a34a; color: #86efac; border-radius: 8px; padding: 10px 14px; font-size: 13px; margin-bottom: 12px; }
+</style>
+</head>
+<body>
+  <div class="card">
+    <div class="logo">
+      <img src="../assets/whale-256.png" alt="DeepSeek Harness">
+      <h1>DeepSeek Harness 环境设置</h1>
+    </div>
+    <div class="subtitle">首次使用前，请确保以下环境已就绪。缺失的项目可以点击按钮一键修复。</div>
+
+    <div class="ready-banner" id="readyBanner">✅ 环境已就绪，点击下方按钮开始使用！</div>
+
+    <div id="nodeItem" class="item">
+      <div class="icon" id="nodeIcon">⏳</div>
+      <div class="info">
+        <div class="name">Node.js（≥ 22）</div>
+        <div class="desc" id="nodeDesc">检测中…</div>
+      </div>
+      <button class="btn secondary" id="nodeBtn" style="display:none">下载 Node.js</button>
+    </div>
+
+    <div id="dshItem" class="item">
+      <div class="icon" id="dshIcon">⏳</div>
+      <div class="info">
+        <div class="name">dsh（DeepSeek Harness 命令行）</div>
+        <div class="desc" id="dshDesc">检测中…</div>
+      </div>
+      <button class="btn" id="dshBtn" style="display:none">自动安装</button>
+    </div>
+
+    <div class="item">
+      <div class="icon">🔑</div>
+      <div class="info">
+        <div class="name">DeepSeek API Key</div>
+        <div class="desc">启动后到「设置 → 模型」填入你的 API Key（platform.deepseek.com 获取）</div>
+      </div>
+      <button class="btn secondary" id="keyBtn">查看指引</button>
+    </div>
+
+    <div class="log" id="log"></div>
+
+    <div class="footer">
+      <button class="btn" id="startBtn" disabled>开始使用</button>
+    </div>
+    <div class="hint">小提示：也可以打开系统终端手动安装 —— <code>npm i -g @deepseek-ai/dsh</code></div>
+  </div>
+
+<script>
+  const $ = (id) => document.getElementById(id)
+
+  function setItem(name, ok, desc) {
+    const icon = $(name + 'Icon')
+    const item = $(name + 'Item')
+    if (ok) {
+      icon.textContent = '✅'; icon.className = 'icon ok'
+      item.style.borderColor = '#166534'
+    } else {
+      icon.textContent = '❌'; icon.className = 'icon missing'
+      item.style.borderColor = '#7f1d1d'
+    }
+    $(name + 'Desc').textContent = desc
+  }
+
+  function updateReady() {
+    const nodeOk = window.__env && window.__env.node && window.__env.node.ok
+    const dshOk = window.__env && window.__env.dsh && window.__env.dsh.ok
+    const ready = !!(nodeOk && dshOk)
+    $('startBtn').disabled = !ready
+    $('readyBanner').style.display = ready ? 'block' : 'none'
+    return ready
+  }
+
+  async function runCheck() {
+    const env = await window.setupAPI.check()
+    window.__env = env
+    if (env.node && env.node.ok) {
+      setItem('node', true, '已安装：Node.js ' + env.node.version)
+      $('nodeBtn').style.display = 'none'
+    } else {
+      setItem('node', false, env.node ? env.node.error : '未检测到 Node.js')
+      $('nodeBtn').style.display = 'inline-block'
+    }
+    if (env.dsh && env.dsh.ok) {
+      setItem('dsh', true, '已安装：' + env.dsh.version)
+      $('dshBtn').style.display = 'none'
+    } else {
+      setItem('dsh', false, env.dsh ? env.dsh.error : '未检测到 dsh')
+      $('dshBtn').style.display = 'inline-block'
+    }
+    updateReady()
+  }
+
+  $('nodeBtn').onclick = () => window.setupAPI.openNode()
+  $('keyBtn').onclick = () => window.setupAPI.openSettings()
+  $('startBtn').onclick = () => window.setupAPI.finish()
+
+  $('dshBtn').onclick = async () => {
+    const btn = $('dshBtn')
+    btn.disabled = true
+    btn.textContent = '安装中…'
+    const log = $('log')
+    log.style.display = 'block'
+    log.textContent = ''
+    window.setupAPI.onInstallLog((line) => {
+      log.textContent += line + '\n'
+      log.scrollTop = log.scrollHeight
+    })
+    const result = await window.setupAPI.installDsh()
+    if (result && result.ok) {
+      log.textContent += '\n✅ dsh 安装成功！'
+      await runCheck()
+    } else {
+      log.textContent += '\n❌ 安装失败：' + (result ? result.error : '未知错误') + '\n可尝试手动运行：npm i -g @deepseek-ai/dsh'
+      btn.disabled = false
+      btn.textContent = '重试安装'
+    }
+  }
+
+  runCheck()
+</script>
+</body>
+</html>