dsh-device-fleet 0.1.0-dev.8 → 0.1.0-dev.9

package/README.md

@@ -8,7 +8,8 @@ DeepSeek Harness 的设备联邦插件：把登录同一账号、且都安装本
 - ✅ **网络层 v2**：自建 Relay（fleetKey 鉴权的信令 + TCP 拼接数据面，不做 NAT 打洞）
 - ✅ **Host 插件 + 直调 MVP（代码完成、单测通过，待真实 DSH 安装联调）**：`fleet_list` / `fleet_tools` / `fleet_call` + `fleet_read` / `fleet_fetch` / `fleet_run`、Tool Policy、Execution Slot、审批 fail-closed
 - ✅ **审批收件箱逻辑层（dev.7）**：`fleet_approvals` / `fleet_approve` / `fleet_deny`，ask 档排队、超时 fail-closed、once/ttl 授权、`fleet_simulate_request` 本机演练；Client 审批面板待做
-- ⏳ Room / Room Board、委派升级 Room、审批面板/设备页 UI（下一步）
+- ✅ **Room 逻辑层（dev.8，单机模拟）**：`room_create` / `room_add_local` / `room_send` / `room_messages` / `room_status` / `room_task_*` / `room_close`；本地真实 agent 参与者、寻址唤醒、Room Board 串行交接；单机仿真验证通过
+- ⏳ Client 审批面板 / 房间视图、远程参与者传输、插件重载 rehydrate（下一步）
 
 ## 安装（开发版）
 

package/client.js

