kitty-hive 0.1.1 → 0.2.0

package/dist/auth.d.ts

@@ -1,7 +1,11 @@
+import { z } from 'zod';
 import type { Agent } from './models.js';
-/**
- * Extract agent from Bearer token.
- * Returns the agent if valid, null otherwise.
- * Also updates last_seen timestamp.
- */
-export declare function authenticateToken(authHeader: string | undefined): Agent | null;
+export declare const asParam: z.ZodOptional<z.ZodString>;
+export declare function resolveAgent(extra: any, asValue?: string): Agent | null;
+export declare function authError(): {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError: boolean;
+};

package/dist/auth.js

@@ -1,19 +1,34 @@
-import { getAgentByToken, touchAgent } from './db.js';
-/**
- * Extract agent from Bearer token.
- * Returns the agent if valid, null otherwise.
- * Also updates last_seen timestamp.
- */
-export function authenticateToken(authHeader) {
-    if (!authHeader)
-        return null;
-    const match = authHeader.match(/^Bearer\s+(\S+)$/i);
-    if (!match)
-        return null;
-    const agent = getAgentByToken(match[1]);
-    if (!agent)
-        return null;
-    touchAgent(agent.id);
-    return agent;
+import { z } from 'zod';
+import { getAgentById, touchAgent } from './db.js';
+import { sessionAgents } from './sessions.js';
+export const asParam = z.string().optional().describe('Your agent id (from hive.start). Optional — session binding takes precedence.');
+export function resolveAgent(extra, asValue) {
+    // 1) Session binding (preferred)
+    const sessionId = extra?.sessionId;
+    if (sessionId) {
+        const agentId = sessionAgents.get(sessionId);
+        if (agentId) {
+            const agent = getAgentById(agentId);
+            if (agent) {
+                touchAgent(agent.id);
+                return agent;
+            }
+        }
+    }
+    // 2) `as` param fallback (id only — names not unique)
+    if (asValue) {
+        const agent = getAgentById(asValue);
+        if (agent) {
+            touchAgent(agent.id);
+            return agent;
+        }
+    }
+    return null;
+}
+export function authError() {
+    return {
+        content: [{ type: 'text', text: 'Error: Not authenticated. Call hive.start first.' }],
+        isError: true,
+    };
 }
 //# sourceMappingURL=auth.js.map

package/dist/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGtD;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAA8B;IAC9D,IAAI,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACpD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACrB,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG9C,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,+EAA+E,CAAC,CAAC;AAEvI,MAAM,UAAU,YAAY,CAAC,KAAU,EAAE,OAAgB;IACvD,iCAAiC;IACjC,MAAM,SAAS,GAAG,KAAK,EAAE,SAAS,CAAC;IACnC,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YACpC,IAAI,KAAK,EAAE,CAAC;gBAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAAC,OAAO,KAAK,CAAC;YAAC,CAAC;QACpD,CAAC;IACH,CAAC;IACD,sDAAsD;IACtD,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC;IACpD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,kDAAkD,EAAE,CAAC;QAC9F,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/dist/db.d.ts

@@ -1,26 +1,42 @@
 import Database from 'better-sqlite3';
-import type { Agent, Room, RoomEvent, RoomEventType, Task, TaskEvent, TaskEventType } from './models.js';
+import type { Agent, Team, TeamMember, TeamEvent, TeamEventType, DMMessage, Task, TaskEvent, TaskEventType } from './models.js';
 export declare function initDB(dbPath?: string): Database.Database;
 export declare function getDB(): Database.Database;
 export declare function createAgent(displayName: string, tool: string, roles: string, expertise: string): Agent;
 export declare function getAgentByToken(token: string): Agent | undefined;
 export declare function getAgentById(id: string): Agent | undefined;
-export declare function getAgentByName(name: string): Agent | undefined;
+export declare function getAgentsByName(name: string): Agent[];
+export declare function listAllAgents(activeOnly?: boolean): Agent[];
 export declare function findAgentByRole(role: string): Agent | undefined;
 export declare function touchAgent(id: string): void;
-export declare function createRoom(kind: string, hostAgentId: string | null, name?: string): Room;
-export declare function getRoomById(id: string): Room | undefined;
-export declare function getLobby(): Room | undefined;
-export declare function findDMRoom(agentA: string, agentB: string): Room | undefined;
-export declare function listTeams(): Room[];
-export declare function appendRoomEvent(roomId: string, type: RoomEventType, actorAgentId: string | null, payload?: object): RoomEvent;
-export declare function getRoomEvents(roomId: string, since?: number, limit?: number): RoomEvent[];
-export declare function getLastRoomEventTs(roomId: string): string | null;
-export declare function getLatestRoomEvents(roomId: string, limit?: number): RoomEvent[];
-export declare function getRoomMembers(roomId: string): string[];
-export declare function isMember(roomId: string, agentId: string): boolean;
-export declare function getAgentRooms(agentId: string, kind?: string, activeOnly?: boolean): Room[];
-export declare function createTask(title: string, creatorId: string, assigneeId?: string, sourceRoomId?: string, input?: object): Task;
+export declare function renameAgent(id: string, newName: string): void;
+export interface ResolvedAgent {
+    agent?: Agent;
+    source: 'id' | 'team-nickname' | 'display-name';
+}
+export declare function resolveAddressee(callerAgentId: string, target: string): ResolvedAgent | {
+    error: string;
+};
+export declare function createTeam(name: string, hostAgentId: string | null): Team;
+export declare function getTeamById(id: string): Team | undefined;
+export declare function getTeamByName(name: string): Team | undefined;
+export declare function listTeams(activeOnly?: boolean): Team[];
+export declare function getAgentTeams(agentId: string, activeOnly?: boolean): Team[];
+export declare function addTeamMember(teamId: string, agentId: string, nickname?: string | null): TeamMember;
+export declare function removeTeamMember(teamId: string, agentId: string): void;
+export declare function isTeamMember(teamId: string, agentId: string): boolean;
+export declare function getTeamMembers(teamId: string): TeamMember[];
+export declare function getTeamMemberAgentIds(teamId: string): string[];
+export declare function setTeamNickname(teamId: string, agentId: string, nickname: string | null): void;
+export declare function getTeamMember(teamId: string, agentId: string): TeamMember | undefined;
+export declare function getTeamDisplayName(teamId: string, agentId: string): string;
+export declare function appendTeamEvent(teamId: string, type: TeamEventType, actorAgentId: string | null, payload?: object): TeamEvent;
+export declare function getTeamEvents(teamId: string, since?: number, limit?: number): TeamEvent[];
+export declare function getLatestTeamEvents(teamId: string, limit?: number): TeamEvent[];
+export declare function appendDM(fromAgentId: string, toAgentId: string, content: string): DMMessage;
+export declare function getMaxIncomingDMId(toAgentId: string, fromAgentId: string): number;
+export declare function getDMConversation(agentA: string, agentB: string, since?: number, limit?: number): DMMessage[];
+export declare function createTask(title: string, creatorId: string, assigneeId?: string, sourceTeamId?: string, input?: object): Task;
 export declare function getTaskById(id: string): Task | undefined;
 export declare function updateTaskStatus(id: string, status: string, extras?: Record<string, any>): void;
 export declare function getAgentTasks(agentId: string, status?: string): Task[];
@@ -29,7 +45,7 @@ export declare function getTaskEvents(taskId: string, since?: number, limit?: nu
 export declare function getReadCursor(agentId: string, targetType: string, targetId: string): number;
 export declare function setReadCursor(agentId: string, targetType: string, targetId: string, seq: number): void;
 export interface UnreadSummary {
-    type: 'room' | 'task';
+    type: 'team' | 'task' | 'dm';
     id: string;
     name: string | null;
     kind: string;

package/dist/db.js

@@ -28,26 +28,45 @@ export function initDB(dbPath) {
     CREATE INDEX IF NOT EXISTS idx_agents_token ON agents(token);
     CREATE INDEX IF NOT EXISTS idx_agents_roles ON agents(roles);
 
-    CREATE TABLE IF NOT EXISTS rooms (
+    CREATE TABLE IF NOT EXISTS teams (
       id              TEXT PRIMARY KEY,
-      name            TEXT,
-      kind            TEXT NOT NULL CHECK(kind IN ('lobby','dm','team')),
+      name            TEXT NOT NULL UNIQUE,
       host_agent_id   TEXT REFERENCES agents(id),
       created_at      TEXT NOT NULL,
       closed_at       TEXT
     );
-    CREATE INDEX IF NOT EXISTS idx_rooms_kind ON rooms(kind);
 
-    CREATE TABLE IF NOT EXISTS room_events (
+    CREATE TABLE IF NOT EXISTS team_members (
+      team_id     TEXT NOT NULL REFERENCES teams(id),
+      agent_id    TEXT NOT NULL REFERENCES agents(id),
+      nickname    TEXT,
+      joined_at   TEXT NOT NULL,
+      PRIMARY KEY (team_id, agent_id),
+      UNIQUE (team_id, nickname)
+    );
+    CREATE INDEX IF NOT EXISTS idx_team_members_agent ON team_members(agent_id);
+
+    CREATE TABLE IF NOT EXISTS team_events (
       id              INTEGER PRIMARY KEY AUTOINCREMENT,
-      room_id         TEXT NOT NULL REFERENCES rooms(id),
+      team_id         TEXT NOT NULL REFERENCES teams(id),
       seq             INTEGER NOT NULL,
-      type            TEXT NOT NULL CHECK(type IN ('join','leave','message')),
+      type            TEXT NOT NULL CHECK(type IN ('join','leave','message','rename')),
       actor_agent_id  TEXT REFERENCES agents(id),
       payload_json    TEXT DEFAULT '{}',
       ts              TEXT NOT NULL
     );
-    CREATE INDEX IF NOT EXISTS idx_room_events_room_seq ON room_events(room_id, seq);
+    CREATE INDEX IF NOT EXISTS idx_team_events_team_seq ON team_events(team_id, seq);
+
+    CREATE TABLE IF NOT EXISTS dm_messages (
+      id              INTEGER PRIMARY KEY AUTOINCREMENT,
+      seq             INTEGER NOT NULL,
+      from_agent_id   TEXT NOT NULL REFERENCES agents(id),
+      to_agent_id     TEXT NOT NULL REFERENCES agents(id),
+      content         TEXT NOT NULL,
+      ts              TEXT NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_dm_to_seq ON dm_messages(to_agent_id, seq);
+    CREATE INDEX IF NOT EXISTS idx_dm_from_seq ON dm_messages(from_agent_id, seq);
 
     CREATE TABLE IF NOT EXISTS tasks (
       id                TEXT PRIMARY KEY,
@@ -58,7 +77,7 @@ export function initDB(dbPath) {
                         CHECK(status IN ('created','proposing','approved','in_progress','completed','failed','canceled')),
       workflow_json     TEXT,
       current_step      INTEGER DEFAULT 0,
-      source_room_id    TEXT REFERENCES rooms(id),
+      source_team_id    TEXT REFERENCES teams(id),
       input_json        TEXT DEFAULT '{}',
       created_at        TEXT NOT NULL,
       completed_at      TEXT
@@ -80,7 +99,7 @@ export function initDB(dbPath) {
 
     CREATE TABLE IF NOT EXISTS read_cursors (
       agent_id    TEXT NOT NULL REFERENCES agents(id),
-      target_type TEXT NOT NULL CHECK(target_type IN ('room','task')),
+      target_type TEXT NOT NULL CHECK(target_type IN ('team','task','dm')),
       target_id   TEXT NOT NULL,
       last_seq    INTEGER NOT NULL DEFAULT 0,
       PRIMARY KEY (agent_id, target_type, target_id)
@@ -123,8 +142,14 @@ export function getAgentByToken(token) {
 export function getAgentById(id) {
     return getDB().prepare('SELECT * FROM agents WHERE id = ?').get(id);
 }
-export function getAgentByName(name) {
-    return getDB().prepare('SELECT * FROM agents WHERE display_name = ?').get(name);
+export function getAgentsByName(name) {
+    return getDB().prepare('SELECT * FROM agents WHERE display_name = ?').all(name);
+}
+export function listAllAgents(activeOnly = false) {
+    const sql = activeOnly
+        ? "SELECT * FROM agents WHERE status = 'active' ORDER BY last_seen DESC"
+        : 'SELECT * FROM agents ORDER BY last_seen DESC';
+    return getDB().prepare(sql).all();
 }
 export function findAgentByRole(role) {
     return getDB().prepare("SELECT * FROM agents WHERE roles LIKE ? AND status = 'active' ORDER BY last_seen DESC LIMIT 1").get(`%${role}%`);
@@ -132,106 +157,159 @@ export function findAgentByRole(role) {
 export function touchAgent(id) {
     getDB().prepare('UPDATE agents SET last_seen = ? WHERE id = ?').run(nowISO(), id);
 }
-// --- Room queries ---
-export function createRoom(kind, hostAgentId, name) {
-    const room = {
-        id: ulid(), name: name ?? null, kind: kind,
-        host_agent_id: hostAgentId, created_at: nowISO(), closed_at: null,
+export function renameAgent(id, newName) {
+    getDB().prepare('UPDATE agents SET display_name = ? WHERE id = ?').run(newName, id);
+}
+export function resolveAddressee(callerAgentId, target) {
+    // 1) direct id
+    const byId = getAgentById(target);
+    if (byId)
+        return { agent: byId, source: 'id' };
+    // 2) nickname in caller's teams
+    const nickMatches = getDB().prepare(`
+    SELECT DISTINCT a.* FROM agents a
+    JOIN team_members tm ON tm.agent_id = a.id
+    WHERE tm.nickname = ?
+      AND tm.team_id IN (SELECT team_id FROM team_members WHERE agent_id = ?)
+  `).all(target, callerAgentId);
+    if (nickMatches.length === 1)
+        return { agent: nickMatches[0], source: 'team-nickname' };
+    if (nickMatches.length > 1)
+        return { error: `Nickname "${target}" matches multiple agents in your teams. Use agent id instead.` };
+    // 3) global display_name
+    const nameMatches = getAgentsByName(target);
+    if (nameMatches.length === 1)
+        return { agent: nameMatches[0], source: 'display-name' };
+    if (nameMatches.length > 1)
+        return { error: `Display name "${target}" matches multiple agents. Use agent id instead.` };
+    return { error: `No agent found matching "${target}".` };
+}
+// --- Team queries ---
+export function createTeam(name, hostAgentId) {
+    const team = {
+        id: ulid(), name,
+        host_agent_id: hostAgentId,
+        created_at: nowISO(), closed_at: null,
     };
     getDB().prepare(`
-    INSERT INTO rooms (id, name, kind, host_agent_id, created_at, closed_at)
-    VALUES (@id, @name, @kind, @host_agent_id, @created_at, @closed_at)
-  `).run(room);
-    return room;
+    INSERT INTO teams (id, name, host_agent_id, created_at, closed_at)
+    VALUES (@id, @name, @host_agent_id, @created_at, @closed_at)
+  `).run(team);
+    return team;
+}
+export function getTeamById(id) {
+    return getDB().prepare('SELECT * FROM teams WHERE id = ?').get(id);
+}
+export function getTeamByName(name) {
+    return getDB().prepare('SELECT * FROM teams WHERE name = ?').get(name);
+}
+export function listTeams(activeOnly = true) {
+    const sql = activeOnly
+        ? 'SELECT * FROM teams WHERE closed_at IS NULL ORDER BY created_at DESC'
+        : 'SELECT * FROM teams ORDER BY created_at DESC';
+    return getDB().prepare(sql).all();
+}
+export function getAgentTeams(agentId, activeOnly = true) {
+    const sql = activeOnly
+        ? `SELECT t.* FROM teams t JOIN team_members tm ON tm.team_id = t.id WHERE tm.agent_id = ? AND t.closed_at IS NULL ORDER BY tm.joined_at DESC`
+        : `SELECT t.* FROM teams t JOIN team_members tm ON tm.team_id = t.id WHERE tm.agent_id = ? ORDER BY tm.joined_at DESC`;
+    return getDB().prepare(sql).all(agentId);
+}
+// --- Team membership ---
+export function addTeamMember(teamId, agentId, nickname = null) {
+    const member = { team_id: teamId, agent_id: agentId, nickname, joined_at: nowISO() };
+    getDB().prepare(`
+    INSERT INTO team_members (team_id, agent_id, nickname, joined_at)
+    VALUES (@team_id, @agent_id, @nickname, @joined_at)
+    ON CONFLICT(team_id, agent_id) DO NOTHING
+  `).run(member);
+    return member;
 }
-export function getRoomById(id) {
-    return getDB().prepare('SELECT * FROM rooms WHERE id = ?').get(id);
+export function removeTeamMember(teamId, agentId) {
+    getDB().prepare('DELETE FROM team_members WHERE team_id = ? AND agent_id = ?').run(teamId, agentId);
 }
-export function getLobby() {
-    return getDB().prepare("SELECT * FROM rooms WHERE kind = 'lobby' LIMIT 1").get();
+export function isTeamMember(teamId, agentId) {
+    const row = getDB().prepare('SELECT 1 FROM team_members WHERE team_id = ? AND agent_id = ?').get(teamId, agentId);
+    return !!row;
 }
-export function findDMRoom(agentA, agentB) {
-    return getDB().prepare(`
-    SELECT r.* FROM rooms r
-    WHERE r.kind = 'dm'
-      AND EXISTS (SELECT 1 FROM room_events e WHERE e.room_id = r.id AND e.type = 'join' AND e.actor_agent_id = ?)
-      AND EXISTS (SELECT 1 FROM room_events e WHERE e.room_id = r.id AND e.type = 'join' AND e.actor_agent_id = ?)
-    LIMIT 1
-  `).get(agentA, agentB);
-}
-export function listTeams() {
-    return getDB().prepare("SELECT * FROM rooms WHERE kind = 'team' AND closed_at IS NULL ORDER BY created_at DESC").all();
-}
-// --- Room event queries ---
-export function appendRoomEvent(roomId, type, actorAgentId, payload = {}) {
+export function getTeamMembers(teamId) {
+    return getDB().prepare('SELECT * FROM team_members WHERE team_id = ?').all(teamId);
+}
+export function getTeamMemberAgentIds(teamId) {
+    return getDB().prepare('SELECT agent_id FROM team_members WHERE team_id = ?').all(teamId).map(r => r.agent_id);
+}
+export function setTeamNickname(teamId, agentId, nickname) {
+    getDB().prepare('UPDATE team_members SET nickname = ? WHERE team_id = ? AND agent_id = ?').run(nickname, teamId, agentId);
+}
+export function getTeamMember(teamId, agentId) {
+    return getDB().prepare('SELECT * FROM team_members WHERE team_id = ? AND agent_id = ?').get(teamId, agentId);
+}
+// Display name for an agent in a team context (nickname || display_name)
+export function getTeamDisplayName(teamId, agentId) {
+    const member = getTeamMember(teamId, agentId);
+    if (member?.nickname)
+        return member.nickname;
+    const agent = getAgentById(agentId);
+    return agent?.display_name ?? 'unknown';
+}
+// --- Team event queries ---
+export function appendTeamEvent(teamId, type, actorAgentId, payload = {}) {
     const d = getDB();
     const ts = nowISO();
     const payloadJson = JSON.stringify(payload);
     const insert = d.transaction(() => {
-        const maxSeq = d.prepare('SELECT COALESCE(MAX(seq), 0) as max_seq FROM room_events WHERE room_id = ?').get(roomId);
+        const maxSeq = d.prepare('SELECT COALESCE(MAX(seq), 0) as max_seq FROM team_events WHERE team_id = ?').get(teamId);
         const seq = maxSeq.max_seq + 1;
-        const result = d.prepare('INSERT INTO room_events (room_id, seq, type, actor_agent_id, payload_json, ts) VALUES (?, ?, ?, ?, ?, ?)').run(roomId, seq, type, actorAgentId, payloadJson, ts);
+        const result = d.prepare('INSERT INTO team_events (team_id, seq, type, actor_agent_id, payload_json, ts) VALUES (?, ?, ?, ?, ?, ?)').run(teamId, seq, type, actorAgentId, payloadJson, ts);
         return { id: result.lastInsertRowid, seq };
     });
     const { id, seq } = insert();
-    return { id, room_id: roomId, seq, type, actor_agent_id: actorAgentId, payload_json: payloadJson, ts };
-}
-export function getRoomEvents(roomId, since = 0, limit = 50) {
-    return getDB().prepare('SELECT * FROM room_events WHERE room_id = ? AND seq > ? ORDER BY seq ASC LIMIT ?').all(roomId, since, limit);
-}
-export function getLastRoomEventTs(roomId) {
-    const row = getDB().prepare('SELECT ts FROM room_events WHERE room_id = ? ORDER BY seq DESC LIMIT 1').get(roomId);
-    return row?.ts ?? null;
-}
-export function getLatestRoomEvents(roomId, limit = 10) {
-    return getDB().prepare('SELECT * FROM (SELECT * FROM room_events WHERE room_id = ? ORDER BY seq DESC LIMIT ?) ORDER BY seq ASC').all(roomId, limit);
-}
-export function getRoomMembers(roomId) {
-    const events = getDB().prepare("SELECT type, actor_agent_id FROM room_events WHERE room_id = ? AND type IN ('join', 'leave') ORDER BY seq ASC").all(roomId);
-    const members = new Set();
-    for (const e of events) {
-        if (e.type === 'join')
-            members.add(e.actor_agent_id);
-        if (e.type === 'leave')
-            members.delete(e.actor_agent_id);
-    }
-    return [...members];
-}
-export function isMember(roomId, agentId) {
-    return getRoomMembers(roomId).includes(agentId);
-}
-export function getAgentRooms(agentId, kind, activeOnly) {
-    let sql = `
-    SELECT DISTINCT r.* FROM rooms r
-    JOIN room_events e ON e.room_id = r.id AND e.type = 'join' AND e.actor_agent_id = ?
-    WHERE NOT EXISTS (
-      SELECT 1 FROM room_events e2
-      WHERE e2.room_id = r.id AND e2.type = 'leave' AND e2.actor_agent_id = ? AND e2.seq > e.seq
-    )
-  `;
-    const params = [agentId, agentId];
-    if (kind) {
-        sql += ' AND r.kind = ?';
-        params.push(kind);
-    }
-    if (activeOnly) {
-        sql += ' AND r.closed_at IS NULL';
-    }
-    return getDB().prepare(sql).all(...params);
+    return { id, team_id: teamId, seq, type, actor_agent_id: actorAgentId, payload_json: payloadJson, ts };
+}
+export function getTeamEvents(teamId, since = 0, limit = 50) {
+    return getDB().prepare('SELECT * FROM team_events WHERE team_id = ? AND seq > ? ORDER BY seq ASC LIMIT ?').all(teamId, since, limit);
+}
+export function getLatestTeamEvents(teamId, limit = 10) {
+    return getDB().prepare('SELECT * FROM (SELECT * FROM team_events WHERE team_id = ? ORDER BY seq DESC LIMIT ?) ORDER BY seq ASC').all(teamId, limit);
+}
+// --- DM queries ---
+export function appendDM(fromAgentId, toAgentId, content) {
+    const d = getDB();
+    const ts = nowISO();
+    const insert = d.transaction(() => {
+        const maxSeq = d.prepare('SELECT COALESCE(MAX(seq), 0) as max_seq FROM dm_messages WHERE to_agent_id = ?').get(toAgentId);
+        const seq = maxSeq.max_seq + 1;
+        const result = d.prepare('INSERT INTO dm_messages (seq, from_agent_id, to_agent_id, content, ts) VALUES (?, ?, ?, ?, ?)').run(seq, fromAgentId, toAgentId, content, ts);
+        return { id: result.lastInsertRowid, seq };
+    });
+    const { id, seq } = insert();
+    return { id, seq, from_agent_id: fromAgentId, to_agent_id: toAgentId, content, ts };
+}
+export function getMaxIncomingDMId(toAgentId, fromAgentId) {
+    const row = getDB().prepare('SELECT MAX(id) AS max_id FROM dm_messages WHERE to_agent_id = ? AND from_agent_id = ?').get(toAgentId, fromAgentId);
+    return row?.max_id ?? 0;
+}
+export function getDMConversation(agentA, agentB, since = 0, limit = 50) {
+    return getDB().prepare(`
+    SELECT * FROM dm_messages
+    WHERE ((from_agent_id = ? AND to_agent_id = ?) OR (from_agent_id = ? AND to_agent_id = ?))
+      AND id > ?
+    ORDER BY id ASC LIMIT ?
+  `).all(agentA, agentB, agentB, agentA, since, limit);
 }
 // --- Task queries ---
-export function createTask(title, creatorId, assigneeId, sourceRoomId, input) {
+export function createTask(title, creatorId, assigneeId, sourceTeamId, input) {
     const task = {
         id: ulid(), title, creator_agent_id: creatorId,
         assignee_agent_id: assigneeId ?? null,
         status: 'created', workflow_json: null, current_step: 0,
-        source_room_id: sourceRoomId ?? null,
+        source_team_id: sourceTeamId ?? null,
         input_json: JSON.stringify(input ?? {}),
         created_at: nowISO(), completed_at: null,
     };
     getDB().prepare(`
-    INSERT INTO tasks (id, title, creator_agent_id, assignee_agent_id, status, workflow_json, current_step, source_room_id, input_json, created_at, completed_at)
-    VALUES (@id, @title, @creator_agent_id, @assignee_agent_id, @status, @workflow_json, @current_step, @source_room_id, @input_json, @created_at, @completed_at)
+    INSERT INTO tasks (id, title, creator_agent_id, assignee_agent_id, status, workflow_json, current_step, source_team_id, input_json, created_at, completed_at)
+    VALUES (@id, @title, @creator_agent_id, @assignee_agent_id, @status, @workflow_json, @current_step, @source_team_id, @input_json, @created_at, @completed_at)
   `).run(task);
     return task;
 }
@@ -291,29 +369,38 @@ export function setReadCursor(agentId, targetType, targetId, seq) {
 }
 export function getUnreadForAgent(agentId) {
     const result = [];
-    // Room unread
-    const rooms = getAgentRooms(agentId, undefined, true);
-    for (const room of rooms) {
-        const cursor = getReadCursor(agentId, 'room', room.id);
-        const unread = getDB().prepare('SELECT * FROM room_events WHERE room_id = ? AND seq > ? AND actor_agent_id != ? ORDER BY seq ASC LIMIT 10').all(room.id, cursor, agentId);
+    const d = getDB();
+    // Team unread
+    const teams = getAgentTeams(agentId, true);
+    for (const team of teams) {
+        const cursor = getReadCursor(agentId, 'team', team.id);
+        const unread = d.prepare('SELECT * FROM team_events WHERE team_id = ? AND seq > ? AND actor_agent_id != ? ORDER BY seq ASC LIMIT 10').all(team.id, cursor, agentId);
         if (unread.length === 0)
             continue;
-        const totalUnread = getDB().prepare('SELECT COUNT(*) as cnt FROM room_events WHERE room_id = ? AND seq > ? AND actor_agent_id != ?').get(room.id, cursor, agentId).cnt;
-        const latest = unread.slice(-5).map(e => {
-            const actor = getAgentById(e.actor_agent_id ?? '');
-            let preview = '';
-            try {
-                const p = JSON.parse(e.payload_json);
-                preview = p.content || '';
-            }
-            catch { }
-            return {
-                from: actor?.display_name ?? 'unknown', type: e.type,
-                preview: preview.length > 200 ? preview.slice(0, 200) + ' [summary — this is a preview, not a broken message]' : preview,
-                ts: e.ts,
-            };
-        });
-        result.push({ type: 'room', id: room.id, name: room.name, kind: room.kind, unread_count: totalUnread, latest });
+        const totalUnread = d.prepare('SELECT COUNT(*) as cnt FROM team_events WHERE team_id = ? AND seq > ? AND actor_agent_id != ?').get(team.id, cursor, agentId).cnt;
+        const latest = unread.slice(-5).map(e => ({
+            from: e.actor_agent_id ? getTeamDisplayName(team.id, e.actor_agent_id) : 'system',
+            type: e.type,
+            preview: previewFromPayload(e.payload_json),
+            ts: e.ts,
+        }));
+        result.push({ type: 'team', id: team.id, name: team.name, kind: 'team', unread_count: totalUnread, latest });
+    }
+    // DM unread (per-sender cursor: target_id = sender_agent_id)
+    const senders = d.prepare('SELECT DISTINCT from_agent_id FROM dm_messages WHERE to_agent_id = ?').all(agentId);
+    for (const { from_agent_id: senderId } of senders) {
+        const cursor = getReadCursor(agentId, 'dm', senderId);
+        const msgs = d.prepare('SELECT * FROM dm_messages WHERE to_agent_id = ? AND from_agent_id = ? AND id > ? ORDER BY id ASC').all(agentId, senderId, cursor);
+        if (msgs.length === 0)
+            continue;
+        const sender = getAgentById(senderId);
+        const latest = msgs.slice(-5).map(m => ({
+            from: sender?.display_name ?? 'unknown',
+            type: 'dm',
+            preview: m.content.length > 200 ? m.content.slice(0, 200) + ' [summary]' : m.content,
+            ts: m.ts,
+        }));
+        result.push({ type: 'dm', id: senderId, name: sender?.display_name ?? null, kind: 'dm', unread_count: msgs.length, latest });
     }
     // Task unread
     const tasks = getAgentTasks(agentId);
@@ -321,12 +408,12 @@ export function getUnreadForAgent(agentId) {
         if (['completed', 'failed', 'canceled'].includes(task.status))
             continue;
         const cursor = getReadCursor(agentId, 'task', task.id);
-        const unread = getDB().prepare('SELECT * FROM task_events WHERE task_id = ? AND seq > ? AND actor_agent_id != ? ORDER BY seq ASC LIMIT 10').all(task.id, cursor, agentId);
+        const unread = d.prepare('SELECT * FROM task_events WHERE task_id = ? AND seq > ? AND actor_agent_id != ? ORDER BY seq ASC LIMIT 10').all(task.id, cursor, agentId);
         if (unread.length === 0)
             continue;
-        const totalUnread = getDB().prepare('SELECT COUNT(*) as cnt FROM task_events WHERE task_id = ? AND seq > ? AND actor_agent_id != ?').get(task.id, cursor, agentId).cnt;
+        const totalUnread = d.prepare('SELECT COUNT(*) as cnt FROM task_events WHERE task_id = ? AND seq > ? AND actor_agent_id != ?').get(task.id, cursor, agentId).cnt;
         const latest = unread.slice(-5).map(e => {
-            const actor = getAgentById(e.actor_agent_id ?? '');
+            const actor = e.actor_agent_id ? getAgentById(e.actor_agent_id) : null;
             let preview = '';
             try {
                 const p = JSON.parse(e.payload_json);
@@ -343,6 +430,16 @@ export function getUnreadForAgent(agentId) {
     }
     return result;
 }
+function previewFromPayload(payloadJson) {
+    try {
+        const p = JSON.parse(payloadJson);
+        const text = p.content || p.message || p.preview || '';
+        return text.length > 200 ? text.slice(0, 200) + ' [summary]' : text;
+    }
+    catch {
+        return '';
+    }
+}
 export function addPeer(name, url, secret, exposed = '') {
     const peer = {
         id: ulid(), name, url, secret, exposed, status: 'active',