dsh-peak-status 1.0.1 → 1.0.2

package/README.md

@@ -2,91 +2,48 @@
 
 English | [中文](README.zh-CN.md)
 
-A peak-hour indicator for the [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) web GUI. A small native chip in the session header shows whether the current **Beijing time** falls inside DeepSeek's API **peak window**, with a live clock, a countdown to the next transition, and a pricing hint.
-
 ![peak indicator preview](assets/peak-indicator.png)
 
-## What it shows
+A peak-hour indicator for the [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) web GUI. A small native chip in the session header shows whether the current **Beijing time** is inside DeepSeek's API **peak window**, with a live clock, a countdown to the next transition, and a pricing hint.
+
+## Peak windows
 
-DeepSeek's official peak/valley API pricing took effect on **2026-08-17**:
+DeepSeek's official peak/valley API pricing (effective 2026-08-17, weekends adjusted 2026-08-23):
 
-| State | Beijing time (daily) | Price |
+| State | When (Beijing time) | Price |
 | :-- | :-- | :-- |
-| 🔴 **高峰 / peak** | 09:00–12:00 and 14:00–18:00 | peak price (= off-peak ×2) |
-| 🟢 **空闲 / off-peak** | everything else | half of peak |
+| 🔴 **Peak** | weekdays 09:00–12:00 and 14:00–18:00 | peak price (= off-peak ×2) |
+| 🟢 **Off-peak** | everything else — including all of Saturday & Sunday | half of peak |
 
-The chip (top-right of the conversation header, inside the native `conversation.session.header.utilities` strip) renders:
+Weekends (Saturday and Sunday) are charged at the valley price all day — no peak windows on weekends.
 
