dsh-oc-desktop 0.3.1

package/launcher/preload.js

@@ -0,0 +1,148 @@
+'use strict';
+// dsh-desktop preload(沙箱内运行)
+// 职责:暴露最小桥 dshNative;自绘标题栏(纯壳能力,不依赖 SPA 结构):
+//   32px 高、固定深色背景、1px 底部分隔线;左侧 32x32 Logo 区(24px 鲸鱼)+ 应用名;
+//   右侧 46x32 窗口按钮(10px 系统字形 Segoe Fluent Icons),仿 Win11 悬停,
+//   关闭键红底白字;最大化/还原字形随窗口状态切换。
+// 注意:不再注入任何 SPA 修改(无折叠按钮/卡片圆角/主题同步/更新按钮)——
+// SPA 保持官方原生显示。
+
+const { contextBridge, ipcRenderer } = require('electron');
+
+const customTitleBar = process.argv.includes('--dsh-custom-titlebar=1');
+const openSessionArg = process.argv.find((a) => a.startsWith('--dsh-open-session='));
+const openSessionId = openSessionArg ? openSessionArg.slice('--dsh-open-session='.length) : null;
+if (openSessionId && /^session-[A-Za-z0-9-]+$/.test(openSessionId)) {
+  try { history.replaceState(null, '', '/s/' + encodeURIComponent(openSessionId) + window.location.search); } catch { /* 失败不阻塞窗口 */ }
+}
+
+async function injectTitleBar() {
+  if (document.getElementById('dsh-titlebar')) return;
+  const style = document.createElement('style');
+  style.textContent = `
+    html{height:100%}
+    body{height:100%;box-sizing:border-box;margin:0;padding-top:32px}
+    /* 主题色由 applyDshTheme 依据 SPA 的 data-ds-dark-theme 设置(默认深色) */
+    :root{--tb-bg:#14161a;--tb-fg:#8a8a8a;--tb-icon:#c9c9c9;--tb-logo:#e6e6e6;
+          --tb-hover:rgba(255,255,255,.06);--tb-active:rgba(255,255,255,.10);--tb-line:rgba(255,255,255,.06)}
+    :root[data-dsh-theme="light"]{--tb-bg:#f3f3f3;--tb-fg:#1f1f1f;--tb-icon:#1f1f1f;--tb-logo:#111827;
+          --tb-hover:rgba(0,0,0,.05);--tb-active:rgba(0,0,0,.08);--tb-line:rgba(0,0,0,.08)}
+    #dsh-titlebar{position:fixed;top:0;left:0;right:0;height:32px;z-index:2147483647;display:flex;align-items:center;
+      -webkit-app-region:drag;user-select:none;font-family:'Segoe UI','Microsoft YaHei',system-ui,sans-serif;
+      background:var(--tb-bg);border-bottom:1px solid var(--tb-line)}
+    #dsh-titlebar .tb-brand{display:flex;align-items:center;gap:8px;padding-left:12px;height:32px;font-size:12px;font-weight:600;
+      color:var(--tb-fg);letter-spacing:.2px;white-space:nowrap}
+    #dsh-titlebar .tb-logo{width:32px;height:32px;display:flex;align-items:center;justify-content:center}
+    #dsh-titlebar .tb-logo svg{width:24px;height:24px;border-radius:6px;color:var(--tb-logo)}
+    #dsh-titlebar .tb-btns{margin-left:auto;display:flex;height:32px;-webkit-app-region:no-drag}
+    #dsh-titlebar .tb-btn{width:46px;height:32px;display:flex;align-items:center;justify-content:center;padding:0;
+      border:none;background:transparent;color:var(--tb-icon);outline:none;
+      font-family:'Segoe Fluent Icons','Segoe MDL2 Assets',sans-serif;font-size:10px}
+    /* Win11 原生悬停/按下:直角矩形;深色悬停白 6%、按下白 10%;浅色悬停黑 5%、按下黑 8%;关闭键红底白字 */
+    #dsh-titlebar .tb-btn:hover{background:var(--tb-hover)}
+    #dsh-titlebar .tb-btn:active{background:var(--tb-active)}
+    #dsh-titlebar .tb-btn:focus-visible{background:var(--tb-hover)}
+    #dsh-titlebar .tb-btn.tb-close:hover{background:#C42B1C;color:#fff}
+    #dsh-titlebar .tb-btn.tb-close:active{background:#A92B1D;color:#fff}
+  `;
+  document.head.appendChild(style);
+
+  // 标题栏跟随 DSH(SPA)外观:读 SPA 的 data-ds-dark-theme 属性,不修改 SPA 本身
+  const applyDshTheme = () => {
+    let dark = true;
+    try {
+      if (document.body.hasAttribute('data-ds-dark-theme')) dark = true;
+      else {
+        const bg = getComputedStyle(document.body).backgroundColor;
+        const m = bg && bg.match(/rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/);
+        if (m) dark = (Number(m[1]) * 299 + Number(m[2]) * 587 + Number(m[3]) * 114) / 1000 < 128;
+      }
+    } catch { /* 保持默认深色 */ }
+    document.documentElement.setAttribute('data-dsh-theme', dark ? 'dark' : 'light');
+  };
+  applyDshTheme();
+  // 监听 SPA 主题切换(data-ds-dark-theme 属性变化 / body 背景变化)
+  try {
+    const obs = new MutationObserver(applyDshTheme);
+    if (document.body) obs.observe(document.body, { attributes: true, attributeFilter: ['data-ds-dark-theme', 'style', 'class'] });
+    document.addEventListener('DOMContentLoaded', () => { applyDshTheme(); obs.observe(document.body, { attributes: true, attributeFilter: ['data-ds-dark-theme', 'style', 'class'] }); });
+  } catch { /* ignore */ }
+
+  const bar = document.createElement('div');
+  bar.id = 'dsh-titlebar';
+  // 窗口按钮字形:Segoe Fluent Icons / Segoe MDL2 Assets(系统字形,10px)
+  //  E921 最小化 / E922 最大化 / E923 还原 / E8BB 关闭
+  bar.innerHTML = `
+    <div class="tb-brand"><span class="tb-logo"></span><span>DeepSeek Harness</span></div>
+    <div class="tb-btns">
+      <button class="tb-btn tb-open" title="在新窗口打开当前会话">&#x29C9;</button>
+      <button class="tb-btn tb-min" title="最小化">&#xE921;</button>
+      <button class="tb-btn tb-max" title="最大化"><span class="ic-max">&#xE922;</span><span class="ic-restore" style="display:none">&#xE923;</span></button>
+      <button class="tb-btn tb-close" title="关闭">&#xE8BB;</button>
+    </div>`;
+  document.documentElement.appendChild(bar);
+
+  bar.querySelector('.tb-open').addEventListener('click', () => ipcRenderer.send('open-session-window'));
+  bar.querySelector('.tb-min').addEventListener('click', () => ipcRenderer.send('win-minimize'));
+  bar.querySelector('.tb-max').addEventListener('click', () => ipcRenderer.send('win-maximize-toggle'));
+  bar.querySelector('.tb-close').addEventListener('click', () => ipcRenderer.send('win-close'));
+  // 最大化/还原字形随窗口状态切换(主进程推送)
+  ipcRenderer.on('win-maximized', (_e, isMax) => {
+    bar.querySelector('.ic-max').style.display = isMax ? 'none' : '';
+    bar.querySelector('.ic-restore').style.display = isMax ? '' : 'none';
+  });
+
+  // 鲸鱼 logo:主进程读 assets/whale.svg 注入(单一来源)
+  try {
+    const svg = await ipcRenderer.invoke('get-brand-svg');
+    if (svg) {
+      const tmp = document.createElement('div');
+      tmp.innerHTML = svg;
+      const s = tmp.querySelector('svg');
+      if (s) {
+        s.removeAttribute('width');
+        s.removeAttribute('height');
+        s.setAttribute('fill', 'currentColor');
+        s.querySelectorAll('path').forEach((p) => p.setAttribute('fill', 'currentColor'));
+        s.querySelectorAll('style').forEach((st) => st.remove());
+        bar.querySelector('.tb-logo').appendChild(s);
+      }
+    }
+  } catch { /* 图标缺失不阻塞标题栏 */ }
+}
+
+// 桌面壳标记镜像:把 ?dsh-desktop-* 查询参数映射到 <html data-dsh-desktop-*> 属性
+// 与 --dsh-title-bar-strip CSS 变量,供 better-sidebar 等插件自动避让标题栏。
+// 由 dsh-oc client 的 Cordis 逻辑迁移至此(壳标记完全属于壳,不依赖 Cordis)。
+function applyDesktopMarkers() {
+  if (typeof document === 'undefined') return;
+  let params = null;
+  try { params = new URLSearchParams(window.location.search.replace(/^\?/, '')); } catch { return; }
+  const mode = params.get('dsh-desktop-mode');
+  const platform = params.get('dsh-desktop-platform');
+  const inset = params.get('dsh-desktop-titlebar-inset');
+  if (!mode && !platform && !inset) return;
+  const root = document.documentElement;
+  if (mode) root.setAttribute('data-dsh-desktop-mode', mode);
+  if (platform) root.setAttribute('data-dsh-desktop-platform', platform);
+  if (inset && /^\d+$/.test(inset)) root.style.setProperty('--dsh-title-bar-strip', inset + 'px');
+}
+
+if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', () => { applyDesktopMarkers(); });
+else applyDesktopMarkers();
+
+if (customTitleBar) {
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', () => { injectTitleBar(); });
+  else injectTitleBar();
+}
+
+contextBridge.exposeInMainWorld('dshNative', {
+  platform: process.platform,
+  customTitleBar,
+  notify: (title, body) => ipcRenderer.send('notify', { title, body }),
+  retryHarness: () => ipcRenderer.send('retry-harness'),
+  openSessionWindow: (sessionId) => {
+    const sid = typeof sessionId === 'string' && /^session-[A-Za-z0-9-]+$/.test(sessionId) ? sessionId : undefined;
+    ipcRenderer.send('open-session-window', sid ? { sessionId: sid } : undefined);
+  },
+});

