dsh-input-traffic 0.2.8 → 0.2.9

package/README.en.md

@@ -70,9 +70,22 @@ The "Freeze session / Resume session" button on the composer's right (beside the
 
 - **Freeze**: the current turn is **not interrupted** — it finishes naturally, then consumption pauses. The queue is fully **decoupled from freezing**: freezing only stops the agent from consuming (executing / inserting / appending), while the waiting area stays visible and **fully operable** — reorder, edit, remove and set the red/yellow/green insertion tier, just like when not frozen;
 - **Resume**: the (possibly edited) queue is re-submitted and **each entry executes with its planned tier** (red = interrupt and process immediately, yellow = interject, green = queue); the agent continues in FIFO order;
-- Engine: freeze = detach every queued row via `updateQueue(remove)` (copies with their tiers kept in the plugin store); the driver stops naturally once the current turn ends with no pending work; edits made while frozen (text / order / tier) write back to the store in real time; resume = re-submit via `send(text)`, waking the driver (red-tier entries are preceded by `cancel()`);
+- **Session isolation**: freeze state and the detached queue are keyed **by sessionId** (`src/client/freeze-store.ts`'s `Map<string, FreezeState>`) — freezing session A never affects session B's banner/button/queue; editing only re-renders the owning session's consumers;
+- **Engine**: freeze = detach every queued row via `updateQueue(remove)` (copies with their tiers kept in the plugin store, keyed by session); the driver stops naturally once the current turn ends with no pending work; edits made while frozen (text / order / tier) write back to the store in real time; resume = first `await sessionGuard.resume(sessionId)` (so the interrupted turn's natural next step happens first), then re-submit via `send(text)`, waking the driver (red-tier entries are preceded by `cancel()`);
 - Note: queued messages containing non-text content (images) cannot be re-sent and are released by the freeze (they do not come back).
 
+### Session-level locking via dsh-session-guard
+
+The freeze button hands off to a **sessionGuard bridge** (`src/client/session-guard-bridge.ts` → `POST /session-guard/rpc { action: stopNextTurn|resume, sessionId }`) for **per-session locking** on the server side, while raising a composer block (`conversation.blocks.set`) so the input box turns inert and Enter can no longer leak into the conversation:
+
+- **Component references**:
+  - `src/client/freeze-button.tsx` — freeze/resume control (slot `conversation.input.right`);
+  - `src/client/steer-queue-dock.tsx` — three-tier planning dock + frozen banner/list (slot `conversation.input.dock` id `queue`);
+  - `src/client/freeze-store.ts` — session-scoped freeze state (`Map<sessionId, {frozen, pending}>`, shared by button ↔ dock);
+  - `src/client/session-guard-bridge.ts` — session-guard RPC bridge (fail-open, silently skipped when session-guard is absent);
+  - `src/client/index.ts` — slot registration + composer-block injection (`conversation.blocks.set`).
+- **Scope comparison**: this plugin's freeze button = **per-session** (locks that one session by id); session-guard's **auto peak gate = global** (pauses all running sessions on peak entry, resumes all on exit). They complement each other — the gate handles the global case, the button the single-session case.
+
 ## Queue management
 
 Each waiting-area message (while not frozen) offers:
@@ -107,13 +120,17 @@ The dock and the freeze button **no longer use hand-drawn colors** — they refe
 ## Installation
 
 ```sh
-# Option 1: install from npm (recommended)
+# Option 1: install from npm (recommended, stable release)
 #   (the profile is a pnpm workspace root, so -w is required)
 dsh plugin --profile web add dsh-input-traffic -w
 
-# Option 2: assemble from git or a local path
+# Option 2: install directly from GitHub (drscrewdriver fork — trial new features first)
+#   (lib/ is not committed; after install build in the profile:
+#    cd ~/.dsh/profiles/web/node_modules/dsh-input-traffic && npm install --legacy-peer-deps && npm run build)
+dsh plugin --profile web add github:drscrewdriver/dsh-input-traffic#main
+
+# Option 3: assemble from a local path
 # dsh plugin --profile web add /absolute/path/to/dsh-input-traffic -w
-#    (after git install, build in the profile's node_modules: npm install --legacy-peer-deps && npm run build)
 
 # Confirm the composed tree contains the new row
 dsh web --dump-config | grep -B1 -A2 'input-traffic'
@@ -122,6 +139,8 @@ dsh web --dump-config | grep -B1 -A2 'input-traffic'
 dsh web
 ```
 
+> ⚠️ **GitHub reachability**: installing via github: requires access to github.com; if your network is restricted, set up a working proxy or mirror first, otherwise add may stall while fetching.
+
 Local build and tests:
 
 ```sh
@@ -184,7 +203,7 @@ Expected — the plugin hides it and pins Enter to green queue; a stale preferen
 
 ### Queued messages disappeared after freezing
 
-Expected — the freeze detaches the queue into the plugin store (removed from the waiting area); they return on resume. Refreshing the page loses the frozen queue; avoid refreshing while frozen.
+Expected — the freeze detaches the queue into the plugin store (keyed by session, removed from the waiting area); they return on resume. Refreshing the page loses the frozen queue; avoid refreshing while frozen.
 
 ### Move up/down is disabled
 
@@ -220,7 +239,7 @@ src/
     ├── index.ts              # browser half apply: busyEnter pinned to queue + three slot registrations
     ├── steer-queue-dock.tsx  # three-tier planning dock (shadows conversation.input.dock id queue)
     ├── freeze-button.tsx     # freeze/resume button (conversation.input.right)
-    ├── freeze-store.ts       # shared freeze state (composer button ↔ dock banner)
+    ├── freeze-store.ts       # session-scoped freeze state (Map<sessionId, {frozen, pending}>)
     ├── hide-enter-row.tsx    # settings-row hiding (shadows settings.general.item id composer-enter)
     ├── locales.ts            # steer dictionaries (zh/en)
     └── *.module.css
@@ -250,6 +269,19 @@ End-to-end browser verification on a live `dsh web`, zero application console er
 - Semantics reference: [dsh-traffic-light](https://github.com/yimeng-dev/dsh-traffic-light) (desktop session-status traffic light)
 - Harness anchors: `packages/client/AGENTS.md`, `packages/client/tsdown.client.ts`, `packages/client/web/src/platform.ts`, `packages/bundle/web-app/cordis.patch.yml`, `packages/client/ui-conversation/src/client/queue/QueueDock.tsx`, `packages/host/apiproxy/src/api-proxy.ts`
 
+## drscrewdriver DSH Plugin Family
+
+This project is one of the DSH plugins maintained by [drscrewdriver](https://github.com/drscrewdriver). If this one helps you, the others likely will too:
+
+| Plugin | One-liner |
+|---|---|
+| **[dsh-input-traffic](https://github.com/drscrewdriver/dsh-input-traffic)** | Busy-time input queue: three-tier traffic control, drag-to-reorder, session freeze |
+| **[dsh-session-guard](https://github.com/drscrewdriver/dsh-session-guard)** | Peak auto session gate: weekend mode + peak auto-pause + session-level lock + backend auto-retry (pairs with this plugin's button) |
+| [dsh-thinking-levels](https://github.com/drscrewdriver/dsh-thinking-levels) | Per-round reasoning_effort control: Auto scheduling or manual wire level |
+| [dsh-seatbelt-sandbox](https://github.com/drscrewdriver/dsh-seatbelt-sandbox) | macOS Seatbelt sandbox adapter: native libsandbox loader replacing deprecated sandbox-exec |
+| [dsh-switch-search](https://github.com/drscrewdriver/dsh-switch-search) | Session content search sidebar: title/content toggle, type-filter by user/reply/tool |
+
 ## License
 
 MIT
+

package/README.md

@@ -6,7 +6,9 @@
 </p>
 <p align="center">
   <a href="LICENSE"><img alt="MIT License" src="https://img.shields.io/badge/license-MIT-263146?style=flat-square"></a>
+  <img src="https://camo.githubusercontent.com/2c11fb2e0e14bb9985c5acbe61123a7441c5ee63aa27fa6e04e2a707ebfd6022/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6473682d2d706c7567696e2d72656164792d3437384342463f6c6f676f3d646565707365656b266c6f676f436f6c6f723d7768697465" alt="dsh-plugin" data-canonical-src="https://img.shields.io/badge/dsh--plugin-ready-478CBF?logo=deepseek&amp;logoColor=white" style="max-width: 100%;">
   <img alt="Public beta" src="https://img.shields.io/badge/status-public%20beta-7da1de?style=flat-square">
+ <a href="https://dshfind.com/zh/plugins/drscrewdriver/dsh-input-traffic?ref=badge"><img alt="dsh-input-traffic" src="https://dshfind.com/api/badge/drscrewdriver/dsh-input-traffic?lang=zh"></a>
 </p>
 
 # dsh-input-traffic
@@ -20,6 +22,8 @@
 > **目前建议搭配**：配合**一般提醒**插件（如 [dsh-notify](https://github.com/zhengjy01/dsh-notify)，到点桌面提醒「该冻结/该恢复」）与**计费统计**插件（如 [dsh-deepseek-usage](https://github.com/yyb16yyb-hub/dsh-deepseek-usage)、[dsh-cost-tracker](https://github.com/yflmq001/dsh-cost-tracker)、[dsh-billing-balance](https://github.com/YZz-S/dsh-billing-balance)，核对冻结前后的实际花费），形成「提醒 → 冻结 → 错峰恢复 → 对账」的省钱闭环。
 
 ## 它能做什么
+<img width="1809" height="547" alt="image" src="https://github.com/user-attachments/assets/4a89687b-5444-4538-b1b2-f0fd093cdd10" />
+<img width="1051" height="302" alt="image" src="https://github.com/user-attachments/assets/710a101e-9ba1-41f0-b74d-bb0ccca77928" />
 
 - **三档插入并存**：智能体忙碌时，每一条输入都先进入等待区，再按需选择何时进入对话——不再只有一个"打断"或只有一个"排队"：
   - 🔴 **红色（now）**：打断当前轮次并立即输入——当前生成停止，消息作为新输入被 agent 立刻处理并回复；
@@ -30,6 +34,7 @@
 - **队列管理**：等待区的消息可以**上移 / 下移调整顺序**、删除，以及队列级「取消并清空」。
 - **编辑不丢内容**：编辑保存失败（消息已被 agent 认领）时，编辑内容自动退回主输入框，不会丢失；主输入框已有内容时不覆盖。
 - **高峰期冻结**：输入框右侧「冻结会话」按钮——邻近 DeepSeek 高峰收费时段（9:00-12:00、14:00-18:00）时主动暂停 API 消耗：当前轮次自然完成后暂停，未发送队列冻结保存；「恢复会话」后在非高价时间继续处理。
+- **会话隔离冻结**：冻结队列按 **sessionId 隔离**——冻结一个会话不影响其他会话（各自独立的 frozen 标志与 detached 队列），多会话并行时互不串台（见「会话冻结 / 恢复」）。
 - **接管官方行为**：插件生效时，官方设置面板的「繁忙时 Enter 键行为」设置行不再显示（Enter 行为固定为绿色排队）。
 - **日夜自动适配**：队列框与冻结按钮全部改用 dsh 官方语义 token（`--dsw-alias-*`），自动跟随系统深色模式 / dsh 暗色主题——深色下自动变为**深灰底 + 白色反色字**，无需任何设置（见「日夜模式」）。
 
@@ -70,9 +75,22 @@
 
 - **冻结**：当前轮次**不打断**、自然完成后暂停；**队列与冻结解耦**——冻结只停止 agent 消费（执行/插入/追加），等待队列保持可见且**完全可操作**（排序、编辑、删除、设定红/黄/绿插入档位），与未冻结无明显区别；
 - **恢复**：按修改后的队列重新入队，**按每条预定的档位执行**（红=打断并立即处理，黄=插话，绿=排队），agent 按 FIFO 继续处理；
-- 引擎实现：冻结 = 逐条 `updateQueue(remove)` 分离队列（含档位的副本存于插件 store），当前轮次完成后 driver 因无 pending 自然停止；冻结期间对队列的修改（文本/顺序/档位）实时写回 store；恢复 = 逐条 `send(text)` 重新提交并唤醒 driver（红色档位的条目先 `cancel()` 再发送）；
+- **会话隔离**：冻结状态与 detached 队列按 **sessionId 键控**（`src/client/freeze-store.ts` 的 `Map<string, FreezeState>`）——A 会话冻结不影响 B 会话的 banner/按钮/队列；编辑只重渲染对应会话的消费者；
+- **引擎实现**：冻结 = 逐条 `updateQueue(remove)` 分离队列（含档位的副本存于插件 store，按 sessionId 隔离），当前轮次完成后 driver 因无 pending 自然停止；冻结期间对队列的修改（文本/顺序/档位）实时写回 store；恢复 = 先 `await sessionGuard.resume(sessionId)`（被打断回合的自然下一步先发生），再逐条 `send(text)` 重新提交并唤醒 driver（红色档位的条目先 `cancel()` 再发送）；
 - 注意：含非文本内容（图片）的排队消息无法重发，冻结时会随队列释放（不会恢复）。
 
+### 借助 dsh-session-guard 实现会话级锁定
+
+冻结按钮触发时经 **sessionGuard 桥**（`src/client/session-guard-bridge.ts` → `POST /session-guard/rpc { action: stopNextTurn|resume, sessionId }`）透传服务端做**会话级锁定**；同时在前端 raise composer block（`conversation.blocks.set`），输入框变 inert、回车不再漏进对话：
+
+- **引用组件指向**：
+  - `src/client/freeze-button.tsx` — 冻结/恢复控制（slot `conversation.input.right`）；
+  - `src/client/steer-queue-dock.tsx` — 三档规划等待区 + 冻结横幅/冻结列表（slot `conversation.input.dock` id `queue`）；
+  - `src/client/freeze-store.ts` — 会话级冻结状态 store（`Map<sessionId, {frozen, pending}>`，供按钮 ↔ dock 共享）；
+  - `src/client/session-guard-bridge.ts` — session-guard RPC 透传（fail-open，未装则静默）；
+  - `src/client/index.ts` — slot 注册 + composer block 注入（`conversation.blocks.set`）。
+- **作用域对比**：本插件冻结按钮 = **会话级**（按 sessionId 锁那一个会话）；session-guard **自动高峰门 = 全局**（入峰暂停全部、退峰自动恢复全部）。两者互补——自动门管全局、按钮管单会话。
+
 ## 队列管理
 
 等待区每条消息（未冻结时）提供：
@@ -107,13 +125,17 @@
 ## 安装
 
 ```sh
-# 方式一：从 npm 安装（推荐）
+# 方式一：从 npm 安装（推荐，稳定发布）
 #   （profile 是 pnpm workspace root，add 需带 -w 参数）
 dsh plugin --profile web add dsh-input-traffic -w
 
-# 方式二：git 或本地路径组装
+# 方式二：GitHub 直装（drscrewdriver fork 专属，先试用新功能）
+#   （本仓库未提交 lib/，装后需在 profile 内现场构建：
+#    cd ~/.dsh/profiles/web/node_modules/dsh-input-traffic && npm install --legacy-peer-deps && npm run build）
+dsh plugin --profile web add github:drscrewdriver/dsh-input-traffic#main
+
+# 方式三：本地路径组装
 # dsh plugin --profile web add /absolute/path/to/dsh-input-traffic -w
-#    （git 安装后需在 profile 的 node_modules 内现场构建：npm install --legacy-peer-deps && npm run build）
 
 # 确认组合树包含新行
 dsh web --dump-config | grep -B1 -A2 'input-traffic'
@@ -122,13 +144,15 @@ dsh web --dump-config | grep -B1 -A2 'input-traffic'
 dsh web
 ```
 
+> ⚠️ **GitHub 网络可达性**：github: 直装需要能连通 github.com；网络受限时请先配置可用代理或镜像加速，否则 add 会在拉取阶段卡住。
+
 本地构建与测试：
 
 ```sh
 npm install --legacy-peer-deps   # @deepseek-ai client 包链在 npm 上不完整，仅装工具链
 npm run build                    # tsc（lib/types）+ tsdown（lib/index.js + lib/client.js）
 node examples/verify-assembly.mjs  # 12 项装配断言
-npm test                         # 36 项 vitest 组件测试
+npm test                         # 50 项 vitest 组件测试
 npm run lint                     # ESLint（src + tests，flat config）
 npm run verify                   # 一体化门禁：lint + test + build + verify-assembly
 ```
@@ -146,7 +170,7 @@ npm run tdd        # vitest watch：改动即重跑，红→绿闭环
 1. 在 `tests/` 新增/修改用例（红：确认新行为尚未实现）；
 2. `npm run tdd` 观察失败；
 3. 在 `src/` 最小实现（绿）；
-4. `npm run verify` 全绿后提交（lint + 36 测试 + 构建 + 12 项装配断言）。
+4. `npm run verify` 全绿后提交（lint + 50 测试 + 构建 + 12 项装配断言）。
 
 Lint 说明：
 
@@ -184,7 +208,11 @@ npm run lint:fix   # 自动修复可修复项
 
 ### 冻结后排队消息消失了
 
-正常——冻结会把队列保存到插件内存（从等待区移除），恢复后重新出现。刷新页面会丢失冻结队列，请避免冻结后刷新。
+正常——冻结会把队列保存到插件 store（按 sessionId 隔离，从等待区移入冻结列表），恢复后重新出现。**刷新页面会丢失冻结队列**，请避免冻结后刷新。
+
+### 冻结一个会话会影响其他会话吗
+
+不会。冻结队列按 **sessionId 隔离**（`freeze-store.ts` 的 `Map<sessionId, …>`）——冻结 A 会话不影响 B 会话的冻结按钮/横幅/队列；编辑 A 的冻结队列只重渲染 A 的消费者。
 
 ### 上移/下移按钮不可用
 
@@ -220,7 +248,8 @@ src/
     ├── index.ts              # browser half apply：busyEnter 固定 queue + 三处 slot 注册
     ├── steer-queue-dock.tsx  # 三档规划等待区（shadowing conversation.input.dock id queue）
     ├── freeze-button.tsx     # 冻结/恢复按钮（conversation.input.right）
-    ├── freeze-store.ts       # 冻结状态共享 store（composer 按钮 ↔ dock 横幅）
+    ├── freeze-store.ts       # 会话级冻结状态 store（Map<sessionId, {frozen, pending}>）
+    ├── session-guard-bridge.ts # session-guard RPC 透传（会话级锁定，fail-open）
     ├── hide-enter-row.tsx    # 设置行隐藏（shadowing settings.general.item id composer-enter）
     ├── locales.ts            # steer 字典（zh/en）
     └── *.module.css
@@ -242,7 +271,7 @@ src/
 | 红色 now | 打断后消息立即被处理：agent 明确回复被打断消息并继续；无滞留中间态 |
 | 黄色 next + 绿色撤回 | 插话后点绿收回排队，消息回到等待区 |
 | 冻结 / 恢复 | 当前轮次自然完成不打断、队列冻结保存、横幅提示；恢复后 FIFO 全部处理完成 |
-| 队列编辑（多行 / 失败退回） | 组件测试覆盖（32 项全绿）；真实环境复核待做 |
+| 队列编辑（多行 / 失败退回） | 组件测试覆盖（50 项全绿）；真实环境复核待做 |
 
 ## 参考
 
@@ -250,6 +279,19 @@ src/
 - 语义参考：[dsh-traffic-light](https://github.com/yimeng-dev/dsh-traffic-light)（Session 运行状态红绿灯提示）
 - harness 锚点：`packages/client/AGENTS.md`、`packages/client/tsdown.client.ts`、`packages/client/web/src/platform.ts`、`packages/bundle/web-app/cordis.patch.yml`、`packages/client/ui-conversation/src/client/queue/QueueDock.tsx`、`packages/host/apiproxy/src/api-proxy.ts`
 
+## drscrewdriver DSH Plugin Family
+
+本项目是 [drscrewdriver](https://github.com/drscrewdriver) 维护的 DSH 插件系列之一。如果这个对你有用，其他插件多半也有用：
+
+| 插件 | 一句话描述 |
+|---|---|
+| **[dsh-input-traffic](https://github.com/drscrewdriver/dsh-input-traffic)** | DSH Web GUI 忙时输入队列：三档交通管制，拖拽重排，会话冻结 |
+| **[dsh-session-guard](https://github.com/drscrewdriver/dsh-session-guard)** | 高峰自动会话门：周末模式 + 高峰自动暂停 + 会话级锁定 + 后端自动重试（配本插件按钮） |
+| [dsh-thinking-levels](https://github.com/drscrewdriver/dsh-thinking-levels) | 逐轮 reasoning_effort 控制：Auto 智能调度或手动固定档位 |
+| [dsh-seatbelt-sandbox](https://github.com/drscrewdriver/dsh-seatbelt-sandbox) | macOS Seatbelt 沙箱适配器：libsandbox 原生 loader，接替弃用的 sandbox-exec |
+| [dsh-switch-search](https://github.com/drscrewdriver/dsh-switch-search) | 侧边栏会话搜索增强：标题/内容切换，按用户/回复/工具筛选 |
+
 ## License
 
 MIT
+