bothouse-dsh 0.1.0 → 0.1.40

package/collab/store.mjs

@@ -10,17 +10,29 @@ export const MAX_TEXT = 128 * 1024;
 // 「默认混合模型」); the same names as the bridge's dispatch_mode config.
 export const DISPATCH_MODES = ['solo', 'team', 'mixed'];
 export const DEFAULT_DISPATCH_MODE = 'mixed';
-// v7 is #133 (reply_to), v8 is #139 team mode A, v9 is #139 team mode B tasks.
-const SCHEMA_VERSION = 10;
+// v7 is #133 (reply_to), v8 is #139 team mode A, v9 is #139 team mode B tasks, v10 is #177
+// (room_settings.dispatch_explicit); columns are added by ensureSchema() on every open
+// (checked with PRAGMA table_info), so either merge or release order ends with every column;
+// user_version only records the newest schema known.
+// v11 is #148 (edited_at).
+const SCHEMA_VERSION = 11;
 /** Columns added after v1, as [table, column, definition]; ensureSchema() adds any missing one. */
 const COLUMNS = [
+  ['members', 'name_customized', 'INTEGER'],
+  ['bindings', 'workspace_path', 'TEXT'], // Keep a CLI conversation in its original directory until /new. // NULL keeps existing names unchanged; only new UI members opt in.
+
   ['jobs', 'input_id', 'TEXT'], // v2: jobs remember the id of the input they admitted, to bind its consuming turn.
+  ['members', 'rooms', 'TEXT'], // NULL or [] retains legacy global visibility.
   ['members', 'cli', 'TEXT'], // v4: a member may be a local CLI agent (claude | codex | gemini) instead of a model route.
   ['members', 'avatar', 'TEXT'], // v5: a member may show an avatar (built-in slug); NULL means the initial badge.
+  // A local CLI member's DSH permission preset (cli-member.mjs PERMISSION_PRESETS); NULL means DSH's default.
+  ['members', 'permission_preset', 'TEXT'],
   // v6 (#121): a streamed reply is stored as a draft (shown, not fanned out) until commit
   // clears the flag. Durable, so a restart between commit and finishJob never fans it out twice.
   ['messages', 'draft', 'INTEGER NOT NULL DEFAULT 0'],
   ['messages', 'reply_to', 'INTEGER'], // v7 (#133): the message a user reply quotes.
+  // #144: JSON list of uploaded files ({id, name, mime, size}); bytes live under dataDir/attachments.
+  ['messages', 'attachments', 'TEXT'],
   // v8 (#139 team mode A): a room is a chat channel or a workspace under one chat channel.
   ['rooms', 'kind', "TEXT NOT NULL DEFAULT 'chat' CHECK (kind IN ('chat', 'workspace'))"],
   ['rooms', 'parent_id', 'INTEGER REFERENCES rooms(id)'],
@@ -30,12 +42,18 @@ const COLUMNS = [
   // The room's highest task id when its owner last claimed it; a claim no task followed
   // yet (the handoff is not worked on) keeps it owned when an earlier task ends (Tasks.releaseIfDone).
   ['rooms', 'claim_task', 'INTEGER'],
+  ['rooms', 'claim_at', 'REAL'], // A fresh claim gets time to open its handoff before idle recovery.
   // 1 = the bridge claimed it (cloudweb.mjs op claim/create): its lead is a bridge session, so
   // only the bridge's op release (lead reset) frees it, never Tasks.releaseIfDone.
   ['rooms', 'claim_bridge', 'INTEGER NOT NULL DEFAULT 0'],
   // Id of the current claim, bumped by every claim (claimWorkspace, createWorkspace): a release
   // naming an earlier claim (the bridge's late op release) is refused ('stale-claim').
   ['rooms', 'claim_seq', 'INTEGER NOT NULL DEFAULT 0'],
+  ['rooms', 'workspace_path', 'TEXT'], // Optional chat directory; workspace rooms inherit their current parent.
+  ['messages', 'edited_at', 'REAL'], // v11 (#148): when the owner last edited their own message; NULL if never.
+  // #597 G34: when a role last changed the row in place (a streamed draft growing, a progress card
+  // edited, the draft committed); NULL if never. The task watch counts it as progress (Tasks.progressed).
+  ['messages', 'changed_at', 'REAL'],
 ];
 /** Workspace rooms are named 工作区<n> (setting added in #139 team mode A, not user-specified). */
 export const WORKSPACE_PREFIX = '工作区';
@@ -51,6 +69,9 @@ export class Store {
   constructor(path) {
     if (path !== ':memory:') mkdirSync(dirname(path), { recursive: true });
     this.db = new DatabaseSync(path);
+    this.closed = false;
+    /** fn(roomId) when a workspace's sessions are dropped for a new claim (resetSessions). */
+    this.sessionResets = [];
     this.db.exec('PRAGMA journal_mode = WAL; PRAGMA foreign_keys = ON;');
     let version = this.db.prepare('PRAGMA user_version').get().user_version;
     if (version > SCHEMA_VERSION) throw Error(`collab: store schema ${version} is newer than ${SCHEMA_VERSION}`);
@@ -60,25 +81,30 @@ export class Store {
       rooms: this.db.prepare('SELECT id, name, kind, parent_id FROM rooms ORDER BY id'),
       children: this.db.prepare("SELECT id, name FROM rooms WHERE kind = 'workspace' AND parent_id = ? ORDER BY id"),
       // A new workspace is claimed with no task yet (claim_task 0): its first task is the handoff.
-      createWorkspace: this.db.prepare(`INSERT INTO rooms (id, name, kind, parent_id, claim_task, claim_bridge)
+      createWorkspace: this.db.prepare(`INSERT INTO rooms (id, name, kind, parent_id, claim_task, claim_bridge, claim_at)
         SELECT MAX(${WORKSPACE_ID_MIN}, COALESCE((SELECT MAX(id) + 1 FROM rooms WHERE id >= ${WORKSPACE_ID_MIN}), ${WORKSPACE_ID_MIN})),
-          ?, 'workspace', ?, 0, ? RETURNING id, name, kind, parent_id`),
-      ensureRoom: this.db.prepare('INSERT INTO rooms (id, name) VALUES (?, ?) ON CONFLICT(id) DO UPDATE SET name = excluded.name'),
-      insert: this.db.prepare(`INSERT INTO messages (room_id, author_kind, author, name, text, created_at, from_turn, card, client_key, draft, reply_to)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`),
+          ?, 'workspace', ?, 0, ?, unixepoch() RETURNING id, name, kind, parent_id`),
+      ensureRoom: this.db.prepare('INSERT INTO rooms (id, name, workspace_path) VALUES (?, ?, ?) ON CONFLICT(id) DO UPDATE SET name = excluded.name, workspace_path = excluded.workspace_path'),
+      workspacePath: this.db.prepare(`SELECT COALESCE(parent.workspace_path, room.workspace_path) AS path
+        FROM rooms room LEFT JOIN rooms parent ON room.kind = 'workspace' AND parent.id = room.parent_id WHERE room.id = ?`),
+      insert: this.db.prepare(`INSERT INTO messages (room_id, author_kind, author, name, text, created_at, from_turn, card, client_key, draft, reply_to, attachments)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`),
       byKey: this.db.prepare('SELECT * FROM messages WHERE client_key = ?'),
       byId: this.db.prepare('SELECT * FROM messages WHERE id = ? AND deleted = 0'),
-      edit: this.db.prepare('UPDATE messages SET text = ?, card = ? WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 RETURNING *'),
-      commit: this.db.prepare('UPDATE messages SET text = ?, from_turn = ?, draft = 0 WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 AND card IS NULL AND draft = 1 RETURNING *'),
+      edit: this.db.prepare('UPDATE messages SET text = ?, card = ?, changed_at = ? WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 RETURNING *'),
+      commit: this.db.prepare('UPDATE messages SET text = ?, from_turn = ?, draft = 0, changed_at = ? WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 AND card IS NULL AND draft = 1 RETURNING *'),
+      editUser: this.db.prepare(`UPDATE messages SET text = ?, edited_at = ? WHERE id = ? AND author_kind = 'user' AND author = ?
+        AND deleted = 0 AND draft = 0 AND card IS NULL RETURNING *`),
       del: this.db.prepare('UPDATE messages SET deleted = 1 WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 RETURNING *'),
       before: this.db.prepare('SELECT * FROM messages WHERE room_id = ? AND id < ? AND deleted = 0 ORDER BY id DESC LIMIT ?'),
       after: this.db.prepare('SELECT * FROM messages WHERE room_id = ? AND id > ? AND deleted = 0 ORDER BY id ASC LIMIT ?'),
-      relay: this.db.prepare(`SELECT COUNT(*) AS n FROM messages WHERE room_id = ? AND id <= ? AND deleted = 0 AND author_kind = 'role'
+      relay: this.db.prepare(`SELECT COUNT(*) AS n FROM messages WHERE room_id = ? AND id <= ? AND deleted = 0 AND author_kind = 'role' AND card IS NULL
         AND id > COALESCE((SELECT MAX(id) FROM messages WHERE room_id = ? AND id <= ? AND author_kind = 'user'), 0)`),
       binding: this.db.prepare('SELECT session_id, context_cursor FROM bindings WHERE member_id = ? AND room_id = ?'),
       // A fresh session starts reading after the room's last release (room_resets), not from its start.
       bind: this.db.prepare(`INSERT INTO bindings (member_id, room_id, session_id, context_cursor)
         VALUES (?, ?, ?, COALESCE((SELECT message_id FROM room_resets WHERE room_id = ?), 0))`),
+      rebind: this.db.prepare('UPDATE bindings SET session_id = ? WHERE member_id = ? AND room_id = ?'),
       cursor: this.db.prepare('UPDATE bindings SET context_cursor = MAX(context_cursor, ?) WHERE member_id = ? AND room_id = ?'),
       firstDraft: this.db.prepare(`SELECT MIN(id) AS id FROM messages WHERE room_id = ? AND id <= ? AND author <> ?
         AND draft = 1 AND deleted = 0 AND card IS NULL`),
@@ -87,19 +113,22 @@ export class Store {
       addJob: this.db.prepare(`INSERT INTO jobs (member_id, room_id, trigger_id, state, created_at)
         VALUES (?, ?, ?, 'pending', ?) ON CONFLICT(member_id, trigger_id) DO NOTHING RETURNING *`),
       job: this.db.prepare('SELECT * FROM jobs WHERE id = ?'),
+      jobByTrigger: this.db.prepare('SELECT * FROM jobs WHERE member_id = ? AND trigger_id = ?'),
+      resetJob: this.db.prepare("UPDATE jobs SET state = ?, created_at = ?, reply_id = NULL, session_id = NULL, seq_before = NULL, input_id = NULL WHERE id = ? RETURNING *"),
+      lastUserMessage: this.db.prepare("SELECT * FROM messages WHERE room_id = ? AND id < ? AND author_kind = 'user' AND deleted = 0 ORDER BY id DESC LIMIT 1"),
       openJobs: this.db.prepare("SELECT * FROM jobs WHERE state IN ('pending', 'sent') ORDER BY id"),
       sent: this.db.prepare("UPDATE jobs SET state = 'sent', session_id = ?, seq_before = ?, input_id = ? WHERE id = ? AND state = 'pending' RETURNING *"),
       finish: this.db.prepare("UPDATE jobs SET state = ?, reply_id = ? WHERE id = ? AND state IN ('pending', 'sent') RETURNING *"),
       createRoom: this.db.prepare("INSERT INTO rooms (name, kind) VALUES (?, 'chat') RETURNING id, name, kind, parent_id"),
       members: this.db.prepare('SELECT * FROM members WHERE removed = 0 ORDER BY created_at, id'),
       member: this.db.prepare('SELECT * FROM members WHERE id = ?'),
-      seedMember: this.db.prepare(`INSERT INTO members (id, name, provider, model, cli, persona, avatar, source, created_at, removed)
-        VALUES (?, ?, ?, ?, ?, ?, ?, 'config', ?, 0)
+      seedMember: this.db.prepare(`INSERT INTO members (id, name, provider, model, cli, persona, avatar, permission_preset, rooms, source, created_at, removed)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'config', ?, 0)
         ON CONFLICT(id) DO UPDATE SET name = excluded.name, provider = excluded.provider, model = excluded.model,
-          cli = excluded.cli, persona = excluded.persona, avatar = excluded.avatar, source = 'config', removed = 0`),
-      addMember: this.db.prepare(`INSERT INTO members (id, name, provider, model, cli, persona, avatar, source, created_at, removed)
-        VALUES (?, ?, ?, ?, ?, ?, ?, 'ui', ?, 0) RETURNING *`),
-      updateMember: this.db.prepare(`UPDATE members SET name = ?, provider = ?, model = ?, cli = ?, persona = ?, avatar = ?
+          cli = excluded.cli, persona = excluded.persona, avatar = excluded.avatar, permission_preset = excluded.permission_preset, rooms = excluded.rooms, source = 'config', removed = 0`),
+      addMember: this.db.prepare(`INSERT INTO members (id, name, provider, model, cli, persona, avatar, permission_preset, name_customized, rooms, source, created_at, removed)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'ui', ?, 0) RETURNING *`),
+      updateMember: this.db.prepare(`UPDATE members SET name = ?, provider = ?, model = ?, cli = ?, persona = ?, avatar = ?, permission_preset = ?, name_customized = ?, rooms = ?
         WHERE id = ? AND source = 'ui' AND removed = 0 RETURNING *`),
       removeMember: this.db.prepare("UPDATE members SET removed = 1 WHERE id = ? AND source = 'ui' AND removed = 0 RETURNING *"),
     };
@@ -157,6 +186,8 @@ export class Store {
         // Old mixed rows were also generated by reads, so they are not explicit choices.
         this.db.exec("UPDATE room_settings SET dispatch_explicit = 1 WHERE dispatch_mode <> 'mixed'");
       }
+      if (!settingColumns.some(c => c.name === 'lead_id')) this.db.exec('ALTER TABLE room_settings ADD COLUMN lead_id TEXT');
+      if (!settingColumns.some(c => c.name === 'workspace_path')) this.db.exec('ALTER TABLE room_settings ADD COLUMN workspace_path TEXT');
       this.db.exec('DROP TABLE IF EXISTS collab_settings');
       if (version < SCHEMA_VERSION) this.db.exec(`PRAGMA user_version = ${SCHEMA_VERSION}`);
     });
@@ -186,13 +217,27 @@ export class Store {
         updated_at REAL NOT NULL,
         returned_at REAL,
         remind_msg_id INTEGER,
-        reason TEXT)`);
+        reason TEXT,
+        paused_at REAL,
+        paused_chat INTEGER,
+        source TEXT,
+        ref TEXT,
+        base TEXT,
+        card_member_id TEXT,
+        renewals INTEGER NOT NULL DEFAULT 0)`);
     } else {
       const cols = new Set(this.db.prepare('PRAGMA table_info(tasks)').all().map(c => c.name));
       for (const [name, type] of [['parent_task', 'INTEGER'], ['next_check_at', 'REAL'], ['result_msg_id', 'INTEGER'],
-        ['assign_msg_id', 'INTEGER'], ['note', 'TEXT'], ['returned_at', 'REAL'], ['remind_msg_id', 'INTEGER'], ['reason', 'TEXT']]) {
+        ['assign_msg_id', 'INTEGER'], ['note', 'TEXT'], ['returned_at', 'REAL'], ['remind_msg_id', 'INTEGER'], ['reason', 'TEXT'], ['paused_at', 'REAL'], ['paused_chat', 'INTEGER'], ['source', 'TEXT'], ['ref', 'TEXT'], ['base', 'TEXT'], ['renewals', 'INTEGER NOT NULL DEFAULT 0'], ['card_member_id', 'TEXT']]) {
         if (!cols.has(name)) this.db.exec(`ALTER TABLE tasks ADD COLUMN ${name} ${type}`);
       }
