dsh-bots 0.2.26 → 0.2.28

package/lib/client.js

@@ -289,7 +289,8 @@
    row on hover and shrink it on leave — width/height jitter the user read
    as flicker. Fixed 30px row + always-laid-out actions = zero geometry
    change; the same trick the native headerActions uses (max-width/opacity). */
-.dbs-secHead{position:relative;cursor:pointer;border-radius:8px;height:30px}
+.dbs-secHead{position:relative;cursor:pointer;border-radius:8px;height:30px;margin-bottom:4px}
+.dbs-secGroup+.dbs-secGroup{margin-top:10px}
 .dbs-secHead:hover{background:var(--dsw-alias-interactive-bg-hover)}
 .dbs-secHead .dbs-rowActions{display:inline-flex;visibility:hidden;opacity:0;pointer-events:none;transition:opacity .12s ease-out}
 .dbs-secHead:hover .dbs-rowActions,.dbs-secHead:focus-within .dbs-rowActions,.dbs-secHead[data-menu="true"] .dbs-rowActions{visibility:visible;opacity:1;pointer-events:auto}
@@ -483,7 +484,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': '名称',
@@ -494,9 +495,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': '删除群聊',
@@ -599,7 +602,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',
@@ -610,9 +613,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',
@@ -1175,7 +1180,7 @@
                     const toggle = () => {
                         patch({ sectionMenu: null, sectionsOpen: { ...(s.sectionsOpen ?? {}), [menuKind]: !isOpen } });
                     };
-                    return e('div', { key: label }, e('div', {
+                    return e('div', { key: label, className: 'dbs-secGroup' }, e('div', {
                         className: 'dbs-navBodyErr dbs-secHead', role: 'button', tabIndex: 0, 'aria-expanded': isOpen,
                         'data-menu': menuOpen ? 'true' : 'false',
                         // Native sectionHeader outdent: label at x=16 (12 sidebar
@@ -2223,7 +2228,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(() => {
@@ -2233,18 +2237,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)
@@ -2262,7 +2265,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;
@@ -2285,10 +2288,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'))
@@ -2327,11 +2327,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;
@@ -2353,13 +2355,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', {
@@ -2393,7 +2406,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.26",
+  "version": "0.2.28",
   "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",