dsh-device-fleet 0.1.0-dev.27 → 0.1.0-dev.29

package/client.js

@@ -1149,6 +1149,49 @@ window.__ModuleLoader__.load({
 
     // Room is a normal Session with participants. This dock keeps the member
     // strip inside the conversation instead of a separate dashboard.
+    function extractDraftText(input, depth = 0) {
+      if (input === null || input === undefined || depth > 3) return '';
+      if (typeof input === 'string') return input;
+      if (typeof input !== 'object') return '';
+      for (const key of ['draft', 'text', 'value', 'plainText', 'input', 'message', 'content', 'current']) {
+        const value = input[key];
+        if (typeof value === 'string' && value !== '') return value;
+        if (value && typeof value === 'object') {
+          const nested = extractDraftText(value, depth + 1);
+          if (nested !== '') return nested;
+        }
+      }
+      return '';
+    }
+
+    function insertMentionText(props, name) {
+      const actions = props?.inputActions;
+      if (actions && typeof actions === 'object') {
+        for (const method of ['insertMention', 'insertText', 'appendText', 'replaceText', 'setText', 'setDraft']) {
+          const fn = actions[method];
+          if (typeof fn === 'function') {
+            try {
+              fn.call(actions, '@' + name + ' ');
+              return true;
+            } catch {
+              /* try the next action */
+            }
+          }
+        }
+      }
+      try {
+        const element = document.activeElement;
+        if (element && (element.isContentEditable || element.tagName === 'TEXTAREA' || element.tagName === 'INPUT')) {
+          element.focus();
+          document.execCommand('insertText', false, '@' + name + ' ');
+          return true;
+        }
+      } catch {
+        /* fall through */
+      }
+      return false;
+    }
+
     function RoomDock(props) {
       const sessionId = props?.sessionId;
       const [room, setRoom] = useState(null);
@@ -1223,12 +1266,61 @@ window.__ModuleLoader__.load({
       }
       if (!room) return null;
       const names = room.members.filter((member) => member.role !== 'host').map((member) => member.name);
-      return h('div', { style: { display: 'flex', alignItems: 'center', gap: 8, fontSize: 11, opacity: 0.8, padding: '2px 2px 0', flexWrap: 'wrap' } },
-        pill('Room', 'ok'),
-        h('span', null, room.members.length + ' 名成员'),
-        names.length > 0 ? h('span', null, '· ' + names.join(', ')) : h('span', null, '· 仅 host'),
-        h('span', { style: { flex: 1 } }),
-        h('span', { style: { opacity: 0.55 } }, '房间消息在「房间」页交流'),
+      const inputState = (() => {
+        try {
+          return typeof props?.useInput === 'function' ? props.useInput() : null;
+        } catch {
+          return null;
+        }
+      })();
+      const draft = extractDraftText(inputState);
+      const mention = /(?:^|\s)@([^\s@]*)$/.exec(draft);
+      const candidates = mention
+        ? room.members.filter((member) => String(member.name ?? '').toLowerCase().includes(mention[1].toLowerCase()))
+        : [];
+      const completion =
+        mention && candidates.length > 0
+          ? h('div', {
+              style: {
+                position: 'fixed',
+                bottom: 96,
+                left: '50%',
+                transform: 'translateX(-50%)',
+                width: 'min(520px, 80vw)',
+                zIndex: 1000,
+                background: 'var(--dsw-alias-bg-overlay, #1f1f1f)',
+                color: 'var(--dsw-alias-label-primary, #e8e8e8)',
+                border: '1px solid var(--dsw-alias-border-l2, #3a3a3a)',
+                borderRadius: 10,
+                boxShadow: '0 12px 32px rgba(0,0,0,.4)',
+                padding: 6,
+                font: '12px system-ui, sans-serif',
+              },
+            },
+              h('div', { style: { opacity: 0.55, fontSize: 10, padding: '3px 7px 5px' } }, '可发送给：所有人 / 指定 agent'),
+              ...candidates.map((member) =>
+                h('button', {
+                  key: member.memberId,
+                  type: 'button',
+                  onClick: () => {
+                    if (!insertMentionText(props, member.name)) {
+                      setStatus('请在输入框手动补全 @' + member.name)
+                    }
+                  },
+                  style: { display: 'flex', alignItems: 'center', gap: 8, width: '100%', padding: '6px 8px', background: 'transparent', border: 'none', color: 'inherit', cursor: 'pointer', fontSize: 12, textAlign: 'left', borderRadius: 6 },
+                }, avatarImg('/device-fleet/avatar/' + (member.role === 'host' ? 'host' : 'worker'), member.name), member.name + (member.role === 'host' ? '（host）' : '')),
+              ),
+            )
+          : null;
+      return h('div', null,
+        completion,
+        h('div', { style: { display: 'flex', alignItems: 'center', gap: 8, fontSize: 11, opacity: 0.8, padding: '2px 2px 0', flexWrap: 'wrap' } },
+          pill('Room', 'ok'),
+          h('span', null, room.members.length + ' 名成员'),
+          names.length > 0 ? h('span', null, '· ' + names.join(', ')) : h('span', null, '· 仅 host'),
+          h('span', { style: { flex: 1 } }),
+          h('span', { style: { opacity: 0.55 } }, '输入 @ 点名，不点名发给所有人'),
+        ),
       );
     }
 
@@ -1503,55 +1595,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

@@ -143,4 +143,14 @@ dsh plugin --profile desktop add dsh-device-fleet@dev
 
 - RoomDock 在检测到会话是 Room 时尝试通过标准 slot 的 `useConversation` 钩子自动切到「房间」Conversation View（不同版本的 shell 若未暴露该 API 则保持手动切换）；
 - 头像库：Settings → Plugins → Device Fleet 配置页新增「头像库」，可多选上传 png/jpeg/webp；Host 存到 `$DSH_HOME/.../avatars/`，提供列表/预览/删除接口；
-- Room 成员头像按成员顺序循环分配库中图片，可点「换头像」切换到下一组；未上传时使用内置三张图。
+- Room 成员头像按成员顺序循环分配库中图片，可点「换头像」切换到下一组；未上传时使用内置三张图。
+## 0.1.0-dev.27（修复插件配置页空白）
+
+- 根因：dev.26 头像库区块误用了不存在的 `sectionCard`，FleetConfig 渲染抛 ReferenceError，导致 Settings → Plugins → Device Fleet 配置页消失。
+- 修复：头像库改用普通卡片容器；client smoke 增加配置页真实渲染用例（plugins.row.config）防止回归。
+## 0.1.0-dev.28（Room 复用 DSH 输入框 + @点名解析）
+
+- 移除房间页自带发送栏，房间消息直接使用 DSH 底部输入框；
+- Host 监听 Room Host 会话的 user/message：解析 `@成员名`，被点名成员才加入收件人；未点名默认发给所有参与者；
+- 消息文本会去掉 @mention 标记后写入房间日志；host 本身已收到 Chat 输入，不重复唤醒；
+- 房间页保留成员/气泡/看板，底部提示用 @ 点名。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-device-fleet",
-  "version": "0.1.0-dev.27",
+  "version": "0.1.0-dev.29",
   "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,79 @@ 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)}`)
+      }
+    }),
+  )
+
+  // The host agent's own Chat replies are mirrored into the Room transcript as
+  // host speech (read-only for participants: recorded, never re-woken).
+  ctx.effect(() =>
+    ctx.on?.('session/event', (session, event) => {
+      try {
+        if (!session?.id || event?.type !== 'assistant/message') return
+        const room = rooms.rooms.get(session.id)
+        if (!room) return
+        const message = event.data
+        const text = (Array.isArray(message?.content) ? message.content : [])
+          .filter((block) => block?.type === 'text')
+          .map((block) => block.text)
+          .join('\n')
+          .trim()
+        if (text === '') return
+        const hostMemberId = `host:${session.id}`
+        void rooms.send({
+          roomId: session.id,
+          from: { sessionId: session.id },
+          to: [hostMemberId],
+          text,
+          skipWakeFor: [hostMemberId],
+        }).catch(() => {})
+      } catch {
+        /* ignore */
+      }
+    }),
+  )
+
   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)