@@ -0,0 +1,167 @@
+// Fleet approval panel (Client half).
+// A floating button under shell.overlay polls the Host route registered by
+// src/host/approval-web.js. Decisions go through ApprovalInbox on the Host.
+window.__ModuleLoader__.load({
+  id: 'dsh-device-fleet',
+  factory(require) {
+    const React = require('react');
+    const h = React.createElement;
+    const { useEffect, useState } = React;
+
+    const POLL_MS = 2500;
+    const panelStyle = {
+      position: 'fixed',
+      right: 16,
+      bottom: 72,
+      width: 360,
+      maxHeight: '65vh',
+      overflow: 'auto',
+      zIndex: 900,
+      background: 'var(--dsw-alias-surface-raised, #1f1f1f)',
+      color: 'var(--dsw-alias-text, #e8e8e8)',
+      border: '1px solid var(--dsw-alias-border, #3a3a3a)',
+      borderRadius: 10,
+      boxShadow: '0 12px 32px rgba(0,0,0,.35)',
+      padding: 12,
+      font: '13px/1.5 system-ui, -apple-system, "Segoe UI", sans-serif',
+    };
+    const buttonStyle = {
+      position: 'fixed',
+      right: 16,
+      bottom: 16,
+      zIndex: 900,
+      display: 'flex',
+      alignItems: 'center',
+      gap: 8,
+      padding: '8px 12px',
+      borderRadius: 999,
+      border: '1px solid var(--dsw-alias-border, #3a3a3a)',
+      background: 'var(--dsw-alias-surface-raised, #1f1f1f)',
+      color: 'var(--dsw-alias-text, #e8e8e8)',
+      cursor: 'pointer',
+      boxShadow: '0 6px 18px rgba(0,0,0,.3)',
+      font: '13px system-ui, -apple-system, "Segoe UI", sans-serif',
+    };
+
+    function ActionButton({ children, onClick, tone = 'normal', disabled = false }) {
+      const colors = {
+        normal: { bg: 'var(--dsw-alias-surface, transparent)', border: 'var(--dsw-alias-border, #3a3a3a)' },
+        allow: { bg: 'var(--dsw-alias-accent, #2f6fed)', border: 'var(--dsw-alias-accent, #2f6fed)' },
+        deny: { bg: 'transparent', border: 'var(--dsw-alias-border, #3a3a3a)' },
+      };
+      const theme = colors[tone] ?? colors.normal;
+      return h(
+        'button',
+        {
+          type: 'button',
+          disabled,
+          onClick,
+          style: {
+            padding: '3px 9px',
+            borderRadius: 6,
+            border: '1px solid ' + theme.border,
+            background: theme.bg,
+            color: 'var(--dsw-alias-text, #e8e8e8)',
+            cursor: disabled ? 'default' : 'pointer',
+            opacity: disabled ? 0.55 : 1,
+            fontSize: 12,
+          },
+        },
+        children,
+      );
+    }
+
+    function ApprovalPanel() {
+      const [items, setItems] = useState([]);
+      const [open, setOpen] = useState(false);
+      const [busy, setBusy] = useState({});
+
+      useEffect(() => {
+        let disposed = false;
+        let timer;
+        const poll = async () => {
+          try {
+            const response = await fetch('/device-fleet/approvals', { headers: { accept: 'application/json' } });
+            if (!response.ok) throw new Error('HTTP ' + response.status);
+            const data = await response.json();
+            if (!disposed) setItems(Array.isArray(data.approvals) ? data.approvals : []);
+          } catch {
+            if (!disposed) setItems([]);
+          }
+          if (!disposed) timer = setTimeout(poll, POLL_MS);
+        };
+        poll();
+        return () => {
+          disposed = true;
+          clearTimeout(timer);
+        };
+      }, []);
+
+      const decide = async (id, action, scope) => {
+        setBusy((current) => ({ ...current, [id]: true }));
+        try {
+          const response = await fetch('/device-fleet/approvals/decide', {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ id, action, ...(scope ? { scope } : {}) }),
+          });
+          if (response.ok) setItems((current) => current.filter((item) => item.id !== id));
+        } finally {
+          setBusy((current) => ({ ...current, [id]: false }));
+        }
+      };
+
+      const label = items.length > 0 ? 'Fleet 审批 (' + items.length + ')' : 'Fleet 审批';
+      return h(
+        'div',
+        null,
+        open
+          ? h(
+              'div',
+              { style: panelStyle, role: 'dialog', 'aria-label': 'Fleet 待审批请求' },
+              h(
+                'div',
+                { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8 } },
+                h('strong', null, '待审批请求'),
+                h('button', { type: 'button', onClick: () => setOpen(false), style: { ...buttonStyle, position: 'static', boxShadow: 'none', padding: '3px 9px', fontSize: 12 } }, '收起'),
+              ),
+              items.length === 0
+                ? h('div', { style: { opacity: 0.7 } }, '暂无待审批请求')
+                : items.map((item) =>
+                    h(
+                      'div',
+                      { key: item.id, style: { borderTop: '1px solid var(--dsw-alias-border, #333)', padding: '8px 0' } },
+                      h('div', { style: { fontWeight: 600 } }, (item.capability || 'tool') + (item.tool ? ' / ' + item.tool : '')),
+                      h('div', { style: { opacity: 0.75, fontSize: 12 } }, '来自 ' + item.fromDeviceId + ' · ' + Math.max(0, Math.round(item.expiresInMs / 1000)) + 's 后超时'),
+                      item.reason ? h('div', { style: { opacity: 0.75, fontSize: 12, marginTop: 2 } }, item.reason) : null,
+                      h('div', { style: { fontFamily: 'ui-monospace, monospace', fontSize: 11, margin: '4px 0', opacity: 0.8, wordBreak: 'break-all' } }, item.argsSummary),
+                      h(
+                        'div',
+                        { style: { display: 'flex', gap: 6, marginTop: 4 } },
+                        h(ActionButton, { tone: 'allow', onClick: () => decide(item.id, 'approve') }, busy[item.id] ? '处理中…' : '允许一次'),
+                        h(ActionButton, { tone: 'allow', onClick: () => decide(item.id, 'approve', 'ttl') }, '允许 15 分钟'),
+                        h(ActionButton, { tone: 'deny', onClick: () => decide(item.id, 'deny') }, '拒绝'),
+                      ),
+                    ),
+                  ),
+            )
+          : null,
+        h(
+          'button',
+          { type: 'button', style: { ...buttonStyle, borderColor: items.length > 0 ? 'var(--dsw-alias-accent, #2f6fed)' : undefined }, onClick: () => setOpen((value) => !value) },
+          h('span', { 'aria-hidden': true }, '🛰️'),
+          h('span', null, label),
+        ),
+      );
+    }
+
+    return {
+      inject: ['slots'],
+      apply(ctx) {
+        ctx.slots.inject('shell.overlay', () =>
+          ctx.slots.register({ name: 'shell.overlay', id: 'fleet-approvals', order: 10 }, ApprovalPanel),
+        );
+      },
+    };
+  },
+});

