dsh-device-fleet 0.1.0-dev.21 → 0.1.0-dev.23

package/client.js

@@ -608,7 +608,9 @@ window.__ModuleLoader__.load({
     function renderRoomDetail(detail, ctl) {
       if (!detail) return h('div', { style: { opacity: 0.65, fontSize: 12 } }, '加载房间…');
       const memberIds = detail.members.map((member) => member.memberId);
-      const recipientIds = Array.isArray(ctl.sendTo) && ctl.sendTo.length > 0 ? ctl.sendTo : memberIds.filter((id) => id.startsWith('host:'));
+      const participantIds = memberIds.filter((id) => !id.startsWith('host:'));
+      const defaultRecipients = participantIds.length > 0 ? participantIds : memberIds;
+      const recipientIds = Array.isArray(ctl.sendTo) && ctl.sendTo.length > 0 ? ctl.sendTo : defaultRecipients;
       return h(
         'div',
         null,
@@ -636,7 +638,7 @@ window.__ModuleLoader__.load({
                   checked: recipientIds.includes(member.memberId),
                   onChange: (event) => {
                     ctl.setSendTo((current) => {
-                      const base = current.length > 0 ? current : recipientIds
+                      const base = current.length > 0 ? current : defaultRecipients
                       return event.target.checked ? [...new Set([...base, member.memberId])] : base.filter((id) => id !== member.memberId)
                     })
                   },
@@ -1138,10 +1140,287 @@ window.__ModuleLoader__.load({
         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 } }, '房间消息会同步到参与者'),
+        h('span', { style: { opacity: 0.55 } }, '房间消息在「房间」页交流'),
       );
     }
 
+    // Session-native Room view: the Room's transcript, members and board live
+    // in their own Conversation View instead of the normal Chat stream.
+    function RoomPane({ roomId }) {
+      const [detail, setDetail] = useState(null);
+      const [missing, setMissing] = useState(false);
+      const [error, setError] = useState('');
+      const [sendText, setSendText] = useState('');
+      const [sendTo, setSendTo] = useState([]);
+      const [taskTitle, setTaskTitle] = useState('');
+      const [taskOwner, setTaskOwner] = useState('');
+      const [status, setStatus] = useState('');
+
+      const load = async () => {
+        if (!roomId) return;
+        try {
+          const response = await fetch('/device-fleet/room?id=' + encodeURIComponent(roomId), { headers: { accept: 'application/json' } });
+          if (response.status === 404) {
+            setMissing(true);
+            setDetail(null);
+            return;
+          }
+          if (!response.ok) throw new Error('HTTP ' + response.status);
+          const data = await response.json();
+          setDetail(data.room ?? null);
+          setMissing(false);
+          setError('');
+        } catch (problem) {
+          setError(String(problem.message ?? problem));
+        }
+      };
+
+      useEffect(() => {
+        void load();
+        const timer = setInterval(load, 2500);
+        return () => clearInterval(timer);
+      }, [roomId]);
+
+      const act = async (label, action) => {
+        setStatus(label + '…');
+        try {
+          await action();
+          setStatus(label + '成功');
+          await load();
+        } catch (problem) {
+          setStatus(label + '失败：' + String(problem.message ?? problem));
+        }
+      };
+
+      if (!roomId) return null;
+      if (missing) {
+        return h('div', { style: { opacity: 0.75, fontSize: 12 } }, '这个会话还不是 Room。在下方输入框旁点击「升级为 Room」，或让 agent 执行 room_create。');
+      }
+      if (!detail) return h('div', { style: { opacity: 0.7, fontSize: 12 } }, error ? '房间加载失败：' + error : '加载房间…');
+
+      const ctl = {
+        sendText,
+        setSendText,
+        sendTo,
+        setSendTo,
+        sendRoomMessage: () =>
+          act('发送', async () => {
+            if (sendText.trim() === '') throw new Error('消息不能为空');
+            await postJson('/device-fleet/room/send', { roomId, to: sendTo, text: sendText });
+            setSendText('');
+          }),
+        taskTitle,
+        setTaskTitle,
+        taskOwner,
+        setTaskOwner,
+        addRoomTask: () =>
+          act('添加任务', async () => {
+            if (taskTitle.trim() === '') throw new Error('任务标题不能为空');
+            await postJson('/device-fleet/room/task', { roomId, action: 'add', title: taskTitle, owner: taskOwner });
+            setTaskTitle('');
+          }),
+        updateRoomTask: (id, nextStatus) => act('更新任务', () => postJson('/device-fleet/room/task', { roomId, action: 'update', id, status: nextStatus })),
+        closeCurrentRoom: () => act('关闭房间', () => postJson('/device-fleet/room/close', { roomId })),
+        removeRoomMember: (memberId) => act('移除成员', () => postJson('/device-fleet/room/member/remove', { roomId, memberId })),
+      };
+
+      return h('div', null,
+        status ? h('div', { style: { fontSize: 11, opacity: 0.6, marginBottom: 6 } }, status) : null,
+        renderRoomDetail(detail, ctl),
+      );
+    }
+
+    function roomAvatar(name, tone) {
+      const text = String(name ?? '?').trim().slice(0, 1).toUpperCase() || '?'
+      return h('div', {
+        style: {
+          width: 26,
+          height: 26,
+          borderRadius: '50%',
+          flex: '0 0 26px',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          fontSize: 12,
+          fontWeight: 600,
+          background: tone === 'user' ? '#2f6fed' : 'var(--dsw-alias-bg-layer-2, #262626)',
+          color: tone === 'user' ? '#fff' : 'var(--dsw-alias-label-primary, #e8e8e8)',
+          border: '1px solid var(--dsw-alias-border-l1, #333)',
+        },
+      }, text)
+    }
+
+    // Room conversation rendered as a chat: agents on the left with names and
+    // avatars, the user on the right. This is the Room's presentation instead of
+    // injecting participant speech into the host's ordinary Chat.
+    function RoomChatPane({ roomId }) {
+      const [detail, setDetail] = useState(null);
+      const [missing, setMissing] = useState(false);
+      const [error, setError] = useState('');
+      const [sendText, setSendText] = useState('');
+      const [sendTo, setSendTo] = useState([]);
+      const [status, setStatus] = useState('');
+      const [showBoard, setShowBoard] = useState(false);
+      const [taskTitle, setTaskTitle] = useState('');
+      const [taskOwner, setTaskOwner] = useState('');
+
+      const load = async () => {
+        if (!roomId) return;
+        try {
+          const response = await fetch('/device-fleet/room?id=' + encodeURIComponent(roomId), { headers: { accept: 'application/json' } });
+          if (response.status === 404) {
+            setMissing(true);
+            setDetail(null);
+            return;
+          }
+          if (!response.ok) throw new Error('HTTP ' + response.status);
+          const data = await response.json();
+          setDetail(data.room ?? null);
+          setMissing(false);
+          setError('');
+        } catch (problem) {
+          setError(String(problem.message ?? problem));
+        }
+      };
+
+      useEffect(() => {
+        void load();
+        const timer = setInterval(load, 2000);
+        return () => clearInterval(timer);
+      }, [roomId]);
+
+      const act = async (label, action) => {
+        setStatus(label + '…');
+        try {
+          await action();
+          setStatus(label + '成功');
+          await load();
+        } catch (problem) {
+          setStatus(label + '失败：' + String(problem.message ?? problem));
+        }
+      };
+
+      if (!roomId) return null;
+      if (missing) {
+        return h('div', { style: { padding: 16, opacity: 0.75, fontSize: 12 } }, '这个会话还不是 Room。点击输入框下方的「升级为 Room」即可创建。');
+      }
+      if (!detail) return h('div', { style: { padding: 16, opacity: 0.7, fontSize: 12 } }, error ? '房间加载失败：' + error : '加载房间…');
+
+      const nameOf = (memberId) => detail.members.find((member) => member.memberId === memberId)?.name ?? memberId
+      const participants = detail.members.filter((member) => member.role !== 'host')
+      const defaultRecipients = participants.length > 0 ? participants.map((member) => member.memberId) : detail.members.map((member) => member.memberId)
+      const recipients = sendTo.length > 0 ? sendTo : defaultRecipients
+      const send = () =>
+        act('发送', async () => {
+          if (sendText.trim() === '') throw new Error('消息不能为空')
+          await postJson('/device-fleet/room/send', { roomId, to: recipients, text: sendText })
+          setSendText('')
+        })
+
+      const messages = detail.messages.map((message) => {
+        const fromUser = message.from?.kind === 'user'
+        const author = fromUser ? '你' : message.from?.name ?? 'agent'
+        const targets = (message.to ?? []).map(nameOf).join(', ')
+        return h('div', { key: message.id, style: { display: 'flex', justifyContent: fromUser ? 'flex-end' : 'flex-start', gap: 8, margin: '10px 0' } },
+          fromUser ? null : roomAvatar(author, 'agent'),
+          h('div', { style: { maxWidth: '74%' } },
+            fromUser ? null : h('div', { style: { fontSize: 11, opacity: 0.6, marginBottom: 2 } }, author + (targets ? ' · → ' + targets : '')),
+            h('div', {
+              style: {
+                background: fromUser ? '#2f6fed' : 'var(--dsw-alias-bg-layer-2, #262626)',
+                color: fromUser ? '#fff' : 'var(--dsw-alias-label-primary, #e8e8e8)',
+                padding: '8px 12px',
+                borderRadius: 12,
+                whiteSpace: 'pre-wrap',
+                fontSize: 13,
+                lineHeight: 1.5,
+              },
+            }, message.text),
+            h('div', { style: { fontSize: 10, opacity: 0.45, marginTop: 2, textAlign: fromUser ? 'right' : 'left' } }, fmtTime(message.createdAt)),
+          ),
+          fromUser ? roomAvatar('你', 'user') : null,
+        )
+      })
+
+      return h('div', { style: { height: '100%', display: 'flex', flexDirection: 'column', padding: '12px 16px', boxSizing: 'border-box' } },
+        h('div', { style: { display: 'flex', alignItems: 'center', gap: 10, flexWrap: 'wrap', marginBottom: 8 } },
+          h('strong', { style: { fontSize: 15 } }, 'Room'),
+          ...detail.members.map((member) =>
+            h('span', { key: member.memberId, style: { display: 'flex', alignItems: 'center', gap: 5, fontSize: 11, opacity: 0.8 } },
+              roomAvatar(member.name ?? member.memberId, member.role === 'host' ? 'user' : 'agent'),
+              member.name + (member.role === 'host' ? '（host）' : ''),
+            ),
+          ),
+          h('span', { style: { flex: 1 } }),
+          status ? h('span', { style: { fontSize: 11, opacity: 0.6 } }, status) : null,
+          smallButton(showBoard ? '收起看板' : '看板', () => setShowBoard((value) => !value), 'normal'),
+          smallButton('关闭房间', () => { void act('关闭房间', () => postJson('/device-fleet/room/close', { roomId })) }, 'deny'),
+        ),
+        h('div', { style: { flex: 1, overflow: 'auto', minHeight: 120 } }, messages.length === 0 ? h('div', { style: { opacity: 0.6, fontSize: 12 } }, '还没有消息') : messages),
+        showBoard
+          ? h('div', { style: { ...cardStyle, marginTop: 8 } },
+              h('div', { style: sectionTitle }, '看板'),
+              detail.tasks.length === 0 ? h('div', { style: { opacity: 0.65, fontSize: 12 } }, '暂无任务') : detail.tasks.map((task) =>
+                h('div', { key: task.id, style: { display: 'flex', alignItems: 'center', gap: 8, padding: '4px 0', fontSize: 12 } },
+                  h('span', { style: { flex: 1 } }, task.title + ' · ' + nameOf(task.owner)),
+                  h('select', {
+                    value: task.status,
+                    onChange: (event) => void act('更新任务', () => postJson('/device-fleet/room/task', { roomId, action: 'update', id: task.id, status: event.target.value })),
+                    style: { height: 24, borderRadius: 5, border: '1px solid var(--dsw-alias-border-l1, #333)', background: 'var(--dsw-alias-bg-layer-2, #262626)', color: 'inherit', fontSize: 11 },
+                  }, ...['pending', 'running', 'done', 'blocked'].map((value) => h('option', { key: value, value }, value))),
+                ),
+              ),
+              h('div', { style: { display: 'flex', gap: 6, marginTop: 8, flexWrap: 'wrap' } },
+                h('input', { type: 'text', value: taskTitle, onChange: (event) => setTaskTitle(event.target.value), placeholder: '新任务', style: { ...controlStyleWidth(160), height: 26, fontSize: 12 } }),
+                h('select', { value: taskOwner, onChange: (event) => setTaskOwner(event.target.value), style: { ...controlStyleWidth(150), height: 26, fontSize: 12 } },
+                  h('option', { value: '' }, 'owner'),
+                  ...detail.members.map((member) => h('option', { key: member.memberId, value: member.memberId }, member.name)),
+                ),
+                smallButton('添加', () => void act('添加任务', () => postJson('/device-fleet/room/task', { roomId, action: 'add', title: taskTitle, owner: taskOwner })), 'allow'),
+              ),
+            )
+          : null,
+        h('div', { style: { ...cardStyle, marginTop: 8 } },
+          h('div', { style: { display: 'flex', flexWrap: 'wrap', gap: '4px 12px', marginBottom: 6 } },
+            h('span', { style: { fontSize: 11, opacity: 0.6, alignSelf: 'center' } }, '发给'),
+            ...detail.members.filter((member) => member.role !== 'host').map((member) =>
+              h('label', { key: member.memberId, style: { display: 'flex', alignItems: 'center', gap: 4, fontSize: 12 } },
+                h('input', {
+                  type: 'checkbox',
+                  checked: recipients.includes(member.memberId),
+                  onChange: (event) => {
+                    setSendTo((current) => {
+                      const base = current.length > 0 ? current : defaultRecipients
+                      return event.target.checked ? [...new Set([...base, member.memberId])] : base.filter((id) => id !== member.memberId)
+                    })
+                  },
+                }),
+                member.name,
+              ),
+            ),
+          ),
+          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' },
+          }),
+          h('div', { style: { display: 'flex', justifyContent: 'flex-end', marginTop: 6 } }, smallButton('发送', () => void send(), 'allow')),
+        ),
+      )
+    }
+
+    function RoomView({ sessionId }) {
+      return h('div', { style: { height: '100%' } }, h(RoomChatPane, { roomId: sessionId }));
+    }
+
     return {
       inject: ['slots'],
       apply(ctx) {
@@ -1158,11 +1437,14 @@ window.__ModuleLoader__.load({
           ctx.slots.register({ name: 'sidebar.panellist', id: 'fleet', order: 20, label: '设备联邦' }, FleetIcon),
         );
         ctx.slots.register({ name: 'main', key: 'fleet' }, FleetConsole);
-        // Session-native Room: member strip below the composer; the normal Chat
-        // stream carries the conversation.
+        // Session-native Room: member strip below the composer, plus a "房间"
+        // Conversation View for the Room transcript/board.
         ctx.slots.inject('conversation.composer.dock', () =>
           ctx.slots.register({ name: 'conversation.composer.dock', id: 'fleet-room', order: 10 }, RoomDock),
         );
+        ctx.slots.inject('conversation.view', () =>
+          ctx.slots.register({ name: 'conversation.view', id: 'room', order: 20, label: '房间' }, RoomView),
+        );
         // Configuration page: Settings → Plugins → Device Fleet (row + bundle).
         ctx.slots.inject('plugins.row.config', () =>
           ctx.slots.register({ name: 'plugins.row.config', key: 'dsh-device-fleet#device-fleet' }, FleetConfig),

package/docs/notes/dev-release.md

@@ -114,4 +114,13 @@ dsh plugin --profile desktop add dsh-device-fleet@dev
 - Room 恢复为「就是普通 Session」的体验：会话输入框下方新增 Room 成员条（composer.dock），显示 Room 成员；普通会话显示「升级为 Room」按钮（Host API `/room/upgrade`，无需工具调用）；
 - Host 监听 `session/event` 的 `user/message`：Room Host 会话里用户正常聊天输入会自动投递给房间参与者并唤醒它们（带 `[Room]` 前缀的注入消息不重播，避免循环）；
 - 参与者回复投递回 Host 时以 `[Room] <成员>: <内容>` 形式进入正常 Chat 流，不再需要独立的房间仪表盘；
-- Fleet 控制台保留为设备/配对/审批/配置管理入口。
+- Fleet 控制台保留为设备/配对/审批/配置管理入口。
+## 0.1.0-dev.21（Room 回复地址修复）
+
+- 参与者被用户消息唤醒时，回复引导里的目标从无效的 "host" 修正为真实 Host member id（`host:<sessionId>`），修复 worker 回执发给自己/失败的问题。
+## 0.1.0-dev.22（Room 独立视图，停止 host 转述）
+
+- Session 内新增「房间」Conversation View（`conversation.view`，label 房间）：展示成员、时间线（含发言者/收件人）、看板与房间操作，输入默认发给非 host 参与者；
+- 移除 Chat 输入的隐式 Room 广播：普通 Chat 只属于 host agent，Room 交流在「房间」页进行，避免用户在 Chat 里说话被自动转发、或 host agent 转述 worker 回复；
+- host 不再接收参与者回复的 Chat 注入（参与者回复只进入房间时间线）；
+- 输入框下方成员条提示「房间消息在『房间』页交流」。

package/package.json

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

@@ -247,6 +247,9 @@ export class RoomService {
     if (!member || typeof this.createUserMessage !== 'function') return false
     if (!(await this.ensureAgent(member))) return false
     if (typeof member.agent?.followup !== 'function') return false
+    // Participant replies are rendered by the Room view; do not inject them into
+    // the Host's normal Chat stream (that caused the host agent to relay them).
+    if (member.role === 'host' && message.from.kind !== 'user') return false
     const senderLabel = message.from.kind === 'user' ? 'user' : (message.from.name ?? 'agent')
     // A user sender has no member id; the reply target is always the Host member.
     const replyTarget = message.from.memberId ?? hostMemberId(room.hostSessionId)

package/src/plugin/index.js

@@ -304,7 +304,9 @@ export function apply(ctx, profileConfig) {
       async sendRoomMessage({ roomId, to, text } = {}) {
         if (typeof roomId !== 'string' || roomId === '') throw Object.assign(new Error('roomId is required'), { code: 'bad-request' })
         const memberIds = rooms.status(roomId).members.map((member) => member.memberId)
-        const recipients = Array.isArray(to) && to.length > 0 ? to : memberIds.filter((id) => id.startsWith('host:'))
+        const hostMemberId = `host:${roomId}`
+        const defaultRecipients = memberIds.filter((id) => id !== hostMemberId)
+        const recipients = Array.isArray(to) && to.length > 0 ? to : defaultRecipients.length > 0 ? defaultRecipients : [hostMemberId]
         const result = await rooms.send({ roomId, from: { kind: 'user' }, to: recipients, text })
         return { roomId, ...result }
       },
@@ -424,37 +426,6 @@ export function apply(ctx, profileConfig) {
     return ctx.on('approval/request', handler)
   })
 
-  // A Room is a normal Session whose user input is also delivered to its
-  // participants. Typing in the Host conversation therefore needs no separate
-  // Room composer.
-  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 recipients = rooms
-          .status(session.id)
-          .members.filter((member) => member.role !== 'host')
-          .map((member) => member.memberId)
-        if (recipients.length === 0) return
-        void rooms.send({ roomId: session.id, from: { kind: 'user' }, to: recipients, text }).catch((error) => {
-          logger.warn?.(`[device-fleet] cannot broadcast room message: ${String(error?.message ?? error)}`)
-        })
-      } catch (error) {
-        logger.warn?.(`[device-fleet] room broadcast 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)