dsh-remote-plugin 0.6.10 → 0.6.12

package/README.en.md

@@ -8,12 +8,15 @@ The official DSH bundle plugin for DSH Remote. It adds a DSH sidebar entry, a co
 
 ```sh
 dsh plugin --profile web add dsh-remote-plugin
+dsh plugin --profile web list --depth 0
 
 # Optional version pin
 dsh plugin --profile web add dsh-remote-plugin@0.6.8
 ```
 
-Restart DSH Web and refresh the browser. The DSH Remote entry will appear in the sidebar.
+The second command verifies installation in the `web` profile. Completely restart DSH Web and hard-refresh with Ctrl+F5. For a user service, a typical restart is `systemctl --user restart dsh-web`; for a manual setup, stop the old `dsh web` process and launch it again.
+
+Open `http://127.0.0.1:8787/health` on the DSH host before pairing a phone. Once it returns JSON, connect the phone to `http://PC-LAN-IP:8787` or the host's Tailscale IP. Do not use `127.0.0.1` or `localhost` on the phone; those point to the phone itself.
 
 ## What the plugin provides
 
@@ -28,19 +31,36 @@ Restart DSH Web and refresh the browser. The DSH Remote entry will appear in the
 
 The Android app / mobile WebUI has five main destinations: Sessions, Files, Home, Stats, and Settings. Session detail supports goals, subagent interruption, model selection, fullscreen input, slash commands, and image attachments. Images can come from the camera or gallery and are sent as image content in `session.prompt`.
 
-Notification settings include approval / question notifications, background polling, peak reminders, task completion notices, and announcement history. Four themes are retained: Default Deep Space, Sunset, Elbphilharmonie, and Prairie Tower.
+Notification settings include approval / question notifications, background polling, peak reminders, task completion notices, and announcement history. Announcements update from a central HTTPS source every 30 seconds while the app is in the foreground, with gateway-cache and bundled-file fallback. Four themes are retained: Default Deep Space, Sunset, Elbphilharmonie, and Prairie Tower.
 
 ## Gateway configuration
 
 - Port priority: `DSH_REMOTE_GATEWAY_PORT` → `~/.dsh-remote/gateway-port` → `8787`.
 - Token: `~/.dsh-remote/token`, generated on first run.
 - Self-healing: `~/.dsh-remote/gateway.enabled`; use `DSH_REMOTE_AUTOSTART=0` to disable automatic management.
-- File roots: `DSH_REMOTE_FS_ROOT`, separated by `:` on Linux/macOS and `;` on Windows.
+- File roots: registered DSH workspaces are allowed automatically; configure other directories with `DSH_REMOTE_FS_ROOT`, separated by `:` on Linux/macOS and `;` on Windows.
 - Upload limit: `DSH_REMOTE_FS_MAX_UPLOAD`, 2 GB by default.
+- Central announcements: override the default HTTPS endpoint with `DSH_REMOTE_ANNOUNCEMENTS_URL`, or set it to an empty string to disable the central source.
 - DSH upstream: `http://127.0.0.1:3080` by default.
 
 The token grants remote control of DSH. Keep it private. For cross-network access, prefer Tailscale or another authenticated secure tunnel.
 
+## Gateway cannot be opened
+
+```bash
+curl -i http://127.0.0.1:8787/health
+ss -ltnp | grep ':8787'
+curl -i http://127.0.0.1:3080/
+```
+
+- If port 8787 refuses locally, verify the `web` profile installation, gateway state in the plugin panel, a real DSH Web restart, and port ownership.
+- If `/health` works but `upstreamOk` is false, the gateway is running; troubleshoot DSH Web on port 3080.
+- If local access works but the phone fails, use the host LAN/Tailscale IP and permit inbound TCP 8787. Do not expose port 3080 publicly.
+- A 401 response means the token is wrong; pair again or copy the current `~/.dsh-remote/token`.
+- For a blank/stale page after an upgrade, hard-refresh or fully close and reopen the app.
+
+The managed gateway may be a transient process. Do not rely on `systemctl --user restart dsh-remote-gateway.service`; use Start Gateway in the plugin panel or restart DSH Web to trigger self-healing.
+
 ## Links
 
 - Admin page: `http://<gateway-ip>:8787/admin`

package/README.md

@@ -8,12 +8,15 @@ DSH Remote 的官方 bundle 插件：在 DSH 侧边栏提供入口，打开快
 
 ```sh
 dsh plugin --profile web add dsh-remote-plugin
+dsh plugin --profile web list --depth 0
 
 # 也可以安装指定版本
 dsh plugin --profile web add dsh-remote-plugin@0.6.8
 ```
 