package/docs/notes/dev-release.md

@@ -39,15 +39,23 @@ dsh plugin --profile desktop add dsh-device-fleet@dev
 - 邀请里新增 `endpoints`（创建者的局域网/热点 IPv4 + direct 端口），加入方重启后自动向这些地址回连，绕开组播发现失败；
 - 新增 `fleet_status`（deviceId/直连端口/发现/连接/roster/hints）与 `fleet_connect(host, port)`（手动直连，成功后会从握手学到对端 deviceId）；
 - `fleet_list` 仍是本地视图；配对成功后双方 roster 会自动固定对端公钥。
-## 0.1.0-dev.7（稳定化）
+## 0.1.0-dev.8（稳定化）
 
 - 直连端口可固定（profile `direct.port`），插件重载不再换端口；
 - 连接断开后自动重试已知地址（不再只在启动时试一次）；
 - `fleet_connect` 手动地址会持久化到 `peer-hints.json`，重启后继续回连；
 - 新增 `fleet_delegate`（dev.5）：目标设备用 `SubagentProvider` + `delivery:'caller'` 跑 agent 并返回最终结果。
-## 0.1.0-dev.7（审批收件箱，逻辑层）
+## 0.1.0-dev.8（审批收件箱，逻辑层）
 
 - 新增 `ApprovalInbox`：ask 档请求排队、超时 fail-closed、approve（once/ttl）/deny、关闭时全部失败关闭；
 - 直调与委派的 ask 档改为等待本机收件箱结果（不再一律拒绝）；
 - 新工具：`fleet_approvals` / `fleet_approve` / `fleet_deny`；`fleet_simulate_request`（仅 `approvals.simulation: true`）用于本机无第二台设备时演练流程；
-- 审批面板（Client UI）与通知尚未实现，当前通过工具/后续 UI 应答。
+- 审批面板（Client UI）与通知尚未实现，当前通过工具/后续 UI 应答。
+## 0.1.0-dev.8（Room 逻辑层，本机模拟）
+
+- `RoomService`：当前会话升级为 Room Host；本地模拟参与者（真实 DSH session/agent）；
+- 寻址消息：`room_send` 只唤醒被点名成员，Host 会话写权威 `room/message` 事件；
+- 可见性：`room_messages` 提供完整 transcript；未点名成员不运行；
+- Room Board：`room_task_add/update/list`，`dependsOn` 串行交接（前置完成时唤醒下一个 owner），无依赖任务并行不受影响；
+- 工具：`room_create / room_add_local / room_remove_member / room_send / room_messages / room_status / room_task_* / room_close`；
+- 远程参与者传输与 Client UI 未做（下一步）。

package/docs/notes/room-logic-phase.md