+      // #574 B2 upgrade: workspace tasks in work with no check time start their 10-minute watch
+      // now (tasks.mjs CHECK_AFTER_S), not from their last change, so an upgrade parks none at once.
+      if (!cols.has('renewals')) {
+        this.db.prepare(`UPDATE tasks SET next_check_at = ? WHERE next_check_at IS NULL AND paused_at IS NULL
+          AND status IN ('assigned', 'accepted', 'asked', 'rework') AND room_id IN (SELECT id FROM rooms WHERE kind = 'workspace')`)
+          .run(Date.now() / 1000 + 10 * 60);
+      }
     }
     this.db.exec('CREATE INDEX IF NOT EXISTS tasks_room ON tasks (room_id, id)');
   }
@@ -273,7 +318,11 @@ export class Store {
         UNIQUE (member_id, trigger_id));`);
   }
 
-  close() { this.db.close(); }
+  close() {
+    if (this.closed) return;
+    this.db.close();
+    this.closed = true;
+  }
 
   /** Run fn in one write transaction; a throw rolls back every statement it made. */
   transaction(fn) {
@@ -294,15 +343,26 @@ export class Store {
    * predates that range or someone configured an id inside it. Refuse loudly instead of
    * moving the workspace: bot sessions are keyed room-<id> and must never see it change.
    */
-  ensureRoom(id, name) {
+  ensureRoom(id, name, workspacePath) {
     this.transaction(() => {
       if (this.q.room.get(id)?.kind === 'workspace') {
         throw new CollabError('workspace-id-conflict',
           `config room id ${id} collides with workspace room ${id}; workspace ids start at ${WORKSPACE_ID_MIN} and cannot be reassigned`);
       }
-      this.q.ensureRoom.run(id, name);
+      const saved = this.db.prepare('SELECT workspace_path FROM room_settings WHERE room_id = ?').get(id)?.workspace_path;
+      this.q.ensureRoom.run(id, name, saved || workspacePath || null);
     });
   }
+  /** Rename the channel without changing any room, message or session identity. */
+  renameRoom(id, name) {
+    if (typeof name !== 'string' || !name || name.length > 32 || /\s/.test(name)) {
+      throw new CollabError('invalid', 'room name must be 1-32 characters without spaces');
+    }
+    const room = this.room(id);
+    if (room === undefined) throw new CollabError('room-missing', `room ${id} does not exist`);
+    if (room.kind === 'workspace') throw new CollabError('invalid', 'workspace names cannot be changed');
+    return this.db.prepare('UPDATE rooms SET name = ? WHERE id = ? RETURNING id, name, kind, parent_id').get(name, id);
+  }
   /** Create a chat channel; its first workspace is made on the first createWorkspace() call. */
   createRoom(name) {
     const room = this.transaction(() => this.q.createRoom.get(name));
@@ -326,8 +386,9 @@ export class Store {
       const num = w => Number(re.exec(w.name)?.[1] ?? 0);
       const free = all.filter(w => w.free && num(w) > 0 && this.activeTasks(w.id) === 0).sort((a, b) => num(a) - num(b))[0];
       if (free !== undefined) {
+        this.resetSessions(free.id);
         return this.db.prepare(`UPDATE rooms SET parent_id = ?, free = 0, claim_bridge = ?, claim_seq = claim_seq + 1,
