dsh-oc-desktop 0.3.1

package/assets/whale.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="50.000000" height="50.000000" viewBox="0 0 50 50" fill="none">
+	<style>
+		@media (prefers-color-scheme: dark) {
+			path { fill: #fff; }
+		}
+	</style>
+	<path id="path" d="M48.8354 10.0479C48.3232 9.79199 48.1025 10.2798 47.8032 10.5278C47.7007 10.6079 47.6143 10.7119 47.5273 10.8076C46.7793 11.624 45.9048 12.1597 44.7622 12.0957C43.0923 12 41.666 12.5356 40.4058 13.8398C40.1377 12.2319 39.2476 11.272 37.8926 10.6558C37.1836 10.3359 36.4668 10.0156 35.9702 9.31982C35.6235 8.82373 35.5293 8.27197 35.356 7.72754C35.2456 7.3999 35.1353 7.06396 34.7651 7.00781C34.3633 6.94385 34.2056 7.2876 34.0479 7.57568C33.418 8.75195 33.1733 10.0479 33.1973 11.3599C33.2524 14.312 34.4736 16.6641 36.8999 18.3359C37.1758 18.5278 37.2466 18.7197 37.1597 19C36.9946 19.5757 36.7974 20.1357 36.624 20.7119C36.5137 21.0801 36.3486 21.1597 35.9624 21C34.6309 20.4321 33.481 19.5918 32.4644 18.5757C30.7393 16.8721 29.1792 14.9917 27.2334 13.52C26.7764 13.1758 26.3193 12.856 25.8467 12.5518C23.8618 10.584 26.1069 8.96777 26.627 8.77588C27.1704 8.57568 26.8159 7.8877 25.0591 7.896C23.3022 7.90381 21.6953 8.50391 19.647 9.30371C19.3477 9.42383 19.0322 9.51172 18.7095 9.58398C16.8501 9.22363 14.9199 9.14355 12.9033 9.37598C9.10596 9.80762 6.07275 11.6396 3.84326 14.7681C1.16455 18.5278 0.53418 22.7998 1.30664 27.2559C2.11768 31.9521 4.46582 35.8398 8.07373 38.8799C11.8159 42.0322 16.1255 43.5762 21.041 43.2803C24.0269 43.104 27.3516 42.6963 31.1016 39.4561C32.0469 39.936 33.0396 40.1279 34.686 40.272C35.9546 40.3921 37.1758 40.208 38.1211 40.0078C39.6021 39.688 39.4995 38.2881 38.9639 38.0322C34.623 35.9678 35.5762 36.8081 34.71 36.1279C36.9155 33.4639 40.2402 30.6958 41.54 21.728C41.6426 21.0161 41.5557 20.5679 41.54 19.9917C41.5322 19.6396 41.6108 19.5039 42.0049 19.4639C43.0923 19.3359 44.1479 19.0317 45.1167 18.4878C47.9292 16.9199 49.064 14.3438 49.3315 11.2559C49.3711 10.7837 49.3237 10.2959 48.8354 10.0479ZM24.3262 37.8398C20.1196 34.4639 18.0791 33.3521 17.2358 33.3999C16.4482 33.4482 16.5898 34.3682 16.7632 34.9678C16.9443 35.5601 17.1812 35.9683 17.5117 36.4878C17.7402 36.832 17.8979 37.3442 17.2832 37.728C15.9282 38.584 13.5728 37.4399 13.4624 37.3838C10.7207 35.7358 8.42822 33.5601 6.81348 30.584C5.25342 27.7197 4.34766 24.6479 4.19775 21.3677C4.1582 20.5757 4.38672 20.2959 5.15869 20.1519C6.17529 19.96 7.22314 19.9199 8.23926 20.0718C12.5327 20.7119 16.1885 22.6719 19.2529 25.7759C21.002 27.5439 22.3252 29.6558 23.6885 31.7202C25.1377 33.9121 26.6978 36 28.6831 37.7119C29.3843 38.312 29.9434 38.7681 30.479 39.104C28.8643 39.2881 26.1699 39.3281 24.3262 37.8398ZM26.3433 24.6001C26.3433 24.248 26.6191 23.9678 26.9658 23.9678C27.0444 23.9678 27.1152 23.9839 27.1782 24.0078C27.2651 24.04 27.3438 24.0879 27.4067 24.1602C27.5171 24.272 27.5801 24.4321 27.5801 24.6001C27.5801 24.9521 27.3042 25.2319 26.9575 25.2319C26.6108 25.2319 26.3433 24.9521 26.3433 24.6001ZM32.6064 27.8799C32.2046 28.0479 31.8027 28.1919 31.4165 28.208C30.8179 28.2397 30.1641 27.9922 29.8096 27.688C29.2583 27.2158 28.8643 26.9521 28.6987 26.1279C28.6279 25.7759 28.6675 25.2319 28.7305 24.9199C28.8721 24.248 28.7144 23.8159 28.2495 23.4238C27.8716 23.104 27.3911 23.0161 26.8633 23.0161C26.666 23.0161 26.4849 22.9277 26.3511 22.856C26.1304 22.7441 25.9492 22.4639 26.1226 22.1201C26.1777 22.0078 26.4458 21.7358 26.5088 21.688C27.2256 21.272 28.0527 21.4077 28.8169 21.7197C29.5259 22.0161 30.0615 22.5601 30.834 23.3281C31.6216 24.2559 31.7632 24.5117 32.2124 25.208C32.5669 25.752 32.8901 26.312 33.1104 26.9521C33.2446 27.3521 33.0713 27.6802 32.6064 27.8799Z" fill="#000" fill-opacity="1.000000" fill-rule="nonzero"/>
+</svg>

package/bin/dsh-desktop.cjs

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+'use strict';
+// dsh-desktop: boot the desktop shell (Electron launcher).
+const { spawn } = require('node:child_process');
+const fs = require('node:fs');
+const path = require('node:path');
+
+function resolveElectron() {
+  try {
+    const p = require('electron');
+    if (typeof p === 'string' && p.length > 0) return p;
+  } catch { /* fall through to explicit package lookup */ }
+  for (const dir of [
+    path.join(__dirname, '..', 'node_modules', 'electron'),
+    path.join(process.cwd(), 'node_modules', 'electron')
+  ]) {
+    try {
+      const pkg = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
+      if (pkg && typeof pkg.version === 'string') {
+        const p = require(dir);
+        if (typeof p === 'string' && p.length > 0) return p;
+      }
+    } catch { /* keep scanning */ }
+  }
+  return null;
+}
+
+function main() {
+  const args = process.argv.slice(2);
+  const electron = resolveElectron();
+  if (electron === null) {
+    console.error('dsh-oc-desktop: electron not found. Run "npm install" in the desktop package or the profile.');
+    process.exit(1);
+  }
+  const mainPath = path.join(__dirname, '..', 'launcher', 'main.js');
+  if (!fs.existsSync(mainPath)) {
+    console.error('dsh-oc-desktop: launcher/main.js missing, reinstall the package.');
+    process.exit(1);
+  }
+  const child = spawn(electron, [mainPath, ...args], { stdio: 'inherit', windowsHide: true });
+  child.on('error', (err) => { console.error(`dsh-oc-desktop: failed to start electron: ${err.message}`); process.exit(1); });
+  child.on('exit', (code, signal) => {
+    if (signal) {
+      try { process.kill(process.pid, signal); } catch { /* unsupported signal — fall through */ }
+      process.exit(1);
+    }
+    process.exit(code ?? 0);
+  });
+}
+
+if (require.main === module) main();
+module.exports = { resolveElectron };

package/launcher/apply-update.js

@@ -0,0 +1,69 @@
+'use strict';
+// apply-update.js - 应用更新(替换文件树)
+//
+// 由主进程以 `--dsh-apply-update` 重启自身后执行:此刻旧进程已退出,
+// 除 exe 本体(当前进程占用)外的文件均可直接替换。
+//
+// 替换策略:
+//   1. staging 内除 exe 外的文件 → 逐个 rename 到正式位置(同卷,原子)
+//   2. exe 本体 → 写入 .dsh-apply.cmd:
+//        timeout 2s(等当前进程完全退出)→ move 新 exe 覆盖旧 exe
+//        → rmdir staging → start 新 exe → 删除自身
+//      cmd 进程不锁定 exe,可以完成最后一步(绿色版无安装器场景的标准做法)
+//
+// 零依赖:仅 node 内置模块。
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+// appRoot  应用根目录(win-unpacked)
+// staging  待应用更新目录(位于 appRoot 内,如 .dsh-update-staging)
+// returns  { ok, error?, exeChanged, cmdPath }
+//   ok=false 时不做任何修改(调用方负责清理/提示)
+function applyUpdate(appRoot, staging) {
+  if (!fs.existsSync(staging)) return { ok: false, error: 'staging 不存在: ' + staging };
+  const top = fs.readdirSync(staging, { withFileTypes: true });
+  const exeEntry = top.find((e) => e.isFile() && /\.exe$/i.test(e.name));
+  const exeName = exeEntry ? exeEntry.name : null;
+  const exeChanged = !!exeName;
+
+  // 1. 替换除 exe 外的全部文件
+  const walk = (dir, rel) => {
+    for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
+      const src = path.join(dir, e.name);
+      const r = rel ? rel + '/' + e.name : e.name;
+      if (e.isFile() && exeName && r === exeName) continue; // exe 留给 cmd 处理
+      if (e.isDirectory()) walk(src, r);
+      else if (e.isFile()) {
+        const dst = path.join(appRoot, r);
+        fs.mkdirSync(path.dirname(dst), { recursive: true });
+        try { fs.renameSync(src, dst); }
+        catch { /* 目标可能被占用,尝试覆盖语义 */ fs.copyFileSync(src, dst); fs.rmSync(src, { force: true }); }
+      }
+    }
+  };
+  walk(staging, '');
+
+  // 1b. 清理 staging 中已被搬空的目录(自底向上;顶层因 exe 文件未移走而保留)
+  const prune = (dir) => {
+    for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
+      if (e.isDirectory()) prune(path.join(dir, e.name));
+    }
+    try { if (fs.readdirSync(dir).length === 0) fs.rmdirSync(dir); } catch { /* ignore */ }
+  };
+  prune(staging);
+
+  // 2. 生成 apply.cmd(exe 延迟替换 + 清理 + 重启)
+  const q = (s) => '"' + String(s).replace(/"/g, '""') + '"';
+  const cmdPath = path.join(appRoot, '.dsh-apply.cmd');
+  const lines = ['@echo off', 'timeout /t 2 /nobreak >nul'];
+  if (exeName) lines.push(`move /y ${q(path.join(staging, exeName))} ${q(path.join(appRoot, exeName))} >nul`);
+  lines.push(`rmdir /s /q ${q(staging)}`);
+  lines.push(`start "" ${q(path.join(appRoot, exeName || path.basename(process.execPath)))}`);
+  lines.push('del "%~f0"');
+  fs.writeFileSync(cmdPath, lines.join('\r\n') + '\r\n', 'ascii');
+
+  return { ok: true, exeChanged, cmdPath };
+}
+
+module.exports = { applyUpdate };

