bothouse-dsh 0.1.0 → 0.1.40

package/collab/quota-cooling.mjs

@@ -0,0 +1,169 @@
+import { mkdirSync, readFileSync, writeFileSync, renameSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+
+// Claude reports a provider-local reset clock; convert it using its IANA zone,
+// including calendar dates for weekly limits. Missing deadlines stay unknown.
+function resetClock(raw, now) {
+  const match = /^(?:([A-Za-z]{3})\s+(\d+),?\s+)?(\d{1,2})(?::(\d{2}))?(am|pm)?\s+\(([^)]+)\)$/i.exec(raw);
+  if (!match) return undefined;
+  const [, month, day, hour, minute, period, timeZone] = match;
+  const fmt = new Intl.DateTimeFormat('en-US', { timeZone, year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric', hourCycle: 'h23' });
+  const parts = at => Object.fromEntries(fmt.formatToParts(at).filter(p => p.type !== 'literal').map(p => [p.type, Number(p.value)]));
+  const current = parts(now);
+  const h = period ? Number(hour) % 12 + (/pm/i.test(period) ? 12 : 0) : Number(hour);
+  if (h > 23 || Number(minute ?? 0) > 59) return undefined;
+  const m = month ? 'jan feb mar apr may jun jul aug sep oct nov dec'.split(' ').indexOf(month.toLowerCase()) + 1 : current.month;
+  if (!m) return undefined;
+  const local = Date.UTC(current.year, m - 1, Number(day ?? current.day), h, Number(minute ?? 0));
+  const utc = local => {
+    let at = local;
+    for (let i = 0; i < 3; i++) {
+      const p = parts(at);
+      at += local - Date.UTC(p.year, p.month - 1, p.day, p.hour, p.minute, p.second);
+    }
+    return at;
+  };
+  let at = utc(local);
+  if (at <= now) at = utc(month ? Date.UTC(current.year + 1, m - 1, Number(day), h, Number(minute ?? 0)) : local + 86400000);
+  return at;
+}
+
+/** Same deadline and directory as bridge/core/quota_cooling.go. */
+export function quotaDeadline(event, now = Date.now()) {
+  const data = event?.data ?? event;
+  const report = data?.usage ?? data?.quota;
+  let until = 0;
+  for (const bucket of report?.buckets ?? report?.Buckets ?? []) {
+    for (const w of bucket.windows ?? bucket.Windows ?? []) {
+      const used = w.usedPercent ?? w.used_percent ?? w.UsedPercent;
+      const seconds = w.windowSeconds ?? w.window_seconds ?? w.WindowSeconds;
+      // Only a reported limit counts: a window merely near its limit still has usable quota
+      // (user 2026-10-28「或者报错再交接，提前量太多，有点浪费了」).
+      if (!(bucket.limitReached || bucket.LimitReached || used >= 100)) continue;
+      const at = (w.resetAtUnix ?? w.reset_at_unix ?? w.ResetAtUnix) * 1000 ||
+        now + (w.resetAfterSeconds ?? w.reset_after_seconds ?? w.ResetAfterSeconds ?? 0) * 1000;
+      if (at > now) until = Math.max(until, at);
+    }
+  }
+  const reset = data?.metadata?.quota_exhausted;
+  const text = [data?.reason?.error?.message, data?.error?.message, typeof data?.error === 'string' ? data.error : '', reset].filter(Boolean).join(' ');
+  if (/quota|resource_exhausted|(?:usage|session) limit|hit your limit/i.test(text) || reset !== undefined) {
+    const duration = /resets in (?:(\d+)h)?(?:(\d+)m)?(?:(\d+(?:\.\d+)?)s)?/i.exec(text);
+    const delay = duration && (Number(duration[1] ?? 0) * 3600 + Number(duration[2] ?? 0) * 60 + Number(duration[3] ?? 0)) * 1000;
+    const raw = reset ?? /resets?\s+(.+?\([^)]+\))/i.exec(text)?.[1] ?? '';
+    let absolute;
+    try { absolute = /^\d{4}-\d\d-\d\dT/.test(raw) ? Date.parse(raw) : resetClock(raw, now); }
+    catch (error) { if (!(error instanceof RangeError)) throw error; } // invalid external IANA zone stays unknown
+    if (delay > 0) until = Math.max(until, now + delay);
+    if (absolute > now) until = Math.max(until, absolute);
+  }
+  return until || undefined;
+}
+
+export class QuotaCooling {
+  constructor(hub, tasks, wake, directory, { now = Date.now } = {}) {
+    this.hub = hub; this.tasks = tasks; this.wake = wake; this.directory = directory; this.now = now;
+    mkdirSync(directory, { recursive: true, mode: 0o700 });
+  }
+  read(id, receipt = false) {
+    try { return JSON.parse(readFileSync(join(this.directory, `${id}${receipt ? '.takeover' : ''}.json`), 'utf8')); }
+    catch (error) {
+      if (error.code !== 'ENOENT') this.hub.logger?.warn?.('quota: cannot read %s: %s', id, error.message);
+      return {};
+    }
+  }
+  save(id, state, receipt = false) {
+    const path = join(this.directory, `${id}${receipt ? '.takeover' : ''}.json`), temp = `${path}.tmp-${process.pid}`;
+    writeFileSync(temp, JSON.stringify(state), { mode: 0o600 }); renameSync(temp, path);
+  }
+  cooling(id) { return Date.parse(this.read(id).cooling_until ?? '') > this.now(); }
+  observe(id, room, event) {
+    // Bridge-backed roles own their cooldown file in Go; the host only reads it.
+    if (this.hub.members.get(id)?.kind !== 'dsh') return;
+    const until = quotaDeadline(event, this.now());
+    if (!until) return;
+    const state = this.read(id);
+    if (Date.parse(state.cooling_until ?? '') >= until) return;
+    state.cooling_until = new Date(until).toISOString();
+    state.session = `cloud_web:room-${room}`;
+    this.save(id, state);
+  }
+  candidate(room, title, from, reserved) {
+    const code = /代码|编译|修复|code|\bPR\b/i.test(title);
+    const rank = m => code ? /longniang|龙娘/.test(m.id + m.name) ? 0 : 1 : /jingyu|鲸鱼/.test(m.id + m.name) ? 0 : 1;
+    const chat = this.hub.store.settingsRoom(room);
+    const busy = id => [...this.hub.thinking].some(([r, ids]) => ids.has(id) && this.hub.store.settingsRoom(r) === chat) ||
+      this.tasks.activeTasksOf(id).some(t => this.hub.store.settingsRoom(t.room_id) === chat);
+    return this.hub.routableIn(room).filter(m => m.id !== from && m.online !== false && !this.cooling(m.id) &&
+      !busy(m.id) && !reserved.has(m.id))
+      .sort((a,b) => rank(a) - rank(b) || a.id.localeCompare(b.id))[0];
+  }
+  notice(room, key, text) {
+    return this.hub.post(room, { authorKind: 'system', author: 'system', name: '额度交接', clientKey: key, text }).message;
+  }
+  tick() {
+    for (const member of this.hub.routable()) {
+      const quota = this.read(member.id);
+      let state = this.read(member.id, true);
+      if (!quota.cooling_until && !state.until) continue;
+      if (!this.cooling(member.id)) {
+        for (const [room, lead] of Object.entries(state.leads ?? {})) {
+          if (this.hub.primaryIn(Number(room))?.id === lead.to) {
+            this.hub.store.setLead(Number(room), member.id);
+            this.notice(Number(room), `${member.id}-${state.until}-restore-${room}`, `${member.name} 额度恢复，主角色已切回。`);
+          }
+        }
+        if (state.until) {
+          this.save(member.id, {}, true);
+          this.hub.emit({ type: 'rooms', rooms: this.hub.store.roomsView() });
+        }
+        continue;
+      }
+      // Extending a cooldown retains its receipts; a recovered generation starts fresh.
+      if (!state.until) state = { until: quota.cooling_until, leads: {}, transfers: {} };
+      const key = `${member.id}-${state.until}`;
+      const reserved = new Set(Object.values(state.transfers).filter(t => !t.woken).map(t => t.to));
+      for (const room of this.hub.store.rooms().filter(r => r.kind !== 'workspace')) {
+        if (state.leads[room.id] || this.hub.primaryIn(room.id)?.id !== member.id) continue;
+        const target = this.candidate(room.id, '', member.id, reserved);
+        if (!target) continue;
+        state.leads[room.id] = { to: target.id, woken: false };
+        this.save(member.id, state, true);
+        this.hub.store.setLead(room.id, target.id);
+        this.hub.emit({ type: 'rooms', rooms: this.hub.store.roomsView() });
+      }
+      for (const [room, lead] of Object.entries(state.leads)) {
+        if (lead.woken || this.cooling(lead.to)) continue;
+        // Replay a crash between persisting intent and changing the selection.
+        if (this.hub.primaryIn(Number(room))?.id === member.id) this.hub.store.setLead(Number(room), lead.to);
+        if (this.hub.primaryIn(Number(room))?.id !== lead.to) continue;
+        const msg = this.notice(Number(room), `${key}-lead-${room}`, `${member.name} 额度冷却，主角色交给 ${this.tasks.nameOf(lead.to)}。请接着推进未完成任务。`);
+        if (this.wake(lead.to, msg)) { lead.woken = true; this.save(member.id, state, true); }
+      }
+      for (const task of this.tasks.activeTasksOf(member.id)) {
+        if (state.transfers[task.id] || this.tasks.awaitingUser(task)) continue;
+        // These rows mirror bridge-owned cards/workspaces. Go moves the original
+        // journal and wakes its replacement; the next card update mirrors ownership.
+        if (member.kind === 'bot' && ['card', 'workspace'].includes(task.source)) continue;
+        const target = this.candidate(task.room_id, task.title, member.id, reserved);
+        if (!target) continue;
+        state.transfers[task.id] = { to: target.id, room: task.room_id, title: task.title, reason: task.reason, ref: task.ref, base: task.base, woken: false };
+        this.save(member.id, state, true);
+        this.tasks.reassignForQuota(task, target.id);
+        reserved.add(target.id);
+      }
+      for (const [id, transfer] of Object.entries(state.transfers)) {
+        if (transfer.woken || this.cooling(transfer.to)) continue;
+        const task = this.tasks.q.get.get(Number(id));
+        if (task?.owner === member.id) this.tasks.reassignForQuota(task, transfer.to);
+        if (this.tasks.q.get.get(Number(id))?.owner !== transfer.to) continue;
+        const msg = this.notice(transfer.room, `${key}-task-${id}`, `接手 #${id}「${transfer.title}」。原交接：${transfer.reason ?? ''}\n参照：${transfer.ref ?? ''}\n底分支：${transfer.base ?? ''}`);
+        if (this.wake(transfer.to, msg)) { transfer.woken = true; this.save(member.id, state, true); }
+      }
+    }
+  }
+  start() { this.tick(); this.timer = setInterval(() => this.tick(), 2000); this.timer.unref(); }
+  close() { clearInterval(this.timer); }
+}
+
+export const quotaDirectory = leadFile => join(dirname(leadFile), 'quota-cooling');

package/collab/roster.mjs

@@ -2,9 +2,10 @@
 // in the UI), UI members are created, edited and removed here. Names must be
 // unique across every channel member (DSH members and cc-connect bots alike)
 // because @-mentions are matched by name.
-import { existsSync, readFileSync, renameSync } from 'node:fs';
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { CollabError } from './store.mjs';
 import { checkAvatar } from './avatars.mjs';
+import { PERMISSION_PRESETS } from './cli-member.mjs';
 
 const MAX_NAME = 32;
 const MAX_PERSONA = 4000;
@@ -18,10 +19,13 @@ export function rowToMember(row) {
   return {
     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 ? { cli: row.cli } : {}),
+    ...(row.cli && row.permission_preset ? { permissionPreset: row.permission_preset } : {}),
     persona: row.persona ?? '',
     ...(row.avatar ? { avatar: row.avatar } : {}),
+    ...(row.rooms && row.rooms !== '[]' ? { rooms: JSON.parse(row.rooms) } : {}),
     source: row.source,
   };
 }