-重启 DSH Web 后刷新浏览器，左侧边栏会出现 DSH Remote 入口。
+第二条命令用于确认插件安装在正确的 `web` profile。然后完整重启 DSH Web 进程并 Ctrl+F5 强刷浏览器，左侧边栏会出现 DSH Remote 入口。如果 DSH Web 由 systemd 用户服务管理，可执行 `systemctl --user restart dsh-web`；手动运行时则需停止旧的 `dsh web` 进程后重新启动。
+
+安装后先在 DSH 主机访问 `http://127.0.0.1:8787/health`。看到 JSON 后再用手机连接 `http://电脑局域网IP:8787`；手机上的 `127.0.0.1` 和 `localhost` 指向手机自己，不是 DSH 主机。
 
 ## 插件提供什么
 
@@ -28,19 +31,36 @@ dsh plugin --profile web add dsh-remote-plugin@0.6.8
 
 Android 应用 / 手机 WebUI 采用五个主要页面：会话、文件、主页、统计、设置。会话详情支持目标控制、子代理中断、模型切换、全屏输入、斜杠命令和图片附件。图片附件可从相机或相册选择，并以 `session.prompt` 图片内容发送到当前会话。
 
-通知设置支持审批 / 提问通知、后台轮询、峰谷提醒、任务完成提醒和历史公告。当前保留四套主题：默认深空、落日、易北爱乐厅、草原孤塔。
+通知设置支持审批 / 提问通知、后台轮询、峰谷提醒、任务完成提醒和历史公告。公告通过中央 HTTPS 源更新，App 前台每 30 秒检查，中央源不可达时回退网关缓存或安装包内公告。当前保留四套主题：默认深空、落日、易北爱乐厅、草原孤塔。
 
 ## 网关配置
 
 - 网关端口优先级：`DSH_REMOTE_GATEWAY_PORT` 环境变量 → `~/.dsh-remote/gateway-port` → `8787`；
 - 令牌：`~/.dsh-remote/token`，首次运行自动生成；
 - 自愈开关：`~/.dsh-remote/gateway.enabled`，或使用 `DSH_REMOTE_AUTOSTART=0` 禁用自动管理；
-- 文件根目录：`DSH_REMOTE_FS_ROOT`，Linux/macOS 使用 `:`，Windows 使用 `;`；
+- 文件根目录：DSH 已登记工作区会自动放行；其他目录用 `DSH_REMOTE_FS_ROOT` 配置，Linux/macOS 使用 `:`，Windows 使用 `;`；
 - 文件上限：`DSH_REMOTE_FS_MAX_UPLOAD`，默认 2GB；
+- 中央公告：`DSH_REMOTE_ANNOUNCEMENTS_URL` 可覆盖默认 HTTPS 地址，设为空字符串可禁用中央源；
 - DSH 上游：默认 `http://127.0.0.1:3080`。
 
 令牌等同于 DSH 远程操作凭证，请不要公开或提交到仓库。局域网访问建议配合防火墙；跨网络访问建议使用 Tailscale 或其他带认证的安全隧道。
 
+## 网关打不开
+
+```bash
+curl -i http://127.0.0.1:8787/health
+ss -ltnp | grep ':8787'
+curl -i http://127.0.0.1:3080/
+```
+
+- 8787 本机也拒绝连接：检查插件是否装在 `web` profile、插件面板的网关开关、DSH Web 是否真正重启，以及 8787 是否被占用。
+- `/health` 能打开但 `upstreamOk: false`：网关已运行，应检查 DSH Web 的 3080 端口。
+- 本机能打开但手机不能：使用电脑局域网/Tailscale IP，并允许防火墙 TCP 8787 入站；不需要对公网放行 3080。
+- 出现 401：重新扫码或复制 `~/.dsh-remote/token`。
+- 页面黑屏/功能未更新：Ctrl+F5 强刷，手机端完全退出后重开。
+
+插件网关可能以 transient 进程运行，不要依赖 `systemctl --user restart dsh-remote-gateway.service`。优先在插件面板启动网关，或重启 DSH Web 触发自愈。
+
 ## 相关地址
 
 - 管理页：`http://<网关IP>:8787/admin`

package/client.js