package/launcher/session-window.js

@@ -0,0 +1,22 @@
+'use strict';
+// 会话新窗口工具:从渲染层 localStorage 读取当前会话 id,并生成深链 URL。
+
+const SESSION_ID_RE = /^session-[A-Za-z0-9-]+$/;
+
+function parseCurrentSession(raw) {
+  if (typeof raw !== 'string' || raw === '') return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed.sessionId === 'string' && SESSION_ID_RE.test(parsed.sessionId)) {
+      return parsed.sessionId;
+    }
+  } catch { /* 非法 JSON 视为无会话 */ }
+  return null;
+}
+
+function sessionWindowUrl(baseUrl, sessionId) {
+  const base = String(baseUrl).replace(/\/+$/, '');
+  return `${base}/s/${encodeURIComponent(sessionId)}`;
+}
+
+module.exports = { parseCurrentSession, sessionWindowUrl, SESSION_ID_RE };

package/launcher/splash.html

@@ -0,0 +1,27 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<style>
+  html, body { margin: 0; height: 100%; background: #101216; color: #e5e7eb;
+    font-family: 'Segoe UI', system-ui, sans-serif; -webkit-user-select: none; user-select: none; overflow: hidden; }
+  .wrap { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 14px; }
+  .logo { width: 72px; height: 72px; border-radius: 18px; }
+  h1 { font-size: 17px; font-weight: 600; margin: 0; letter-spacing: .3px; }
+  p { font-size: 12px; color: #8b93a3; margin: 0; }
+  .dot { display: flex; gap: 6px; margin-top: 4px; }
+  .dot i { width: 7px; height: 7px; border-radius: 50%; background: #4d6bfe; animation: p 1.2s infinite ease-in-out; }
+  .dot i:nth-child(2) { animation-delay: .15s; }
+  .dot i:nth-child(3) { animation-delay: .3s; }
+  @keyframes p { 0%,100% { opacity: .25; transform: translateY(0); } 50% { opacity: 1; transform: translateY(-3px); } }
+</style>
+</head>
+<body>
+  <div class="wrap">
+    <img class="logo" src="../assets/splash-whale.png" alt="dsh">
+    <h1>DeepSeek Harness</h1>
+    <p>正在启动本地引擎…</p>
+    <div class="dot"><i></i><i></i><i></i></div>
+  </div>
+</body>
+</html>

package/launcher/updater.js

@@ -0,0 +1,188 @@
+'use strict';
+// updater.js - 检查更新(骨架阶段)
+//
+// 只做「检查」闭环:请求更新服务器 version.json,与本地版本对比,返回结果。
+//   - 未配置 updateUrl        → { ok:false, error:'未配置更新源...' }
+//   - 网络/解析失败           → { ok:false, error:<原因> }
+//   - 成功                    → { ok:true, hasUpdate, current, latest, notes }
+//
+// 下载 / 校验 / 替换 / 重启 属于阶段 3 更新器核心,后续在此模块扩展
+// (checkForUpdates 的返回结构保持稳定,下载逻辑接入时不用改调用方)。
+// 依赖:仅 node 内置模块(http/https),零第三方依赖,与项目「零依赖」一致。
+
+const http = require('node:http');
+const https = require('node:https');
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+
+const REQUEST_TIMEOUT_MS = 10000;
+const MAX_BODY_BYTES = 1 * 1024 * 1024; // version.json 极小,1MB 上限防异常
+
+// "0.2.0" / "0.1.0-rc.7" → { num:[0,2,0], pre:'rc.7'|null }; 解析不了返回 null
+function parseVersion(v) {
+  const s = String(v == null ? '' : v).trim();
+  const m = s.match(/^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/);
+  if (!m) return null;
+  return { num: [Number(m[1]), Number(m[2]), Number(m[3])], pre: m[4] || null };
+}
+
+// 语义化版本比较:a>b → 1,a<b → -1,相等 → 0。
+// pre-release(如 rc.7)低于同号正式版;解析不了时按字符串兜底(不抛异常)。
+function semverCompare(a, b) {
+  const pa = parseVersion(a);
+  const pb = parseVersion(b);
+  if (!pa || !pb) return String(a).localeCompare(String(b));
+  for (let i = 0; i < 3; i++) {
+    if (pa.num[i] !== pb.num[i]) return pa.num[i] > pb.num[i] ? 1 : -1;
+  }
+  if (pa.pre === pb.pre) return 0;
+  if (!pa.pre) return 1; // 正式版 > 预发布
+  if (!pb.pre) return -1;
+  return pa.pre < pb.pre ? -1 : 1; // 同为预发布,字符串序(骨架够用)
+}
+
+// GET 一个 JSON(支持 http/https),带超时与体积上限。
+function fetchJson(url, timeoutMs = REQUEST_TIMEOUT_MS) {
+  return new Promise((resolve, reject) => {
+    let lib;
+    try { lib = new URL(url).protocol === 'https:' ? https : http; }
+    catch { return reject(new Error('无效的更新地址: ' + url)); }
+    const req = lib.get(url, { headers: { 'User-Agent': 'dsh-desktop-updater' } }, (res) => {
+      if (res.statusCode !== 200) {
+        res.resume();
+        return reject(new Error('更新服务器返回 HTTP ' + res.statusCode));
+      }
+      let body = '';
+      res.setEncoding('utf8');
+      res.on('data', (d) => {
+        body += d;
+        if (body.length > MAX_BODY_BYTES) { req.destroy(new Error('更新清单过大')); }
+      });
+      res.on('end', () => {
+        try { resolve(JSON.parse(body)); }
+        catch { reject(new Error('更新清单不是有效 JSON')); }
+      });
+    });
+    req.setTimeout(timeoutMs, () => req.destroy(new Error('连接更新服务器超时')));
+    req.on('error', (e) => reject(e));
+  });
+}
+
+// 检查更新主入口。updateUrl: 更新服务器根地址(可含尾斜杠);currentVersion: 本地版本号。
+async function checkForUpdates(updateUrl, currentVersion) {
+  if (!updateUrl) return { ok: false, error: '未配置更新源(settings.json → updateUrl)' };
+  const base = String(updateUrl).replace(/\/+$/, '');
+  try {
+    const manifest = await fetchJson(base + '/version.json');
+    const latest = manifest && manifest.version;
+    if (!latest) return { ok: false, error: '更新清单缺少 version 字段' };
+    const cmp = semverCompare(String(latest), String(currentVersion));
+    return {
+      ok: true,
+      hasUpdate: cmp > 0,
+      current: String(currentVersion),
+      latest: String(latest),
+      notes: (manifest.notes || '').trim(),
+    };
+  } catch (e) {
+    return { ok: false, error: e && e.message ? e.message : String(e) };
+  }
+}
+
+// sha256 单个文件(流式,不整读入内存)。
+function hashFile(file) {
+  return new Promise((resolve, reject) => {
+    const h = crypto.createHash('sha256');
+    const s = fs.createReadStream(file);
+    s.on('data', (d) => h.update(d));
+    s.on('error', (e) => reject(e));
+    s.on('end', () => resolve(h.digest('hex')));
+  });
+}
+
+// 对比本地文件树与更新清单,产出「需要下载」的差异列表。
+//   rootDir  本地应用根目录(绿色版 = exe 所在目录,即 win-unpacked)
+//   files    更新清单 files.json 的 files 数组 [{path,size,sha256}]
+//   return   [{path,size,sha256,reason}] reason: 'missing' | 'changed'
+// 优化:先按 size 过滤(大小不同 = 必变,免读哈希),size 相同的才算 sha256。
+async function diffLocal(rootDir, files) {
+  const need = [];
+  for (const f of files) {
+    const abs = path.join(rootDir, f.path);
+    let st = null;
+    try { st = fs.statSync(abs); } catch { /* missing */ }
+    if (!st || !st.isFile()) { need.push({ path: f.path, size: f.size, sha256: f.sha256, reason: 'missing' }); continue; }
+    if (st.size !== f.size) { need.push({ path: f.path, size: f.size, sha256: f.sha256, reason: 'changed' }); continue; }
+    let hash;
+    try { hash = await hashFile(abs); } catch { need.push({ path: f.path, size: f.size, sha256: f.sha256, reason: 'changed' }); continue; }
+    if (hash !== f.sha256) need.push({ path: f.path, size: f.size, sha256: f.sha256, reason: 'changed' });
+  }
+  return need;
+}
+
+// 下载单文件(流式写盘 + sha256 校验,校验通过才 rename 到目标)。
+//   baseUrl   更新服务器根地址(如 http://host/dsh-updates)
+//   relPath   清单中的相对路径(resources/app.asar 等)
+//   destFile  本地目标绝对路径
+//   expected  期望 sha256;不符则删除 .part 并抛错
+//   onProgress (loadedBytes, totalBytes) 可选;total 来自 Content-Length,可能为 0
+function downloadFile(baseUrl, relPath, destFile, expected, onProgress) {
+  return new Promise((resolve, reject) => {
+    const enc = relPath.split('/').map(encodeURIComponent).join('/');
+    const url = baseUrl + '/files/' + enc;
+    let lib;
+    try { lib = new URL(url).protocol === 'https:' ? https : http; }
+    catch { return reject(new Error('无效下载地址: ' + url)); }
+    fs.mkdirSync(path.dirname(destFile), { recursive: true });
+    const tmp = destFile + '.part';
+    const cleanup = () => { try { fs.rmSync(tmp, { force: true }); } catch { /* ignore */ } };
+    const out = fs.createWriteStream(tmp);
+    const h = crypto.createHash('sha256');
+    let got = 0, total = 0;
+    const req = lib.get(url, { headers: { 'User-Agent': 'dsh-desktop-updater' } }, (res) => {
+      if (res.statusCode !== 200) {
+        res.resume();
+        cleanup();
+        return reject(new Error('下载失败 HTTP ' + res.statusCode + ': ' + relPath));
+      }
+      total = Number(res.headers['content-length']) || 0;
+      res.on('data', (d) => { h.update(d); got += d.length; out.write(d); if (onProgress) onProgress(got, total); });
+      res.on('error', (e) => { cleanup(); reject(e); });
+      res.on('end', () => {
+        out.end();
+        out.on('finish', () => {
+          const hash = h.digest('hex');
+          if (expected && hash !== expected) {
+            cleanup();
+            return reject(new Error('sha256 校验失败: ' + relPath));
+          }
+          try { fs.renameSync(tmp, destFile); }
+          catch (e) { cleanup(); return reject(e); }
+          resolve(hash);
+        });
+        out.on('error', (e) => { cleanup(); reject(e); });
+      });
+    });
+    req.setTimeout(REQUEST_TIMEOUT_MS, () => req.destroy(new Error('下载超时: ' + relPath)));
+    req.on('error', (e) => { cleanup(); reject(e); });
+  });
+}
+
+// 按差异列表逐个下载到 stagingDir(保留相对路径)。任一文件失败即抛错(staging 由调用方清理)。
+//   onProgress (doneCount, totalCount, currentPath)
+async function downloadUpdate(baseUrl, needList, stagingDir, onProgress) {
+  const done = [];
+  for (let i = 0; i < needList.length; i++) {
+    const f = needList[i];
+    await downloadFile(baseUrl, f.path, path.join(stagingDir, f.path), f.sha256);
+    done.push(f.path);
+    if (onProgress) onProgress(i + 1, needList.length, f.path);
+  }
+  return done;
+}
+
+module.exports = {
+  parseVersion, semverCompare, fetchJson, checkForUpdates, hashFile, diffLocal,
+  downloadFile, downloadUpdate,
+};

package/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "dsh-oc-desktop",
+  "productName": "DeepSeek Harness Desktop",
+  "version": "0.3.1",
+  "description": "DeepSeek Harness 桌面端插件(Electron 启动器):自绘标题栏/托盘/通知/快捷键/崩溃自愈",
+  "main": "launcher/main.js",
+  "bin": {
+    "dsh-desktop": "bin/dsh-desktop.cjs"
+  },
+  "scripts": {
+    "start": "electron .",
+    "test": "node --check launcher/main.js && node --check launcher/preload.js && node --check launcher/events.js && node --check launcher/session-window.js && node --check launcher/updater.js && node --check launcher/apply-update.js && node --check bin/dsh-desktop.cjs && node scripts/test.mjs"
+  },
+  "devDependencies": {
+    "electron": "^43.4.0"
+  },
+  "files": ["launcher", "bin", "assets", "scripts"],
+  "license": "MIT"
+}

package/scripts/test.mjs

@@ -0,0 +1,15 @@
+// dsh-shell smoke test: pure-logic units from the shell launcher.
+import assert from "node:assert";
+import { parseFrame, classifyFrame } from "../launcher/events.js";
+import { parseCurrentSession, sessionWindowUrl } from "../launcher/session-window.js";
+
+assert.deepStrictEqual(parseFrame(JSON.stringify({ type: "server-request", rpcId: "r1", payload: { type: "approval/requested" } })), { type: "approval/requested" });
+assert.strictEqual(parseFrame("not-json"), null);
+assert.deepStrictEqual(classifyFrame({ type: "approval/requested", toolName: "bash", reason: "run test" }), { kind: "approval", title: "需要审批", body: "工具「bash」请求执行 (run test)" });
+assert.deepStrictEqual(classifyFrame({ type: "session/event", sessionId: "s1", event: { type: "turn/end", data: { reason: { code: "done" } } } }), { kind: "turn-end", title: "任务完成", body: "对话轮次已结束({\"code\":\"done\"})" });
+
+assert.strictEqual(parseCurrentSession('{"sessionId":"session-abc123"}'), "session-abc123");
+assert.strictEqual(parseCurrentSession(""), null);
+assert.strictEqual(sessionWindowUrl("http://127.0.0.1:3080", "session-abc"), "http://127.0.0.1:3080/s/session-abc");
+
+console.log("shell tests passed");