npm - dsh-offpeak-guard - Versions diffs - 0.1.0 → 0.3.0 - Mend

dsh-offpeak-guard 0.1.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,24 @@
 # Changelog
+## 0.3.0 — 2026-11-06
+- 新增峰时策略 `pauseMode`：`pause-now` 立即暂停，`finish-turn` 完成当前轮后暂停；设置面板可切换。
+- 子代理感知：会话有正在运行的子代理时先放行，子代理结束后再暂停父会话并记录，谷价开始自动恢复。
+- 精确模型识别：按 `provider/model` 精确匹配，`peakPricedModels` 精确列表 + `exemptModels` 豁免；设置面板可逐模型开关。
+- 新增设置面板（点击左栏计时打开）：峰时策略、模型管理、会话豁免、节假日同步状态。
+- 会话豁免：`offpeak_guard exempt/unexempt` 或设置面板，可随时取消。
+- 节假日动态识别：默认从公开节假日 API 同步当前/下一年，缓存到 `holidays.json`，失败回退内置 2026 列表；`holidaySource: builtin` 可完全离线。
+- 新增环境变量：`DSH_OFFPEAK_PAUSE_MODE`、`DSH_OFFPEAK_HOLIDAY_SOURCE`、`DSH_OFFPEAK_HOLIDAY_API`、`DSH_OFFPEAK_PEAK_MODELS`。
+- 状态 schema 扩展：等待中的任务、会话豁免、模型规则、峰时策略；兼容旧 `state.json`。
+## 0.2.0 — 2026-11-05
+- 默认规则改为 DeepSeek 官方峰谷：工作日 09:00–12:00、14:00–18:00 峰时，周末与**中国法定节假日全天**谷价；内置 2026 年节假日列表。
+- 新增 `preset`：`auto` / `deepseek-official` / `workbuddy` / `custom`，按 provider 自动选择（WorkBuddy/CodeBuddy → workbuddy，其余 → 官方）。
+- 新增 `Config` schema：DSH 设置页可直接修改时区、窗口、豁免模型、提醒阈值等。
+- 新增 `DSH_OFFPEAK_*` 环境变量覆盖（优先级：环境变量 > 配置 > 默认），便于部署方统一注入。
+- 状态工具与界面显示当前规则和节假日状态。
 ## 0.1.0 — 2026-11-05
 - 首个公开版本。

package/README.en.md CHANGED Viewed

@@ -1,9 +1,16 @@
 # Off-peak guard (dsh-offpeak-guard)