@@ -24,6 +24,61 @@ window.__ModuleLoader__.load({
     // 动态注入列布局, 让各 footer action 上下堆叠。
     var FOOTER_FIX_ID = 'dsh-remote-footer-stack'
     var FOOTER_FIX_CSS = '.kIs9zW_footerActions{flex-direction:column!important;align-items:stretch!important}'
+    var PLUGIN_THEMES = ['default', 'dark', 'light', 'neutral']
+    var ICON_PALETTES = {
+      default: { bg: '#F6F9FF', upper: '#4F7FEF', lower: '#8A64D8' },
+      dark: { bg: '#FFF4E3', upper: '#C66A00', lower: '#8A5A24' },
+      light: { bg: '#FFF9EF', upper: '#9B6A20', lower: '#66517F' },
+      neutral: { bg: '#F4F0DF', upper: '#585818', lower: '#832D15' },
+    }
+
+    function currentPluginTheme() {
+      var saved = null
+      try { saved = localStorage.getItem('dshTheme') } catch (_) {}
+      if (PLUGIN_THEMES.indexOf(saved) >= 0) return saved
+      return window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'default'
+    }
+
+    function usePluginTheme() {
+      var themeState = React.useState(currentPluginTheme)
+      var theme = themeState[0]
+      var setTheme = themeState[1]
+      React.useEffect(function () {
+        var mq = window.matchMedia('(prefers-color-scheme: light)')
+        function sync() { setTheme(currentPluginTheme()) }
+        function onStorage(e) { if (!e || e.key === 'dshTheme') sync() }
+        function onMessage(e) {
+          var d = e.data
+          if (e.origin !== location.origin || !d || d.source !== 'dsh-remote-theme' || d.type !== 'change') return
+          if (PLUGIN_THEMES.indexOf(d.theme) >= 0) setTheme(d.theme)
+        }
+        window.addEventListener('storage', onStorage)
+        window.addEventListener('message', onMessage)
+        if (mq.addEventListener) mq.addEventListener('change', sync)
+        else if (mq.addListener) mq.addListener(sync)
+        return function () {
+          window.removeEventListener('storage', onStorage)
+          window.removeEventListener('message', onMessage)
+          if (mq.removeEventListener) mq.removeEventListener('change', sync)
+          else if (mq.removeListener) mq.removeListener(sync)
+        }
+      }, [])
+      return theme
+    }
+
+    function PluginIcon() {
+      var palette = ICON_PALETTES[usePluginTheme()] || ICON_PALETTES.default
+      var common = {
+        fill: 'none', strokeWidth: 2.8, strokeLinecap: 'square', strokeLinejoin: 'miter',
+      }
+      return React.createElement('svg', {
+        viewBox: '0 0 24 24', 'aria-hidden': true, focusable: false,
+        style: { width: 16, height: 16, flexShrink: 0, display: 'block' },
+      },
+        React.createElement('rect', { x: .75, y: .75, width: 22.5, height: 22.5, rx: 5, fill: palette.bg, stroke: 'rgba(15, 23, 42, .14)', strokeWidth: 1 }),
+        React.createElement('path', Object.assign({ d: 'M10 6l4 4 4-4m-4 4 4 4', stroke: palette.upper }, common)),
+        React.createElement('path', Object.assign({ d: 'M6 10l4 4-4 4m4-4 4 4', stroke: palette.lower }, common)))
+    }
 
     function useFooterStack() {
       React.useEffect(function () {
@@ -59,10 +114,7 @@ window.__ModuleLoader__.load({
           font: '500 13px/1.3 system-ui, sans-serif', textAlign: 'left',
         },
       },
-        React.createElement('img', {
-          src: '/remote/icon.svg', alt: '', 'aria-hidden': true,
-          style: { width: 16, height: 16, flexShrink: 0 },
-        }),
+        React.createElement(PluginIcon),
         props.wide ? React.createElement('span', null, 'DSH Remote') : null)
     }
 

package/gateway-stats.cjs

@@ -6,7 +6,7 @@
  *
  * 聚合:
  *   time(UTC 毫秒) -> Asia/Shanghai(固定 UTC+8, 无夏令时) -> 日 × 小时 × 模型
- *   时段: 高峰 9:00-12:00 / 14:00-18:00(含起点, 不含终点), 其余空闲
+ *   时段: 工作日高峰 9:00-12:00 / 14:00-18:00(含起点, 不含终点), 周末全天空闲
  *   四桶: input(未缓存输入) / cacheRead(缓存命中读) / cacheWrite(缓存写) / output(输出)
  *
  * 存储:
@@ -24,7 +24,7 @@ const { spawn } = require('node:child_process')
 const readline = require('node:readline')
 
 // ---------- 固定价格表(v1 硬编码; v2 将改为配置文件/环境变量) ----------
-// 时段判定: 北京时间 9:00-12:00 与 14:00-18:00 为高峰(含起点不含终点)
+// 时段判定: 工作日北京时间 9:00-12:00 与 14:00-18:00 为高峰(含起点不含终点)，周末全天谷时
 const PEAK_HOURS = [[9, 12], [14, 18]]
 const PRICES = {
   'deepseek-v4-flash': {
@@ -73,6 +73,19 @@ function periodOfHour(hour) {
   return 'off'
 }
 
+/** 北京自然日是否为周六/周日。 */
+function isWeekendDate(date) {
+  const parts = String(date || '').split('-').map(Number)
+  if (parts.length !== 3 || parts.some(n => !Number.isInteger(n))) return false
+  const day = new Date(Date.UTC(parts[0], parts[1] - 1, parts[2])).getUTCDay()
+  return day === 0 || day === 6
+}
+
+/** 北京日期 + 小时 -> 计费时段；周末全天谷时。 */
+function periodOfDateHour(date, hour) {
+  return isWeekendDate(date) ? 'off' : periodOfHour(hour)
+}
+
 /** 时段单价; 未知模型返回全 0(统计照记, 费用为 0)。 */
 function pricesFor(model) {
   return PRICES[model] || null
@@ -105,6 +118,11 @@ function addUsage(bucket, model, period, usage) {
   return bucket
 }
 
+/** 按当前日期规则重算 bucket 费用，兼容升级前已按工作日价格写入的周末历史数据。 */
+function pricedBucket(model, period, bucket) {
+  return addUsage(emptyBucket(), model, period, bucket)
+}
+
 function mergeBucket(dst, src) {
   for (const key of ['input', 'cacheRead', 'cacheWrite', 'output', 'cost']) {
     dst[key] += src[key]
@@ -114,7 +132,9 @@ function mergeBucket(dst, src) {
 
 /** 时段事件 -> 日/小时/模型聚合的 key。 */
 function eventKey(timeMs) {
-  return { date: beijingDate(timeMs), hour: beijingHour(timeMs), period: periodOfHour(beijingHour(timeMs)) }
+  const date = beijingDate(timeMs)
+  const hour = beijingHour(timeMs)
+  return { date, hour, period: periodOfDateHour(date, hour) }
 }
 
 /** 事件里的模型: 优先 message.source.model。 */
@@ -143,9 +163,10 @@ function summarizeDay(day) {
   const off = emptyBucket()
   for (const hourStr of Object.keys(day?.hours || {})) {
     const hour = Number(hourStr)
-    const target = periodOfHour(hour) === 'peak' ? peak : off
+    const period = periodOfDateHour(day?.date, hour)
+    const target = period === 'peak' ? peak : off
     for (const model of Object.keys(day.hours[hourStr] || {})) {
-      mergeBucket(target, day.hours[hourStr][model])
+      mergeBucket(target, pricedBucket(model, period, day.hours[hourStr][model]))
     }
   }
   const total = emptyBucket()
@@ -403,11 +424,12 @@ class StatsStore {
       const s = dayTotals(day)
       const byModel = {}
       for (const hourStr of Object.keys(day.hours || {})) {
-        const period = periodOfHour(Number(hourStr))
+        const period = periodOfDateHour(date, Number(hourStr))
         for (const [model, bucket] of Object.entries(day.hours[hourStr])) {
           const m = byModel[model] || (byModel[model] = { peak: emptyBucket(), off: emptyBucket(), total: emptyBucket() })
-          mergeBucket(m[period], bucket)
-          mergeBucket(m.total, bucket)
+          const priced = pricedBucket(model, period, bucket)
+          mergeBucket(m[period], priced)
+          mergeBucket(m.total, priced)
         }
       }
       out.push({ date, ...s, byModel })
@@ -421,10 +443,14 @@ class StatsStore {
     const day = this._loadDay(effective)
     const hours = []
     for (let hour = 0; hour < 24; hour++) {
-      const models = day.hours[hour] || {}
+      const period = periodOfDateHour(effective, hour)
+      const models = {}
       const total = emptyBucket()
-      for (const bucket of Object.values(models)) mergeBucket(total, bucket)
-      hours.push({ hour, period: periodOfHour(hour), models, total })
+      for (const [model, bucket] of Object.entries(day.hours[hour] || {})) {
+        models[model] = pricedBucket(model, period, bucket)
+        mergeBucket(total, models[model])
+      }
+      hours.push({ hour, period, models, total })
     }
     return { date: effective, pricingStart: PRICING_START_DATE, hours }
   }
@@ -438,8 +464,11 @@ module.exports = {
   beijingHour,
   beijingDate,
   periodOfHour,
+  isWeekendDate,
+  periodOfDateHour,
   emptyBucket,
   addUsage,
+  pricedBucket,
   summarizeDay,
   dayTotals,
   eventKey,