dsh-bots 0.2.27 → 0.2.29

package/lib/client.js

@@ -320,6 +320,7 @@
 .dbs-avatar{width:20px;height:20px;border-radius:6px;flex:none;display:grid;place-items:center;font-size:11px;line-height:1;font-weight:600;color:#fff;overflow:hidden;user-select:none}
 .dbs-avatar.dbs-group{border-radius:999px}
 .dbs-avatar img{width:100%;height:100%;object-fit:cover;display:block}
+.dbs-avatarRound{border-radius:999px}
 .dbs-badge{min-width:16px;height:16px;padding:0 5px;border-radius:999px;background:var(--dsw-alias-state-business-primary,#1a6dff);color:#fff;font-size:11px;line-height:16px;text-align:center;flex:none;font-variant-numeric:tabular-nums}
 .dbs-railBtn{width:32px;height:32px;display:inline-flex;align-items:center;justify-content:center;border:none;border-radius:8px;background:transparent;color:var(--dsw-alias-label-secondary);cursor:pointer;padding:0}
 .dbs-railBtn:hover{background:var(--dsw-alias-interactive-bg-hover)}
@@ -484,7 +485,7 @@
                 'chat.stop.noop': '当前没有进行中的生成',
                 'media.openFailed': '打开失败，文件可能已移动或被删除',
                 'chat.members.manage': '管理成员',
-                'chat.members.cap': '已达群成员上限 {cap} 人——可先在下方调大「成员上限」再添加',
+                'chat.members.cap': '已达群成员上限 {cap} 人——可在会话设置里调高',
                 'chat.settings': '设置',
                 'chat.settings.title': '会话设置',
                 'chat.settings.name': '名称',
@@ -495,9 +496,11 @@
                 'chat.settings.paths': '额外可写路径（逗号分隔）',
                 'chat.settings.pathsPh': '/tmp/xxx, /Users/you/shared',
                 'chat.settings.hint': '写入被沙盒限制在工作区（含额外路径）内，读取不受限；同 slug 的 Bot 共享同一目录。',
+                'chat.settings.cap': '成员上限（1–16）',
+                'chat.settings.capHint': '保存在该群的配置里；调低会立即截断超出部分。',
+                'chat.settings.capBad': '成员上限需为 1–16 的整数',
                 'modal.members.title': '管理群成员',
                 'modal.members.hint': '勾选的 Bot 为群成员；保存后立即生效（可随时再改）。',
-                'modal.members.cap': '成员上限（1–16）',
                 'action.delete': '删除',
                 'delete.title.bot': '删除 Bot',
                 'delete.title.group': '删除群聊',
@@ -600,7 +603,7 @@
                 'chat.stop.noop': 'No generation in progress',
                 'media.openFailed': 'Open failed — the file may have moved or been deleted',
                 'chat.members.manage': 'Manage members',
-                'chat.members.cap': 'Group cap is {cap} members — raise the cap below first',
+                'chat.members.cap': 'Group cap is {cap} members — raise it in session settings',
                 'chat.settings': 'Settings',
                 'chat.settings.title': 'Session settings',
                 'chat.settings.name': 'Name',
@@ -611,9 +614,11 @@
                 'chat.settings.paths': 'Extra writable paths (comma-separated)',
                 'chat.settings.pathsPh': '/tmp/xxx, /Users/you/shared',
                 'chat.settings.hint': 'Writes are sandboxed to the workspace (plus extra paths); reads stay unrestricted. Bots sharing a slug share one directory.',
+                'chat.settings.cap': 'Member cap (1–16)',
+                'chat.settings.capHint': 'Stored in this group\'s config; lowering it drops members beyond the new cap right away.',
+                'chat.settings.capBad': 'The cap must be an integer from 1 to 16',
                 'modal.members.title': 'Manage group members',
                 'modal.members.hint': 'Checked bots are members; changes apply immediately on save (editable again anytime).',
-                'modal.members.cap': 'Member cap (1–16)',
                 'action.delete': 'Delete',
                 'delete.title.bot': 'Delete bot',
                 'delete.title.group': 'Delete group chat',
@@ -1087,8 +1092,11 @@
                 const a = p.agent;
                 const size = p.size ?? 20;
                 const style = { width: size, height: size };
+                // Conversation avatars are round (native chat look); the sidebar keeps
+                // the native squircle via the base class.
+                const shape = p.round === true || a.isGroup === true ? ' dbs-avatarRound' : (a.isGroup ? ' dbs-group' : '');
                 if (typeof a.avatarDataUrl === 'string' && a.avatarDataUrl !== '') {
-                    return e('span', { className: 'dbs-avatar' + (a.isGroup ? ' dbs-group' : ''), style }, e('img', { src: a.avatarDataUrl, alt: '' }));
+                    return e('span', { className: 'dbs-avatar' + shape, style }, e('img', { src: a.avatarDataUrl, alt: '' }));
                 }
                 style.background = typeof a.avatarColor === 'string' && a.avatarColor !== ''
                     ? a.avatarColor
@@ -1097,7 +1105,7 @@
                     style.fontSize = '13px';
                 const initial = (a.name ?? '').trim().slice(0, 1) || '·';
                 return e('span', {
-                    className: 'dbs-avatar' + (a.isGroup ? ' dbs-group' : ''), style, 'aria-hidden': true,
+                    className: 'dbs-avatar' + shape, style, 'aria-hidden': true,
                 }, initial);
             }
             /** Chevron matching the shipped project row (fills in if the icon moves). */
@@ -1553,7 +1561,7 @@
                 };
                 const displayName = p.isGroup ? en.authorName : p.agent?.name;
                 const authorColor = 'hsl(' + String(hueOf(avAgent.id)) + ' 55% 45%)';
-                return e('div', { className: 'dbs-botRow' }, e('div', { className: 'dbs-author' }, e(Avatar, { agent: avAgent, size: 22 }), displayName != null && displayName !== ''
+                return e('div', { className: 'dbs-botRow' }, e('div', { className: 'dbs-author' }, e(Avatar, { agent: avAgent, size: 22, round: true }), displayName != null && displayName !== ''
                     ? e('span', { className: 'dbs-authorName', style: { color: authorColor } }, displayName)
                     : null, e(MsgTime, { entry: en })), e('div', { className: 'dbs-mdRow' }, e(MarkdownText, { text: en.content, streaming: en.isStreaming === true }), en.isStreaming === true ? e('span', { className: 'dbs-caret' }) : null, en.isStreaming === true ? null : e(MediaRefs, { text: en.content, files: true })));
             }
@@ -1813,7 +1821,7 @@
                     variant: 'ghost', size: 'sm', title: t('action.close'), 'aria-label': t('action.close'),
                     icon: Ico('IconCloseOutline16', { size: 16 }),
                     onClick: () => patch({ chatAgentId: null }),
-                }), agent !== null ? e(Avatar, { agent, size: 24 }) : null, e('span', { className: 'dbs-chatbarName' }, agent?.name ?? t('chat.loading')), e('span', { className: 'dbs-meta' }, isGroup ? t('chat.group', { n: memberNames.length }) : t('chat.single')), e('span', { style: { flex: 1 } }), isGroup
+                }), agent !== null ? e(Avatar, { agent, size: 24, round: true }) : null, e('span', { className: 'dbs-chatbarName' }, agent?.name ?? t('chat.loading')), e('span', { className: 'dbs-meta' }, isGroup ? t('chat.group', { n: memberNames.length }) : t('chat.single')), e('span', { style: { flex: 1 } }), isGroup
                     ? e(Button, {
                         variant: 'ghost', size: 'sm', title: t('chat.members.manage'), 'aria-label': t('chat.members.manage'),
                         onClick: () => patch({ manageMembers: p.agentId }),
@@ -1827,7 +1835,7 @@
                     : null, e('div', { className: 'dbs-scrollArea' }, e('div', { className: 'dbs-scrollBody', ref: scrollRef, onScroll: onScrollBody }, e('div', { className: 'dbs-scroll' }, e('div', { className: 'dbs-column' }, entries === null
                     ? e('div', { className: 'dbs-skeleton' }, e('div', { className: 'dbs-skelRow', style: { width: '42%' } }), e('div', { className: 'dbs-skelRow', style: { width: '76%' } }), e('div', { className: 'dbs-skelRow', style: { width: '58%' } }))
                     : list.length === 0
-                        ? e('div', { className: 'dbs-welcome' }, agent !== null ? e(Avatar, { agent, size: 44 }) : null, e('div', { className: 'dbs-welcomeName' }, agent?.name ?? ''), typeof agent?.description === 'string' && agent.description !== ''
+                        ? e('div', { className: 'dbs-welcome' }, agent !== null ? e(Avatar, { agent, size: 44, round: true }) : null, e('div', { className: 'dbs-welcomeName' }, agent?.name ?? ''), typeof agent?.description === 'string' && agent.description !== ''
                             ? e('div', { className: 'dbs-welcomeDesc' }, agent.description) : null, e('div', { className: 'dbs-welcomeHint' }, isGroup ? t('chat.empty.group') : t('chat.empty.single', { name: agent?.name ?? '' })))
                         : thread, composing
                     ? e('div', { className: 'dbs-typing', 'aria-label': t('chat.composing'), title: t('chat.composing') }, 
@@ -2224,7 +2232,6 @@
                 const [picked, setPicked] = React.useState(null);
                 const [err, setErr] = React.useState(null);
                 const [working, setWorking] = React.useState(false);
-                const [capText, setCapText] = React.useState('8');
                 // Seed once per opened group; a group vanishing mid-edit (deleted by
                 // the swarm, say) just renders the modal inert until closed.
                 React.useEffect(() => {
@@ -2234,18 +2241,17 @@
                     for (const id of group.memberIds ?? [])
                         init[id] = true;
                     setPicked(init);
-                    setCapText(String(group.maxMembers ?? 8));
                     // eslint-disable-next-line react-hooks/exhaustive-deps
                 }, [s.manageMembers]);
                 if (group === null || group === undefined)
                     return null;
                 const singles = s.agents.filter((a) => !a.isGroup && a.isHiddenFromSidebar !== true);
                 const pickedIds = picked === null ? [] : Object.keys(picked).filter((k) => picked[k]);
-                // Per-group cap (group.json maxMembers, default 8, engine hard max 16):
-                // the glue slice(0, maxMembers)-truncates the roster SILENTLY — an
-                // over-cap save writes successfully and just drops whoever ranked past
-                // the cap. Surface it here instead of letting a save pretend to work.
-                const MEMBER_CAP = Math.min(16, Math.max(1, Math.floor(Number(capText)) || 8));
+                // Per-group cap (group.json maxMembers, default 8, engine hard max 16;
+                // the host enriches group rows with the real value). The glue slice(0,
+                // maxMembers)-truncates the roster SILENTLY, so an over-cap pick is
+                // blocked here — the cap itself is edited in session settings.
+                const MEMBER_CAP = group.maxMembers ?? 8;
                 const overCap = pickedIds.length > MEMBER_CAP;
                 function toggle(id) {
                     if (picked === null)
@@ -2263,7 +2269,7 @@
                     setWorking(true);
                     setErr(null);
                     try {
-                        await botsCall('setGroupMembers', { id: group.id, memberIds: pickedIds, maxMembers: MEMBER_CAP });
+                        await botsCall('setGroupMembers', { id: group.id, memberIds: pickedIds });
                         patch({ manageMembers: null });
                         await refreshAgents();
                         return;
@@ -2286,10 +2292,7 @@
                     disabled: working,
                     icon: Ico('IconCloseOutline16', { size: 16 }),
                     onClick: () => patch({ manageMembers: null }),
-                })), e('div', { className: 'dbs-modalBody' }, e('div', { className: 'dbs-meta', style: { padding: '0 2px 6px' } }, t('modal.members.hint')), e('div', { className: 'dbs-setrow', style: { padding: '0 2px 8px', gap: 8 } }, e('span', { className: 'dbs-meta' }, t('modal.members.cap')), e(Input, {
-                    value: capText, disabled: working, style: { width: 72 },
-                    onChange: (ev) => setCapText(ev.target.value),
-                })), picked === null
+                })), e('div', { className: 'dbs-modalBody' }, e('div', { className: 'dbs-meta', style: { padding: '0 2px 6px' } }, t('modal.members.hint')), picked === null
                     ? e('div', { className: 'dbs-meta', style: { padding: '4px 6px' } }, t('list.loading'))
                     : e('div', { className: 'dbs-modalMembers' }, singles.length === 0
                         ? e('div', { className: 'dbs-meta', style: { padding: '4px 6px' } }, t('list.empty'))
@@ -2328,11 +2331,13 @@
                 const [wsLoaded, setWsLoaded] = React.useState(false);
                 const [working, setWorking] = React.useState(false);
                 const [err, setErr] = React.useState(null);
+                const [capText, setCapText] = React.useState('8');
                 React.useEffect(() => {
                     if (agent === null || agent === undefined)
                         return;
                     setName(String(agent.name ?? ''));
                     setDesc(String(agent.description ?? ''));
+                    setCapText(String(agent.maxMembers ?? 8));
                     if (agent.isGroup === true) {
                         setWsLoaded(true);
                         return;
@@ -2354,13 +2359,24 @@
                 if (agent === null || agent === undefined)
                     return null;
                 const valid = name.trim() !== '';
+                // Member cap lives here (session settings), not in the roster editor:
+                // it is this group's own config field. Empty/unchanged = keep.
+                const capNum = Math.floor(Number(capText));
+                const capValid = capText.trim() === '' || (Number.isInteger(capNum) && capNum >= 1 && capNum <= 16);
                 async function save() {
                     if (working || valid === false)
                         return;
+                    if (capValid === false) {
+                        setErr(t('chat.settings.capBad'));
+                        return;
+                    }
                     setWorking(true);
                     setErr(null);
                     try {
                         await botsCall('update', { id: agent.id, profile: { name: name.trim(), description: desc.trim() } });
+                        if (agent.isGroup === true && capText.trim() !== '') {
+                            await botsCall('setGroupMembers', { id: agent.id, memberIds: agent.memberIds ?? [], maxMembers: capNum });
+                        }
                         if (agent.isGroup !== true && wsLoaded === true) {
                             const list = paths.split(/[,,]/).map((x) => x.trim()).filter((x) => x !== '');
                             await botsCall('workspaceSet', {
@@ -2394,7 +2410,12 @@
                 })), e('div', { className: 'dbs-modalBody' }, e('div', { className: 'dbs-setLabel' }, t('chat.settings.name')), e(Input, {
                     value: name, autoFocus: true, disabled: working,
                     onChange: (ev) => setName(ev.target.value),
-                }), isGroup === false
+                }), isGroup === true
+                    ? e('div', null, e('div', { className: 'dbs-setLabel' }, t('chat.settings.cap')), e(Input, {
+                        value: capText, disabled: working, inputMode: 'numeric', style: { width: 96 },
+                        onChange: (ev) => setCapText(ev.target.value),
+                    }), e('div', { className: 'dbs-meta', style: { marginTop: 6 } }, t('chat.settings.capHint')))
+                    : null, isGroup === false
                     ? e('div', null, e('div', { className: 'dbs-setLabel' }, t('chat.settings.desc')), e(Input, {
                         value: desc, disabled: working,
                         onChange: (ev) => setDesc(ev.target.value),

package/lib/index.js

@@ -214,7 +214,22 @@ export class BotsRemote extends TypertRemoteService {
      * would make the gateway reject the envelope with "unexpected request".
      */
     async list(request) {
-        return normalizeAgents(await callGateway(this.cfg.dataDir, 'listAgents', {}));
+        const agents = normalizeAgents(await callGateway(this.cfg.dataDir, 'listAgents', {}));
+        // The gateway row omits group.json's maxMembers, so read it here — the
+        // settings editor needs the CURRENT cap, not a hardcoded default.
+        for (const a of agents) {
+            if (a.isGroup !== true)
+                continue;
+            try {
+                const cfg = JSON.parse(readFileSync(join(effectiveDataDir(this.cfg.dataDir), 'agents', a.id, 'group.json'), 'utf-8'));
+                const n = typeof cfg.maxMembers === 'number' ? Math.floor(cfg.maxMembers) : Number.NaN;
+                a.maxMembers = Number.isFinite(n) ? Math.min(16, Math.max(1, n)) : 8;
+            }
+            catch {
+                a.maxMembers = 8;
+            }
+        }
+        return agents;
     }
     async workspaces(request) {
         const registry = this.ctx.get('workspaceRegistry');
@@ -285,6 +300,7 @@ export class BotsRemote extends TypertRemoteService {
         const updated = await callGateway(this.cfg.dataDir, 'setGroupMembers', {
             id: request?.id,
             memberAgentIds: Array.isArray(request?.memberIds) ? request.memberIds : [],
+            ...(typeof request?.maxMembers === 'number' ? { maxMembers: request.maxMembers } : {}),
         });
         return trimAgent(updated?.agent ?? updated);
     }

package/lib/types/index.d.ts

@@ -91,6 +91,7 @@ export declare class BotsRemote extends TypertRemoteService {
     setGroupMembers(request: {
         id?: string;
         memberIds?: string[];
+        maxMembers?: number;
     } | null): Promise<AgentInfo | null>;
     /**
      * Resolve a bot-written path against the media allowlist: only files inside

package/lib/types/shared.d.ts

@@ -20,6 +20,9 @@ export interface AgentInfo {
     title: string;
     isGroup: boolean;
     memberIds: string[];
+    /** Per-group roster cap (group.json maxMembers; 1-16, default 8). The
+        gateway row omits it, so the host enriches group rows from disk. */
+    maxMembers?: number;
     isRunning: boolean;
     isActive: boolean;
     lastMessagePreview: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-bots",
-  "version": "0.2.27",
+  "version": "0.2.29",
   "description": "Multi-bot workbench for DeepSeek Harness: bridges the sdk-bots orchestration gateway (group chats, single bots) into the dsh web shell with official-styled UI.",
   "type": "module",
   "main": "lib/index.js",