-          claim_task = (SELECT COALESCE(MAX(id), 0) FROM tasks WHERE room_id = ?) WHERE id = ? RETURNING id, name, kind, parent_id`)
+          claim_task = (SELECT COALESCE(MAX(id), 0) FROM tasks WHERE room_id = ?), claim_at = unixepoch() WHERE id = ? RETURNING id, name, kind, parent_id`)
           .get(parent, bridge ? 1 : 0, free.id, free.id);
       }
       const n = Math.max(0, ...all.map(num));
@@ -341,9 +402,11 @@ export class Store {
    * channel at a time: one another chat channel owns (not free) is refused with
    * 'workspace-owned' until it is released after its last task (releaseWorkspace).
    * chatId may be a workspace (then its chat channel is used). bridge: the claim comes from the
-   * bridge (cloudweb.mjs), whose lead session the bridge releases itself. Returns the workspace room.
+   * bridge (cloudweb.mjs), whose lead session the bridge releases itself. handoff: the task this
+   * claim is for when it already exists (a paused task resumed, Tasks.resumeClaim), so handoffDone
+   * waits for that task instead of one dispatched later. Returns the workspace room.
    */
-  claimWorkspace(chatId, workspaceId, { bridge = false } = {}) {
+  claimWorkspace(chatId, workspaceId, { bridge = false, handoff = null } = {}) {
     return this.transaction(() => {
       const chat = this.q.room.get(chatId);
       const ws = this.q.room.get(workspaceId);
@@ -354,9 +417,14 @@ export class Store {
       if (owner != null && owner !== parent) {
         throw new CollabError('workspace-owned', `workspace ${ws.name} belongs to room ${owner} until it finishes its last task`);
       }
+      // #597 G35: a released workspace keeps its sessions until a new claim. Claimed back for a task of
+      // its last claim (rework, a paused task resumed: Tasks.reworkClaim/resumeClaim; claim_task stays
+      // after the release), the members go on in the same sessions; any other claim starts fresh.
+      const last = this.db.prepare('SELECT claim_task FROM rooms WHERE id = ?').get(ws.id).claim_task;
+      if (owner == null && !(handoff != null && last != null && Number(handoff) > last)) this.resetSessions(ws.id);
       return this.db.prepare(`UPDATE rooms SET parent_id = ?, free = 0, claim_bridge = ?, claim_seq = claim_seq + 1,
-        claim_task = (SELECT COALESCE(MAX(id), 0) FROM tasks WHERE room_id = ?) WHERE id = ? RETURNING id, name, kind, parent_id`)
-        .get(parent, bridge ? 1 : 0, ws.id, ws.id);
+        claim_task = COALESCE(?, (SELECT COALESCE(MAX(id), 0) FROM tasks WHERE room_id = ?)), claim_at = unixepoch() WHERE id = ? RETURNING id, name, kind, parent_id`)
+        .get(parent, bridge ? 1 : 0, handoff == null ? null : Number(handoff) - 1, ws.id, ws.id);
     });
   }
 
@@ -386,16 +454,24 @@ export class Store {
     return handoff !== undefined && (handoff.status === 'returned' || handoff.status === 'done');
   }
 
-  /** Tasks in work in roomId (same statuses as tasks.mjs WORKING). */
+  /**
+   * True while workspace roomId is held by a bridge claim: the bridge's handoff watch checks it
+   * (core/team_watch.go), so the task watch here leaves it alone (one watcher per handoff).
+   */
+  bridgeClaimed(roomId) {
+    return Boolean(this.db.prepare('SELECT claim_bridge FROM rooms WHERE id = ?').get(roomId)?.claim_bridge);
+  }
+
+  /** Tasks in work in roomId (same statuses as tasks.mjs WORKING; paused ones do not count). */
   activeTasks(roomId) {
     return this.db.prepare(`SELECT COUNT(*) AS n FROM tasks WHERE room_id = ?
-      AND status IN ('assigned', 'accepted', 'asked', 'rework')`).get(roomId).n;
+      AND status IN ('assigned', 'accepted', 'asked', 'rework') AND paused_at IS NULL`).get(roomId).n;
   }
 
   /**
    * Release workspace roomId after its last task: it goes back to the pool (free) for any chat
-   * channel, and its sessions are cleared (bindings dropped; fresh ones start reading after the
-   * room's last message, room_resets). Refused with 'busy' while tasks are in work there.
+   * channel. Its sessions stay until a new claim takes it (resetSessions), so a rework or a resumed
+   * task goes on in them (#597 G35). Refused with 'busy' while tasks are in work there.
    * Returns false if roomId is no owned workspace (already free, or a chat channel). claim (from
    * the bridge's op release): the claim being ended; refused with 'stale-claim' once the
    * workspace was claimed again, so a late release never frees the new claim. null = any claim.
@@ -409,15 +485,28 @@ export class Store {
         throw new CollabError('stale-claim', `workspace ${ws.name} was claimed again since claim ${claim}`);
       }
       if (this.activeTasks(ws.id) > 0) throw new CollabError('busy', `workspace ${ws.name} has tasks in work`);
-      this.db.prepare('UPDATE rooms SET free = 1, claim_task = NULL, claim_bridge = 0 WHERE id = ?').run(ws.id);
-      this.db.prepare('DELETE FROM bindings WHERE room_id = ?').run(ws.id);
-      const last = this.db.prepare('SELECT MAX(id) AS id FROM messages WHERE room_id = ?').get(ws.id).id ?? 0;
-      this.db.prepare(`INSERT INTO room_resets (room_id, message_id) VALUES (?, ?)
-        ON CONFLICT (room_id) DO UPDATE SET message_id = excluded.message_id`).run(ws.id, last);
+      // claim_task stays: it tells a claim back for this claim's own task from a new one (claimWorkspace).
+      this.db.prepare('UPDATE rooms SET free = 1, claim_bridge = 0 WHERE id = ?').run(ws.id);
       return true;
     });
   }
 
+  /** Register fn(roomId), called when a workspace's sessions are dropped (resetSessions). */
+  onSessionsReset(fn) { this.sessionResets.push(fn); }
+
+  /**
+   * A free workspace taken by a new claim starts over: its sessions are cleared (bindings dropped;
+   * fresh ones start reading after the room's last message, room_resets) and the listeners drop
+   * what they keep per conversation (dsh-member resetRoom).
+   */
+  resetSessions(roomId) {
+    this.db.prepare('DELETE FROM bindings WHERE room_id = ?').run(roomId);
+    const last = this.db.prepare('SELECT MAX(id) AS id FROM messages WHERE room_id = ?').get(roomId).id ?? 0;
+    this.db.prepare(`INSERT INTO room_resets (room_id, message_id) VALUES (?, ?)
+      ON CONFLICT (room_id) DO UPDATE SET message_id = excluded.message_id`).run(roomId, last);
+    for (const fn of this.sessionResets) { try { fn(roomId); } catch { /* in-memory only: the store is already reset */ } }
+  }
+
   ensureRoomSettings(roomId) {
     this.db.prepare('INSERT OR IGNORE INTO room_settings (room_id) VALUES (?)').run(roomId);
   }
@@ -451,25 +540,69 @@ export class Store {
     return mode;
   }
 
+  /** Keep legacy members visible in all channels, including future ones. */
+  migrateMemberRooms() {
+    return this.db.prepare("UPDATE members SET rooms = '[]' WHERE rooms IS NULL").run().changes > 0;
+  }
+
   /** Active DSH members, config seeds and UI-created alike. */
   members() { return this.q.members.all(); }
   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, now);
+    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);
   }
   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, now);
