dsh-device-fleet 0.1.0-dev.26 → 0.1.0-dev.28

package/client.js

@@ -1094,24 +1094,22 @@ window.__ModuleLoader__.load({
           h(NumberControl, { value: draft.execDelegateTimeoutMs, onChange: (value) => set('execDelegateTimeoutMs', value) }),
         ),
         h('div', { style: sectionStyle }, '头像库'),
-        sectionCard('Room 成员头像',
-          h('div', null,
-            h('div', { style: { display: 'flex', alignItems: 'center', gap: 10, flexWrap: 'wrap' } },
-              h('input', { type: 'file', accept: 'image/png,image/jpeg,image/webp', multiple: true, onChange: (event) => void uploadAvatars(event) }),
-              avatarStatus ? h('span', { style: { fontSize: 12, opacity: 0.7 } }, avatarStatus) : null,
-            ),
-            library.length === 0
-              ? h('div', { style: { fontSize: 12, opacity: 0.6, marginTop: 8 } }, '未上传头像时使用内置头像；上传后 Room 成员按顺序循环分配')
-              : h('div', { style: { display: 'flex', flexWrap: 'wrap', gap: 10, marginTop: 10 } },
-                  ...library.map((item) =>
-                    h('div', { key: item.name, style: { display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 4 } },
-                      h('img', { src: item.url, alt: item.name, style: { width: 46, height: 46, borderRadius: '50%', objectFit: 'cover', border: '1px solid var(--dsw-alias-border-l1, #333)' } }),
-                      smallButton('删除', () => void removeAvatar(item.name), 'deny'),
-                    ),
+        h('div', { style: { ...cardStyle, padding: 14 } },
+          h('div', { style: { display: 'flex', alignItems: 'center', gap: 10, flexWrap: 'wrap' } },
+            h('input', { type: 'file', accept: 'image/png,image/jpeg,image/webp', multiple: true, onChange: (event) => void uploadAvatars(event) }),
+            avatarStatus ? h('span', { style: { fontSize: 12, opacity: 0.7 } }, avatarStatus) : null,
+          ),
+          library.length === 0
+            ? h('div', { style: { fontSize: 12, opacity: 0.6, marginTop: 8 } }, '未上传头像时使用内置头像；上传后 Room 成员按顺序循环分配')
+            : h('div', { style: { display: 'flex', flexWrap: 'wrap', gap: 10, marginTop: 10 } },
+                ...library.map((item) =>
+                  h('div', { key: item.name, style: { display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 4 } },
+                    h('img', { src: item.url, alt: item.name, style: { width: 46, height: 46, borderRadius: '50%', objectFit: 'cover', border: '1px solid var(--dsw-alias-border-l1, #333)' } }),
+                    smallButton('删除', () => void removeAvatar(item.name), 'deny'),
                   ),
                 ),
-          ),
-          '上传的图片存放在设备数据目录的 avatars/ 下；Room 视图按成员顺序循环取用，可点「换头像」切换到下一组。',
+              ),
+          h('div', { style: { fontSize: 11, opacity: 0.55, marginTop: 8 } }, '图片存放在设备数据目录的 avatars/ 下；Room 视图按成员顺序循环取用，可点「换头像」切换到下一组。'),
         ),
         h('div', { style: sectionStyle }, '远端权限'),
         h(Row, { label: '允许的根目录', wide: true },
@@ -1505,55 +1503,8 @@ window.__ModuleLoader__.load({
               ),
             )
           : null,
-        h('div', { style: { ...cardStyle, marginTop: 8 } },
-          h('div', { style: { display: 'flex', flexWrap: 'wrap', gap: 6, alignItems: 'center', marginBottom: 6 } },
-            h('span', { style: { fontSize: 11, opacity: 0.6 } }, '发给'),
-            sendTo.length === 0
-              ? h('span', { style: { fontSize: 11, opacity: 0.8 } }, '所有人')
-              : sendTo.map((memberId) =>
-                  h('span', {
-                    key: memberId,
-                    style: { fontSize: 11, padding: '1px 7px', borderRadius: 999, border: '1px solid var(--dsw-alias-accent, #2f6fed)', color: 'var(--dsw-alias-accent, #2f6fed)', cursor: 'pointer' },
-                    onClick: () => setSendTo((current) => current.filter((id) => id !== memberId)),
-                  }, '@' + nameOf(memberId) + ' ×'),
-                ),
-            h('span', { style: { flex: 1 } }),
-            h('span', { style: { fontSize: 10, opacity: 0.45 } }, '输入 @ 点名'),
-          ),
-          h('textarea', {
-            value: sendText,
-            onChange: (event) => setSendText(event.target.value),
-            onKeyDown: (event) => {
-              if (event.key === 'Enter' && !event.shiftKey) {
-                event.preventDefault()
-                void send()
-              }
-            },
-            rows: 2,
-            placeholder: '发消息给房间成员；输入 @ 可点名（Enter 发送，Shift+Enter 换行）',
-            style: { width: '100%', boxSizing: 'border-box', padding: '7px 9px', borderRadius: 8, border: '1px solid var(--dsw-alias-border-l1, #333)', background: 'var(--dsw-alias-bg-layer-2, #262626)', color: 'inherit', fontSize: 13, resize: 'vertical', fontFamily: 'inherit' },
-          }),
-          mentionInfo && mentionCandidates.length > 0
-            ? h('div', { style: { marginTop: 6, border: '1px solid var(--dsw-alias-border-l1, #333)', borderRadius: 8, background: 'var(--dsw-alias-bg-layer-2, #262626)', overflow: 'hidden' } },
-                ...mentionCandidates.map((member) =>
-                  h('button', {
-                    key: member.memberId,
-                    type: 'button',
-                    onClick: () => {
-                      setSendTo((current) => [...new Set([...current, member.memberId])])
-                      setSendText((text) => {
-                        const match = /(?:^|\s)@([^\s@]*)$/.exec(text)
-                        if (!match) return text
-                        const start = text.length - match[1].length - 1
-                        return text.slice(0, start).replace(/\s+$/, '')
-                      })
-                    },
-                    style: { display: 'flex', alignItems: 'center', gap: 6, width: '100%', padding: '6px 9px', background: 'transparent', border: 'none', color: 'inherit', cursor: 'pointer', fontSize: 12, textAlign: 'left' },
-                  }, avatarImg(memberAvatarSrc(member), member.name ?? member.memberId), member.name + (member.role === 'host' ? '（host）' : '')),
-                ),
-              )
-            : null,
-          h('div', { style: { display: 'flex', justifyContent: 'flex-end', marginTop: 6 } }, smallButton('发送', () => void send(), 'allow')),
+        h('div', { style: { ...cardStyle, marginTop: 8, fontSize: 12, opacity: 0.75 } },
+          '在下方 DSH 输入框发送：用 @成员名 点名（例如 @worker-c），不点名则发给所有人。',
         ),
       )
     }

package/docs/notes/dev-release.md

@@ -138,4 +138,13 @@ dsh plugin --profile desktop add dsh-device-fleet@dev
 ## 0.1.0-dev.25（Room 头像）
 
 - Room 对话头像改为图片：worker → worker.png（蓝色大肥鱼），host → host.png（偷吃 Token），user → user.png；
-- Host 新增 `/device-fleet/avatar/{host,worker,user}` 精确路由，从插件 `assets/avatars/` 提供 PNG；package `files` 包含 assets。
+- Host 新增 `/device-fleet/avatar/{host,worker,user}` 精确路由，从插件 `assets/avatars/` 提供 PNG；package `files` 包含 assets。
+## 0.1.0-dev.26（Room 自动切换 + 头像库）
+
+- RoomDock 在检测到会话是 Room 时尝试通过标准 slot 的 `useConversation` 钩子自动切到「房间」Conversation View（不同版本的 shell 若未暴露该 API 则保持手动切换）；
+- 头像库：Settings → Plugins → Device Fleet 配置页新增「头像库」，可多选上传 png/jpeg/webp；Host 存到 `$DSH_HOME/.../avatars/`，提供列表/预览/删除接口；
+- Room 成员头像按成员顺序循环分配库中图片，可点「换头像」切换到下一组；未上传时使用内置三张图。
+## 0.1.0-dev.27（修复插件配置页空白）
+
+- 根因：dev.26 头像库区块误用了不存在的 `sectionCard`，FleetConfig 渲染抛 ReferenceError，导致 Settings → Plugins → Device Fleet 配置页消失。
+- 修复：头像库改用普通卡片容器；client smoke 增加配置页真实渲染用例（plugins.row.config）防止回归。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-device-fleet",
-  "version": "0.1.0-dev.26",
+  "version": "0.1.0-dev.28",
   "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/room-service.js

@@ -186,7 +186,7 @@ export class RoomService {
    * Send one addressed message. The Host appends it to the canonical log and
    * wakes only the addressed local members (never the sender).
    */
-  async send({ roomId, from, to, text } = {}) {
+  async send({ roomId, from, to, text, skipWakeFor = [] } = {}) {
     const room = this.requireRoom(roomId)
     const body = typeof text === 'string' ? text.trim() : ''
     if (body === '') throw Object.assign(new Error('room message needs text'), { code: 'bad-request' })
@@ -216,6 +216,7 @@ export class RoomService {
     const woken = []
     for (const memberId of recipients) {
       if (sender.memberId === memberId) continue
+      if (skipWakeFor.includes(memberId)) continue
       const member = room.members.get(memberId)
       if (await this.wake(room, member, message)) woken.push(memberId)
     }

package/src/plugin/index.js

@@ -435,6 +435,50 @@ export function apply(ctx, profileConfig) {
     return ctx.on('approval/request', handler)
   })
 
+  // A Room reuses the normal DSH composer: every user message in a Room Host
+  // session is logged as a Room message. `@name` addresses specific members;
+  // without mentions it goes to every participant. Host itself already has the
+  // message as normal Chat input, so it is never re-woken.
+  ctx.effect(() =>
+    ctx.on?.('session/event', (session, event) => {
+      try {
+        if (!session?.id || event?.type !== 'user/message') return
+        const room = rooms.rooms.get(session.id)
+        if (!room) return
+        const message = event.data
+        if (message?.source?.kind && message.source.kind !== 'user') return
+        const text = (Array.isArray(message?.content) ? message.content : [])
+          .filter((block) => block?.type === 'text')
+          .map((block) => block.text)
+          .join('\n')
+          .trim()
+        if (text === '' || text.startsWith('[Room]') || text.startsWith('[Fleet Room')) return
+        const members = rooms.status(session.id).members
+        const hostMemberId = `host:${session.id}`
+        const participants = members.filter((member) => member.role !== 'host')
+        const mentioned = members.filter((member) => member.name && text.includes('@' + member.name))
+        const recipients = mentioned.length > 0
+          ? mentioned.map((member) => member.memberId)
+          : participants.map((member) => member.memberId)
+        if (recipients.length === 0) return
+        let body = text
+        for (const member of mentioned) body = body.split('@' + member.name).join('')
+        body = body.trim() || '(点名)'
+        void rooms.send({
+          roomId: session.id,
+          from: { kind: 'user' },
+          to: recipients,
+          text: body,
+          skipWakeFor: [hostMemberId],
+        }).catch((error) => {
+          logger.warn?.(`[device-fleet] cannot route room message: ${String(error?.message ?? error)}`)
+        })
+      } catch (error) {
+        logger.warn?.(`[device-fleet] room message routing failed: ${String(error?.message ?? error)}`)
+      }
+    }),
+  )
+
   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)