@@ -32,7 +36,8 @@ export class Roster {
    * @param dsh - DshMembers (runtime routing).
    * @param llm - DSH `ctx.llm` service, or undefined to skip model checks.
    */
-  constructor(hub, dsh, llm) {
+  constructor(hub, dsh, llm, avatars) {
+    this.avatars = avatars;
     this.hub = hub;
     this.store = hub.store;
     this.dsh = dsh;
@@ -42,13 +47,20 @@ export class Roster {
   /** Write config members as seeds, then publish every active member. */
   load(configMembers) {
     this.store.transaction(() => { for (const m of configMembers) this.store.seedMember(m); });
-    for (const row of this.store.members()) this.dsh.putMember(rowToMember(row));
+    // The members table has no preset columns: a config member's agentPreset and
+    // permissionPreset come from the config itself, or they never reach its Sessions.
+    const presets = new Map(configMembers.map(m => [m.id, {
+      ...(m.agentPreset === undefined ? {} : { agentPreset: m.agentPreset }),
+      ...(m.permissionPreset === undefined ? {} : { permissionPreset: m.permissionPreset }),
+    }]));
+    for (const row of this.store.members()) this.dsh.putMember({ ...rowToMember(row), ...(row.source === 'ui' ? {} : presets.get(row.id)) });
   }
 
   /**
    * Add the roles the setup wizard wrote (bridge core/setup_dsh_configure.go: {"members":[{name,cli?,persona?}]})
-   * as UI members, once: names already in the channel are skipped, then the file becomes *.imported.json.
-   * Returns the names added.
+   * as UI members, once: names already in the channel are skipped, then the file becomes *.imported.json with
+   * each role's member id (the new one, or the one already holding the name), so bothouse names the role's wiki
+   * after the id the member really has (bridge core/setup_dsh_wiki.go). Returns the names added.
    */
   async importWizard(path, logger) {
     if (!existsSync(path)) return [];
@@ -60,18 +72,28 @@ export class Roster {
       return [];
     }
     const added = [];
+    const imported = [];
     for (const m of Array.isArray(members) ? members : []) {
       const name = String(m?.name ?? '').trim();
-      if (this.hub.memberList().some(x => x.name.toLowerCase() === name.toLowerCase())) continue;
+      const same = this.hub.memberList().find(x => x.name.toLowerCase() === name.toLowerCase());
+      // A default-named role may become Codex-2 when Codex is already there; custom and legacy
+      // names stay idempotent (a re-import must not duplicate them).
+      if (same !== undefined && m?.name_customized !== false) {
+        imported.push({ ...m, id: same.id });
+        continue;
+      }
       try {
         const avatar = m?.avatar && ['orange', 'whale', 'dragon', 'rainbow', 'lanxi'].includes(m.avatar) ? m.avatar : undefined;
-        await this.create({ name, persona: m?.persona ?? '', ...(m?.cli ? { cli: m.cli } : {}), ...(avatar ? { avatar } : {}) });
-        added.push(name);
+        const member = await this.create({ name, persona: m?.persona ?? '', ...(m?.cli ? { cli: m.cli } : {}), ...(m?.name_customized === undefined ? {} : { nameCustomized: Boolean(m.name_customized) }), ...(avatar ? { avatar } : {}) });
+        imported.push({ ...m, id: member.id });
+        added.push(member.name);
       } catch (error) {
+        imported.push(m);
         logger?.warn?.('conest-collab: wizard member %s not added: %s', name, error?.message ?? error);
       }
     }
-    renameSync(path, path.replace(/\.json$/, '') + '.imported.json');
+    writeFileSync(path.replace(/\.json$/, '') + '.imported.json', JSON.stringify({ members: imported }, null, 2), { mode: 0o600 });
+    unlinkSync(path);
     return added;
   }
 
@@ -102,7 +124,12 @@ 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`);
-    const m = await this.validate(input, id);
+    const m = await this.validate({ ...input, rooms: input?.rooms === undefined ? JSON.parse(existing.rooms ?? '[]') : input.rooms }, id);
+    if (input?.nameCustomized === undefined && existing.name_customized != null) m.nameCustomized = Boolean(existing.name_customized);
+    // An edit that leaves out the approval tier keeps the stored one instead of falling back to the default.
+    if (m.cli !== undefined && input?.permissionPreset === undefined && existing.cli && existing.permission_preset) {
+      m.permissionPreset = existing.permission_preset;
+    }
     const row = this.store.updateMember(id, m);
     const member = rowToMember(row);
     this.dsh.putMember(member);
@@ -113,16 +140,51 @@ 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 removed here`);
+    this.avatars?.remove(id);
     this.store.removeMember(id);
     this.dsh.dropMember(id);
   }
 
+  setAvatar(id, png) {
+    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', '配置文件中的成员不能在这里修改头像');
+    let avatar = '';
+    if (png === undefined) this.avatars.remove(id);
+    else avatar = this.avatars.save(id, png);
+    const row = this.store.updateMember(id, { ...rowToMember(existing), avatar });
+    const member = rowToMember(row);
+    this.dsh.putMember(member);
+    return member;
+  }
+
   async validate(input, selfId) {
-    const name = String(input?.name ?? '').trim();
-    if (!name || name.length > MAX_NAME || /[\s@<>]/.test(name)) {
-      throw new CollabError('invalid', `name must be 1-${MAX_NAME} characters without spaces, @ or <>`);
+    let name = String(input?.name ?? '').trim();
+    const existing = selfId === undefined ? undefined : this.store.member(selfId);
+    const nameCustomized = input?.nameCustomized ?? (existing?.name_customized == null ? undefined : Boolean(existing.name_customized));
+    if (nameCustomized !== undefined && typeof nameCustomized !== 'boolean') throw new CollabError('invalid', 'nameCustomized must be boolean');
+    const cli = input?.cli ?? existing?.cli;
+    const backend = { claude: 'Claude Code', codex: 'Codex', gemini: 'Gemini' }[cli] ?? 'DSH';
+    const used = new Set(this.hub.memberList().filter(m => m.id !== selfId).map(m => m.name.toLowerCase()));
+    const isNew = existing === undefined;
+    if (!name || (nameCustomized === false && (isNew ? used.has(name.toLowerCase()) : existing.cli !== cli))) {
+      if (isNew && name) {
+        // Keep the requested automatic stem (Codex, Claude Code…) and only move past collisions.
+        const stem = name.replace(/-\d+$/, '');
+        for (let n = 2; used.has(name.toLowerCase()); n++) name = `${stem}-${n}`;
+      } else {
+        name = backend;
+        for (let n = 2; used.has(name.toLowerCase()); n++) name = `${backend}-${n}`;
+      }
+    }
+    if (!name || name.length > MAX_NAME || /[@<>\r\n\t]/.test(name) || (/\s/.test(name) && !/^Claude Code(?:-\d+)?$/.test(name))) {
+      throw new CollabError('invalid', `name must be 1-${MAX_NAME} characters without spaces (except Claude Code), @ or <>`);
+    }
+    const rooms = input?.rooms ?? [];
+    if (!Array.isArray(rooms) || rooms.some(id => !Number.isSafeInteger(id) || this.store.room(id)?.kind !== 'chat')) {
+      throw new CollabError('invalid', 'rooms must contain existing chat channel ids');
     }
-    const clash = this.hub.memberList().find(m => m.id !== selfId && (m.name.toLowerCase() === name.toLowerCase() || m.id.toLowerCase() === name.toLowerCase()));
+    const clash = this.hub.memberList().find(m => m.id !== selfId && (!rooms.length || !m.rooms?.length || rooms.some(id => m.rooms.includes(id))) && (m.name.toLowerCase() === name.toLowerCase() || m.id.toLowerCase() === name.toLowerCase()));
     if (clash !== undefined) throw new CollabError('conflict', `name ${name} is already used by ${clash.name}`);
     const persona = String(input?.persona ?? '');
     if (persona.length > MAX_PERSONA) throw new CollabError('invalid', `persona exceeds ${MAX_PERSONA} characters`);
@@ -132,7 +194,10 @@ export class Roster {
       // A local CLI member brings its own model; no provider route to check.
       const cli = String(input.cli);
       if (!CLIS.includes(cli)) throw new CollabError('invalid', `cli must be one of ${CLIS.join(', ')}`);
-      return { name, persona, avatar, cli };
+      // Tool approval tier: one of DSH's permission presets; absent = DSH's default (cli-member.mjs).
+      const preset = input.permissionPreset == null || input.permissionPreset === '' ? undefined : String(input.permissionPreset);
+      if (preset !== undefined && !PERMISSION_PRESETS.includes(preset)) throw new CollabError('invalid', `permissionPreset must be one of ${PERMISSION_PRESETS.join(', ')}`);
+      return { name, persona, avatar, nameCustomized, rooms, cli, ...(preset === undefined ? {} : { permissionPreset: preset }) };
     }
     let model;
     if (input?.model != null) {
@@ -148,7 +213,7 @@ export class Roster {
       }
       model = { provider, model: id };
     }
-    return { name, persona, avatar, ...(model === undefined ? {} : { model }) };
+    return { name, persona, avatar, nameCustomized, rooms, ...(model === undefined ? {} : { model }) };
   }
 
   /** A stable, unused member id derived from the name (ASCII) or a short random suffix. */