+    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 ?? []), 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, id);
+    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 ?? []), id);
   }
   removeMember(id) { return this.q.removeMember.get(id); }
+  leadId(roomId) {
+    return this.db.prepare('SELECT lead_id FROM room_settings WHERE room_id = ?').get(this.settingsRoom(roomId))?.lead_id ?? null;
+  }
+  setLead(roomId, id) {
+    roomId = this.settingsRoom(roomId);
+    this.ensureRoomSettings(roomId);
+    this.db.prepare('UPDATE room_settings SET lead_id = ? WHERE room_id = ?').run(id, roomId);
+  }
+  bindingWorkspacePath(memberId, roomId, fallback) {
+    return this.db.prepare('SELECT workspace_path FROM bindings WHERE member_id = ? AND room_id = ?').get(memberId, roomId)?.workspace_path || fallback;
+  }
+  setBindingWorkspacePath(memberId, roomId, path) {
+    this.db.prepare('UPDATE bindings SET workspace_path = ? WHERE member_id = ? AND room_id = ?').run(path, memberId, roomId);
+  }
+  setWorkspacePath(roomId, path, fallback) {
+    roomId = this.settingsRoom(roomId);
+    const previous = this.workspacePath(roomId, fallback);
+    if (previous) this.db.prepare(`UPDATE bindings SET workspace_path = ? WHERE workspace_path IS NULL AND
+      (room_id = ? OR room_id IN (SELECT id FROM rooms WHERE parent_id = ?))`).run(previous, roomId, roomId);
+    this.ensureRoomSettings(roomId);
+    this.db.prepare('UPDATE room_settings SET workspace_path = ? WHERE room_id = ?').run(path, roomId);
+    this.db.prepare('UPDATE rooms SET workspace_path = ? WHERE id = ?').run(path, roomId);
+  }
+  workspacePath(roomId, fallback) {
+    const saved = this.db.prepare('SELECT workspace_path FROM room_settings WHERE room_id = ?').get(this.settingsRoom(roomId))?.workspace_path;
+    return saved || this.q.workspacePath.get(roomId)?.path || fallback;
+  }
   room(id) { return this.q.room.get(id); }
   rooms() { return this.q.rooms.all(); }
