bothouse-dsh 0.1.66 → 0.1.67

package/collab/cli-member.mjs

@@ -226,7 +226,7 @@ export class CliMember {
     if (prevId && this.canLoad) {
       try {
         const loaded = await Promise.race([this.conn.loadSession({ sessionId: prevId, cwd: this.cwd, mcpServers: [] }), this.exited])
-        s = { sessionId: prevId, configOptions: loaded?.configOptions }
+        s = { sessionId: prevId, configOptions: loaded?.configOptions, defaultModel: loaded?.models?.currentModelId }
         this.sessions.set(room, s)
         return { ...s, resumed: true, lost: false }
       } catch (err) {
@@ -234,7 +234,7 @@ export class CliMember {
       }
     }
     const r = await Promise.race([this.conn.newSession({ cwd: this.cwd, mcpServers: [] }), this.exited])
-    s = { sessionId: r.sessionId, configOptions: r.configOptions }
+    s = { sessionId: r.sessionId, configOptions: r.configOptions, defaultModel: r.models?.currentModelId }
     this.sessions.set(room, s)
     return { ...s, resumed: false, lost: Boolean(prevId) }
   }
@@ -301,6 +301,18 @@ export class CliMember {
     }
   }
 
+  async _configureClaude(s, model) {
+    // Claude's ACP adapter exposes session/set_model, not Codex's config options.
+    // Remember its initial selection so clearing an override also affects a live session.
+    if (model == null && s.appliedModel === undefined) return
+    const target = model ?? s.defaultModel
+    if (!target) throw new Error('Claude default model is unavailable')
+    if (s.appliedModel === target) return
+    await Promise.race([this.conn.request('session/set_model', { sessionId: s.sessionId, modelId: target }), this.exited])
+    const stored = [...this.sessions.values()].find(x => x.sessionId === s.sessionId)
+    if (stored) stored.appliedModel = target
+  }
+
   /**
    * onText(textSoFar) 在每个公开文字分片到达时调用（#121）；onTool(update) 在每个工具调用开始/更新和每个思考分片到达时调用。
    * opts.resumeId：要续上的 sessionId；opts.onSession({ sessionId, resumed, lost })：会话就绪后、发提示词前调用。
@@ -314,9 +326,10 @@ export class CliMember {
     return run
   }
 
-  async _ask(text, room, onText, onTool, { resumeId, onSession, attachments = [], onPermission, cliConfig, cliConfigManaged } = {}) {
+  async _ask(text, room, onText, onTool, { resumeId, onSession, attachments = [], onPermission, model, cliConfig, cliConfigManaged } = {}) {
     const s = await this._session(room, resumeId)
     if (this.cli === 'codex' && cliConfigManaged) await this._configure(s, cliConfig)
+    if (this.cli === 'claude') await this._configureClaude(s, model)
     await onSession?.({ sessionId: s.sessionId, resumed: s.resumed, lost: s.lost })
     // persona 每轮都拼：续上的或新开的会话都不会丢人设。
     const body = this.persona ? `${this.persona}\n\n${text}` : text

package/collab/dsh-member.mjs

@@ -171,7 +171,7 @@ export function promptText(room, member, messages, status = '', mode = DEFAULT_D
     mode = DEFAULT_DISPATCH_MODE;
   }
   const lines = messages.map(m => `【${m.name}】${quotePrefix(store?.quote?.(m))}${m.text}`);
-  const model = member.model === undefined ? '' : `你底层用的模型是 ${member.model.provider}/${member.model.model}。`;
+  const model = member.model === undefined ? '' : `你底层用的模型是 ${typeof member.model === 'string' ? member.model : `${member.model.provider}/${member.model.model}`}。`;
   const persona = member.persona?.trim() ? ['你的人设：', member.persona.trim(), ''] : [];
   return [
     `你是频道 #${room.name} 的成员「${member.name}」。${model}频道里其他人各有自己的身份，他们的自我介绍说的是他们自己，不是你。`,
@@ -851,7 +851,7 @@ export class DshMembers {
       // 这两步失败时提前标记会让重试跳过 MEMORY.md。记忆目录是否真的送达由 onSession 里的调用决定。
       // #197: a file over the bot connection cap is not inlined; the CLI reads it from disk.
       const bigNote = oversizedNote(this.rt.files?.oversized(unseen.flatMap(messageAttachments)));
-      const text = (await entry.agent.ask(`${prompt}${bigNote ? `\n${bigNote}` : ''}`, String(room.id), onText, onTool, { resumeId, onSession, onPermission, cliConfig: member.cliConfig, cliConfigManaged: member.cliConfigManaged, attachments: attachmentBlocks(this.rt.files, unseen) }))?.trim();
+      const text = (await entry.agent.ask(`${prompt}${bigNote ? `\n${bigNote}` : ''}`, String(room.id), onText, onTool, { resumeId, onSession, onPermission, model: member.model, cliConfig: member.cliConfig, cliConfigManaged: member.cliConfigManaged, attachments: attachmentBlocks(this.rt.files, unseen) }))?.trim();
       if (this.closed) return;
       this.hub.quota?.observe(member.id, room.id, { error: text });
       if (!text) { this.fail(job.id, `${member.name} 这一轮没有给出回复（${member.cli} 没有输出文字）`); return; }

package/collab/member-management.mjs

@@ -12,7 +12,7 @@ function check(body, create = false) {
 function view(m, source = m.source) {
   return { id: m.id, name: m.name, source, can_edit: source === 'ui', can_delete: source === 'ui', persona: m.persona ?? '',
     cli: m.cli ?? null, model: m.model ?? null, cliConfig: m.cliConfig ?? null,
-    apply: { timing: 'next_turn', status: m.cliConfigManaged ? 'pending' : 'not_configured' } };
+    apply: { timing: 'next_turn', status: m.cliConfigManaged || (m.cli === 'claude' && m.model) ? 'pending' : 'not_configured' } };
 }
 export function managementMembers(roster, hub) {
   const rows = roster.store.members().map(rowToMember);

package/collab/plugin.mjs

@@ -74,8 +74,9 @@ export function resolveConfig(config, env = process.env) {
       throw Error(`conest-collab: dshMembers id ${JSON.stringify(m?.id)} must be unique lowercase [a-z0-9_-]`);
     }
     if (typeof m.name !== 'string' || !m.name.trim()) throw Error(`conest-collab: dshMembers ${m.id} needs a name`);
-    if (m.model !== undefined && (typeof m.model?.provider !== 'string' || typeof m.model?.model !== 'string')) {
-      throw Error(`conest-collab: dshMembers ${m.id} model must be { provider, model }`);
+    if (m.model !== undefined && (m.cli === 'claude' ? typeof m.model !== 'string' || !m.model.trim()
+      : typeof m.model?.provider !== 'string' || typeof m.model?.model !== 'string')) {
+      throw Error(`conest-collab: dshMembers ${m.id} model must be ${m.cli === 'claude' ? 'a non-empty model id' : '{ provider, model }'}`);
     }
     if (m.rooms !== undefined && (!Array.isArray(m.rooms) || m.rooms.some(id => !rooms.some(r => r.id === id)))) {
       throw Error(`conest-collab: dshMembers ${m.id} rooms must contain configured chat channel ids`);
@@ -803,8 +804,8 @@ function ticketWorkspace(req, res, roomId, { store, hub, gateway, later, tasks,
 /**
  * 一句话拉团队 (user 11-04: DSH 用户一句话拉单模型多角色): the primary role of a channel, with its
  * (member, room) later ticket, creates a new chat channel and its roles in one call.
- *   POST /collab/api/rooms/{id}/team  { channel, members: [{ name, persona?, model? }], model? }
- * model is a model id ("deepseek-v4.1-flash") or "provider/model"; absent = DSH's default model.
+ *   POST /collab/api/rooms/{id}/team  { channel, members: [{ name, persona?, cli?, model? }], model? }
+ * DSH model is an id or "provider/model"; Claude model is a CLI model id. Absent = backend default.
  * The new roles join only the new channel; the caller becomes its primary role and joins it too.
  */
 export function teamRoute(req, res, url, { store, hub, later, roster }) {
@@ -844,16 +845,18 @@ export async function buildTeam(body, leadId, { store, hub, roster }) {
   if (wanted.length === 0 || wanted.length > MAX_TEAM) throw new CollabError('invalid', `members must list 1-${MAX_TEAM} roles`);
   const names = wanted.map(x => String(x?.name ?? '').trim());
   if (names.some(n => !n) || new Set(names.map(n => n.toLowerCase())).size !== names.length) throw new CollabError('invalid', 'every role needs a distinct name');
-  const shared = await resolveTeamModel(roster, body?.model);
   const models = [];
-  for (const x of wanted) models.push(x?.model === undefined || x?.model === '' ? shared : await resolveTeamModel(roster, x.model));
+  for (const x of wanted) {
+    const wantedModel = x?.model === undefined || x?.model === '' ? body?.model : x.model;
+    models.push(x?.cli ? wantedModel : await resolveTeamModel(roster, wantedModel));
+  }
   // Check every role before anything is written, so a bad name leaves no half-built channel behind.
-  for (const [i, x] of wanted.entries()) await roster.validate({ name: names[i], persona: String(x?.persona ?? ''), avatar: TEAM_AVATARS[i % TEAM_AVATARS.length] });
+  for (const [i, x] of wanted.entries()) await roster.validate({ name: names[i], persona: String(x?.persona ?? ''), cli: x?.cli, model: models[i], avatar: TEAM_AVATARS[i % TEAM_AVATARS.length] });
   const room = store.createRoom(channel);
   const created = [];
   for (const [i, x] of wanted.entries()) {
     const model = models[i];
-    created.push(await roster.create({ name: names[i], persona: String(x?.persona ?? ''), rooms: [room.id], avatar: TEAM_AVATARS[i % TEAM_AVATARS.length], ...(model ? { model } : {}) }));
+    created.push(await roster.create({ name: names[i], persona: String(x?.persona ?? ''), cli: x?.cli, rooms: [room.id], avatar: TEAM_AVATARS[i % TEAM_AVATARS.length], ...(model ? { model } : {}) }));
   }
   const lead = store.member(leadId);
   if (lead?.source === 'ui' && lead.rooms && lead.rooms !== '[]') {
@@ -861,11 +864,11 @@ export async function buildTeam(body, leadId, { store, hub, roster }) {
   }
   store.setLead(room.id, leadId);
   hub.emit({ type: 'rooms', rooms: store.roomsView() });
-  const label = model => (model ? model.model : 'DSH 默认模型');
+  const label = (model, i) => (model ? typeof model === 'string' ? model : model.model : `${wanted[i]?.cli ?? 'DSH'} 默认模型`);
   const leadName = hub.members.get(leadId)?.name ?? leadId;
   hub.post(room.id, { authorKind: 'system', author: 'system', name: '建团队',
-    text: `【已建团队】${leadName} 拉好了 #${channel}：${created.map((c, i) => `${c.name}（${label(models[i])}）`).join('、')}。${leadName} 是本频道主角色，直接在这里说需求。` });
-  return { room, lead: leadId, members: created.map((c, i) => ({ id: c.id, name: c.name, model: label(models[i]) })) };
+    text: `【已建团队】${leadName} 拉好了 #${channel}：${created.map((c, i) => `${c.name}（${label(models[i], i)}）`).join('、')}。${leadName} 是本频道主角色，直接在这里说需求。` });
+  return { room, lead: leadId, members: created.map((c, i) => ({ id: c.id, name: c.name, model: label(models[i], i) })) };
 }
 
 const ERROR_STATUS = { 'room-missing': 404, 'member-missing': 404, 'task-missing': 404, conflict: 409, 'read-only': 403, forbidden: 403, offline: 503, 'member-busy': 409 };

