borgmcp-server 0.1.4 → 0.1.5

package/src/store.ts

@@ -1,8 +1,9 @@
-import { randomUUID } from "node:crypto";
+import { randomUUID, timingSafeEqual } from "node:crypto";
 import { statfsSync, statSync } from "node:fs";
 import { chmod, lstat, mkdir, open } from "node:fs/promises";
 import { dirname, join, parse, relative, resolve, sep } from "node:path";
 import { DatabaseSync } from "node:sqlite";
+import type { MessageTaxonomy } from "borgmcp-shared/domain";
 
 import { applyMigrations, assertMigrationsCurrent } from "./migrations.js";
 import { operatorErrors } from "./operator-error.js";
@@ -12,6 +13,7 @@ import {
   type Principal,
 } from "./principal.js";
 import { patchRoleSectionText, type RoleSectionPatchOp } from "./role-section.js";
+import { validateMessageTaxonomy } from "./message-taxonomy.js";
 
 export type CubeAccess = "read" | "write" | "manage";
 
@@ -20,6 +22,7 @@ export interface CubeRecord {
   readonly ownerId: string;
   readonly name: string;
   readonly directive: string;
+  readonly messageTaxonomy: MessageTaxonomy | null;
   readonly createdAt: string;
   readonly updatedAt: string;
 }
@@ -51,6 +54,22 @@ export interface EnrichedActivityRecord {
   readonly recipient_drone_ids: string[];
 }
 
