dsh-device-fleet 0.1.0-dev.15 → 0.1.0-dev.17

package/client.js

@@ -273,6 +273,7 @@ window.__ModuleLoader__.load({
       const [rooms, setRooms] = useState([]);
       const [selectedRoom, setSelectedRoom] = useState(null);
       const [roomDetail, setRoomDetail] = useState(null);
+      const [roomError, setRoomError] = useState('');
       const [error, setError] = useState('');
 
       useEffect(() => {
@@ -307,12 +308,18 @@ window.__ModuleLoader__.load({
         let disposed = false;
         const load = async () => {
           try {
-            const response = await fetch('/device-fleet/rooms/' + encodeURIComponent(selectedRoom), { headers: { accept: 'application/json' } });
+            const response = await fetch('/device-fleet/room?id=' + encodeURIComponent(selectedRoom), { headers: { accept: 'application/json' } });
             if (!response.ok) throw new Error('HTTP ' + response.status);
             const data = await response.json();
-            if (!disposed) setRoomDetail(data.room ?? null);
-          } catch {
-            if (!disposed) setRoomDetail(null);
+            if (!disposed) {
+              setRoomDetail(data.room ?? null);
+              setRoomError('');
+            }
+          } catch (problem) {
+            if (!disposed) {
+              setRoomDetail(null);
+              setRoomError(String(problem.message ?? problem));
+            }
           }
         };
         load();
@@ -434,7 +441,7 @@ window.__ModuleLoader__.load({
                   ),
                 ),
           ),
-          h('div', { style: { flex: '2 1 420px', minWidth: 320 } }, selectedRoom ? renderRoomDetail(roomDetail) : h('div', { style: { opacity: 0.65, fontSize: 12 } }, '选择一个房间查看成员、时间线与看板。')),
+          h('div', { style: { flex: '2 1 420px', minWidth: 320 } }, selectedRoom ? (roomError && !roomDetail ? h('div', { style: { opacity: 0.7, fontSize: 12 } }, '房间加载失败：' + roomError) : renderRoomDetail(roomDetail)) : h('div', { style: { opacity: 0.65, fontSize: 12 } }, '选择一个房间查看成员、时间线与看板。')),
         );
       } else {
         const approvals = overview.approvals ?? [];
@@ -549,9 +556,15 @@ window.__ModuleLoader__.load({
     }
 
     function Row({ label, children, wide = false }) {
+      if (wide) {
+        return h('div', { style: { ...rowStyle, flexDirection: 'column', alignItems: 'stretch', gap: 6, padding: '8px 0' } },
+          h('div', { style: rowLabelStyle }, label),
+          h('div', { style: { width: '100%' } }, children),
+        )
+      }
       return h('div', { style: rowStyle },
         h('div', { style: rowLabelStyle }, label),
-        h('div', { style: wide ? { width: '100%' } : { width: CONTROL_WIDTH } }, children),
+        h('div', { style: { width: CONTROL_WIDTH } }, children),
       )
     }
 
@@ -601,7 +614,7 @@ window.__ModuleLoader__.load({
       ['capGrep', '搜索内容'],
       ['capFetch', '获取文件'],
       ['capRun', '执行命令'],
-      ['capTool', '调用原始工具'],
+      ['capTool', '原始工具（遵循 DSH 审批）'],
       ['capDelegate', '委派任务'],
     ]
 
@@ -635,7 +648,6 @@ window.__ModuleLoader__.load({
         execDelegateTimeoutMs: execution.delegateTimeoutMs ?? 180000,
         execSubagentProvider: execution.subagentProvider ?? 'spawn',
         rootsText: (policy.allowedRoots ?? []).join('\n'),
-        toolsText: (policy.allowedTools ?? []).join('\n'),
         capRead: policy.capabilities?.read ?? 'auto',
         capList: policy.capabilities?.list ?? 'auto',
         capGrep: policy.capabilities?.grep ?? 'auto',
@@ -676,7 +688,6 @@ window.__ModuleLoader__.load({
         },
         policy: {
           allowedRoots: draft.rootsText.split('\n').map((item) => item.trim()).filter(Boolean),
-          allowedTools: draft.toolsText.split('\n').map((item) => item.trim()).filter(Boolean),
           capabilities: {
             read: draft.capRead,
             list: draft.capList,
@@ -774,7 +785,7 @@ window.__ModuleLoader__.load({
               padding: '0 14px',
               borderRadius: 6,
               border: '1px solid var(--dsw-alias-brand-primary, #2f6fed)',
-              background: 'var(--dsw-alias-brand-primary, #2f6fed)',
+              background: '#2f6fed',
               color: '#fff',
               fontSize: 13,
               cursor: busy ? 'default' : 'pointer',
@@ -835,7 +846,7 @@ window.__ModuleLoader__.load({
           h(NumberControl, { value: draft.execDelegateTimeoutMs, onChange: (value) => set('execDelegateTimeoutMs', value) }),
         ),
         h('div', { style: sectionStyle }, '远端权限'),
-        h(Row, { label: '可访问根目录', wide: true },
+        h(Row, { label: '允许的根目录', wide: true },
           h('textarea', {
             value: draft.rootsText,
             onChange: (event) => set('rootsText', event.target.value),
@@ -843,14 +854,6 @@ window.__ModuleLoader__.load({
             style: textareaStyle,
           }),
         ),
-        h(Row, { label: '允许的原始工具', wide: true },
-          h('textarea', {
-            value: draft.toolsText,
-            onChange: (event) => set('toolsText', event.target.value),
-            rows: 3,
-            style: textareaStyle,
-          }),
-        ),
         ...CAPABILITY_ROWS.map(([key, label]) =>
           h(Row, { key, label },
             h(SelectControl, { value: draft[key], options: modeOptions, onChange: (value) => set(key, value) }),

package/cordis.patch.yml

@@ -18,9 +18,9 @@
             grep: auto
             fetch: auto
             run: ask
-            tool: deny
+            tool: auto
           allowedTools: []
         promptSection: true
         autoApproveAsk: false
-
-
+
+

package/docs/notes/dev-release.md

@@ -39,19 +39,19 @@ 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.14（稳定化）
+## 0.1.0-dev.16（稳定化）
 
 - 直连端口可固定（profile `direct.port`），插件重载不再换端口；
 - 连接断开后自动重试已知地址（不再只在启动时试一次）；
 - `fleet_connect` 手动地址会持久化到 `peer-hints.json`，重启后继续回连；
 - 新增 `fleet_delegate`（dev.5）：目标设备用 `SubagentProvider` + `delivery:'caller'` 跑 agent 并返回最终结果。
-## 0.1.0-dev.14（审批收件箱，逻辑层）
+## 0.1.0-dev.16（审批收件箱，逻辑层）
 
 - 新增 `ApprovalInbox`：ask 档请求排队、超时 fail-closed、approve（once/ttl）/deny、关闭时全部失败关闭；
 - 直调与委派的 ask 档改为等待本机收件箱结果（不再一律拒绝）；
 - 新工具：`fleet_approvals` / `fleet_approve` / `fleet_deny`；`fleet_simulate_request`（仅 `approvals.simulation: true`）用于本机无第二台设备时演练流程；
 - 审批面板（Client UI）与通知尚未实现，当前通过工具/后续 UI 应答。
-## 0.1.0-dev.14（Room 逻辑层，本机模拟）
+## 0.1.0-dev.16（Room 逻辑层，本机模拟）
 
 - `RoomService`：当前会话升级为 Room Host；本地模拟参与者（真实 DSH session/agent）；
 - 寻址消息：`room_send` 只唤醒被点名成员，Host 会话写权威 `room/message` 事件；
@@ -59,22 +59,35 @@ dsh plugin --profile desktop add dsh-device-fleet@dev
 - 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 未做（下一步）。
-## 0.1.0-dev.14（审批面板 UI，第一版）
+## 0.1.0-dev.16（审批面板 UI，第一版）
 
 - Host 新增本地 HTTP 数据面：GET `/device-fleet/approvals`、POST `/device-fleet/approvals/decide`（仅本机 web 载体，决策仍走 ApprovalInbox）；
 - Client half：`client.js` 闭包工厂，注册 `shell.overlay` 浮动「Fleet 审批」按钮 + 面板，轮询待审批列表，支持允许一次 / 允许 15 分钟 / 拒绝；
 - package.json 增加 `dsh.client` 与 `./client` 导出；`files` 增加 client.js；
 - Client 视觉验证需要刷新页面；当前无浏览器控制，仅验证了 bundle 语法与 Host 路由注册。
-## 0.1.0-dev.14（审批入口不遮挡）
+## 0.1.0-dev.16（审批入口不遮挡）
 
 - 触发按钮从右下角浮动改为 `sidebar.footer.action`（设置旁边），不再遮挡任务列表/内容面板；
 - 审批 inbox 改为点击后居中的模态对话框（带遮罩，Esc/点遮罩关闭）；
 - 轮询在 Client apply 中启动并由 ctx.effect 清理；待审批数量作为按钮徽标；
 - 已实测：面板点击「允许」后 Host `fleet_approvals` 清空。
-## 0.1.0-dev.14（Phase B：运行时配置 + 配置页）
+## 0.1.0-dev.16（Phase B：运行时配置 + 配置页）
 
 - `RuntimeConfig`：profile patch 为 base，UI 修改写入 `$DSH_HOME/device-fleet/config-overrides.json`，apply 时合并并持久化；
 - 保存即生效：policy/execution/approvals/deviceName/promptSection/autoApproveAsk 直接更新运行时对象；direct/discovery/relay 通过 `FleetNode.reconfigure()` 原地重启网络监听（不重启插件/DSH）；`dataDir` 只读；
 - Host：`GET /device-fleet/config`、`POST /device-fleet/config`（校验/清洗后应用）；
 - Client：注册 `plugins.row.config`（key `dsh-device-fleet#device-fleet`）与 `plugins.bundle.config`（key `dsh-device-fleet`），配置页含设备/网络、执行上下文、Tool Policy、审批与提示四组表单；
-- 单测 18/18、网络 9/9。
+- 单测 18/18、网络 9/9。
+## 0.1.0-dev.16（配置页 DSH 化改版）
+
+- Host 新增 `GET /device-fleet/options`：本机地址、可用 preset 列表、shell 工具、subagent providers、工作目录候选；
+- 配置保存前会 ensure 工作目录存在（Device Fleet 工作区自动创建）；
+- 配置页重做：行式布局（label 左/控件右）、DSH token 配色、分组标题、去掉多余说明文字与 dataDir 展示；
+- 下拉化：直连地址、局域网发现、Relay 模式、工作目录（工作区/默认/DSH 主目录/自定义）、Agent Preset、Shell、委派 Provider、7 项能力权限、开关项；
+- 仍保留文本输入：设备名称、端口、超时、根目录/工具列表、自定义工作目录与 Relay 地址。
+## 0.1.0-dev.16（房间详情与配置页修复）
+
+- 房间详情接口从 prefix 路由改为精确路由 `GET /device-fleet/room?id=...`，修复控制台一直「加载房间…」；客户端加载失败时显示错误文案；
+- 配置页宽行改为「标签在上、控件在下」，修复根目录等标签竖排换行；
+- 保存按钮改为固定品牌蓝底白字，修复按钮看起来空白；
+- 「允许的原始工具」改为「免审批即用的工具」：从 Host options 拉取本机真实工具清单，以复选框选择（不再手输工具名）。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-device-fleet",
-  "version": "0.1.0-dev.15",
+  "version": "0.1.0-dev.17",
   "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",

package/src/host/tool-policy.js

@@ -13,7 +13,7 @@ export const DEFAULT_POLICY = Object.freeze({
     grep: 'auto',
     fetch: 'auto',
     run: 'ask',
-    tool: 'deny',
+    tool: 'auto',
     delegate: 'ask',
   },
   allowedTools: [],
@@ -77,15 +77,17 @@ export class ToolPolicy {
       return { decision: 'allow', reason: 'run is allowed by policy', key: grantKey, capability: capabilityName }
     }
     if (capabilityName === 'tool') {
-      if (!this.config.allowedTools.includes(String(tool))) {
-        return {
-          decision: 'deny',
-          reason: `tool ${String(tool)} is not in the allowed tools list`,
-          key: grantKey,
-          capability: capabilityName,
-        }
+      // Raw tools follow the normal DSH tool pipeline on this device: the
+      // target Session's tool pre-execute policy and approval seam decide
+      // whether a call runs, asks, or is rejected. `deny` disables raw tools
+      // entirely; `ask` adds the plugin-level approval in front of DSH.
+      if (mode === 'deny') {
+        return { decision: 'deny', reason: 'raw tool calls are disabled by policy', key: grantKey, capability: capabilityName }
+      }
+      if (mode === 'ask') {
+        return { decision: 'ask', reason: 'raw tool call requires local approval', key: grantKey, capability: capabilityName }
       }
-      return { decision: 'allow', reason: 'tool is allowlisted', key: grantKey, capability: capabilityName }
+      return { decision: 'allow', reason: 'raw tool call follows the DSH tool pipeline', key: grantKey, capability: capabilityName }
     }
     if (mode === 'allow') return { decision: 'allow', reason: 'capability is allowed by policy', key: grantKey, capability: capabilityName }
     if (mode === 'auto') return { decision: 'allow', reason: 'capability is auto-approved', key: grantKey, capability: capabilityName }

package/src/host/ui-web.js

@@ -57,12 +57,16 @@ export function registerUiRoutes({ webServer, inbox, rooms, getOverview, logger
   )
   disposers.push(
     webServer.register({
-      kind: 'prefix',
-      path: '/device-fleet/rooms/',
+      kind: 'exact',
+      path: '/device-fleet/room',
       handler: async (req, res) => {
         if (req.method !== 'GET') return json(res, 405, { error: 'method not allowed' })
-        const path = pathOf(req)
-        const roomId = decodeURIComponent(path.slice('/device-fleet/rooms/'.length))
+        let roomId = ''
+        try {
+          roomId = new URL(req.url ?? '/', 'http://local').searchParams.get('id') ?? ''
+        } catch {
+          roomId = ''
+        }
         if (roomId === '') return json(res, 400, { error: 'room id is required' })
         try {
           json(res, 200, { room: rooms.detail(roomId, { limit: 100 }) })

package/src/plugin/index.js

@@ -20,7 +20,7 @@ import { RoomService } from '../host/room-service.js'
 import { registerApprovalRoutes } from '../host/approval-web.js'
 import { registerUiRoutes } from '../host/ui-web.js'
 import { registerConfigRoutes } from '../host/config-web.js'
-import { RuntimeConfig } from '../host/runtime-config.js'
+import { RuntimeConfig, deepMerge } from '../host/runtime-config.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'
@@ -158,6 +158,16 @@ export function apply(ctx, profileConfig) {
     base: profileConfig ?? {},
     overridesFile: join(state.dataDir, 'config-overrides.json'),
   })
+  // Migration: an old UI save wrote the legacy `tool: deny` + empty allowlist;
+  // raw tools now follow the DSH pipeline by default.
+  if (
+    runtime.overrides?.policy?.capabilities?.tool === 'deny' &&
+    (runtime.overrides?.policy?.allowedTools?.length ?? 0) === 0
+  ) {
+    runtime.overrides = deepMerge(runtime.overrides, { policy: { capabilities: { tool: 'auto' } } })
+    runtime.current = deepMerge(runtime.base, runtime.overrides)
+    runtime.persist()
+  }
   const config = runtime.current
 
   const node = new FleetNode({
@@ -255,6 +265,7 @@ export function apply(ctx, profileConfig) {
           return ['spawn']
         }
       })(),
+      tools: [...toolNames].sort(),
       presets: presets.map((preset) => ({
         id: preset.id ?? preset.name,
         label: preset.name ?? preset.title ?? preset.id,
@@ -339,6 +350,33 @@ export function apply(ctx, profileConfig) {
       })
     : null
 
+  // Mirror the normal DSH approval behavior for tools executed in the hidden
+  // Execution Slot: the tool pipeline asks here when its own pre-execute policy
+  // requires approval, and this device's approval inbox answers.
+  ctx.effect(() => {
+    if (!slot) return () => {}
+    const handler = async (request, next) => {
+      try {
+        if (request?.signal?.aborted) return 'cancelled'
+        if (!slot.sessionId || request?.agent?.session?.id !== slot.sessionId) return next()
+        const toolName = typeof request?.toolName === 'string' ? request.toolName : 'tool'
+        const outcome = await inbox.request({
+          fromDeviceId: 'local-tool-pipeline',
+          capability: 'tool',
+          tool: toolName,
+          reason: request?.displayReason ?? request?.reason ?? `tool "${toolName}" requires approval`,
+          args: {},
+        })
+        if (outcome.approved === true) return 'allowed-once'
+        if (outcome.reason === 'inbox-closed') return 'cancelled'
+        return 'rejected'
+      } catch {
+        return next()
+      }
+    }
+    return ctx.on('approval/request', handler)
+  })
+
   node.onRequest(async (request) => {
     if (!host) throw Object.assign(new Error('this device cannot serve direct calls (no execution slot)'), { code: 'unsupported' })
     return host.handleRequest(request)