package/collab/roster.mjs

@@ -23,7 +23,8 @@ export function rowToMember(row) {
     id: row.id,
     name: row.name,
     ...(row.name_customized == null ? {} : { nameCustomized: Boolean(row.name_customized) }),
-    ...(row.provider && row.model ? { model: { provider: row.provider, model: row.model } } : {}),
+    ...(row.cli === 'claude' && row.model ? { model: row.model }
+      : row.provider && row.model ? { model: { provider: row.provider, model: row.model } } : {}),
     ...(row.cli ? { cli: row.cli } : {}),
     ...(row.cli_config ? { cliConfig: JSON.parse(row.cli_config) } : {}),
     ...(row.cli_config_managed ? { cliConfigManaged: true } : {}),
@@ -185,6 +186,10 @@ export class Roster {
     const existing = this.store.member(id);
     if (existing === undefined || existing.removed) throw new CollabError('member-missing', `member ${id} does not exist`);
     if (existing.source !== 'ui') throw new CollabError('read-only', `member ${id} comes from the config file and cannot be edited here`);
+    // Both PATCH endpoints preserve omitted fields. A backend change drops the old backend's model/config.
+    const old = rowToMember(existing);
+    const changedCli = Object.hasOwn(input, 'cli') && (input.cli ?? undefined) !== old.cli;
+    input = { ...old, ...(changedCli ? { model: undefined, cliConfig: undefined, permissionPreset: undefined } : {}), ...input };
     const m = await this.validate({ ...input, rooms: input?.rooms === undefined ? JSON.parse(existing.rooms ?? '[]') : input.rooms }, id);
     if (input?.cliConfig === undefined && existing.cli === m.cli) {
       m.cliConfig = existing.cli_config ? JSON.parse(existing.cli_config) : undefined;
@@ -278,8 +283,13 @@ export class Roster {
         }
         if (!Object.keys(cliConfig).length) cliConfig = undefined;
       }
-      if (input.model != null) throw new CollabError('invalid', 'CLI members cannot use a DSH model route');
-      return { name, persona, avatar, nameCustomized, rooms, cli, cliConfig, cliConfigManaged: input.cliConfig !== undefined, ...(preset === undefined ? {} : { permissionPreset: preset }) };
+      let model;
+      if (input.model != null) {
+        if (cli !== 'claude') throw new CollabError('invalid', 'CLI members cannot use a DSH model route');
+        if (typeof input.model !== 'string' || !input.model.trim()) throw new CollabError('invalid', 'Claude model must be a non-empty model id');
+        model = input.model.trim();
+      }
+      return { name, persona, avatar, nameCustomized, rooms, cli, model, cliConfig, cliConfigManaged: input.cliConfig !== undefined, ...(preset === undefined ? {} : { permissionPreset: preset }) };
     }
     if (input?.cliConfig != null) throw new CollabError('invalid', 'cliConfig requires a Codex member');
     let model;

package/collab/store.mjs

@@ -655,14 +655,14 @@ export class Store {
   member(id) { return this.q.member.get(id); }
   /** Upsert a config member; config always wins for its own ids. */
   seedMember(m, now = Date.now() / 1000) {
-    this.q.seedMember.run(m.id, m.name, m.model?.provider ?? null, m.model?.model ?? null, m.cli ?? null, m.persona ?? '', m.avatar || null, m.permissionPreset ?? null, JSON.stringify(m.rooms ?? []), now);
+    this.q.seedMember.run(m.id, m.name, m.model?.provider ?? null, typeof m.model === 'string' ? m.model : m.model?.model ?? null, m.cli ?? null, m.persona ?? '', m.avatar || null, m.permissionPreset ?? null, JSON.stringify(m.rooms ?? []), now);
   }
   addMember(m, now = Date.now() / 1000) {
-    return this.q.addMember.get(m.id, m.name, m.model?.provider ?? null, m.model?.model ?? null, m.cli ?? null, m.persona ?? '', m.avatar || null, m.permissionPreset ?? null, m.nameCustomized == null ? null : Number(m.nameCustomized), JSON.stringify(m.rooms ?? []), m.cliConfig ? JSON.stringify(m.cliConfig) : null, Number(Boolean(m.cliConfigManaged)), now);
+    return this.q.addMember.get(m.id, m.name, m.model?.provider ?? null, typeof m.model === 'string' ? m.model : m.model?.model ?? null, m.cli ?? null, m.persona ?? '', m.avatar || null, m.permissionPreset ?? null, m.nameCustomized == null ? null : Number(m.nameCustomized), JSON.stringify(m.rooms ?? []), m.cliConfig ? JSON.stringify(m.cliConfig) : null, Number(Boolean(m.cliConfigManaged)), now);
   }
   /** Edit a UI-created member; config members and removed ones are refused (undefined). */
   updateMember(id, m) {
-    return this.q.updateMember.get(m.name, m.model?.provider ?? null, m.model?.model ?? null, m.cli ?? null, m.persona ?? '', m.avatar || null, m.permissionPreset ?? null, m.nameCustomized == null ? null : Number(m.nameCustomized), JSON.stringify(m.rooms ?? []), m.cliConfig ? JSON.stringify(m.cliConfig) : null, Number(Boolean(m.cliConfigManaged)), id);
+    return this.q.updateMember.get(m.name, m.model?.provider ?? null, typeof m.model === 'string' ? m.model : m.model?.model ?? null, m.cli ?? null, m.persona ?? '', m.avatar || null, m.permissionPreset ?? null, m.nameCustomized == null ? null : Number(m.nameCustomized), JSON.stringify(m.rooms ?? []), m.cliConfig ? JSON.stringify(m.cliConfig) : null, Number(Boolean(m.cliConfigManaged)), id);
   }
   removeMember(id) { return this.q.removeMember.get(id); }
   leadId(roomId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bothouse-dsh",
-  "version": "0.1.66",
+  "version": "0.1.67",
   "description": "BotHouse channels for DeepSeek Harness: Discord-style rooms where DSH models and local CLIs (Claude Code, Codex, Gemini) are members",
   "type": "module",
   "main": "./collab/plugin.mjs",