+export type ActivityNotificationRecord = EnrichedActivityRecord & (
+  | {
+    readonly kind: "ack" | "claim";
+    readonly log_entry_id: string;
+    readonly ack_kind: "ack" | "claim";
+    readonly ack_at: string;
+    readonly entry_preview: string;
+    readonly author_drone_id?: string;
+    readonly claimant_drone_id?: string;
+    readonly claimant_role?: string | null;
+  }
+  | { readonly kind: "heartbeat_ping" }
+);
+
+export type ActivityStreamRecord = EnrichedActivityRecord | ActivityNotificationRecord;
+
 export interface ClaimRecord {
   readonly log_entry_id: string;
   readonly claimant_drone_id: string;
@@ -104,6 +123,8 @@ export interface DroneRecord {
   readonly hostname: string | null;
   readonly posture: "observer" | "participant";
   readonly created_at: string;
+  readonly last_log_post_at?: string | null;
+  readonly seen_since?: boolean;
 }
 
 export interface StoreDiagnostics {
@@ -153,10 +174,19 @@ export interface StoreRuntime {
   readonly forPrincipal: (principal: Principal) => ScopedStore;
   readonly maintenance: MaintenanceStore;
   readonly credentials: CredentialStore;
+  readonly liveness: LivenessStore;
   readonly diagnostics: () => StoreDiagnostics;
   readonly close: () => void;
 }
 
+export interface LivenessStore {
+  readonly scan: (options?: {
+    readonly silentMs?: number;
+    readonly cooldownMs?: number;
+    readonly limit?: number;
+  }) => ActivityNotificationRecord[];
+}
+
 export interface DigestPair {
   readonly lookup: Buffer;
   readonly verifier: Buffer;
@@ -206,6 +236,7 @@ export interface StoredDroneSessionDigest extends StoredSecretDigest {
   readonly cubeId: string;
   readonly droneId: string;
   readonly expiresAt: string;
+  readonly evictedAt: string | null;
 }
 
 export interface CredentialStore {
@@ -232,6 +263,7 @@ export interface CredentialStore {
   readonly clientExists: (clientId: string) => boolean;
   readonly clientIsActive: (clientId: string) => boolean;
   readonly findDroneSessionCredential: (lookup: Buffer) => StoredDroneSessionDigest | null;
+  readonly findActiveDroneSessionExpiry: (sessionId: string) => string | null;
   readonly rotateClientCredential: (input: {
     readonly clientId: string;
     readonly credentialId: string;
@@ -244,6 +276,7 @@ export interface ScopedStore {
   readonly createCube: (input: CreateCubeInput) => CreateCubeRecord;
   readonly listCubes: () => CubeRecord[];
   readonly getCube: (cubeId: string) => CubeRecord | null;
+  readonly updateCube: (cubeId: string, input: UpdateCubeInput) => CubeRecord;
   readonly updateDirective: (cubeId: string, directive: string) => void;
   readonly appendActivity: (cubeId: string, message: string) => ActivityRecord;
   readonly readActivity: (cubeId: string, limit: number) => ActivityRecord[];
@@ -252,6 +285,10 @@ export interface ScopedStore {
   readonly updateRole: (cubeId: string, roleId: string, input: UpdateRoleInput) => RoleRecord;
   readonly patchRoleSection: (cubeId: string, roleId: string, input: RoleSectionPatchOp) => RoleRecord;
   readonly listDrones: (cubeId: string) => DroneRecord[];
+  readonly listDronesSince: (cubeId: string, since: string) => {
+    readonly drones: DroneRecord[];
+    readonly since: string;
+  };
   readonly appendLog: (cubeId: string, input: {
     readonly message: string;
     readonly visibility?: "broadcast" | "direct";
@@ -267,7 +304,7 @@ export interface ScopedStore {
   readonly listDecisions: (cubeId: string) => DecisionRecord[];
   readonly subscribeActivity: (
     cubeId: string,
-    listener: (entry: EnrichedActivityRecord) => void,
+    listener: (entry: ActivityStreamRecord) => void,
   ) => (() => void);
   readonly attachSeat: (input: SeatAttachInput) => SeatAttachRecord;
 }
@@ -281,6 +318,7 @@ export interface CreateRoleInput {
   readonly isHumanSeat?: boolean;
   readonly canBroadcast?: boolean;
   readonly receivesAllDirect?: boolean;
+  readonly roleClass?: "queen" | "worker";
 }
 
 export interface UpdateRoleInput {
@@ -292,6 +330,12 @@ export interface UpdateRoleInput {
   readonly isHumanSeat?: boolean;
   readonly canBroadcast?: boolean;
   readonly receivesAllDirect?: boolean;
+  readonly roleClass?: "queen" | "worker";
+}
+
+export interface UpdateCubeInput {
+  readonly directive?: string;
+  readonly messageTaxonomy?: MessageTaxonomy | null;
 }
 
 export interface CreateCubeInput {
@@ -310,7 +354,6 @@ export interface CreateCubeRecord {
 export interface SeatAttachInput {
   readonly cubeId: string;
   readonly roleId: string;
-  readonly retryKey: string;
   readonly priorDroneId?: string;
   readonly droneId: string;
   readonly sessionId: string;
@@ -336,10 +379,7 @@ export interface SeatAttachRecord {
   };
   readonly sessionId: string;
   readonly expiresAt: string;
-  readonly generation: number;
-  readonly posture: "observer" | "participant";
-  readonly reattached: boolean;
-  readonly revokedSessionIds: readonly string[];
+  readonly result: "created" | "reused";
 }
 
 export interface MaintenanceStore {
@@ -449,12 +489,12 @@ export class CursorExpiredError extends Error {
   }
 }
 
-export class AttachConflictError extends Error {
-  readonly code = "ATTACH_CONFLICT";
+export class AttachSessionRejectedError extends Error {
+  readonly code = "SESSION_REJECTED";
 
   constructor() {
-    super("The attach request conflicts with an existing attachment.");
-    this.name = "AttachConflictError";
+    super("The saved session is not accepted for this seat.");
+    this.name = "AttachSessionRejectedError";
   }
 }
 
@@ -482,6 +522,7 @@ interface CubeRow {
   readonly owner_id: string;
   readonly name: string;
   readonly directive: string;
+  readonly message_taxonomy: string | null;
   readonly created_at: string;
   readonly updated_at: string;
 }
@@ -573,9 +614,10 @@ export async function openStore(options: OpenStoreOptions): Promise<StoreRuntime
     capacityProbe,
     requiredInteger(pageRow, "page_size"),
   );
+  const activityHub = new ActivityHub();
   const maintenance = new SqliteMaintenanceStore(database, clock);
+  const liveness = new SqliteLivenessStore(database, clock, activityHub, capacityGuard);
   const credentials = new SqliteCredentialStore(database, clock, capacityGuard, options.mutationHook);
-  const activityHub = new ActivityHub();
   return Object.freeze({
     forPrincipal: (principal: Principal) => {
       assertServerDerivedPrincipal(principal);
@@ -592,6 +634,7 @@ export async function openStore(options: OpenStoreOptions): Promise<StoreRuntime
     },
     maintenance,
     credentials,
+    liveness,
     diagnostics: () => diagnostics(database),
     close: () => database.close(),
   });
@@ -712,7 +755,8 @@ class SqliteScopedStore implements ScopedStore {
   listCubes(): CubeRecord[] {
     const scope = this.#scope("read");
     const rows = this.#database.prepare(`
-      SELECT c.id, c.owner_id, c.name, c.directive, c.created_at, c.updated_at
+      SELECT c.id, c.owner_id, c.name, c.directive, c.message_taxonomy,
+             c.created_at, c.updated_at
       FROM cubes AS c
       WHERE ${scope.sql}
       ORDER BY c.id
@@ -724,7 +768,8 @@ class SqliteScopedStore implements ScopedStore {
     assertCanonicalUuid(cubeId, "Cube id");
     const scope = this.#scope("read");
     const row = this.#database.prepare(`
-      SELECT c.id, c.owner_id, c.name, c.directive, c.created_at, c.updated_at
+      SELECT c.id, c.owner_id, c.name, c.directive, c.message_taxonomy,
+             c.created_at, c.updated_at
       FROM cubes AS c
       WHERE c.id = ? AND ${scope.sql}
     `).get(cubeId, ...scope.parameters);
@@ -732,17 +777,42 @@ class SqliteScopedStore implements ScopedStore {
   }
 
   updateDirective(cubeId: string, directive: string): void {
+    this.updateCube(cubeId, { directive });
+  }
+
+  updateCube(cubeId: string, input: UpdateCubeInput): CubeRecord {
     assertCanonicalUuid(cubeId, "Cube id");
-    validateDirective(directive);
+    if (input.directive === undefined && input.messageTaxonomy === undefined) {
+      throw new TypeError("At least one cube field is required.");
+    }
+    if (input.directive !== undefined) validateDirective(input.directive);
+    const taxonomy = input.messageTaxonomy === undefined
+      ? undefined
+      : validateMessageTaxonomy(input.messageTaxonomy);
+    const serializedTaxonomy = taxonomy === undefined ? undefined : serializeTaxonomy(taxonomy);
     const scope = this.#scope("manage");
     this.#requireCube(cubeId, "manage");
-    this.#capacityGuard.assertCanGrow(Buffer.byteLength(directive));
+    this.#capacityGuard.assertCanGrow(
+      Buffer.byteLength(input.directive ?? "") + Buffer.byteLength(serializedTaxonomy ?? ""),
+    );
     const result = this.#database.prepare(`
       UPDATE cubes AS c
-      SET directive = ?, updated_at = ?
+      SET directive = COALESCE(?, directive),
+          message_taxonomy = CASE WHEN ? = 1 THEN ? ELSE message_taxonomy END,
+          updated_at = ?
       WHERE c.id = ? AND ${scope.sql}
-    `).run(directive, this.#now(), cubeId, ...scope.parameters);
+    `).run(
+      input.directive ?? null,
+      serializedTaxonomy === undefined ? 0 : 1,
+      serializedTaxonomy ?? null,
+      this.#now(),
+      cubeId,
+      ...scope.parameters,
+    );
     if (result.changes !== 1) throw new ScopedStoreError();
+    const cube = this.getCube(cubeId);
+    if (cube === null) throw new ScopedStoreError();
+    return cube;
   }
 
   appendActivity(cubeId: string, message: string): ActivityRecord {
@@ -803,6 +873,7 @@ class SqliteScopedStore implements ScopedStore {
     ]) {
       if (value !== undefined && typeof value !== "boolean") throw new TypeError("Role flags must be boolean.");
     }
+    validateRoleClass(input.roleClass);
     const isDefault = input.isDefault ?? false;
     const isMandatory = input.isMandatory ?? false;
     const isHumanSeat = input.isHumanSeat ?? false;
@@ -832,11 +903,12 @@ class SqliteScopedStore implements ScopedStore {
           id, cube_id, name, short_description, detailed_description,
           is_default, is_mandatory, is_human_seat, can_broadcast,
           receives_all_direct, role_class, created_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'worker', ?)
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       `).run(
         id, cubeId, input.name, shortDescription, detailedDescription,
         booleanInteger(isDefault), booleanInteger(isMandatory), booleanInteger(isHumanSeat),
-        booleanInteger(canBroadcast), booleanInteger(receivesAllDirect), this.#now(),
+        booleanInteger(canBroadcast), booleanInteger(receivesAllDirect), input.roleClass ?? "worker",
+        this.#now(),
       );
       this.#mutationHook?.("role.insert");
       const row = this.#database.prepare(`
@@ -875,6 +947,7 @@ class SqliteScopedStore implements ScopedStore {
     ]) {
       if (value !== undefined && typeof value !== "boolean") throw new TypeError("Role flags must be boolean.");
     }
+    validateRoleClass(input.roleClass);
     this.#requireCube(cubeId, "manage");
     this.#capacityGuard.assertCanGrow(
       Buffer.byteLength(input.name ?? "") + Buffer.byteLength(input.shortDescription ?? "") +
@@ -911,7 +984,8 @@ class SqliteScopedStore implements ScopedStore {
       this.#database.prepare(`
         UPDATE roles SET
           name = ?, short_description = ?, detailed_description = ?, is_default = ?,
-          is_mandatory = ?, is_human_seat = ?, can_broadcast = ?, receives_all_direct = ?
+          is_mandatory = ?, is_human_seat = ?, can_broadcast = ?, receives_all_direct = ?,
+          role_class = ?
         WHERE id = ? AND cube_id = ?
       `).run(
         input.name ?? existing.name,
@@ -922,6 +996,7 @@ class SqliteScopedStore implements ScopedStore {
         booleanInteger(input.isHumanSeat ?? existing.is_human_seat),
         booleanInteger(input.canBroadcast ?? existing.can_broadcast),
         booleanInteger(input.receivesAllDirect ?? existing.receives_all_direct),
+        input.roleClass ?? existing.role_class,
         roleId,
         cubeId,
       );
@@ -1006,6 +1081,50 @@ class SqliteScopedStore implements ScopedStore {
     return rows.map(droneRecord);
   }
 
+  listDronesSince(cubeId: string, since: string): { drones: DroneRecord[]; since: string } {
+    this.#requireCube(cubeId, "read");
+    let createdAt: string;
+    let anchorId: string | null = null;
+    if (/^[0-9a-f]{8}-[0-9a-f-]{27}$/iu.test(since)) {
+      const anchor = this.#database.prepare(
+        "SELECT id, created_at FROM activity_log WHERE id = ? AND cube_id = ?",
+      ).get(since, cubeId);
+      if (anchor === undefined) throw new ScopedStoreError();
+      anchorId = requiredText(anchor, "id");
+      createdAt = requiredText(anchor, "created_at");
+    } else {
+      validateTimestamp(since);
+      createdAt = since;
+    }
+    const rows = this.#database.prepare(`
+      SELECT drone.id, drone.cube_id, drone.role_id, drone.label,
+             COALESCE(drone.last_seen, drone.created_at) AS last_seen,
+             drone.hostname, drone.created_at,
+             CASE WHEN client.revoked_at IS NULL AND grant_row.access IN ('write', 'manage')
+               THEN 'participant' ELSE 'observer' END AS posture,
+             (SELECT MAX(post.created_at) FROM activity_log AS post
+              WHERE post.cube_id = drone.cube_id AND post.drone_id = drone.id) AS last_log_post_at,
+             EXISTS (SELECT 1 FROM activity_log AS response
+              WHERE response.cube_id = drone.cube_id AND response.drone_id = drone.id
+                AND (response.created_at > ? OR
+                   (? IS NOT NULL AND response.created_at = ? AND response.id > ?))) AS seen_since
+      FROM drones AS drone
+      LEFT JOIN clients AS client ON client.id = drone.client_id
+      LEFT JOIN client_cube_grants AS grant_row
+        ON grant_row.client_id = drone.client_id AND grant_row.cube_id = drone.cube_id
+      WHERE drone.cube_id = ? AND drone.evicted_at IS NULL
+      ORDER BY drone.label, drone.id
+    `).all(createdAt, anchorId, createdAt, anchorId, cubeId);
+    return {
+      since: createdAt,
+      drones: rows.map((row) => ({
+        ...droneRecord(row),
+        last_log_post_at: nullableText(row, "last_log_post_at"),
+        seen_since: requiredInteger(row, "seen_since") === 1,
+      })),
+    };
+  }
+
   appendLog(cubeId: string, input: {
     readonly message: string;
     readonly visibility?: "broadcast" | "direct";
@@ -1052,6 +1171,12 @@ class SqliteScopedStore implements ScopedStore {
         createdAt, visibility, cubeId, ...scope.parameters,
       );
       if (inserted.changes !== 1) throw new ScopedStoreError();
+      if (droneId !== null) {
+        this.#database.prepare(`
+          UPDATE drones SET last_seen = ? WHERE id = ? AND cube_id = ? AND evicted_at IS NULL
+        `).run(createdAt, droneId, cubeId);
+        this.#database.prepare("DELETE FROM silent_seat_ping_state WHERE drone_id = ?").run(droneId);
+      }
       if (recipients.length > 0) {
         const valid = this.#database.prepare(`
           SELECT COUNT(*) AS count
@@ -1125,19 +1250,56 @@ class SqliteScopedStore implements ScopedStore {
     this.#requireCube(cubeId, "write");
     assertCanonicalUuid(entryId, "Activity entry id");
     if (kind !== "ack" && kind !== "claim") throw new Error("Unknown acknowledgement kind.");
-    const exists = this.#database.prepare(
-      "SELECT 1 AS present FROM activity_log WHERE id = ? AND cube_id = ?",
-    ).get(entryId, cubeId);
-    if (exists === undefined) throw new ScopedStoreError();
+    const original = this.#database.prepare(`
+      SELECT drone_id, message, visibility FROM activity_log WHERE id = ? AND cube_id = ?
+    `).get(entryId, cubeId);
+    if (original === undefined) throw new ScopedStoreError();
     this.#capacityGuard.assertCanGrow(512);
     const claimant = this.#principal.kind === "drone-session"
       ? this.#principal.droneId
       : this.#principal.id;
-    this.#database.prepare(`
+    const ackAt = this.#now();
+    const inserted = this.#database.prepare(`
       INSERT OR IGNORE INTO activity_acks (
         entry_id, principal_kind, principal_id, kind, created_at, claimant_drone_id
       ) VALUES (?, ?, ?, ?, ?, ?)
-    `).run(entryId, this.#principal.kind, this.#principal.id, kind, this.#now(), claimant);
+    `).run(entryId, this.#principal.kind, this.#principal.id, kind, ackAt, claimant);
+    if (inserted.changes !== 1 || this.#principal.kind !== "drone-session") return;
+    const claimantDroneId = this.#principal.droneId;
+
+    const actor = this.#database.prepare(`
+      SELECT drone.label, role.name AS role_name
+      FROM drones AS drone JOIN roles AS role ON role.id = drone.role_id
+      WHERE drone.id = ? AND drone.cube_id = ? AND drone.evicted_at IS NULL
+    `).get(claimantDroneId, cubeId);
+    const preview = activityPreview(requiredText(original, "message"));
+    const originalAuthor = nullableText(original, "drone_id");
+    const recipients = kind === "ack"
+      ? originalAuthor === null ? [] : [originalAuthor]
+      : this.#claimAudience(cubeId, entryId, requiredText(original, "visibility"))
+        .filter((droneId) => droneId !== claimantDroneId);
+    if (recipients.length === 0) return;
+    const roleName = actor === undefined ? null : requiredText(actor, "role_name");
+    const notification: ActivityNotificationRecord = {
+      kind,
+      id: randomUUID(),
+      cube_id: cubeId,
+      drone_id: claimantDroneId,
+      drone_label: actor === undefined ? null : requiredText(actor, "label"),
+      role_name: roleName,
+      message: `[${kind.toUpperCase()}] ${preview}`,
+      created_at: ackAt,
+      visibility: "direct",
+      recipient_drone_ids: recipients,
+      log_entry_id: entryId,
+      ack_kind: kind,
+      ack_at: ackAt,
+      entry_preview: preview,
+      ...(kind === "ack"
+        ? { author_drone_id: recipients[0]! }
+        : { claimant_drone_id: claimantDroneId, claimant_role: roleName }),
+    };
+    this.#activityHub.publish(cubeId, notification);
   }
 
   recordDecision(cubeId: string, input: {
@@ -1194,7 +1356,6 @@ class SqliteScopedStore implements ScopedStore {
     if (this.#principal.kind !== "client") throw new ScopedStoreError();
     assertCanonicalUuid(input.cubeId, "Cube id");
     assertCanonicalUuid(input.roleId, "Role id");
-    assertCanonicalUuid(input.retryKey, "Retry key");
     if (input.priorDroneId !== undefined) assertCanonicalUuid(input.priorDroneId, "Prior drone id");
     assertCanonicalUuid(input.droneId, "Drone id");
     assertCanonicalUuid(input.sessionId, "Drone session id");
@@ -1219,95 +1380,96 @@ class SqliteScopedStore implements ScopedStore {
         WHERE c.id = ? AND role.id = ? AND ${scope.sql}
       `).get(input.cubeId, input.roleId, ...scope.parameters);
       if (roleRow === undefined) throw new ScopedStoreError();
-      const posture = this.#allowsDirectedWork(input.cubeId) ? "participant" : "observer";
-
-      const retryBinding = this.#database.prepare(`
-        SELECT binding.cube_id AS binding_cube_id,
-               binding.requested_role_id AS binding_requested_role_id,
-               binding.prior_drone_id, drone.id, drone.label,
-               drone.attach_generation, drone.evicted_at
-        FROM seat_attach_bindings AS binding
-        JOIN drones AS drone ON drone.id = binding.drone_id
-        WHERE binding.client_id = ? AND binding.retry_key = ?
-      `).get(this.#principal.id, input.retryKey);
+      const bound = this.#database.prepare(`
+        SELECT credential.verifier_digest, credential.revoked_at AS credential_revoked_at,
+               session.id AS session_id, session.client_id, session.cube_id, session.drone_id,
+               session.expires_at, session.revoked_at AS session_revoked_at,
+               drone.role_id, drone.label, drone.evicted_at
+        FROM drone_session_credentials AS credential
+        JOIN drone_sessions AS session ON session.id = credential.session_id
+        JOIN drones AS drone ON drone.id = session.drone_id
+          AND drone.client_id = session.client_id AND drone.cube_id = session.cube_id
+        WHERE credential.lookup_digest = ?
+      `).get(input.credentialDigest.lookup);
+      if (bound !== undefined) {
+        const verifier = requiredBuffer(bound, "verifier_digest");
+        if (!timingSafeEqual(verifier, input.credentialDigest.verifier) ||
+            optionalText(bound, "credential_revoked_at") !== null ||
+            optionalText(bound, "session_revoked_at") !== null ||
+            optionalText(bound, "evicted_at") !== null ||
+            requiredText(bound, "expires_at") <= now ||
+            requiredText(bound, "client_id") !== this.#principal.id ||
+            requiredText(bound, "cube_id") !== input.cubeId ||
+            requiredText(bound, "role_id") !== input.roleId ||
+            (input.priorDroneId !== undefined &&
+              requiredText(bound, "drone_id") !== input.priorDroneId)) {
+          throw new AttachSessionRejectedError();
+        }
+        const droneId = requiredText(bound, "drone_id");
+        this.#database.prepare("UPDATE drones SET last_seen = ? WHERE id = ?").run(now, droneId);
+        this.#database.prepare("DELETE FROM silent_seat_ping_state WHERE drone_id = ?").run(droneId);
+        const attachedRoleRow = this.#database.prepare(`
+          SELECT id AS role_id, name AS role_name, role_class, is_human_seat
+          FROM roles WHERE id = ? AND cube_id = ?
+        `).get(requiredText(bound, "role_id"), input.cubeId);
+        if (attachedRoleRow === undefined) throw new Error("Attached drone role is unavailable.");
+        const roleClass = requiredText(attachedRoleRow, "role_class");
+        if (roleClass !== "queen" && roleClass !== "worker") {
+          throw new Error("Database contains invalid role class.");
+        }
+        this.#database.exec("COMMIT");
+        return {
+          cube: {
+            id: requiredText(roleRow, "cube_id"),
+            name: requiredText(roleRow, "cube_name"),
+          },
+          role: {
+            id: requiredText(attachedRoleRow, "role_id"),
+            name: requiredText(attachedRoleRow, "role_name"),
+            role_class: roleClass,
+            is_human_seat: requiredInteger(attachedRoleRow, "is_human_seat") === 1,
+          },
+          drone: { id: droneId, label: requiredText(bound, "label") },
+          sessionId: requiredText(bound, "session_id"),
+          expiresAt: requiredText(bound, "expires_at"),
+          result: "reused",
+        };
+      }
+
+      const priorSeat = input.priorDroneId === undefined ? undefined : this.#database.prepare(`
+        SELECT id, role_id, label FROM drones
+        WHERE id = ? AND client_id = ? AND cube_id = ? AND evicted_at IS NULL
+      `).get(input.priorDroneId, this.#principal.id, input.cubeId);
       let droneId: string;
       let droneLabel: string;
-      let reattached: boolean;
-      let generation: number;
-      if (retryBinding !== undefined) {
-        if (optionalText(retryBinding, "evicted_at") != null) throw new ScopedStoreError();
-        if (requiredText(retryBinding, "binding_cube_id") !== input.cubeId ||
-            requiredText(retryBinding, "binding_requested_role_id") !== input.roleId ||
-            nullableText(retryBinding, "prior_drone_id") !== (input.priorDroneId ?? null)) {
-          throw new AttachConflictError();
+      if (priorSeat !== undefined) {
+        const priorSeatId = requiredText(priorSeat, "id");
+        if (requiredText(priorSeat, "role_id") !== input.roleId) {
+          throw new AttachSessionRejectedError();
         }
-        droneId = requiredText(retryBinding, "id");
-        droneLabel = requiredText(retryBinding, "label");
-        generation = requiredInteger(retryBinding, "attach_generation") + 1;
-        this.#database.prepare(`
-          UPDATE drones SET last_seen = ?, attach_generation = ? WHERE id = ?
-        `).run(now, generation, droneId);
-        reattached = true;
+        const occupied = this.#database.prepare(`
+          SELECT 1 FROM drone_sessions AS session
+          JOIN drone_session_credentials AS credential ON credential.session_id = session.id
+          WHERE session.drone_id = ? AND session.client_id = ? AND session.cube_id = ?
+            AND session.revoked_at IS NULL AND credential.revoked_at IS NULL
+            AND session.expires_at > ?
+        `).get(priorSeatId, this.#principal.id, input.cubeId, now);
+        if (occupied !== undefined) throw new AttachSessionRejectedError();
+        droneId = priorSeatId;
+        droneLabel = requiredText(priorSeat, "label");
+        this.#database.prepare("UPDATE drones SET last_seen = ? WHERE id = ?").run(now, droneId);
       } else {
-        const priorSeat = input.priorDroneId === undefined ? undefined : this.#database.prepare(`
-          SELECT id, label, attach_generation
-          FROM drones
-          WHERE id = ? AND client_id = ? AND cube_id = ? AND evicted_at IS NULL
-        `).get(input.priorDroneId, this.#principal.id, input.cubeId);
-        if (priorSeat !== undefined) {
-          droneId = requiredText(priorSeat, "id");
-          droneLabel = requiredText(priorSeat, "label");
-          generation = requiredInteger(priorSeat, "attach_generation") + 1;
-          this.#database.prepare(`
-            UPDATE drones SET last_seen = ?, attach_generation = ? WHERE id = ?
-          `).run(now, generation, droneId);
-          reattached = true;
-        } else {
-          droneId = input.droneId;
-          droneLabel = seatLabel(requiredText(roleRow, "role_name"), droneId);
-          this.#database.prepare(`
-            INSERT INTO drones (
-              id, cube_id, role_id, client_id, label, created_at, last_seen, retry_key,
-              attach_generation
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1)
-          `).run(
-            droneId,
-            input.cubeId,
-            input.roleId,
-            this.#principal.id,
-            droneLabel,
-            now,
-            now,
-            input.retryKey,
-          );
-          reattached = false;
-          generation = 1;
-        }
+        droneId = input.droneId;
+        droneLabel = seatLabel(requiredText(roleRow, "role_name"), droneId);
         this.#database.prepare(`
-          INSERT INTO seat_attach_bindings (
-            client_id, retry_key, cube_id, requested_role_id, drone_id, prior_drone_id, created_at
-          ) VALUES (?, ?, ?, ?, ?, ?, ?)
+          INSERT INTO drones (id, cube_id, role_id, client_id, label, created_at, last_seen)
+          VALUES (?, ?, ?, ?, ?, ?, ?)
         `).run(
-          this.#principal.id, input.retryKey, input.cubeId, input.roleId,
-          droneId, input.priorDroneId ?? null, now,
+          droneId, input.cubeId, input.roleId, this.#principal.id, droneLabel, now, now,
         );
       }
+      this.#database.prepare("DELETE FROM silent_seat_ping_state WHERE drone_id = ?").run(droneId);
 
-      const oldSessions = this.#database.prepare(
-        "SELECT id FROM drone_sessions WHERE drone_id = ? AND client_id = ? AND cube_id = ?",
-      ).all(droneId, this.#principal.id, input.cubeId)
-        .map((row) => requiredText(row, "id"));
-      if (oldSessions.length > 0) {
-        const placeholders = oldSessions.map(() => "?").join(", ");
-        this.#database.prepare(`
-          UPDATE drone_session_credentials SET revoked_at = ?
-          WHERE session_id IN (${placeholders}) AND revoked_at IS NULL
-        `).run(now, ...oldSessions);
-        this.#database.prepare(`
-          UPDATE drone_sessions SET revoked_at = ?
-          WHERE id IN (${placeholders}) AND revoked_at IS NULL
-        `).run(now, ...oldSessions);
-      }
       this.#database.prepare(`
         INSERT INTO drone_sessions (
           id, client_id, cube_id, drone_id, created_at, expires_at
@@ -1355,10 +1517,7 @@ class SqliteScopedStore implements ScopedStore {
         drone: { id: droneId, label: droneLabel },
         sessionId: input.sessionId,
         expiresAt: input.expiresAt,
-        generation,
-        posture,
-        reattached,
-        revokedSessionIds: oldSessions,
+        result: "created",
       };
     } catch (error) {
       try { this.#database.exec("ROLLBACK"); } catch { /* Preserve the original failure. */ }
@@ -1366,13 +1525,44 @@ class SqliteScopedStore implements ScopedStore {
     }
   }
 
-  subscribeActivity(cubeId: string, listener: (entry: EnrichedActivityRecord) => void): () => void {
+  subscribeActivity(cubeId: string, listener: (entry: ActivityStreamRecord) => void): () => void {
     this.#requireCube(cubeId, "read");
     return this.#activityHub.subscribe(cubeId, (entry) => {
+      if ("kind" in entry) {
+        if (this.#principal.kind === "drone-session" &&
+            entry.recipient_drone_ids.includes(this.#principal.droneId)) listener(entry);
+        return;
+      }
       if (entry.visibility === "broadcast" || this.#allowsDirectedWork(cubeId)) listener(entry);
     });
   }
 
+  #claimAudience(cubeId: string, entryId: string, visibility: string): string[] {
+    if (visibility === "direct") {
+      return this.#database.prepare(`
+        SELECT recipient.drone_id
+        FROM activity_log_recipients AS recipient
+        JOIN drones AS drone ON drone.id = recipient.drone_id
+        JOIN clients AS client ON client.id = drone.client_id
+        JOIN client_cube_grants AS grant_row
+          ON grant_row.client_id = drone.client_id AND grant_row.cube_id = drone.cube_id
+        WHERE recipient.entry_id = ? AND drone.cube_id = ? AND drone.evicted_at IS NULL
+          AND client.revoked_at IS NULL AND grant_row.access IN ('write', 'manage')
+        ORDER BY recipient.drone_id
+      `).all(entryId, cubeId).map((row) => requiredText(row, "drone_id"));
+    }
+    return this.#database.prepare(`
+      SELECT drone.id AS drone_id
+      FROM drones AS drone
+      JOIN clients AS client ON client.id = drone.client_id
+      JOIN client_cube_grants AS grant_row
+        ON grant_row.client_id = drone.client_id AND grant_row.cube_id = drone.cube_id
+      WHERE drone.cube_id = ? AND drone.evicted_at IS NULL AND client.revoked_at IS NULL
+        AND grant_row.access IN ('write', 'manage')
+      ORDER BY drone.id
+    `).all(cubeId).map((row) => requiredText(row, "drone_id"));
+  }
+
   #allowsDirectedWork(cubeId: string): boolean {
     const scope = this.#scope("write");
     return this.#database.prepare(`
@@ -1386,7 +1576,15 @@ class SqliteScopedStore implements ScopedStore {
     const row = this.#database.prepare(`
       SELECT 1 AS present FROM cubes AS c WHERE c.id = ? AND ${scope.sql}
     `).get(cubeId, ...scope.parameters);
-    if (row === undefined) throw new ScopedStoreError();
+    if (row !== undefined) return;
+    if (access === "manage") {
+      const visibleScope = this.#scope("read");
+      const visible = this.#database.prepare(`
+        SELECT 1 AS present FROM cubes AS c WHERE c.id = ? AND ${visibleScope.sql}
+      `).get(cubeId, ...visibleScope.parameters);
+      if (visible !== undefined) throw new AccessDeniedError();
+    }
+    throw new ScopedStoreError();
   }
 
   #nextActivityTimestamp(cubeId: string): string {
@@ -1644,7 +1842,7 @@ class SqliteMaintenanceStore implements MaintenanceStore {
       for (const table of [
         "cube_create_bindings", "activity_acks", "activity_log_recipients", "activity_log",
         "decisions", "expired_activity_cursors", "drone_session_credentials", "drone_sessions",
-        "seat_attach_bindings", "drones", "roles", "client_cube_grants", "cubes", "client_server_capabilities",
+        "drones", "roles", "client_cube_grants", "cubes", "client_server_capabilities",
         "enrollment_claims", "client_credentials", "owner_enrollment_state", "clients",
         "enrollment_invitations",
       ]) this.#database.exec(`DELETE FROM ${table}`);
@@ -1812,9 +2010,9 @@ class SqliteMaintenanceStore implements MaintenanceStore {
 }
 
 class ActivityHub {
-  readonly #listeners = new Map<string, Set<(entry: EnrichedActivityRecord) => void>>();
+  readonly #listeners = new Map<string, Set<(entry: ActivityStreamRecord) => void>>();
 
-  subscribe(cubeId: string, listener: (entry: EnrichedActivityRecord) => void): () => void {
+  subscribe(cubeId: string, listener: (entry: ActivityStreamRecord) => void): () => void {
     const listeners = this.#listeners.get(cubeId) ?? new Set();
     listeners.add(listener);
     this.#listeners.set(cubeId, listeners);
@@ -1824,7 +2022,7 @@ class ActivityHub {
     };
   }
 
-  publish(cubeId: string, entry: EnrichedActivityRecord): void {
+  publish(cubeId: string, entry: ActivityStreamRecord): void {
     for (const listener of this.#listeners.get(cubeId) ?? []) {
       try {
         listener(entry);
@@ -1835,6 +2033,64 @@ class ActivityHub {
   }
 }
 
+class SqliteLivenessStore implements LivenessStore {
+  constructor(
+    readonly database: DatabaseSync,
+    readonly clock: () => Date,
+    readonly hub: ActivityHub,
+    readonly capacityGuard: StorageCapacityGuard,
+  ) {}
+
+  scan(options: { silentMs?: number; cooldownMs?: number; limit?: number } = {}): ActivityNotificationRecord[] {
+    const now = this.clock();
+    const silentBefore = new Date(now.getTime() - (options.silentMs ?? 600_000)).toISOString();
+    const cooldownBefore = new Date(now.getTime() - (options.cooldownMs ?? 600_000)).toISOString();
+    const limit = Math.max(1, Math.min(Math.trunc(options.limit ?? 25), 25));
+    const candidates = this.database.prepare(`
+      SELECT drone.id AS drone_id, drone.cube_id, COALESCE(state.attempts, 0) AS attempts
+      FROM drones AS drone
+      JOIN clients AS client ON client.id = drone.client_id AND client.revoked_at IS NULL
+      JOIN client_cube_grants AS grant_row ON grant_row.client_id = drone.client_id
+        AND grant_row.cube_id = drone.cube_id AND grant_row.access IN ('write', 'manage')
+      LEFT JOIN silent_seat_ping_state AS state ON state.drone_id = drone.id
+      WHERE drone.evicted_at IS NULL AND COALESCE(drone.last_seen, drone.created_at) < ?
+        AND COALESCE(state.attempts, 0) < 3
+        AND (state.last_ping_at IS NULL OR state.last_ping_at < ?)
+        AND EXISTS (SELECT 1 FROM drone_sessions AS session
+          WHERE session.drone_id = drone.id AND session.revoked_at IS NULL AND session.expires_at > ?)
+      ORDER BY COALESCE(drone.last_seen, drone.created_at), drone.id LIMIT ?
+    `).all(silentBefore, cooldownBefore, now.toISOString(), limit);
+    const published: ActivityNotificationRecord[] = [];
+    for (const candidate of candidates) {
+      const droneId = requiredText(candidate, "drone_id");
+      const cubeId = requiredText(candidate, "cube_id");
+      const message = "[HEARTBEAT-PING] No recent activity; confirm this seat is responsive.";
+      this.capacityGuard.assertCanGrow(256);
+      const id = randomUUID();
+      const createdAt = now.toISOString();
+      this.database.exec("BEGIN IMMEDIATE");
+      try {
+        this.database.prepare(`INSERT INTO silent_seat_ping_state (drone_id, attempts, last_ping_at)
+          VALUES (?, 1, ?) ON CONFLICT(drone_id) DO UPDATE
+          SET attempts = attempts + 1, last_ping_at = excluded.last_ping_at
+        `).run(droneId, now.toISOString());
+        this.database.exec("COMMIT");
+      } catch (error) {
+        try { this.database.exec("ROLLBACK"); } catch { /* Preserve original failure. */ }
+        throw error;
+      }
+      const entry: ActivityNotificationRecord = {
+        kind: "heartbeat_ping",
+        id, cube_id: cubeId, drone_id: null, message, visibility: "direct", created_at: createdAt,
+        drone_label: null, role_name: null, recipient_drone_ids: [droneId],
+      };
+      this.hub.publish(cubeId, entry);
+      published.push(entry);
+    }
+    return published;
+  }
+}
+
 class SqliteCredentialStore implements CredentialStore {
   readonly #database: DatabaseSync;
   readonly #clock: () => Date;
@@ -2159,9 +2415,8 @@ class SqliteCredentialStore implements CredentialStore {
       SELECT credential.id, credential.lookup_digest, credential.verifier_digest,
              credential.session_id, session.client_id, session.cube_id, session.drone_id,
              session.expires_at,
-             COALESCE(
-               credential.revoked_at, session.revoked_at, client.revoked_at, drone.evicted_at
-             ) AS revoked_at
+             COALESCE(credential.revoked_at, session.revoked_at, client.revoked_at) AS revoked_at,
+             drone.evicted_at
       FROM drone_session_credentials AS credential
       JOIN drone_sessions AS session ON session.id = credential.session_id
       JOIN clients AS client ON client.id = session.client_id
@@ -2173,6 +2428,21 @@ class SqliteCredentialStore implements CredentialStore {
     return row === undefined ? null : storedDroneSessionDigest(row);
   }
 
+  findActiveDroneSessionExpiry(sessionId: string): string | null {
+    assertCanonicalUuid(sessionId, "Drone session id");
+    const row = this.#database.prepare(`
+      SELECT session.expires_at
+      FROM drone_sessions AS session
+      JOIN clients AS client ON client.id = session.client_id
+      JOIN drones AS drone ON drone.id = session.drone_id
+        AND drone.client_id = session.client_id
+        AND drone.cube_id = session.cube_id
+      WHERE session.id = ? AND session.revoked_at IS NULL
+        AND client.revoked_at IS NULL AND drone.evicted_at IS NULL
+    `).get(sessionId);
+    return row === undefined ? null : requiredText(row, "expires_at");
+  }
+
   rotateClientCredential(input: {
     readonly clientId: string;
     readonly credentialId: string;
@@ -2195,6 +2465,16 @@ class SqliteCredentialStore implements CredentialStore {
         UPDATE client_credentials SET revoked_at = ?
         WHERE client_id = ? AND revoked_at IS NULL
       `).run(now, input.clientId);
+      this.#database.prepare(`
+        UPDATE drone_session_credentials SET revoked_at = ?
+        WHERE revoked_at IS NULL AND session_id IN (
+          SELECT id FROM drone_sessions WHERE client_id = ?
+        )
+      `).run(now, input.clientId);
+      this.#database.prepare(`
+        UPDATE drone_sessions SET revoked_at = ?
+        WHERE client_id = ? AND revoked_at IS NULL
+      `).run(now, input.clientId);
       this.#database.prepare(`
         INSERT INTO client_credentials (
           id, client_id, lookup_digest, verifier_digest, created_at
@@ -2361,6 +2641,7 @@ function cubeRecord(row: CubeRow): CubeRecord {
     ownerId: row.owner_id,
     name: row.name,
     directive: row.directive,
+    messageTaxonomy: parseTaxonomy(row.message_taxonomy),
     createdAt: row.created_at,
     updatedAt: row.updated_at,
   };
@@ -2384,6 +2665,7 @@ function cubeRow(row: Record<string, unknown>): CubeRow {
     owner_id: requiredText(row, "owner_id"),
     name: requiredText(row, "name"),
     directive: requiredText(row, "directive"),
+    message_taxonomy: nullableText(row, "message_taxonomy"),
     created_at: requiredText(row, "created_at"),
     updated_at: requiredText(row, "updated_at"),
   };
@@ -2611,6 +2893,7 @@ function storedDroneSessionDigest(row: Record<string, unknown>): StoredDroneSess
     cubeId: requiredText(row, "cube_id"),
     droneId: requiredText(row, "drone_id"),
     expiresAt: requiredText(row, "expires_at"),
+    evictedAt: nullableText(row, "evicted_at"),
   };
 }
 
@@ -2696,6 +2979,34 @@ function validateDirective(value: string): void {
   }
 }
 
+function activityPreview(message: string): string {
+  return message.replace(/\s+/gu, " ").trim().slice(0, 200);
+}
+
+function validateRoleClass(value: unknown): void {
+  if (value !== undefined && value !== "queen" && value !== "worker") {
+    throw new TypeError("Role class must be queen or worker.");
+  }
+}
+
+function serializeTaxonomy(value: MessageTaxonomy | null): string | null {
+  if (value === null) return null;
+  const serialized = JSON.stringify(value);
+  if (Buffer.byteLength(serialized) > 100_000) {
+    throw new RangeError("Message taxonomy exceeds 100000 bytes.");
+  }
+  return serialized;
+}
+
+function parseTaxonomy(value: string | null): MessageTaxonomy | null {
+  if (value === null) return null;
+  try {
+    return validateMessageTaxonomy(JSON.parse(value));
+  } catch {
+    throw new Error("Database contains invalid message taxonomy.");
+  }
+}
+
 function validateDigest(digest: DigestPair): void {
   validateLookup(digest.lookup);
   if (digest.verifier.length !== 32) throw new Error("Verifier digest must contain 32 bytes.");