-- a colored status dot — **red = peak, green = off-peak**
-- the live Beijing clock (`HH:MM:SS`, timezone `Asia/Shanghai`, independent of the machine's timezone)
-- a countdown: `剩 3h 54m · 价格 ×2` (peak) / `距高峰 3h 54m · 半价` (off-peak)
-- click to expand a small popover with the full detail: peak windows, next transition with `HH:MM:SS` countdown, a phase progress bar, and the pricing note
+## What you get
 
-Everything is themed with the web UI's native `--dsw-alias-*` variables, so it blends into the interface — no floating overlays.
+- A colored status dot — **red = peak, green = off-peak** — plus the live Beijing clock (`HH:MM:SS`, timezone `Asia/Shanghai`, independent of your machine's timezone)
+- A countdown: `剩 3h 54m · 价格 ×2` during peak / `距高峰 3h 54m · 半价` off-peak
+- Click the chip to expand a detail card: peak windows, the next transition with a `HH:MM:SS` countdown, and a progress bar of the current phase
+- Fully themed with the web UI's native `--dsw-alias-*` variables — it blends into the interface instead of floating over it
+- Mounted persistently: it survives dsh web restarts
 
 ## Install
 
-The plugin is a real package mounted through the profile's patch layer, so it **survives dsh web restarts**.
-
-### Via the dsh CLI (after publishing to npm)
-
 ```sh
 dsh plugin --profile web add dsh-peak-status
 ```
 
-### Manual / from source
-
-1. Copy (or link) the `dsh-peak-status` folder into the profile's `node_modules`:
-
-   ```sh
-   # from the repo root
-   cp -R . "$HOME/.dsh/profiles/web/node_modules/dsh-peak-status"
-   ```
-
-2. Add one insert to `~/.dsh/profiles/web/cordis.patch.yml`:
-
-   ```yaml
-   - insert:
-       - id: dsh-peak-status
-         name: 'dsh-peak-status'
-   ```
-
-3. Refresh the page (the patch file is watched and hot-reloads); restart `dsh web` if the chip does not appear.
-
-## Build
-
-The shipped `lib/` is generated from `src/`:
+Prefer installing straight from GitHub:
 
 ```sh
-npm run build     # copies src/*.js -> lib/
-npm run check     # syntax-check both halves
-npm test          # boundary tests for the peak algorithm
+dsh plugin --profile web add github:xiaoyi-xx/dsh-peak-status
 ```
 
-`npm publish` runs `prepack` (build) automatically.
-
-## Peak window policy
-
-The peak windows are hard-coded in `src/client.js` (`BOUNDS = [540, 720, 840, 1080]` — 09:00, 12:00, 14:00, 18:00 in minutes of day). If DeepSeek ever changes the schedule, update that one constant and rebuild. Open an issue or PR in this repository and the community plugin list ([awesome-dsh-plugin](https://awesome-dsh-plugin.com)) will pick it up.
+Then restart `dsh web` (or refresh the page). The chip appears at the top-right of the conversation header.
 
-## Repository layout
+## Usage
 
-```
-dsh-peak-status/
-├── src/             # source of truth (host half + browser half)
-├── lib/             # built output, committed for zero-friction installs
-├── scripts/         # build + tests
-├── cordis.patch.yml # bundle patch used by `dsh plugin add`
-└── package.json     # dsh.bundle / dsh.client declarations
-```
-
-## Publish
-
-```sh
-npm publish          # prepack builds lib/ automatically
-```
+The chip updates every second. Click it to expand/collapse the detail card; hover for a quick tooltip. Peak/off-peak state follows the official schedule above, computed in Beijing time.
 
-Then `dsh plugin --profile web add dsh-peak-status` installs the published version.
+If DeepSeek ever changes the peak schedule, a new release will ship with the updated windows — open an issue on this repository if you notice a mismatch.
 
 ## License
 

package/README.zh-CN.md

@@ -2,91 +2,48 @@
 
 [English](README.md) | 中文
 
-[DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) Web GUI 的高峰时段指示灯。在会话头部右上角（原生 `conversation.session.header.utilities` 工具位）显示一个融入界面的小胶囊，实时告诉你当前**北京时间**是否处于 DeepSeek API 的**高峰时段**，带秒级时钟、下一转折倒计时和价格提示。
-
 ![peak indicator 预览](assets/peak-indicator.png)
 
-## 功能
+[DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) Web GUI 的高峰时段指示灯。在会话头部右上角显示一个融入界面的小胶囊，实时告诉你当前**北京时间**是否处于 DeepSeek API 的**高峰时段**，带秒级时钟、下一转折倒计时和价格提示。
+
+## 高峰时段
 
-DeepSeek 官方峰谷定价于 **2026-08-17** 生效：
+DeepSeek 官方峰谷定价（2026-08-17 生效，2026-08-23 起周末调整）：
 
-| 状态 | 北京时间（每日） | 价格 |
+| 状态 | 时段（北京时间） | 价格 |
 | :-- | :-- | :-- |
-| 🔴 **高峰** | 09:00–12:00 和 14:00–18:00 | 高峰价（= 空闲 ×2） |
-| 🟢 **空闲** | 其余时间 | 高峰的一半 |
+| 🔴 **高峰** | 工作日 09:00–12:00 和 14:00–18:00 | 高峰价（= 空闲 ×2） |
+| 🟢 **空闲** | 其余时间——包括周六、周日全天 | 高峰的一半 |
 
-胶囊显示内容：
+周末（周六、周日）全天按谷价计费，不设高峰时段。
 
-- 状态圆点——**红 = 高峰，绿 = 空闲**
-- 实时北京时钟（`HH:MM:SS`，时区 `Asia/Shanghai`，与本机时区无关）
-- 倒计时：`剩 3h 54m · 价格 ×2`（高峰）/ `距高峰 3h 54m · 半价`（空闲）
-- 点击展开下拉详情：高峰窗口、下一转折（含 `HH:MM:SS` 倒计时）、当前阶段进度条、价格说明
+## 功能
 
-全部使用 Web UI 原生 `--dsw-alias-*` 主题变量，与界面完全融合，没有悬浮贴片。
+- 状态圆点——**红 = 高峰，绿 = 空闲**，外加实时北京时钟（`HH:MM:SS`，时区 `Asia/Shanghai`，与本机时区无关）
+- 倒计时：高峰时显示 `剩 3h 54m · 价格 ×2`，空闲时显示 `距高峰 3h 54m · 半价`
+- 点击胶囊展开详情卡：高峰窗口、下一转折（含 `HH:MM:SS` 倒计时）、当前阶段进度条
+- 全部使用 Web UI 原生 `--dsw-alias-*` 主题变量，与界面完全融合，没有悬浮贴片
+- 持久挂载：重启 dsh web 后依然存在
 
 ## 安装
 
-插件是经 profile 补丁层挂载的真实包，**重启 dsh web 不会消失**。
-
-### dsh CLI 安装（发布到 npm 后）
-
 ```sh
 dsh plugin --profile web add dsh-peak-status
 ```
 
-### 手动 / 源码安装
-
-1. 把 `dsh-peak-status` 目录复制（或链接）进 profile 的 `node_modules`：
-
-   ```sh
-   # 在仓库根目录执行
-   cp -R . "$HOME/.dsh/profiles/web/node_modules/dsh-peak-status"
-   ```
-
-2. 在 `~/.dsh/profiles/web/cordis.patch.yml` 里加一行插入：
-
-   ```yaml
-   - insert:
-       - id: dsh-peak-status
-         name: 'dsh-peak-status'
-   ```
-
-3. 刷新页面（补丁文件有监听、支持热加载）；没出现就重启一次 `dsh web`。
-
-## 构建
-
-发布的 `lib/` 由 `src/` 生成：
+也可以直接从 GitHub 安装：
 
 ```sh
-npm run build     # 把 src/*.js 复制到 lib/
-npm run check     # 两个半区的语法检查
-npm test          # 高峰判定算法边界测试
+dsh plugin --profile web add github:xiaoyi-xx/dsh-peak-status
 ```
 
-`npm publish` 会自动执行 `prepack`（构建）。
-
-## 高峰时段策略
-
-高峰窗口硬编码在 `src/client.js` 的 `BOUNDS = [540, 720, 840, 1080]`（一天中的分钟：09:00、12:00、14:00、18:00）。如果 DeepSeek 以后调整时段，改这一个常量重新构建即可；也可以在本仓库提 Issue/PR，社区插件列表（[awesome-dsh-plugin](https://awesome-dsh-plugin.com)）会自动收录。
-
-## 目录结构
+然后重启 `dsh web`（或刷新页面），胶囊会出现在会话头部右上角。
 
-```
-dsh-peak-status/
-├── src/             # 源码（宿主半区 + 浏览器半区）
-├── lib/             # 构建产物（已提交，零门槛安装）
-├── scripts/         # 构建与测试脚本
-├── cordis.patch.yml # dsh plugin add 使用的 bundle 补丁
-└── package.json     # dsh.bundle / dsh.client 声明
-```
-
-## 发布
+## 使用
 
-```sh
-npm publish          # prepack 会自动构建 lib/
-```
+胶囊每秒自动更新。点击展开/收起详情卡，悬停有快捷提示。高峰/空闲状态严格按上面官方时刻表、以北京时间计算。
 
-之后 `dsh plugin --profile web add dsh-peak-status` 即可安装已发布版本。
+如果 DeepSeek 以后调整高峰时段，我们会发布包含新时段的新版本——发现不一致欢迎在仓库提 Issue。
 
 ## 许可证
 

package/lib/client.js

@@ -7,9 +7,11 @@
  * variables so it blends into the interface.
  *
  * Shows whether the current Beijing time falls in DeepSeek's API peak
- * window. Official definition (effective 2026-08-17):
- *   peak:     daily 09:00–12:00 and 14:00–18:00 (Beijing time)
- *   off-peak: everything else (priced at half of peak)
+ * window. Official pricing (peak/valley, effective 2026-08-17, weekends
+ * adjusted 2026-08-23):
+ *   weekdays peak:   09:00–12:00 and 14:00–18:00 (Beijing time)
+ *   weekends:        Saturday & Sunday all day at the valley price
+ *   off-peak:        everything else (priced at half of peak)
  *
  * Red = peak (bold), green = off-peak; live Beijing clock, countdown to the
  * next transition, click to expand a small popover with the full detail.
@@ -42,44 +44,84 @@
     var react = require('react')
 
     var TZ = 'Asia/Shanghai'
-    // Peak window boundaries in minutes of day: 09:00, 12:00, 14:00, 18:00.
+    // Weekday peak window boundaries in minutes of day: 09:00, 12:00, 14:00, 18:00.
     var BOUNDS = [540, 720, 840, 1080]
+    // Weekday labels for "next boundary" display (ISO weekday 1..7).
+    var WEEKDAY_LABELS = ['一', '二', '三', '四', '五', '六', '日']
 
     var FONT = 'var(--dsw-font-family, system-ui, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif)'
     var DIM = 'var(--dsw-alias-label-secondary, var(--dsh-text-dim, #8a8f98))'
     var PEAK_COLOR = 'var(--dsw-alias-state-error-primary, #e5484d)'
     var OFF_COLOR = 'var(--dsw-alias-state-success-primary, #30a46c)'
 
+    /** Beijing time parts incl. ISO weekday (1=Mon … 7=Sun), timezone-proof. */
     function bjParts() {
       var parts = new Intl.DateTimeFormat('en-GB', {
-        timeZone: TZ, hour12: false,
+        timeZone: TZ, hour12: false, weekday: 'short',
         hour: '2-digit', minute: '2-digit', second: '2-digit',
       }).formatToParts(new Date())
       var get = function (type) {
         for (var i = 0; i < parts.length; i++) {
-          if (parts[i].type === type) return Number(parts[i].value)
+          if (parts[i].type === type) return parts[i].value
         }
-        return 0
+        return ''
+      }
+      var wdMap = { Mon: 1, Tue: 2, Wed: 3, Thu: 4, Fri: 5, Sat: 6, Sun: 7 }
+      return {
+        h: Number(get('hour')),
+        m: Number(get('minute')),
+        s: Number(get('second')),
+        weekday: wdMap[get('weekday')] || 1,
       }
-      return { h: get('hour'), m: get('minute'), s: get('second') }
     }
 
+    /**
+     * Peak/off-peak state at a Beijing-time instant.
+     * Weekends (Sat/Sun) are all-day off-peak; weekdays follow the peak
+     * windows 09:00–12:00 / 14:00–18:00. Returns the next state boundary as
+     * { nextMin, daysAhead } (daysAhead counts how many Beijing days away),
+     * seconds until it, and the progress through the current phase.
+     */
     function compute(t) {
       var now = t.h * 60 + t.m
-      var peak = (now >= BOUNDS[0] && now < BOUNDS[1]) || (now >= BOUNDS[2] && now < BOUNDS[3])
-      var next = null
-      for (var i = 0; i < BOUNDS.length; i++) {
-        if (BOUNDS[i] > now) { next = { min: BOUNDS[i], tomorrow: false }; break }
-      }
-      if (next === null) next = { min: BOUNDS[0], tomorrow: true }
-      var secsToNext = (next.min - now) * 60 - t.s + (next.tomorrow ? 24 * 3600 : 0)
-      var phaseStart = 0
-      for (var j = BOUNDS.length - 1; j >= 0; j--) {
-        if (BOUNDS[j] <= now) { phaseStart = BOUNDS[j]; break }
+      var weekend = t.weekday === 6 || t.weekday === 7
+      var peak, nextMin, daysAhead, phaseStartMin, phaseLenMin
+
+      if (weekend) {
+        peak = false
+        nextMin = BOUNDS[0] // Monday 09:00
+        daysAhead = ((1 - t.weekday + 7) % 7) || 7 // Sat → 2, Sun → 1
+        var daysSinceSat = (t.weekday - 6 + 7) % 7 // Sat=0, Sun=1
+        phaseStartMin = daysSinceSat * 1440
+        phaseLenMin = 2 * 1440 + BOUNDS[0] // Sat 00:00 → Mon 09:00
+      } else {
+        peak = (now >= BOUNDS[0] && now < BOUNDS[1]) || (now >= BOUNDS[2] && now < BOUNDS[3])
+        var next = null
+        for (var i = 0; i < BOUNDS.length; i++) {
+          if (BOUNDS[i] > now) { next = BOUNDS[i]; break }
+        }
+        if (next !== null) {
+          nextMin = next
+          daysAhead = 0
+          var ps = 0
+          for (var j = BOUNDS.length - 1; j >= 0; j--) {
+            if (BOUNDS[j] <= now) { ps = BOUNDS[j]; break }
+          }
+          phaseStartMin = ps
+          phaseLenMin = nextMin - ps
+        } else {
+          nextMin = BOUNDS[0]
+          // After 18:00: Friday → next Monday 09:00 (3 days), otherwise next day 09:00.
+          daysAhead = t.weekday === 5 ? 3 : 1
+          phaseStartMin = BOUNDS[3]
+          phaseLenMin = daysAhead * 1440 + BOUNDS[0] - phaseStartMin
+        }
       }
-      var phaseLenMin = (next.min - now) + (next.tomorrow ? 1440 : 0) + (now - phaseStart)
-      var progress = phaseLenMin > 0 ? Math.min(100, Math.max(0, ((now - phaseStart) / phaseLenMin) * 100)) : 0
-      return { peak: peak, next: next, secsToNext: secsToNext, progress: progress }
+
+      var secsToNext = daysAhead * 86400 + (nextMin - now) * 60 - t.s
+      var elapsedMin = weekend ? daysSinceSat * 1440 + now : now - phaseStartMin
+      var progress = phaseLenMin > 0 ? Math.min(100, Math.max(0, (elapsedMin / phaseLenMin) * 100)) : 0
+      return { peak: peak, nextMin: nextMin, daysAhead: daysAhead, secsToNext: secsToNext, progress: progress }
     }
 
     function pad(n) { return (n < 10 ? '0' : '') + n }
@@ -87,8 +129,10 @@
     function fmtBoundary(min) { return pad(Math.floor(min / 60)) + ':' + pad(min % 60) }
     function fmtDur(totalSecs) {
       var s = Math.max(0, Math.round(totalSecs))
-      var h = Math.floor(s / 3600)
+      var d = Math.floor(s / 86400)
+      var h = Math.floor((s % 86400) / 3600)
       var m = Math.floor((s % 3600) / 60)
+      if (d > 0) return d + 'd ' + h + 'h'
       return (h > 0 ? h + 'h ' : '') + m + 'm'
     }
     function fmtDurFull(totalSecs) {
@@ -98,6 +142,13 @@
       var sec = s % 60
       return pad(h) + ':' + pad(m) + ':' + pad(sec)
     }
+    /** Human label for the next boundary: "18:00" / "明天 09:00" / "周一 09:00". */
+    function fmtBoundaryLabel(t, s) {
+      if (s.daysAhead === 0) return fmtBoundary(s.nextMin)
+      if (s.daysAhead === 1) return '明天 ' + fmtBoundary(s.nextMin)
+      var nextW = ((t.weekday - 1 + s.daysAhead) % 7) + 1
+      return '周' + WEEKDAY_LABELS[nextW - 1] + ' ' + fmtBoundary(s.nextMin)
+    }
 
     function PeakChip() {
       var tickState = react.useState(bjParts())
@@ -112,17 +163,18 @@
       }, [])
 
       var s = compute(tick)
+      var weekend = tick.weekday === 6 || tick.weekday === 7
       var color = s.peak ? PEAK_COLOR : OFF_COLOR
       var clock = fmtClock(tick)
-      var boundaryLabel = fmtBoundary(s.next.min) + (s.next.tomorrow ? '（明天）' : '')
+      var boundaryLabel = fmtBoundaryLabel(tick, s)
 
       var chip = react.createElement(
         'div',
         {
           onClick: function () { setOpen(!open[0]) },
           title: s.peak
-            ? '高峰期（北京时间 9:00-12:00 / 14:00-18:00）：价格 = 空闲 ×2。' + boundaryLabel + ' 结束，点击展开详情'
-            : '空闲期：价格为高峰一半。下一高峰 ' + boundaryLabel + '，点击展开详情',
+            ? '高峰期（工作日 9:00-12:00 / 14:00-18:00）：价格 = 空闲 ×2。' + boundaryLabel + ' 结束，点击展开详情'
+            : '空闲期：价格为高峰一半' + (weekend ? '（周末全天谷价）' : '') + '。下一高峰 ' + boundaryLabel + '，点击展开详情',
           style: {
             display: 'inline-flex', alignItems: 'center', gap: 6,
             fontFamily: FONT, fontSize: 12, lineHeight: '20px',
@@ -135,7 +187,7 @@
         [
           react.createElement('span', { key: 'dot', style: { width: 7, height: 7, borderRadius: '50%', background: color, flexShrink: 0 } }),
           react.createElement('span', { key: 'state', style: { fontWeight: s.peak ? 700 : 500, color: color } },
-            s.peak ? '高峰期' : '空闲期'),
+            s.peak ? '高峰期' : (weekend ? '周末谷价' : '空闲期')),
           react.createElement('span', { key: 'clock', style: { fontVariantNumeric: 'tabular-nums' } }, clock),
           react.createElement('span', { key: 'count', style: { fontVariantNumeric: 'tabular-nums' } },
             s.peak
@@ -164,14 +216,16 @@
         [
           react.createElement('div', { key: 'l1', style: { display: 'flex', alignItems: 'center', gap: 6 } }, [
             react.createElement('span', { key: 'st', style: { fontWeight: 700, color: color } },
-              s.peak ? '高峰时段' : '空闲时段'),
+              s.peak ? '高峰时段' : (weekend ? '周末谷价' : '空闲时段')),
             react.createElement('span', { key: 'tm', style: { fontVariantNumeric: 'tabular-nums' } },
               clock + '（北京）'),
             react.createElement('span', { key: 'price', style: { color: color, fontWeight: 500 } },
               s.peak ? '价格 ×2' : '半价'),
           ]),
           react.createElement('div', { key: 'l2' },
-            '高峰窗口：09:00–12:00 / 14:00–18:00（每日）'),
+            '高峰窗口（工作日）：09:00–12:00 / 14:00–18:00'),
+          react.createElement('div', { key: 'l2b', style: { color: weekend ? OFF_COLOR : DIM, fontWeight: weekend ? 600 : 400 } },
+            '周末（周六、周日）：全天按谷价计费'),
           react.createElement('div', { key: 'l3', style: { fontVariantNumeric: 'tabular-nums' } },
             '下一转折：' + boundaryLabel + ' · 倒计时 ' + fmtDurFull(s.secsToNext)),
           react.createElement('div', { key: 'bar', style: { display: 'flex', alignItems: 'center', gap: 8 } }, [
@@ -185,7 +239,7 @@
               s.progress.toFixed(0) + '%'),
           ]),
           react.createElement('div', { key: 'foot', style: { fontSize: 10.5, lineHeight: 1.5, opacity: 0.85 } },
-            '官方峰谷定价 2026-08-17 生效：空闲时段价格为高峰一半。'),
+            '官方峰谷定价 8/17 生效，8/23 起周末全天谷价；空闲价 = 高峰一半。'),
         ],
       )
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-peak-status",
-  "version": "1.0.1",
-  "description": "Peak-hour indicator for the DSH web GUI: a native header chip showing whether the current Beijing time is inside DeepSeek's API peak window (daily 09:00–12:00 / 14:00–18:00), with a live clock, countdown, and ×2/off-peak pricing hints. · DSH Web GUI 高峰指示灯：原生会话头部胶囊，实时显示当前北京时间是否处于 DeepSeek API 高峰时段。",
+  "version": "1.0.2",
+  "description": "Peak-hour indicator for the DSH web GUI: a native header chip showing whether the current Beijing time is inside DeepSeek's API peak window (weekdays 09:00–12:00 / 14:00–18:00; weekends all-day valley price), with a live clock, countdown, and ×2/off-peak pricing hints. · DSH Web GUI 高峰指示灯：原生会话头部胶囊，实时显示当前北京时间是否处于 DeepSeek API 高峰时段（工作日 9:00-12:00 / 14:00-18:00，周末全天谷价）。",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

package/src/client.js

@@ -7,9 +7,11 @@
  * variables so it blends into the interface.
  *
  * Shows whether the current Beijing time falls in DeepSeek's API peak
- * window. Official definition (effective 2026-08-17):
- *   peak:     daily 09:00–12:00 and 14:00–18:00 (Beijing time)
- *   off-peak: everything else (priced at half of peak)
+ * window. Official pricing (peak/valley, effective 2026-08-17, weekends
+ * adjusted 2026-08-23):
+ *   weekdays peak:   09:00–12:00 and 14:00–18:00 (Beijing time)
+ *   weekends:        Saturday & Sunday all day at the valley price
+ *   off-peak:        everything else (priced at half of peak)
  *
  * Red = peak (bold), green = off-peak; live Beijing clock, countdown to the
  * next transition, click to expand a small popover with the full detail.
@@ -42,44 +44,84 @@
     var react = require('react')
 
     var TZ = 'Asia/Shanghai'
-    // Peak window boundaries in minutes of day: 09:00, 12:00, 14:00, 18:00.
+    // Weekday peak window boundaries in minutes of day: 09:00, 12:00, 14:00, 18:00.
     var BOUNDS = [540, 720, 840, 1080]
+    // Weekday labels for "next boundary" display (ISO weekday 1..7).
+    var WEEKDAY_LABELS = ['一', '二', '三', '四', '五', '六', '日']
 
     var FONT = 'var(--dsw-font-family, system-ui, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif)'
     var DIM = 'var(--dsw-alias-label-secondary, var(--dsh-text-dim, #8a8f98))'
     var PEAK_COLOR = 'var(--dsw-alias-state-error-primary, #e5484d)'
     var OFF_COLOR = 'var(--dsw-alias-state-success-primary, #30a46c)'
 
+    /** Beijing time parts incl. ISO weekday (1=Mon … 7=Sun), timezone-proof. */
     function bjParts() {
       var parts = new Intl.DateTimeFormat('en-GB', {
-        timeZone: TZ, hour12: false,
+        timeZone: TZ, hour12: false, weekday: 'short',
         hour: '2-digit', minute: '2-digit', second: '2-digit',
       }).formatToParts(new Date())
       var get = function (type) {
         for (var i = 0; i < parts.length; i++) {
-          if (parts[i].type === type) return Number(parts[i].value)
+          if (parts[i].type === type) return parts[i].value
         }
-        return 0
+        return ''
+      }
+      var wdMap = { Mon: 1, Tue: 2, Wed: 3, Thu: 4, Fri: 5, Sat: 6, Sun: 7 }
+      return {
+        h: Number(get('hour')),
+        m: Number(get('minute')),
+        s: Number(get('second')),
+        weekday: wdMap[get('weekday')] || 1,
       }
-      return { h: get('hour'), m: get('minute'), s: get('second') }
     }
 
+    /**
+     * Peak/off-peak state at a Beijing-time instant.
+     * Weekends (Sat/Sun) are all-day off-peak; weekdays follow the peak
+     * windows 09:00–12:00 / 14:00–18:00. Returns the next state boundary as
+     * { nextMin, daysAhead } (daysAhead counts how many Beijing days away),
+     * seconds until it, and the progress through the current phase.
+     */
     function compute(t) {
       var now = t.h * 60 + t.m
-      var peak = (now >= BOUNDS[0] && now < BOUNDS[1]) || (now >= BOUNDS[2] && now < BOUNDS[3])
-      var next = null
-      for (var i = 0; i < BOUNDS.length; i++) {
-        if (BOUNDS[i] > now) { next = { min: BOUNDS[i], tomorrow: false }; break }
-      }
-      if (next === null) next = { min: BOUNDS[0], tomorrow: true }
-      var secsToNext = (next.min - now) * 60 - t.s + (next.tomorrow ? 24 * 3600 : 0)
-      var phaseStart = 0
-      for (var j = BOUNDS.length - 1; j >= 0; j--) {
-        if (BOUNDS[j] <= now) { phaseStart = BOUNDS[j]; break }
+      var weekend = t.weekday === 6 || t.weekday === 7
+      var peak, nextMin, daysAhead, phaseStartMin, phaseLenMin
+
+      if (weekend) {
+        peak = false
+        nextMin = BOUNDS[0] // Monday 09:00
+        daysAhead = ((1 - t.weekday + 7) % 7) || 7 // Sat → 2, Sun → 1
+        var daysSinceSat = (t.weekday - 6 + 7) % 7 // Sat=0, Sun=1
+        phaseStartMin = daysSinceSat * 1440
+        phaseLenMin = 2 * 1440 + BOUNDS[0] // Sat 00:00 → Mon 09:00
+      } else {
+        peak = (now >= BOUNDS[0] && now < BOUNDS[1]) || (now >= BOUNDS[2] && now < BOUNDS[3])
+        var next = null
+        for (var i = 0; i < BOUNDS.length; i++) {
+          if (BOUNDS[i] > now) { next = BOUNDS[i]; break }
+        }
+        if (next !== null) {
+          nextMin = next
+          daysAhead = 0
+          var ps = 0
+          for (var j = BOUNDS.length - 1; j >= 0; j--) {
+            if (BOUNDS[j] <= now) { ps = BOUNDS[j]; break }
+          }
+          phaseStartMin = ps
+          phaseLenMin = nextMin - ps
+        } else {
+          nextMin = BOUNDS[0]
+          // After 18:00: Friday → next Monday 09:00 (3 days), otherwise next day 09:00.
+          daysAhead = t.weekday === 5 ? 3 : 1
+          phaseStartMin = BOUNDS[3]
+          phaseLenMin = daysAhead * 1440 + BOUNDS[0] - phaseStartMin
+        }
       }
-      var phaseLenMin = (next.min - now) + (next.tomorrow ? 1440 : 0) + (now - phaseStart)
-      var progress = phaseLenMin > 0 ? Math.min(100, Math.max(0, ((now - phaseStart) / phaseLenMin) * 100)) : 0
-      return { peak: peak, next: next, secsToNext: secsToNext, progress: progress }
+
+      var secsToNext = daysAhead * 86400 + (nextMin - now) * 60 - t.s
+      var elapsedMin = weekend ? daysSinceSat * 1440 + now : now - phaseStartMin
+      var progress = phaseLenMin > 0 ? Math.min(100, Math.max(0, (elapsedMin / phaseLenMin) * 100)) : 0
+      return { peak: peak, nextMin: nextMin, daysAhead: daysAhead, secsToNext: secsToNext, progress: progress }
     }
 
     function pad(n) { return (n < 10 ? '0' : '') + n }
@@ -87,8 +129,10 @@
     function fmtBoundary(min) { return pad(Math.floor(min / 60)) + ':' + pad(min % 60) }
     function fmtDur(totalSecs) {
       var s = Math.max(0, Math.round(totalSecs))
-      var h = Math.floor(s / 3600)
+      var d = Math.floor(s / 86400)
+      var h = Math.floor((s % 86400) / 3600)
       var m = Math.floor((s % 3600) / 60)
+      if (d > 0) return d + 'd ' + h + 'h'
       return (h > 0 ? h + 'h ' : '') + m + 'm'
     }
     function fmtDurFull(totalSecs) {
@@ -98,6 +142,13 @@
       var sec = s % 60
       return pad(h) + ':' + pad(m) + ':' + pad(sec)
     }
+    /** Human label for the next boundary: "18:00" / "明天 09:00" / "周一 09:00". */
+    function fmtBoundaryLabel(t, s) {
+      if (s.daysAhead === 0) return fmtBoundary(s.nextMin)
+      if (s.daysAhead === 1) return '明天 ' + fmtBoundary(s.nextMin)
+      var nextW = ((t.weekday - 1 + s.daysAhead) % 7) + 1
+      return '周' + WEEKDAY_LABELS[nextW - 1] + ' ' + fmtBoundary(s.nextMin)
+    }
 
     function PeakChip() {
       var tickState = react.useState(bjParts())
@@ -112,17 +163,18 @@
       }, [])
 
       var s = compute(tick)
+      var weekend = tick.weekday === 6 || tick.weekday === 7
       var color = s.peak ? PEAK_COLOR : OFF_COLOR
       var clock = fmtClock(tick)
-      var boundaryLabel = fmtBoundary(s.next.min) + (s.next.tomorrow ? '（明天）' : '')
+      var boundaryLabel = fmtBoundaryLabel(tick, s)
 
       var chip = react.createElement(
         'div',
         {
           onClick: function () { setOpen(!open[0]) },
           title: s.peak
-            ? '高峰期（北京时间 9:00-12:00 / 14:00-18:00）：价格 = 空闲 ×2。' + boundaryLabel + ' 结束，点击展开详情'
-            : '空闲期：价格为高峰一半。下一高峰 ' + boundaryLabel + '，点击展开详情',
+            ? '高峰期（工作日 9:00-12:00 / 14:00-18:00）：价格 = 空闲 ×2。' + boundaryLabel + ' 结束，点击展开详情'
+            : '空闲期：价格为高峰一半' + (weekend ? '（周末全天谷价）' : '') + '。下一高峰 ' + boundaryLabel + '，点击展开详情',
           style: {
             display: 'inline-flex', alignItems: 'center', gap: 6,
             fontFamily: FONT, fontSize: 12, lineHeight: '20px',
@@ -135,7 +187,7 @@
         [
           react.createElement('span', { key: 'dot', style: { width: 7, height: 7, borderRadius: '50%', background: color, flexShrink: 0 } }),
           react.createElement('span', { key: 'state', style: { fontWeight: s.peak ? 700 : 500, color: color } },
-            s.peak ? '高峰期' : '空闲期'),
+            s.peak ? '高峰期' : (weekend ? '周末谷价' : '空闲期')),
           react.createElement('span', { key: 'clock', style: { fontVariantNumeric: 'tabular-nums' } }, clock),
           react.createElement('span', { key: 'count', style: { fontVariantNumeric: 'tabular-nums' } },
             s.peak
@@ -164,14 +216,16 @@
         [
           react.createElement('div', { key: 'l1', style: { display: 'flex', alignItems: 'center', gap: 6 } }, [
             react.createElement('span', { key: 'st', style: { fontWeight: 700, color: color } },
-              s.peak ? '高峰时段' : '空闲时段'),
+              s.peak ? '高峰时段' : (weekend ? '周末谷价' : '空闲时段')),
             react.createElement('span', { key: 'tm', style: { fontVariantNumeric: 'tabular-nums' } },
               clock + '（北京）'),
             react.createElement('span', { key: 'price', style: { color: color, fontWeight: 500 } },
               s.peak ? '价格 ×2' : '半价'),
           ]),
           react.createElement('div', { key: 'l2' },
-            '高峰窗口：09:00–12:00 / 14:00–18:00（每日）'),
+            '高峰窗口（工作日）：09:00–12:00 / 14:00–18:00'),
+          react.createElement('div', { key: 'l2b', style: { color: weekend ? OFF_COLOR : DIM, fontWeight: weekend ? 600 : 400 } },
+            '周末（周六、周日）：全天按谷价计费'),
           react.createElement('div', { key: 'l3', style: { fontVariantNumeric: 'tabular-nums' } },
             '下一转折：' + boundaryLabel + ' · 倒计时 ' + fmtDurFull(s.secsToNext)),
           react.createElement('div', { key: 'bar', style: { display: 'flex', alignItems: 'center', gap: 8 } }, [
@@ -185,7 +239,7 @@
               s.progress.toFixed(0) + '%'),
           ]),
           react.createElement('div', { key: 'foot', style: { fontSize: 10.5, lineHeight: 1.5, opacity: 0.85 } },
-            '官方峰谷定价 2026-08-17 生效：空闲时段价格为高峰一半。'),
+            '官方峰谷定价 8/17 生效，8/23 起周末全天谷价；空闲价 = 高峰一半。'),
         ],
       )