+[![npm](https://img.shields.io/npm/v/dsh-offpeak-guard?color=blue)](https://www.npmjs.com/package/dsh-offpeak-guard)
+Published on npm: install it from the DSH Plugins page, or run
+`dsh plugin --profile <profile> add dsh-offpeak-guard`.
 Schedule work around **DeepSeek peak/off-peak pricing** inside DeepSeek Harness:
-- **Time awareness**: weekdays `09:00–12:00` and `14:00–18:00` are peak price; every other hour (lunch, night, weekends) is off-peak at 50% (time zone `Asia/Shanghai` by default).
-- **Model awareness**: only sessions using a peak-priced model (model name contains `deepseek` by default; exempt models one by one with `exemptModels`) are paused/resumed. Other models are untouched.
+- **Time awareness**: per DeepSeek's official pricing, Beijing-time weekdays (excluding Chinese statutory holidays) `09:00–12:00` and `14:00–18:00` are peak; every other hour (weekends, holidays, lunch, night) is off-peak at 50%. Holidays sync from a public API with a built-in 2026 fallback.
+- **Model awareness**: exact `provider / model` detection; models containing `deepseek` are managed by default, and the settings panel can toggle each model. `peakPricedModels` / `exemptModels` provide exact control.
+- **Peak strategy**: choose immediate pause or finish the current turn first; if a session has running subagents, they are allowed to finish and the parent is paused afterwards, then resumed at off-peak.
+- **Session exemptions**: exempt any session from the guard (settings panel or `offpeak_guard exempt/unexempt`), and un-exempt it at any time.
 - **Work planning**:
   - peak starts → running tasks are paused (the pending inbox is kept, no message is lost);
   - a task started during peak → stopped immediately, no peak-priced tokens spent;
@@ -21,6 +28,10 @@ Red blink within the alert window before peak (sample):
 ![Sidebar clock blinking red](docs/sidebar-clock-blink.png)
+Click the clock to open the settings panel:
+![Settings panel](docs/settings-panel.png)
 ## Tools
 | Tool | Purpose |
@@ -31,16 +42,22 @@ Red blink within the alert window before peak (sample):
 ## Configuration
-The `config` of the `offpeak-guard` row in `cordis.patch.yml`:
+The `offpeak-guard` row's `config` in `cordis.patch.yml`, or the plugin settings form in DSH (a Config schema is declared):
 | Key | Default | Meaning |
 | --- | --- | --- |
 | `enabled` | `true` | Master switch |
-| `timezone` | `Asia/Shanghai` | Pricing time zone |
-| `peakWeekdays` | `[1,2,3,4,5]` | Weekdays that have peak windows (0 = Sunday) |
-| `peakWindows` | 09:00–12:00, 14:00–18:00 | Peak windows; edit these when DeepSeek changes prices |
-| `discount` | `0.5` | Off-peak discount, used for the "50%" label |
-| `modelPattern` | `deepseek` | Model/provider name containing it counts as peak-priced |
+| `preset` | `auto` | `auto` picks by provider: WorkBuddy/CodeBuddy → `workbuddy`, otherwise `deepseek-official`; can be pinned to `deepseek-official` / `workbuddy` / `custom` |
+| `pauseMode` | `pause-now` | `pause-now` pauses immediately; `finish-turn` pauses after the current turn |
+| `timezone` | `Asia/Shanghai` | Pricing time zone (DeepSeek bills in Beijing time) |
+| `peakWeekdays` | `[1,2,3,4,5]` | Weekdays with peak windows (0 = Sunday); only used by `custom` |
+| `peakWindows` | 09:00–12:00, 14:00–18:00 | Peak windows; only used by `custom` |
+| `discount` | `0.5` | Off-peak discount, display only; only used by `custom` |
+| `holidays` | `[]` | Extra statutory holidays (`YYYY-MM-DD`) appended to synced/built-in dates |
+| `holidaySource` | `auto` | `auto` syncs from the public holiday API; `builtin` stays offline |
+| `holidayApi` | timor.tech | Dynamic holiday API prefix |
+| `modelPattern` | `deepseek` | Fallback match when no exact model list is set |
+| `peakPricedModels` | `[]` | Exact peak-priced models (`provider/model` or `model`); takes priority over `modelPattern` |
 | `exemptModels` | `[]` | Model ids exempted one by one |
 | `pauseRunningOnPeak` | `true` | Pause running tasks when peak starts |
 | `deferNewTurnsOnPeak` | `true` | Stop tasks started during peak immediately |
@@ -50,12 +67,62 @@ The `config` of the `offpeak-guard` row in `cordis.patch.yml`:
 | `bypassMinutes` | `10` | Grace period after a manual resume |
 | `alertMinutes` | `10` | Blink the sidebar clock within this many minutes of a switch (0 = never) |
+### Environment variables
+Deployments can inject settings with environment variables. Priority: **env > config > default**. Invalid values are ignored.
+| Variable | Example | Config field |
+| --- | --- | --- |
+| `DSH_OFFPEAK_ENABLED` | `0` / `1` | `enabled` |
+| `DSH_OFFPEAK_PRESET` | `custom` | `preset` |
+| `DSH_OFFPEAK_PAUSE_MODE` | `finish-turn` | `pauseMode` |
+| `DSH_OFFPEAK_TIMEZONE` | `Asia/Shanghai` | `timezone` |
+| `DSH_OFFPEAK_PEAK_WEEKDAYS` | `1,2,3,4,5` | `peakWeekdays` |
+| `DSH_OFFPEAK_PEAK_WINDOWS` | `09:00-12:00,14:00-18:00` | `peakWindows` |
+| `DSH_OFFPEAK_DISCOUNT` | `0.5` | `discount` |
+| `DSH_OFFPEAK_HOLIDAYS` | `2026-10-01,2026-10-02` | `holidays` |
+| `DSH_OFFPEAK_HOLIDAY_SOURCE` | `builtin` | `holidaySource` |
+| `DSH_OFFPEAK_HOLIDAY_API` | `https://.../year` | `holidayApi` |
+| `DSH_OFFPEAK_MODEL_PATTERN` | `deepseek` | `modelPattern` |
+| `DSH_OFFPEAK_PEAK_MODELS` | `deepseek-flash,vendor/model` | `peakPricedModels` |
+| `DSH_OFFPEAK_EXEMPT_MODELS` | `deepseek-v4-pro,deepseek-flash` | `exemptModels` |
+| `DSH_OFFPEAK_PAUSE_RUNNING` | `0` / `1` | `pauseRunningOnPeak` |
+| `DSH_OFFPEAK_DEFER_NEW` | `0` / `1` | `deferNewTurnsOnPeak` |
+| `DSH_OFFPEAK_RESUME` | `0` / `1` | `resumeOnOffPeak` |
+| `DSH_OFFPEAK_POLL_SECONDS` | `15` | `pollSeconds` |
+| `DSH_OFFPEAK_RESUME_DELAY_SECONDS` | `3` | `resumeDelaySeconds` |
+| `DSH_OFFPEAK_BYPASS_MINUTES` | `10` | `bypassMinutes` |
+| `DSH_OFFPEAK_ALERT_MINUTES` | `10` | `alertMinutes` |
+### Presets
+- `deepseek-official` (default): official weekday peak windows plus built-in 2026 Chinese holidays (holidays are off-peak all day).
+- `workbuddy`: same peak windows, labeled as WorkBuddy credit pricing; selected automatically for WorkBuddy/CodeBuddy providers.
+- `custom`: use `peakWeekdays` / `peakWindows` / `discount` / `holidays` exactly, for other providers or self-hosted pricing.
+## Settings panel
+Click the sidebar clock:
+- **Peak strategy**: pause immediately or finish the current turn first;
+- **Models**: provider-grouped catalog with a checkbox per model (persisted as `modelRules`, overriding `modelPattern`);
+- **Session exemptions**: exempt/un-exempt live root sessions;
+- **Holidays**: show the dynamic sync state.
+## Subagents and waiting
+- Running subagents are allowed to finish; the parent is paused after the last child ends and resumed off-peak;
+- In `finish-turn` mode the current turn finishes; a queued next turn is stopped and recorded;
+- A finished turn is marked `completed`, so no spurious turn is started at off-peak.
 ## Data
 State and snapshots live in `$DSH_HOME/offpeak-guard/`:
-- `state.json`: paused tasks, off-peak plans, last phase;
-- `status.json`: read-only snapshot for the UI (mirrored to `~/.dsh/offpeak-guard/status.json`).
+- `state.json`: paused/waiting tasks, plans, session exemptions, exact model rules, peak strategy;
+- `status.json`: read-only snapshot for the UI (mirrored to `~/.dsh/offpeak-guard/status.json`);
+- `holidays.json`: cached dynamic holiday dates.
 Nothing is written into user workspaces.
@@ -65,6 +132,11 @@ Pause uses `sessionController.cancel`, which ends only the current turn and keep
 ## Boundaries
+- Dynamic holidays come from a third-party public API (default timor.tech; only the year is sent). Offline failures fall back to the `holidays.json` cache and the built-in 2026 list; set `holidaySource: builtin` for fully offline operation.
+- Built-in statutory holidays cover 2026 only; the dynamic sync fills later years once published, or append dates with `holidays`.
+- Named presets have fixed windows; use `preset: custom` for other providers or self-hosted pricing.
 - Only root sessions with a working directory are handled; subagent sessions are skipped so parents do not hang.
+- Subagent results are consumed by the parent after it resumes; the guard stops the parent at child completion but cannot intercept messages already written into the parent history.
+- A session exemption affects future pauses/resumes only; use `resume_now` to resume an already paused session.
 - A plugin restart does not cancel tasks that are already running (so installing the plugin cannot kill the current conversation); the next peak or new task follows the rules again.
 - Manual `resume_now` grants those sessions a 10-minute grace period so they are not paused again immediately.

package/README.md CHANGED Viewed

@@ -1,15 +1,22 @@
 # 错峰调度 · 峰谷守卫（dsh-offpeak-guard）
+[![npm](https://img.shields.io/npm/v/dsh-offpeak-guard?color=blue)](https://www.npmjs.com/package/dsh-offpeak-guard)
+已发布到 npm：在 DSH 的插件页搜索 `dsh-offpeak-guard` 安装，或运行
+`dsh plugin --profile <profile> add dsh-offpeak-guard`。
 在 DeepSeek Harness 里按 **DeepSeek 峰谷计价** 安排工作：
-- **时间识别**：工作日 `09:00–12:00`、`14:00–18:00` 为峰值原价；其余时间（含午间、夜间、周末）为谷价，按 5 折计费（默认 `Asia/Shanghai`）。
-- **模型识别**：只有使用峰谷计价模型（默认模型名含 `deepseek`，可在 `exemptModels` 里逐项豁免）的会话才会被暂停/恢复；用其它模型的会话不受影响。
+- **时间识别**：按 DeepSeek 官方规则，北京时间周一至周五（不含中国法定节假日）`09:00–12:00`、`14:00–18:00` 为峰值原价；其余时间（含周末、法定节假日全天）为谷价，按 5 折计费。节假日默认从公开 API 动态同步，失败时回退内置 2026 列表。
+- **模型识别**：按会话真实 `provider / model` 精确判断；默认名字含 `deepseek` 的模型受管理，可在设置面板逐模型开关，或用 `peakPricedModels` / `exemptModels` 精确控制。
+- **峰时策略**：可选「立即暂停」或「完成当前轮后暂停」；会话有子代理在跑时先放行子代理，子代理结束后再暂停父会话，谷价开始时恢复。
+- **会话豁免**：可让某个会话不参与插件的暂停/恢复（设置面板或 `offpeak_guard exempt/unexempt`），随时取消豁免。
 - **工作规划**：
   - 峰时开始 → 暂停正在运行的任务（保留待处理队列，不丢消息）；
   - 峰时新起的任务 → 立即停住，不花峰时 token；
   - 谷价开始 → 自动把被打断的任务交还会话继续执行；
   - 另提供 `offpeak_plan` 工具，把「12 点再跑」这类事排进下一个谷价窗口。
-- **界面**：输入框下方一条状态条，显示当前峰/谷、距下次切换的倒计时、当前模型，以及暂停/规划数量；左侧栏底部另有一枚常驻计时，临近切换时闪色提醒（峰价快开始闪红、谷价快开始闪绿）。
+- **界面**：输入框下方一条状态条，显示当前峰/谷、距下次切换的倒计时、当前模型，以及暂停/规划数量；左侧栏底部另有一枚常驻计时，临近切换时闪色提醒（峰价快开始闪红、谷价快开始闪绿）。**点击左栏计时打开设置面板**：切换峰时策略、逐模型管理、会话豁免、查看节假日同步状态。
 ![输入框下方的峰谷状态条](docs/peak-strip.png)
@@ -21,6 +28,10 @@
 ![左栏峰谷计时闪红](docs/sidebar-clock-blink.png)
+点击左栏计时打开设置面板：
+![峰谷守卫设置面板](docs/settings-panel.png)
 ## 工具
 | 工具 | 用途 |
@@ -31,16 +42,22 @@
 ## 配置
-`cordis.patch.yml` 里那一行 `offpeak-guard` 的 `config`：
+`cordis.patch.yml` 里那一行 `offpeak-guard` 的 `config`，或在 DSH 设置页的插件配置里修改（已声明 Config schema）：
 | 键 | 默认 | 说明 |
 | --- | --- | --- |
 | `enabled` | `true` | 总开关 |
-| `timezone` | `Asia/Shanghai` | 计价时区 |
-| `peakWeekdays` | `[1,2,3,4,5]` | 峰时适用的星期（0=周日） |
-| `peakWindows` | 09:00–12:00、14:00–18:00 | 峰时窗口；官方调价时改这里 |
-| `discount` | `0.5` | 谷价折扣，仅用于显示「5 折」 |
-| `modelPattern` | `deepseek` | 模型名/供应商名包含它即视为峰谷计价模型 |
+| `preset` | `auto` | `auto` 按 provider 自动选：WorkBuddy/CodeBuddy → `workbuddy`，其余 → `deepseek-official`；也可固定为 `deepseek-official` / `workbuddy` / `custom` |
+| `pauseMode` | `pause-now` | `pause-now` 峰时立即暂停；`finish-turn` 当前轮跑完后再暂停 |
+| `timezone` | `Asia/Shanghai` | 计价时区（DeepSeek 计费按北京时间） |
+| `peakWeekdays` | `[1,2,3,4,5]` | 峰时适用的星期（0=周日）；仅 `custom` 预设使用 |
+| `peakWindows` | 09:00–12:00、14:00–18:00 | 峰时窗口；仅 `custom` 预设使用，官方调价时改这里 |
+| `discount` | `0.5` | 谷价折扣，仅用于显示「5 折」；仅 `custom` 预设使用 |
+| `holidays` | `[]` | 追加的法定节假日（`YYYY-MM-DD`），在动态/内置列表上追加 |
+| `holidaySource` | `auto` | `auto` 从公开节假日 API 动态同步；`builtin` 只用内置/配置列表 |
+| `holidayApi` | timor.tech | 动态节假日 API 前缀 |
+| `modelPattern` | `deepseek` | 未配置精确列表时，模型名/供应商名包含它即视为峰谷计价模型 |
+| `peakPricedModels` | `[]` | 精确的峰谷计价模型列表（`provider/model` 或 `model`）；非空时优先于 `modelPattern` |
 | `exemptModels` | `[]` | 逐项豁免的模型 id |
 | `pauseRunningOnPeak` | `true` | 峰时开始时暂停正在运行的任务 |
 | `deferNewTurnsOnPeak` | `true` | 峰时新起的任务立即停住 |
@@ -50,12 +67,64 @@
 | `bypassMinutes` | `10` | 手动恢复后的豁免期，避免立刻又被暂停 |
 | `alertMinutes` | `10` | 左栏计时在距切换多少分钟内开始闪烁（0 = 不闪） |
+### 环境变量
+部署方可以用环境变量统一注入，优先级：**环境变量 > 配置 > 默认**。无效值会被忽略。
+| 环境变量 | 例子 | 对应配置 |
+| --- | --- | --- |
+| `DSH_OFFPEAK_ENABLED` | `0` / `1` | `enabled` |
+| `DSH_OFFPEAK_PRESET` | `custom` | `preset` |
+| `DSH_OFFPEAK_PAUSE_MODE` | `finish-turn` | `pauseMode` |
+| `DSH_OFFPEAK_TIMEZONE` | `Asia/Shanghai` | `timezone` |
+| `DSH_OFFPEAK_PEAK_WEEKDAYS` | `1,2,3,4,5` | `peakWeekdays` |
+| `DSH_OFFPEAK_PEAK_WINDOWS` | `09:00-12:00,14:00-18:00` | `peakWindows` |
+| `DSH_OFFPEAK_DISCOUNT` | `0.5` | `discount` |
+| `DSH_OFFPEAK_HOLIDAYS` | `2026-10-01,2026-10-02` | `holidays` |
+| `DSH_OFFPEAK_HOLIDAY_SOURCE` | `builtin` | `holidaySource` |
+| `DSH_OFFPEAK_HOLIDAY_API` | `https://.../year` | `holidayApi` |
+| `DSH_OFFPEAK_MODEL_PATTERN` | `deepseek` | `modelPattern` |
+| `DSH_OFFPEAK_PEAK_MODELS` | `deepseek-flash,vendor/model` | `peakPricedModels` |
+| `DSH_OFFPEAK_EXEMPT_MODELS` | `deepseek-v4-pro,deepseek-flash` | `exemptModels` |
+| `DSH_OFFPEAK_PAUSE_RUNNING` | `0` / `1` | `pauseRunningOnPeak` |
+| `DSH_OFFPEAK_DEFER_NEW` | `0` / `1` | `deferNewTurnsOnPeak` |
+| `DSH_OFFPEAK_RESUME` | `0` / `1` | `resumeOnOffPeak` |
+| `DSH_OFFPEAK_POLL_SECONDS` | `15` | `pollSeconds` |
+| `DSH_OFFPEAK_RESUME_DELAY_SECONDS` | `3` | `resumeDelaySeconds` |
+| `DSH_OFFPEAK_BYPASS_MINUTES` | `10` | `bypassMinutes` |
+| `DSH_OFFPEAK_ALERT_MINUTES` | `10` | `alertMinutes` |
+### 预设
+- `deepseek-official`（默认）：官方工作日峰时 + 内置 2026 法定节假日（节假日全天谷价）。
+- `workbuddy`：WorkBuddy 积分规则，峰时窗口与官方相同；按 provider 自动选择时用于标注来源。
+- `custom`：完全使用 `peakWeekdays` / `peakWindows` / `discount` / `holidays`，适合其他供应商或自建计价。
+## 设置面板
+点击左栏计时打开：
+- **峰时策略**：立即暂停 / 完成当前轮后暂停；
+- **模型管理**：按 provider 分组列出模型目录，勾选即精确纳入峰谷管理（写入 `state.json` 的 `modelRules`，优先于 `modelPattern`）；
+- **会话豁免**：勾选某个会话后，它不再被暂停/恢复；取消勾选立即恢复管理；
+- **节假日**：显示动态同步状态。
+面板里的修改立即生效并持久化。
+## 子代理与等待
+- 峰时开始时若会话有**正在运行的子代理**，先放行父会话与子代理；
+- 子代理结束后，父会话按当前策略暂停（`waiting-children`），谷价开始后自动恢复；
+- 「完成当前轮后暂停」模式下，当前轮允许跑完；如果随后又排入了下一轮，下一轮会在峰时被拦下并记录，谷价开始恢复；
+- 当前轮跑完且没有后续轮次时，记录标记为 `completed`，不会在谷价时无意义地再起一轮。
 ## 数据
 状态与快照都在 `$DSH_HOME/offpeak-guard/`：
-- `state.json`：暂停中的任务、错峰规划、上次时段；
-- `status.json`：给输入框状态条读的只读快照（同时镜像到 `~/.dsh/offpeak-guard/status.json`）。
+- `state.json`：暂停/等待中的任务、错峰规划、会话豁免、精确模型规则、峰时策略；
+- `status.json`：给输入框状态条/设置面板读的只读快照（同时镜像到 `~/.dsh/offpeak-guard/status.json`）；
+- `holidays.json`：动态同步的节假日缓存。
 不写用户工作区。
@@ -65,6 +134,11 @@
 ## 边界
+- 动态节假日来自第三方公开 API（默认 timor.tech，只发送年份）；离线或接口失败时回退 `holidays.json` 缓存与内置 2026 列表。可设 `holidaySource: builtin` 完全离线。
+- 内置法定节假日目前覆盖 2026 年；2027 年安排公布后动态同步会自动补，或用 `holidays` / `DSH_OFFPEAK_HOLIDAYS` 追加，否则节假日会被当作普通工作日。
+- 命名预设的窗口是固定的；需要其他供应商/自建计价时用 `preset: custom` 配 `peakWindows`。
 - 只处理有工作目录、非子代理的根会话，避免打断子代理让父会话卡住。
+- 子代理结果在父会话恢复后由模型继续消费；插件能在子代理结束时停住父会话，但无法在传输层拦截已经进入父会话历史的消息。
+- 「会话豁免」只影响后续暂停/恢复，不会自动把已经暂停的任务立即恢复；需要时用 `resume_now`。
 - 插件自身重启时不会主动打断正在跑的任务（避免刚安装就停掉当前对话）；之后进入峰时或新起任务仍按规则处理。
 - 手动「立即恢复」会给这些会话 10 分钟豁免，避免峰时刚恢复又被停回去。

package/client.js CHANGED Viewed

@@ -149,7 +149,7 @@ window.__ModuleLoader__.load({
         };
       }, [load]);
-      return { snapshot, error };
+      return { snapshot, error, refresh: load };
     }
     function makeStrip(pluginCtx) {
@@ -266,7 +266,7 @@ window.__ModuleLoader__.load({
     }
     const clockStyle = `
-.opg-clock{box-sizing:border-box;display:inline-flex;flex:0 0 auto;align-items:center;gap:5px;width:auto;max-width:100%;min-height:32px;margin-left:auto;padding:4px 8px;border-radius:8px;color:var(--dsw-alias-label-primary,#252936);font:500 12px/18px var(--dsw-font-family,system-ui,sans-serif);white-space:nowrap;-webkit-app-region:no-drag;}
+.opg-clock{box-sizing:border-box;display:inline-flex;flex:0 0 auto;align-items:center;gap:5px;width:auto;max-width:100%;min-height:32px;margin-left:auto;padding:4px 8px;border-radius:8px;color:var(--dsw-alias-label-primary,#252936);font:500 12px/18px var(--dsw-font-family,system-ui,sans-serif);white-space:nowrap;-webkit-app-region:no-drag;cursor:pointer;}
 .opg-clock[data-compact="true"]{width:32px;min-height:32px;justify-content:center;padding:6px;gap:0;}
 .opg-clock-dot{flex:none;width:7px;height:7px;border-radius:50%;background:currentColor;}
 .opg-clock-state{flex:none;}
@@ -278,6 +278,27 @@ window.__ModuleLoader__.load({
 @keyframes opg-blink-red{0%,100%{color:#e0554e;opacity:1;}50%{color:#ff8f8a;opacity:.4;}}
 @keyframes opg-blink-green{0%,100%{color:#3f9d7a;opacity:1;}50%{color:#69d3aa;opacity:.4;}}
 @media (prefers-reduced-motion: reduce){.opg-clock[data-blink]{animation:none;}}
+.opg-panel{border:none;border-radius:14px;padding:0;width:min(600px,92vw);max-height:84vh;background:var(--dsw-alias-bg-base,#fff);color:var(--dsw-alias-label-primary,#252936);box-shadow:0 24px 80px #0006;font:13px/1.6 var(--dsw-font-family,system-ui,sans-serif);}
+.opg-panel::backdrop{background:#0006;}
+.opg-panel-shell{display:flex;flex-direction:column;max-height:84vh;}
+.opg-panel-head{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:16px 20px;border-bottom:1px solid var(--dsw-alias-border-l1,#dde0e6);}
+.opg-panel-head strong{font-size:15px;}
+.opg-panel-close{border:1px solid var(--dsw-alias-border-l1,#dde0e6);background:transparent;color:inherit;border-radius:8px;padding:4px 10px;cursor:pointer;font:inherit;}
+.opg-panel-body{padding:16px 20px;overflow:auto;}
+.opg-panel-meta{color:var(--dsw-alias-label-secondary,#6c7769);font-size:12px;margin-bottom:14px;}
+.opg-section{margin-bottom:18px;}
+.opg-section h4{margin:0 0 8px;font-size:12px;font-weight:600;color:var(--dsw-alias-label-secondary,#6c7769);}
+.opg-row{display:flex;align-items:center;gap:10px;padding:6px 0;border-top:1px solid var(--dsw-alias-border-l1,#eef0f3);min-width:0;}
+.opg-row:first-of-type{border-top:0;}
+.opg-row-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
+.opg-row-sub{color:var(--dsw-alias-label-secondary,#8a8d94);font-size:11px;margin-left:4px;}
+.opg-group-name{font-size:11px;color:var(--dsw-alias-label-secondary,#8a8d94);margin:8px 0 2px;}
+.opg-check{width:15px;height:15px;accent-color:var(--dsw-alias-state-business-primary,#4d6bfe);flex:none;}
+.opg-seg{display:inline-flex;border:1px solid var(--dsw-alias-border-l1,#dde0e6);border-radius:8px;overflow:hidden;}
+.opg-seg button{border:0;background:transparent;color:inherit;padding:5px 10px;font:inherit;cursor:pointer;}
+.opg-seg button[data-active="true"]{background:var(--dsw-alias-state-business-primary,#4d6bfe);color:#fff;}
+.opg-note{color:var(--dsw-alias-label-secondary,#8a8d94);font-size:11px;line-height:1.6;}
+.opg-error{color:#e0554e;font-size:12px;margin-top:8px;}
 `;
     function ClockIcon() {
@@ -299,15 +320,188 @@ window.__ModuleLoader__.load({
       );
     }
+    function useCatalog(ctx, enabled) {
+      const [groups, setGroups] = React.useState([]);
+      React.useEffect(() => {
+        if (!enabled) return undefined;
+        let alive = true;
+        (async () => {
+          try {
+            const result = await ctx.remote.session.modelCatalog();
+            const list = result?.value?.groups ?? result?.groups ?? [];
+            if (alive && Array.isArray(list)) setGroups(list);
+          } catch {
+            /* 目录不可用时留空 */
+          }
+        })();
+        return () => {
+          alive = false;
+        };
+      }, [enabled]);
+      return groups;
+    }
+    function SettingsPanel({ ctx, snapshot, refresh, groups, onClose }) {
+      const [busy, setBusy] = React.useState('');
+      const [error, setError] = React.useState('');
+      const post = async (body) => {
+        setBusy(`${body.action}:${body.sessionId ?? body.provider ?? body.mode ?? ''}`);
+        setError('');
+        try {
+          const response = await fetch('/plugins/dsh-offpeak-guard/action', {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(body),
+          });
+          const json = await response.json();
+          if (!response.ok || json.ok === false) throw new Error(json.error ?? `HTTP ${response.status}`);
+          await refresh();
+        } catch (caught) {
+          setError(String(caught?.message ?? caught));
+        } finally {
+          setBusy('');
+        }
+      };
+      const modelManaged = (provider, model) => {
+        const key = `${provider}/${model}`;
+        if (Object.prototype.hasOwnProperty.call(snapshot.modelRules ?? {}, key)) return snapshot.modelRules[key] === true;
+        if ((snapshot.peakPricedModels ?? []).length > 0) {
+          return snapshot.peakPricedModels.includes(key) || snapshot.peakPricedModels.includes(model);
+        }
+        if ((snapshot.exemptModels ?? []).includes(model)) return false;
+        const needle = String(snapshot.modelPattern ?? 'deepseek').toLowerCase();
+        return model.toLowerCase().includes(needle) || provider.toLowerCase().includes(needle);
+      };
+      const sessions = Object.values(snapshot.sessions ?? {});
+      return h('div', { className: 'opg-panel-shell' }, [
+        h('div', { className: 'opg-panel-head', key: 'head' }, [
+          h('strong', { key: 'title' }, '峰谷守卫设置'),
+          h('button', { key: 'close', className: 'opg-panel-close', onClick: onClose }, '关闭'),
+        ]),
+        h('div', { className: 'opg-panel-body', key: 'body' }, [
+          h(
+            'div',
+            { className: 'opg-panel-meta', key: 'meta' },
+            `${snapshot.presetLabel ?? ''} · ${snapshot.phaseLabel ?? ''} · ${snapshot.holiday ? '今天法定节假日（全天谷价）' : '按工作日峰时'}`,
+          ),
+          h('div', { className: 'opg-section', key: 'mode' }, [
+            h('h4', { key: 'h' }, '峰时策略'),
+            h('div', { className: 'opg-seg' }, [
+              h(
+                'button',
+                {
+                  key: 'now',
+                  'data-active': snapshot.pauseMode !== 'finish-turn' ? 'true' : 'false',
+                  disabled: busy !== '',
+                  onClick: () => post({ action: 'pauseMode', mode: 'pause-now' }),
+                },
+                '立即暂停',
+              ),
+              h(
+                'button',
+                {
+                  key: 'finish',
+                  'data-active': snapshot.pauseMode === 'finish-turn' ? 'true' : 'false',
+                  disabled: busy !== '',
+                  onClick: () => post({ action: 'pauseMode', mode: 'finish-turn' }),
+                },
+                '完成当前轮后暂停',
+              ),
+            ]),
+            h('div', { className: 'opg-note', key: 'note' }, '有子代理在运行时，会先放行子代理；子代理结束后再暂停父会话。'),
+          ]),
+          h('div', { className: 'opg-section', key: 'models' }, [
+            h('h4', { key: 'h' }, '模型管理（精确到 provider/model）'),
+            groups.length === 0
+              ? h('div', { className: 'opg-note', key: 'empty' }, '模型目录暂不可用；仍可在配置里用 modelPattern / exemptModels 管理。')
+              : groups.map((group) =>
+                  h('div', { key: `g:${group.id}` }, [
+                    h('div', { className: 'opg-group-name', key: 'name' }, group.name ?? group.id),
+                    ...(Array.isArray(group.models) ? group.models : []).map((model) =>
+                      h('label', { className: 'opg-row', key: `m:${group.id}/${model.id}` }, [
+                        h('input', {
+                          className: 'opg-check',
+                          type: 'checkbox',
+                          checked: modelManaged(String(group.id), String(model.id)),
+                          disabled: busy !== '',
+                          onChange: (event) =>
+                            post({
+                              action: 'model',
+                              provider: String(group.id),
+                              model: String(model.id),
+                              peakPriced: event.target.checked,
+                            }),
+                        }),
+                        h('span', { className: 'opg-row-label' }, [
+                          model.name ?? model.id,
+                          h('span', { className: 'opg-row-sub', key: 'id' }, model.id),
+                        ]),
+                      ]),
+                    ),
+                  ]),
+                ),
+          ]),
+          h('div', { className: 'opg-section', key: 'sessions' }, [
+            h('h4', { key: 'h' }, '会话豁免（不参与暂停/恢复）'),
+            sessions.length === 0
+              ? h('div', { className: 'opg-note', key: 'empty' }, '当前没有运行中的根会话。')
+              : sessions.map((session) =>
+                  h('label', { className: 'opg-row', key: `s:${session.id}` }, [
+                    h('input', {
+                      className: 'opg-check',
+                      type: 'checkbox',
+                      checked: session.exempt === true,
+                      disabled: busy !== '',
+                      onChange: (event) =>
+                        post({ action: 'exempt', sessionId: String(session.id), exempt: event.target.checked }),
+                    }),
+                    h('span', { className: 'opg-row-label' }, [
+                      session.title ?? session.id,
+                      h('span', { className: 'opg-row-sub', key: 'model' }, session.id),
+                    ]),
+                  ]),
+                ),
+          ]),
+          h('div', { className: 'opg-section', key: 'holidays' }, [
+            h('h4', { key: 'h' }, '节假日'),
+            h(
+              'div',
+              { className: 'opg-note', key: 'note' },
+              snapshot.holidaySource === 'auto'
+                ? `动态识别：已同步（${snapshot.holidaySyncedAt ? new Date(snapshot.holidaySyncedAt).toLocaleString() : '尚未同步'}），失败时回退内置 2026 列表。`
+                : '使用内置节假日（可在配置 holidays 追加）。',
+            ),
+          ]),
+          error === '' ? null : h('div', { className: 'opg-error', key: 'error' }, error),
+        ]),
+      ]);
+    }
     function makeClock(pluginCtx) {
       return function Clock(props) {
         const t = useLocale(pluginCtx);
-        const { snapshot } = useSnapshot(pluginCtx, null);
+        const { snapshot, refresh } = useSnapshot(pluginCtx, null);
+        const [open, setOpen] = React.useState(false);
+        const dialogRef = React.useRef(null);
+        const groups = useCatalog(pluginCtx, open);
         const [, force] = React.useState(0);
         React.useEffect(() => {
           const timer = setInterval(() => force((value) => value + 1), 1000);
           return () => clearInterval(timer);
         }, []);
+        React.useEffect(() => {
+          const dialog = dialogRef.current;
+          if (dialog === null) return;
+          if (open && !dialog.open) dialog.showModal();
+          if (!open && dialog.open) dialog.close();
+        }, [open]);
+        React.useEffect(() => {
+          const dialog = dialogRef.current;
+          if (dialog === null) return undefined;
+          const onClose = () => setOpen(false);
+          dialog.addEventListener('close', onClose);
+          return () => dialog.removeEventListener('close', onClose);
+        }, []);
         if (snapshot === null) return null;
         const phase = snapshot.phase === 'peak' ? 'peak' : 'offpeak';
@@ -335,6 +529,7 @@ window.__ModuleLoader__.load({
           t('offpeakNote'),
           `${t('model')}: ${modelId || '—'}`,
           t('clockHint'),
+          '点击打开设置 / Click to open settings',
         ]
           .filter(Boolean)
           .join('\n');
@@ -347,7 +542,7 @@ window.__ModuleLoader__.load({
             ]
           : [ClockIcon()];
-        return h(
+        const clock = h(
           'div',
           {
             className: 'opg-clock',
@@ -357,9 +552,31 @@ window.__ModuleLoader__.load({
             'data-tone': tone,
             'data-blink': blink ?? undefined,
             'data-compact': wide ? 'false' : 'true',
+            onClick: () => setOpen(true),
           },
           [h('style', { key: 'style' }, clockStyle)].concat(inner),
         );
+        const dialog = h(
+          'dialog',
+          {
+            key: 'dialog',
+            ref: dialogRef,
+            className: 'opg-panel',
+            onClick: (event) => {
+              if (event.target === event.currentTarget) setOpen(false);
+            },
+          },
+          open
+            ? h(SettingsPanel, {
+                ctx: pluginCtx,
+                snapshot,
+                refresh,
+                groups,
+                onClose: () => setOpen(false),
+              })
+            : null,
+        );
+        return h(React.Fragment, null, [clock, dialog]);
       };
     }

package/cordis.patch.yml CHANGED Viewed

@@ -1,12 +1,20 @@
 # dsh-offpeak-guard：DeepSeek 峰谷计价守卫。
-# 规则来自 DeepSeek 夜间折扣：工作日 09:00–12:00、14:00–18:00 为峰值原价，
-# 其余时间（含午间、夜间与周末）为谷价，按 5 折计费。
-# 官方调价时只改这里的 peakWindows / discount 即可。
+# 默认按 DeepSeek 官方「模型 & 价格」规则：
+#   北京时间周一至周五（不含中国法定节假日）09:00–12:00、14:00–18:00 为高峰；
+#   其余时段（含周末、法定节假日全天）为空闲，空闲价为高峰价的一半。
+# preset:
+#   auto              按 provider 自动选（WorkBuddy/CodeBuddy 走 workbuddy，其余走 deepseek-official）
+#   deepseek-official 官方规则（含内置 2026 法定节假日）
+#   workbuddy         WorkBuddy 积分规则（时段相同）
+#   custom            用下面 peakWeekdays / peakWindows / discount / holidays
+# 环境变量（部署方注入，优先级高于本文件）：DSH_OFFPEAK_*，详见 README。
 - insert:
     - id: offpeak-guard
       name: 'dsh-offpeak-guard'
       config:
         enabled: true
+        preset: 'auto'
+        pauseMode: 'pause-now'
         timezone: 'Asia/Shanghai'
         peakWeekdays: [1, 2, 3, 4, 5]
         peakWindows:
@@ -15,7 +23,11 @@
           - start: '14:00'
             end: '18:00'
         discount: 0.5
+        holidays: []
+        holidaySource: 'auto'
+        holidayApi: 'https://timor.tech/api/holiday/year'
         modelPattern: 'deepseek'
+        peakPricedModels: []
         exemptModels: []
         pauseRunningOnPeak: true
         deferNewTurnsOnPeak: true

package/docs/settings-panel.png ADDED Viewed

Binary file