@@ -0,0 +1,31 @@
+# Room 逻辑层实测（2026-11-09，dev.8，单机模拟参与者）
+
+在当前这台 DSH 内，用两个**真实本地 session/agent** 充当 Room 参与者，验证寻址唤醒与看板串行交接，不依赖第二台设备。
+
+## 流程与结果
+
+1. `room_create` → roomId = 当前会话 `session-269260c9-…`，host 成员 `host:session-269260c9-…`。
+2. `room_add_local(name="worker-a", cwd=E:/Dsh_test)` → 真实 session `session-d063026e-…`。
+3. `room_send(to=[worker-a], text="读取 hello-from-A.txt 并用 room_send 回复 host")` → `woke worker-a`；
+   - worker-a 的 agent 真实跑了一轮模型 + 本机 `read`，并在 3.4s 内调用 `room_send` 回传 `hello from device A (fleet test)`；
+   - transcript 两条消息，完整可见。
+4. `room_add_local(name="worker-b")`；看板：
+   - taskA `读取 hello-from-A.txt` owner=worker-a；
+   - taskB `汇总读取结果` owner=worker-b，`dependsOn=[taskA]`；
+   - taskC `并行：独立检查` owner=worker-a，无依赖。
+5. `room_task_update(taskA, done)` → 返回 `handed off to worker-b`；worker-b 被点名唤醒，30s 内完成汇总并 `room_send` 给 host（内容含前序结果、交叉校验、并行任务仍 pending 的说明），同时把自己 taskB 置为 running。
+6. `room_task_list`：taskA done、taskB running、taskC pending（并行任务未被串行交接影响）。
+7. `room_close`。
+
+## 结论
+
+- Room 生命周期、成员管理、寻址消息、未点名不唤醒、host 权威日志：单机逻辑通过；
+- Room Board `dependsOn` 串行交接 / 并行任务不阻塞：真实 agent 验证通过；
+- 参与者使用的都是真实 DSH agent（各自 session），不是 mock。
+
+## 限制（下一步）
+
+- 远程参与者传输（把 local participant 换成远端设备成员）尚未接入；
+- Client 面板/房间视图未做（用户无法在 GUI 直接看 room 时间线/看板）；
+- 房间状态在插件内存 + host session 事件里，插件重载后需要 rehydrate（未实现）；
+- 房间策略仅存储，尚未强制（invite/join/maxMembers 中 maxMembers 已生效）。

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "dsh-device-fleet",
-  "version": "0.1.0-dev.8",
+  "version": "0.1.0-dev.9",
   "description": "DeepSeek Harness device fleet: enroll devices, direct-call remote tools, shared Rooms with lazy-woken agents, and delegated subagents across devices.",
   "type": "module",
   "main": "src/plugin/index.js",
   "exports": {
     ".": "./src/plugin/index.js",
+    "./client": "./client.js",
     "./net": "./src/net/index.js",
     "./host": "./src/host/index.js",
     "./package.json": "./package.json"
@@ -16,6 +17,13 @@
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "immediately": true,
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime"
+      ]
     }
   },
   "peerDependencies": {
@@ -31,6 +39,7 @@
   },
   "files": [
     "src",
+    "client.js",
     "cordis.patch.yml",
     "README.md",
     "CONTEXT.md",

package/src/host/approval-web.js

@@ -0,0 +1,95 @@
+// Local approval HTTP surface for the approval panel (dev.9). The page is
+// served by the DSH web carrier, so browser fetch carries the session cookie.
+// All decisions go through ApprovalInbox; nothing here bypasses Tool Policy.
+const MAX_BODY_BYTES = 64 * 1024
+
+function json(res, status, value) {
+  const text = JSON.stringify(value)
+  res.statusCode = status
+  res.setHeader('content-type', 'application/json; charset=utf-8')
+  res.setHeader('cache-control', 'no-store')
+  res.end(text)
+}
+
+async function readJsonBody(req) {
+  const chunks = []
+  let size = 0
+  for await (const chunk of req) {
+    size += chunk.length
+    if (size > MAX_BODY_BYTES) throw Object.assign(new Error('request body is too large'), { code: 'body-too-large' })
+    chunks.push(chunk)
+  }
+  if (chunks.length === 0) return {}
+  try {
+    return JSON.parse(Buffer.concat(chunks).toString('utf8'))
+  } catch {
+    throw Object.assign(new Error('request body must be JSON'), { code: 'bad-json' })
+  }
+}
+
+/** HTTP-free decision helper shared by the routes and unit tests. */
+export function createApprovalApi({ inbox }) {
+  return {
+    list() {
+      return { approvals: inbox.list() }
+    },
+    decide(body = {}) {
+      const { id, action } = body
+      if (typeof id !== 'string' || id === '') {
+        throw Object.assign(new Error('id is required'), { code: 'bad-request' })
+      }
+      if (action === 'approve') {
+        const scope = body.scope === 'ttl' ? 'ttl' : 'once'
+        return { ok: true, result: inbox.approve(id, { scope }) }
+      }
+      if (action === 'deny') {
+        return { ok: true, result: inbox.deny(id, typeof body.reason === 'string' ? body.reason : 'denied by local user') }
+      }
+      throw Object.assign(new Error('action must be approve or deny'), { code: 'bad-request' })
+    },
+  }
+}
+
+/**
+ * Register the approval routes on the DSH web carrier.
+ * @returns {() => void} disposer
+ */
+export function registerApprovalRoutes({ webServer, inbox, logger = null }) {
+  if (!webServer?.register || !inbox) return () => {}
+  const api = createApprovalApi({ inbox })
+  const disposers = []
+  disposers.push(
+    webServer.register({
+      kind: 'exact',
+      path: '/device-fleet/approvals',
+      handler: async (req, res) => {
+        if (req.method !== 'GET') return json(res, 405, { error: 'method not allowed' })
+        try {
+          json(res, 200, api.list())
+        } catch (error) {
+          logger?.warn?.(`[device-fleet] approval list failed: ${String(error?.message ?? error)}`)
+          json(res, 500, { error: 'internal error' })
+        }
+      },
+    }),
+  )
+  disposers.push(
+    webServer.register({
+      kind: 'exact',
+      path: '/device-fleet/approvals/decide',
+      handler: async (req, res) => {
+        if (req.method !== 'POST') return json(res, 405, { error: 'method not allowed' })
+        try {
+          const body = await readJsonBody(req)
+          json(res, 200, api.decide(body))
+        } catch (error) {
+          const status = ['bad-request', 'bad-json', 'body-too-large', 'unknown-request'].includes(error?.code) ? 400 : 500
+          json(res, status, { error: String(error?.message ?? error), code: error?.code ?? 'error' })
+        }
+      },
+    }),
+  )
+  return () => {
+    for (const dispose of disposers) dispose()
+  }
+}

package/src/host/index.js

@@ -5,5 +5,6 @@ export * from './execution-slot.js'
 export * from './direct-call.js'
 export * from './delegation.js'
 export * from './approval-inbox.js'
+export * from './approval-web.js'
 export * from './room-service.js'
 export * from './tools.js'

package/src/plugin/index.js

@@ -16,6 +16,7 @@ import { DirectCallClient, DirectCallHost } from '../host/direct-call.js'
 import { DelegationHost } from '../host/delegation.js'
 import { ApprovalInbox } from '../host/approval-inbox.js'
 import { RoomService } from '../host/room-service.js'
+import { registerApprovalRoutes } from '../host/approval-web.js'
 import { ExecutionSlot, DEFAULT_SHELL_TOOL } from '../host/execution-slot.js'
 import { ToolPolicy } from '../host/tool-policy.js'
 import { createFleetHandlers, createFleetToolDefinitions } from '../host/tools.js'
@@ -197,6 +198,13 @@ export function apply(ctx, config) {
     : async (request) => inbox.request(request)
 
   const rooms = new RoomService({ sessionController, createUserMessage })
+
+  // Client approval panel data plane (dev.9). Optional service: host-only
+  // deployments simply do not expose the panel routes.
+  const webServer = service('webServer')
+  if (webServer) {
+    ctx.effect(() => registerApprovalRoutes({ webServer, inbox, logger }))
+  }
   if (!sessionController) logger.warn?.('[device-fleet] sessionController unavailable: direct calls to stateful tools will fail')
   const slot = sessionController
     ? new ExecutionSlot({ sessionController, tools: ctx.tools, config: config.execution })