package/launcher/events.js

@@ -0,0 +1,118 @@
+'use strict';
+// events.js - 业务事件监听:主进程直连引擎 events.mux WebSocket
+//
+// 引擎(dsh-client-connection)暴露两条 WebSocket 下行流:
+//   /api/events.mux  业务事件(mux 帧)
+//   /api/events.host 宿主事件
+// 本模块连接 mux 流,解析帧并分类为可通知的业务事件:
+//
+// WS 文本消息 = ServerRequest envelope:
+//   { type:'server-request', rpcId, method, payload }
+// payload = mux 帧(discriminatedUnion by type):
+//   approval/requested  { sessionId, approvalId, toolName, callId?, reason? }   ← 审批请求
+//   question/requested  { sessionId, questions:[{question, header?, ...}] }     ← 用户提问
+//   session/event       { sessionId, event }   → event.type==='turn/end'        ← 任务轮次结束
+//   session/subscribed / session/queue / session/jobs / session/projection / stream/error 等(暂不通知)
+//
+// 说明:审批/提问是宿主级广播帧,任何连接都能收到;session/event 是否对所有会话
+// 广播取决于服务端订阅策略,真机验证时以日志记录的帧类型为准(见 main.js)。
+//
+// 零依赖:Node 内置全局 WebSocket(Node 22+/Electron 43)。
+
+const RECONNECT_BASE_MS = 1000;
+const RECONNECT_MAX_MS = 15000;
+
+// 解析一条 WS 文本消息 → mux 帧;非法/非 server-request 返回 null(静默忽略)。
+function parseFrame(raw) {
+  let msg;
+  try { msg = JSON.parse(String(raw)); } catch { return null; }
+  if (!msg || msg.type !== 'server-request' || !msg.payload || typeof msg.payload.type !== 'string') return null;
+  return msg.payload;
+}
+
+// 把 mux 帧分类为可通知的业务事件;不关心的返回 null。
+// 返回 { kind, title, body }。
+function classifyFrame(frame) {
+  if (!frame || typeof frame.type !== 'string') return null;
+  switch (frame.type) {
+    case 'approval/requested': {
+      const reason = frame.reason ? `(${frame.reason})` : '';
+      const body = `工具「${frame.toolName || '未知'}」请求执行 ${reason}`.trim();
+      return { kind: 'approval', title: '需要审批', body };
+    }
+    case 'question/requested': {
+      const q = frame.questions && frame.questions[0];
+      if (!q) return null;
+      return { kind: 'question', title: '有提问需要回答', body: q.question || q.header || '请回答一个问题' };
+    }
+    case 'session/event': {
+      if (frame.event && frame.event.type === 'turn/end') {
+        const data = frame.event.data;
+        let reason = '';
+        if (data && data.reason != null) {
+          // reason 可能是字符串或对象(如 {code,message});对象安全序列化,避免 [object Object]
+          reason = typeof data.reason === 'string' ? data.reason : JSON.stringify(data.reason);
+        }
+        return { kind: 'turn-end', title: '任务完成', body: `对话轮次已结束${reason ? `(${reason})` : ''}` };
+      }
+      return null;
+    }
+    default:
+      return null;
+  }
+}
+
+// 连接引擎事件流。
+//   baseUrl  引擎地址,形如 http://127.0.0.1:1234
+//   onNotify ({title, body}) 收到可通知业务事件时回调
+//   onFrame  (frame) 收到任意 mux 帧时回调(诊断用,观察服务端推送内容)
+//   onState  ('connected' | 'reconnecting') 连接状态回调(可选)
+// 自动重连(指数退避);返回 { stop() }。
+function connectEvents(baseUrl, { onNotify, onFrame, onState } = {}) {
+  if (typeof WebSocket !== 'function') {
+    console.error('[events] 全局 WebSocket 不可用(Node 需 ≥22)');
+    return { stop() { /* noop */ } };
+  }
+  const wsUrl = String(baseUrl).replace(/^http/i, 'ws') + '/api/events.mux';
+  let ws = null;
+  let stopped = false;
+  let timer = null;
+  let attempt = 0;
+
+  const scheduleReconnect = () => {
+    if (stopped) return;
+    const delay = Math.min(RECONNECT_BASE_MS * 2 ** attempt, RECONNECT_MAX_MS);
+    attempt += 1;
+    if (onState) { try { onState('reconnecting'); } catch { /* ignore */ } }
+    timer = setTimeout(open, delay);
+  };
+
+  const open = () => {
+    if (stopped) return;
+    let socket;
+    try { socket = new WebSocket(wsUrl); } catch { scheduleReconnect(); return; }
+    ws = socket;
+    socket.onopen = () => { attempt = 0; if (onState) { try { onState('connected'); } catch { /* ignore */ } } };
+    socket.onmessage = (ev) => {
+      const frame = parseFrame(ev.data);
+      if (!frame) return;
+      if (onFrame) { try { onFrame(frame); } catch { /* ignore */ } }
+      const info = classifyFrame(frame);
+      if (info && onNotify) { try { onNotify(info); } catch { /* ignore */ } }
+    };
+    socket.onclose = () => { if (!stopped) scheduleReconnect(); };
+    socket.onerror = () => { try { socket.close(); } catch { /* ignore */ } };
+  };
+
+  open();
+  return {
+    stop() {
+      stopped = true;
+      clearTimeout(timer);
+      if (ws) { try { ws.close(); } catch { /* ignore */ } }
+      ws = null;
+    },
+  };
+}
+
+module.exports = { parseFrame, classifyFrame, connectEvents };