dsh-clean-desktop-shell 0.1.7 → 0.1.9

package/README.en.md

@@ -87,11 +87,43 @@ following in person:
     set up signed + notarized builds.
 - Post-extract executable bits and quarantine extended attributes can only be
   confirmed on real hardware.
+- **If the window still does not appear**: a failed launch writes diagnostics
+  to `desktop-shell-launch.log` inside your DSH home:
+
+  ```sh
+  cat "${DSH_HOME:-$HOME/.dsh}/desktop-shell-launch.log"
+  ```
+
+  Paste the contents into an issue — it records platform, arch, Node version,
+  DSH home, runtime directory and the exact error. With no window on screen,
+  this is the only thing that can tell us what went wrong.
 
 If you have a Mac and want to co-maintain macOS support (test the .dmg, set up
 signing, or add a launch-at-login tray item), PRs and verified issues are very
 welcome. You will be added to [CONTRIBUTORS.md](./CONTRIBUTORS.md).
 
+## Security & permissions: what it actually does
+
+Third-party scanners (e.g. [dsh-xray](https://github.com/unStone/dsh-xray)) rate
+this project as "high capability combined with sensitive behavior". **That rating
+is not a false positive** — every item is real, and every item has a concrete,
+necessary reason. You should know what runs on your machine.
+
+| Behavior | Why it is required | Where |
+|:--|:--|:--|
+| Spawning system commands | The shell's core job is **starting / restarting / stopping the `dsh web` backend** and probing port 3080. There is no way to do that without system commands. | `electron/service.js` |
+| Downloading the ~100MB Electron runtime | Needed on first launch. Two sources race with a 3s timeout: `github.com` and `npmmirror.com` — the latter is a CN mirror that is usually much faster on Chinese networks. | `src/host/runtime.js` |
+| Calling `api.github.com` | Only for the tray's "Check for updates" action, to read the latest release metadata. | `electron/update.js` |
+| Reading env vars | Path resolution and feature switches only: `DSH_HOME` (DSH home), `DSH_SHELL_ELECTRON_DIR` (reuse a local Electron, skip the download), `DSH_SHELL_AUTO_LAUNCH=0` (disable auto-launch), `USERPROFILE` / `APPDATA` (locate `dsh.cmd` and the shortcuts folder on Windows). | `src/host/common.js`, `src/host/index.js`, `electron/shortcut.js` |
+| Patching the DSH runtime (`cordis.patch.yml`) | **DSH's official plugin registration mechanism** — every DSH plugin mounts this way, it is not specific to this project. | `cordis.patch.yml` |
+
+**The line it does not cross**: no telemetry, no uploads, no reading of your
+conversation data. The network requests above are the only two kinds that exist,
+and both can be avoided entirely by setting `DSH_SHELL_ELECTRON_DIR`.
+
+The unsigned-installer warnings (Windows SmartScreen, macOS Gatekeeper) come from
+the **absence of a code-signing certificate**, not from any of the above.
+
 ## Install
 
 **Option 1: download the installer from Releases (for a standalone desktop app)**
@@ -199,6 +231,21 @@ npm run pack    # package NSIS (Win) / DMG (mac)
 
 ## Changelog
 
+### 0.1.7
+- **Fixed a silent failure that made the window never open on macOS**: the
+  Electron macOS archive is an `Electron.app` bundle with the binary at
+  `Electron.app/Contents/MacOS/Electron`; the launcher was looking for a
+  top-level `electron` (the Linux layout) and gave up without any feedback.
+- Extraction now tries multiple strategies (ditto / unzip / tar) and verifies
+  the payload; the executable bit is restored and the macOS quarantine
+  attribute is cleared afterwards.
+- Launch failures no longer vanish into the log: diagnostics are written to
+  `desktop-shell-launch.log` and its full path is reported.
+- macOS tray now uses a template image so it adapts to light/dark menu bars;
+  the Windows-only "create desktop shortcut" item is hidden elsewhere.
+- Added `CONTRIBUTORS.md` and an open call for Mac co-maintainers (signing,
+  notarization, real-device verification).
+
 ### 0.1.6
 - Fixed "check for updates" reporting the Electron runtime version in plugin mode.
 

package/README.md

@@ -79,9 +79,32 @@ v0.1.7 修复了插件形态在 macOS 上无法定位 `Electron.app` 路径的
   - 临时解决：`xattr -cr "/Applications/DSH Clean Desktop Shell.app"`，然后右键 → 打开。
   - 长期解决：需要一位有 Apple Developer 账号的 Mac 合作者协助签名/公证，或长期把 .dmg 安装体验写为「需要右键打开 / 执行 xattr」。
 - **Electron.app 解压后的可执行位、quarantine 扩展属性等**只有真机能确认行为是否完全正确。
+- **如果窗口还是没弹出来**：启动失败时会把诊断信息写到 DSH home 下的 `desktop-shell-launch.log`：
+
+  ```sh
+  cat "${DSH_HOME:-$HOME/.dsh}/desktop-shell-launch.log"
+  ```
+
+  把内容贴到 Issue 即可——里面记录了平台、架构、Node 版本、DSH home、运行时目录和具体报错。没有界面时，这是唯一能回传的信息。
 
 诚挚邀请有 Mac 环境、愿意一起打磨的同学参与：能帮忙验证安装流程、补充签名配置、或者把开机自启/登录项做进 Electron 托盘，欢迎直接提 PR 或在 Issue 里 @ 我，我会把你加入 [CONTRIBUTORS.md](./CONTRIBUTORS.md)。
 
+## 安全与权限：它到底做了什么
+
+第三方安全扫描器（如 [dsh-xray](https://github.com/unStone/dsh-xray)）会给本项目打出「高能力 + 敏感行为」的评级。这个评级**没有误报**——列出的每一条都属实，但每一条都有明确且必要的原因。既然要装进你的机器，就该摊开讲清楚。
+
+| 行为 | 为什么必须这么做 | 代码位置 |
+|:--|:--|:--|
+| 执行系统命令（spawn） | 壳的核心功能就是**启动 / 重启 / 停止 `dsh web` 后端**，以及探测 3080 端口占用。不调用系统命令无法实现。 | `electron/service.js` |
+| 下载约 100MB 的 Electron 运行时 | 首次启动需要。两个源按网络环境自动竞速（3 秒超时）：`github.com` 与 `npmmirror.com`——后者是国内镜像，CN 网络下通常更快。 | `src/host/runtime.js` |
+| 访问 `api.github.com` | 仅用于托盘「检查更新」拉取最新 Release 信息。 | `electron/update.js` |
+| 读取环境变量 | 只用于定位路径和功能开关：`DSH_HOME`（DSH 主目录）、`DSH_SHELL_ELECTRON_DIR`（复用本地 Electron，跳过下载）、`DSH_SHELL_AUTO_LAUNCH=0`（关闭自动弹窗）、`USERPROFILE` / `APPDATA`（Windows 下定位 `dsh.cmd` 与快捷方式目录）。 | `src/host/common.js`、`src/host/index.js`、`electron/shortcut.js` |
+| 修改 DSH 运行时（`cordis.patch.yml`） | **DSH 官方的插件注册机制**，所有 DSH 插件都靠它挂载，并非本项目特有行为。 | `cordis.patch.yml` |
+
+**边界**：不上传任何数据、不读取会话内容、不回传遥测。全部网络请求只有上面两类（下载运行时 / 查更新），且都可通过设置 `DSH_SHELL_ELECTRON_DIR` 完全避免。
+
+安装包的未签名警告（Windows SmartScreen、macOS Gatekeeper）来自**缺少代码签名证书**，与上述行为无关。
+
 ## 安装
 
 **方式一：从 Release 下载安装包（想要独立桌面应用的用户）**
@@ -189,6 +212,13 @@ npm run pack    # 打包 NSIS (Win) / DMG (mac)
 
 ## 更新历史
 
+### 0.1.7
+- **修复 macOS 上窗口完全打不开的静默失败**：Electron 的 macOS 包是 `Electron.app` 应用包，可执行文件位于 `Electron.app/Contents/MacOS/Electron`；此前按 Linux 布局去找顶层 `electron`，导致 Mac 上必然启动失败且无任何提示。
+- 解压改为多策略回退（ditto / unzip / tar）并校验产物；解压后补齐可执行位，清除 macOS quarantine 扩展属性。
+- 启动失败不再只写日志：诊断信息落盘到 `desktop-shell-launch.log`，并在提示中给出完整路径。
+- macOS 托盘改用模板图，深浅色菜单栏自适应；非 Windows 平台隐藏「创建桌面快捷方式」。
+- 新增 `CONTRIBUTORS.md`，公开招募 Mac 合作开发者（代码签名 / 公证 / 实机验证）。
+
 ### 0.1.6
 - 修复插件形态下「检查更新」误报 Electron 运行时版本号的问题。
 

package/electron/update.js

@@ -1,35 +1,47 @@
 /**
- * Update handling — Windows auto-update, macOS manual download.
+ * Update handling — three install forms, three update sources.
  *
  * Windows (packaged app): uses electron-updater to download the new
  * installer from GitHub Releases in the background and install it on
  * restart. Progress is shown in the small progress window.
  *
- * macOS / dev mode: falls back to a manual check that opens the GitHub
- * Releases page (macOS auto-update needs a Developer ID signature which
- * this project does not have yet).
+ * macOS (packaged app): manual check that opens the GitHub Releases page
+ * (macOS auto-update needs a Developer ID signature which this project
+ * does not have yet).
+ *
+ * Plugin mode (npm-installed, !app.isPackaged): checks the npm registry for
+ * dist-tags.latest and offers a one-click update executed through the
+ * package manager that actually installed the plugin (inferred from the
+ * lockfile next to the install, vercel-style), with command variants to
+ * absorb environment and pnpm-version differences.
  */
 import { app, shell, dialog } from 'electron'
-import { readFileSync } from 'node:fs'
-import { dirname, join } from 'node:path'
+import { existsSync, readFileSync } from 'node:fs'
+import { spawn } from 'node:child_process'
+import { basename, dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { showProgress, setProgress, closeProgress } from './progress.js'
 import { loadConfig } from './config.js'
 
 const REPO_URL = 'https://github.com/Icather/dsh-clean-desktop-shell'
 const RELEASES_API = 'https://api.github.com/repos/Icather/dsh-clean-desktop-shell/releases/latest'
+// npm registry — the update source for plugin (npm-installed) mode.
+const NPM_REGISTRY_API = 'https://registry.npmjs.org/dsh-clean-desktop-shell'
 
 // Plugin (bare-runtime) mode has no app bundle, so app.getVersion() returns
 // the Electron runtime version (e.g. 33.4.11). Read the plugin's own version
 // from its package.json instead.
 const PKG_ROOT = dirname(dirname(fileURLToPath(import.meta.url)))
-const PKG_VERSION = (() => {
+const PKG_INFO = (() => {
   try {
-    return JSON.parse(readFileSync(join(PKG_ROOT, 'package.json'), 'utf8')).version
+    return JSON.parse(readFileSync(join(PKG_ROOT, 'package.json'), 'utf8'))
   } catch {
     return null
   }
 })()
+const PKG_VERSION = PKG_INFO?.version ?? null
+// Read from the plugin's own manifest — never hardcode the package name.
+const PKG_NAME = PKG_INFO?.name ?? 'dsh-clean-desktop-shell'
 
 let autoUpdater = null
 let updaterPromise = null
@@ -125,33 +137,62 @@ export async function checkForUpdatesAuto() {
     return
   }
 
-  // Manual path (macOS / dev mode): compare versions, offer GitHub page.
-  const r = await checkForUpdate()
+  // Manual path. Plugin mode is installed via npm/DSH market, so it checks the
+  // npm registry; the packaged desktop app checks GitHub Releases.
   const isPlugin = !app.isPackaged
+  const r = isPlugin ? await checkForUpdateNpm() : await checkForUpdate()
   if (r.hasUpdate) {
+    if (!isPlugin) {
+      const choice = dialog.showMessageBoxSync({
+        type: 'info',
+        title: '发现新版本',
+        message: `当前版本 ${r.current}，最新版本 ${r.latest}。`,
+        detail: 'macOS 自动更新需要代码签名，当前请前往 GitHub Releases 手动下载。',
+        buttons: ['前往下载', '取消'],
+        defaultId: 0,
+        cancelId: 1,
+      })
+      if (choice === 0) openUrl(r.url)
+      return
+    }
+
+    // Plugin mode (Plan B + A): offer a one-click update executed through the
+    // package manager that actually installed this package, and show the
+    // equivalent manual command plus the DSH market path.
+    const plan = detectPluginUpdatePlan()
+    const variants = plan ? updateCommandVariants(plan.pm) : []
+    const cmdLine = variants[0] || null
+    const marketHint = '① DSH 网页「设置 → 插件市场 → 已安装」→「更新」（完成后按提示重启）。'
+    const detail = cmdLine
+      ? `${marketHint}\n② 或在目录 ${plan.profileRoot} 下执行：\n${cmdLine}\n（按 Ctrl+C 可复制本对话框全部文字）`
+      : marketHint
     const choice = dialog.showMessageBoxSync({
       type: 'info',
       title: '发现新版本',
       message: `当前版本 ${r.current}，最新版本 ${r.latest}。`,
-      detail: isPlugin
-        ? '插件形态请到 DSH 网页的「设置 → 插件市场 → 已安装」里点「更新」，完成后按提示重启即可生效。'
-        : 'macOS 自动更新需要代码签名，当前请前往 GitHub Releases 手动下载。',
-      buttons: isPlugin ? ['打开 DSH 网页', '稍后'] : ['前往下载', '取消'],
+      detail,
+      buttons: cmdLine ? ['立即更新', '打开 DSH 网页', '稍后'] : ['打开 DSH 网页', '稍后'],
       defaultId: 0,
-      cancelId: 1,
+      cancelId: cmdLine ? 2 : 1,
     })
-    if (choice === 0) openUrl(isPlugin ? loadConfig().targetUrl : r.url)
+    if (cmdLine && choice === 0) {
+      await updatePluginViaPackageManager(plan, variants, r)
+    } else if (choice === (cmdLine ? 1 : 0)) {
+      openUrl(loadConfig().targetUrl)
+    }
   } else if (r.latest) {
     dialog.showMessageBoxSync({
       type: 'info',
       title: '已是最新版本',
-      message: `当前版本 ${r.current} 已是最新（${r.latest}）。`,
+      message: `当前版本 ${r.current} 已是最新。`,
     })
   } else {
     dialog.showMessageBoxSync({
       type: 'warning',
       title: '检查更新失败',
-      message: '无法连接 GitHub 检查更新，请检查网络后重试。',
+      message: isPlugin
+        ? '无法连接 npm 检查更新，请检查网络后重试。'
+        : '无法连接 GitHub 检查更新，请检查网络后重试。',
     })
   }
 }
@@ -227,3 +268,185 @@ export function openRepo() {
 export function openUrl(url) {
   shell.openExternal(url)
 }
+
+/**
+ * Version check for plugin (npm-installed) mode. The plugin is updated through
+ * the npm registry / DSH market, so its "latest" must come from npm — NOT from
+ * GitHub Releases (that endpoint is only for the packaged desktop app).
+ * @returns {{ hasUpdate: boolean, latest?: string, current: string, url: string }}
+ */
+export async function checkForUpdateNpm() {
+  const current = currentVersion()
+  let latestStr = null
+  const url = 'https://www.npmjs.com/package/dsh-clean-desktop-shell'
+
+  try {
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), 8000)
+    const res = await fetch(NPM_REGISTRY_API, { signal: controller.signal })
+    clearTimeout(timer)
+    if (res.ok) {
+      const data = await res.json()
+      latestStr = data['dist-tags']?.latest || null
+    }
+  } catch {
+    // Network error — no update known.
+  }
+
+  const currentV = parseVersion(current)
+  const latestV = parseVersion(latestStr)
+  return {
+    hasUpdate: isNewer(latestV, currentV),
+    latest: latestStr ? `v${latestStr}` : null,
+    current,
+    url,
+  }
+}
+
+/**
+ * Locate the directory whose package.json declares this plugin as a dependency
+ * (the DSH profile root: <root>/node_modules/<pkg>), and infer the package
+ * manager that manages it from the lockfile found there (vercel-style).
+ * @returns {{ pm: 'pnpm'|'npm'|'yarn'|'bun', profileRoot: string } | null}
+ */
+function detectPluginUpdatePlan() {
+  try {
+    const nm = dirname(PKG_ROOT)
+    if (basename(nm) !== 'node_modules') return null
+    const profileRoot = dirname(nm)
+    if (!existsSync(join(profileRoot, 'package.json'))) return null
+    const pm = existsSync(join(profileRoot, 'pnpm-lock.yaml')) ? 'pnpm'
+      : existsSync(join(profileRoot, 'package-lock.json')) ? 'npm'
+      : existsSync(join(profileRoot, 'yarn.lock')) ? 'yarn'
+      : (existsSync(join(profileRoot, 'bun.lockb')) || existsSync(join(profileRoot, 'bun.lock'))) ? 'bun'
+      : null
+    return pm ? { pm, profileRoot } : null
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Command candidates for the detected package manager, ordered from the most
+ * explicit to the most tolerant. Environment differences (pnpm only reachable
+ * via corepack) and pnpm version/flag differences are absorbed by trying them
+ * in order — the first variant that exits 0 wins. Quoting via JSON.stringify
+ * keeps paths/args safe in cmd.exe, PowerShell and POSIX shells alike.
+ */
+function updateCommandVariants(pm) {
+  const q = JSON.stringify(PKG_NAME)
+  switch (pm) {
+    case 'pnpm':
+      return [
+        `pnpm update ${q} --latest --config.minimumReleaseAge=0`,
+        `pnpm update ${q} --latest`,
+        `pnpm update ${q}`,
+        `corepack pnpm update ${q} --latest`,
+      ]
+    case 'npm':
+      return [`npm install ${q}@latest`]
+    case 'yarn':
+      return [`yarn up ${q}@latest`, `yarn upgrade ${q} --latest`]
+    case 'bun':
+      return [`bun update ${q}`, `bun add ${q}@latest`]
+    default:
+      return []
+  }
+}
+
+/**
+ * Run a shell command, capturing tail output. Node's spawn with shell:true
+ * always uses cmd.exe on Windows (regardless of the user's login shell being
+ * PowerShell or cmd), which is also required for .cmd shims like pnpm — a
+ * bare spawn would throw EINVAL. Resolves { ok, out, err }.
+ */
+function runShell(cmd, cwd, timeoutMs = 5 * 60 * 1000) {
+  return new Promise((resolve) => {
+    let out = ''
+    let err = ''
+    let settled = false
+    const child = spawn(cmd, {
+      cwd,
+      shell: true,
+      windowsHide: true, // no console flash from the GUI process
+    })
+    const timer = setTimeout(() => {
+      if (!settled) child.kill()
+    }, timeoutMs)
+    child.stdout?.on('data', (d) => { out += d })
+    child.stderr?.on('data', (d) => { err += d })
+    child.on('error', () => {
+      settled = true
+      clearTimeout(timer)
+      resolve({ ok: false, out: tail(out), err: tail(err) })
+    })
+    child.on('close', (code) => {
+      if (settled) return
+      settled = true
+      clearTimeout(timer)
+      resolve({ ok: code === 0, out: tail(out), err: tail(err) })
+    })
+  })
+}
+
+function tail(s, n = 4000) {
+  return s.length > n ? s.slice(-n) : s
+}
+
+/** Read the currently installed plugin version from disk (post-update check). */
+function installedPluginVersion() {
+  try {
+    return JSON.parse(readFileSync(join(PKG_ROOT, 'package.json'), 'utf8')).version || null
+  } catch {
+    return null
+  }
+}
+
+/**
+ * One-click plugin update: try each command variant until one exits 0, then
+ * verify the on-disk version actually changed. Three outcomes — success,
+ * "ran but version unchanged" (constraint/cooldown), or failure with the
+ * attempted commands and output tail for manual retry.
+ */
+async function updatePluginViaPackageManager(plan, variants, check) {
+  showProgress({ title: '插件更新', message: `正在通过 ${plan.pm} 更新插件…` })
+  let result = null
+  for (const cmd of variants) {
+    setProgress({ title: '插件更新', message: `正在执行：${cmd}`, state: 'busy' })
+    result = await runShell(cmd, plan.profileRoot)
+    if (result.ok) break
+  }
+  closeProgress()
+
+  const newVer = installedPluginVersion()
+  if (result?.ok && newVer && newVer !== check.current) {
+    dialog.showMessageBoxSync({
+      type: 'info',
+      title: '更新完成',
+      message: `插件已更新到 ${newVer}。`,
+      detail: '重启 dsh web 后生效（可从本应用托盘菜单重启后端）。',
+    })
+    return
+  }
+  if (result?.ok) {
+    dialog.showMessageBoxSync({
+      type: 'warning',
+      title: '版本未变化',
+      message: `命令执行成功，但插件版本仍为 ${check.current}。`,
+      detail: '可能被 package.json 的版本约束或新版本冷却策略限制，可稍后重试，或到 DSH 插件市场更新。',
+    })
+    return
+  }
+  const logTail = [result?.out, result?.err].filter(Boolean).join('\n').trim()
+  dialog.showMessageBoxSync({
+    type: 'warning',
+    title: '自动更新失败',
+    message: '无法自动更新插件，请手动执行或到 DSH 插件市场更新。',
+    detail: [
+      `已依次尝试：\n${variants.join('\n')}`,
+      logTail ? `命令输出（末尾）：\n${logTail}` : '',
+      `手动命令（在目录 ${plan.profileRoot} 下）：\n${variants[0]}`,
+      '按 Ctrl+C 可复制本对话框全部文字。',
+    ].filter(Boolean).join('\n\n'),
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-clean-desktop-shell",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Clean desktop shell for DeepSeek Harness (DSH) as a DSH plugin — wraps your web profile in a native window, tray-managed backend, offline auto-reconnect, zero visual changes. DSH 插件形态的纯净桌面壳：复用现有 web profile，托盘管理后端，零视觉改造。",
   "repository": {
     "type": "git",

package/version.txt

@@ -1 +1 @@
-0.1.7
+0.1.9