+  /** Return stale, empty claims to the pool without taking bridge or paused work. */
+  releaseIdleWorkspaces() {
+    const idle = this.db.prepare(`SELECT id FROM rooms WHERE kind = 'workspace' AND free = 0
+      AND claim_bridge = 0 AND claim_task > 0
+      AND (claim_at IS NULL OR claim_at < unixepoch() - 1800)
+      AND NOT EXISTS (SELECT 1 FROM tasks WHERE room_id = rooms.id
+        AND status IN ('assigned', 'accepted', 'asked', 'rework'))`).all();
+    for (const room of idle) this.releaseWorkspace(room.id);
+    return idle.length;
+  }
+
   /** Rooms for clients: each carries kind, parent_id and its open task count. */
   roomsView() {
+    this.releaseIdleWorkspaces();
     const counts = new Map(this.db.prepare(`SELECT room_id, COUNT(*) AS n FROM tasks
       WHERE status IN ('assigned', 'accepted', 'asked', 'rework') GROUP BY room_id`).all().map(t => [t.room_id, t.n]));
     return this.rooms().map(r => ({ ...r, active: counts.get(r.id) ?? 0, ...this.dispatchSetting(r.id) }));
@@ -482,7 +615,8 @@ export class Store {
   append(roomId, m, now = Date.now() / 1000) {
     if (this.room(roomId) === undefined) throw new CollabError('room-missing', `room ${roomId} does not exist`);
     const text = String(m.text ?? '');
-    if (!text.trim() && m.card == null) throw new CollabError('empty', 'message text is empty');
+    const attachments = Array.isArray(m.attachments) && m.attachments.length ? m.attachments : null;
+    if (!text.trim() && m.card == null && attachments === null) throw new CollabError('empty', 'message text is empty');
     if (text.length > MAX_TEXT) throw new CollabError('too-long', `message exceeds ${MAX_TEXT} characters`);
     if (m.clientKey != null) {
       const existing = this.q.byKey.get(m.clientKey);
@@ -496,7 +630,8 @@ export class Store {
       replyTo = ref.id;
     }
     const row = this.q.insert.get(roomId, m.authorKind, m.author, m.name, text, now,
-      m.fromTurn == null ? null : (m.fromTurn ? 1 : 0), m.card ?? null, m.clientKey ?? null, m.draft ? 1 : 0, replyTo);
+      m.fromTurn == null ? null : (m.fromTurn ? 1 : 0), m.card ?? null, m.clientKey ?? null, m.draft ? 1 : 0, replyTo,
+      attachments === null ? null : JSON.stringify(attachments));
     return { message: row, created: true };
   }
 
@@ -516,25 +651,41 @@ export class Store {
     return { id: ref.id, author_kind: ref.author_kind, author: ref.author, name: ref.name, text };
   }
   /** Edit or delete only a row the same author wrote; returns the row or undefined. */
-  edit(id, authorKind, author, text, card) { return this.q.edit.get(text, card ?? null, id, authorKind, author); }
+  /** #144: {id, name, mime, size} of a stored attachment, or undefined when no live message carries it. */
+  attachmentMeta(id) {
+    const row = this.db.prepare("SELECT attachments FROM messages WHERE deleted = 0 AND attachments LIKE ? LIMIT 1").get(`%"${id}"%`);
+    return messageAttachments(row).find(a => a.id === id);
+  }
+
+  edit(id, authorKind, author, text, card, now = Date.now() / 1000) { return this.q.edit.get(text, card ?? null, now, id, authorKind, author); }
   /**
    * Finish a streamed draft row with its complete text (#121). Returns
    * { message, first }: first is true only when this call turned the draft
    * into a reply (the caller fans out once). A row already committed gets the
    * text and first = false. undefined if it is not that author's live text row.
    */
-  commit(id, authorKind, author, text, fromTurn) {
+  commit(id, authorKind, author, text, fromTurn, now = Date.now() / 1000) {
     if (!text.trim() || text.length > MAX_TEXT) return undefined;
-    const row = this.q.commit.get(text, fromTurn == null ? null : (fromTurn ? 1 : 0), id, authorKind, author);
+    const row = this.q.commit.get(text, fromTurn == null ? null : (fromTurn ? 1 : 0), now, id, authorKind, author);
     if (row !== undefined) return { message: row, first: true };
     const old = this.message(id);
     if (old === undefined || old.card != null) return undefined;
-    const again = this.edit(id, authorKind, author, text);
+    const again = this.edit(id, authorKind, author, text, undefined, now);
     return again === undefined ? undefined : { message: again, first: false };
   }
+  /** #148: a person edits their own plain message; returns the row, or undefined if it is not theirs. */
+  editUser(id, author, text, now = Date.now() / 1000) {
+    text = String(text ?? '');
+    if (!text.trim()) throw new CollabError('empty', 'message text is empty');
+    if (text.length > MAX_TEXT) throw new CollabError('too-long', `message exceeds ${MAX_TEXT} characters`);
+    return this.q.editUser.get(text, now, id, author);
+  }
   remove(id, authorKind, author) { return this.q.del.get(id, authorKind, author); }
   /** One author's live text drafts (#121), oldest first. */
-  drafts(authorKind, author) { return this.q.authorDrafts.all(authorKind, author); }
+  drafts(authorKind, author) {
+    // WebSocket close events may arrive after plugin teardown has closed SQLite.
+    return this.closed ? [] : this.q.authorDrafts.all(authorKind, author);
+  }
 
   /** Up to `limit` messages before `beforeId` (exclusive), oldest first. */
   page(roomId, beforeId, limit) {
@@ -549,6 +700,8 @@ export class Store {
 
   binding(memberId, roomId) { return this.q.binding.get(memberId, roomId); }
   bind(memberId, roomId, sessionId) { this.q.bind.run(memberId, roomId, sessionId, roomId); }
+  /** Point an existing binding at a new Session; the context cursor stays. */
+  rebind(memberId, roomId, sessionId) { this.q.rebind.run(sessionId, memberId, roomId); }
   /**
    * Move a member's context cursor up to messageId, but never past a
    * teammate's uncommitted text draft (#121): it keeps its old id when it
@@ -563,6 +716,19 @@ export class Store {
   addJob(memberId, roomId, triggerId, now = Date.now() / 1000) {
     return this.q.addJob.get(memberId, roomId, triggerId, now);
   }
+  jobByTrigger(memberId, triggerId) {
+    return this.q.jobByTrigger.get(memberId, triggerId);
+  }
+  retryJob(memberId, roomId, triggerId, now = Date.now() / 1000) {
+    const existing = this.jobByTrigger(memberId, triggerId);
+    if (existing !== undefined) {
+      return this.q.resetJob.get('pending', now, existing.id);
+    }
+    return this.addJob(memberId, roomId, triggerId, now);
+  }
+  lastUserMessage(roomId, beforeId) {
+    return this.q.lastUserMessage.get(roomId, beforeId);
+  }
   job(id) { return this.q.job.get(id); }
   openJobs() { return this.q.openJobs.all(); }
   /** Record admission before the prompt reaches the Agent; false if already moved on. */
@@ -587,12 +753,21 @@ export function publicMessage(row, store) {
   const out = {
     id: row.id, room_id: row.room_id, author_kind: row.author_kind, author: row.author, name: row.name,
     text: row.text, created_at: row.created_at, card: row.card, from_turn: row.from_turn,
+    ...(row.edited_at != null ? { edited_at: row.edited_at } : {}),
   };
   const quote = store?.quote(row);
   if (quote !== undefined) out.reply_to = quote;
+  const attachments = messageAttachments(row);
+  if (attachments.length) out.attachments = attachments;
   return out;
 }
 
+/** #144: the uploaded files a message carries ([] when none or unreadable). */
+export function messageAttachments(row) {
+  if (!row?.attachments) return [];
+  try { const list = JSON.parse(row.attachments); return Array.isArray(list) ? list : []; } catch { return []; }
+}
+
 /** Discord-style quote prefix for agent prompts: `[回复 作者：前40字…] ` (discord.go:1645-1650). */
 export function quotePrefix(quote) {
   if (quote === undefined) return '';