borgmcp-server 0.1.4 → 0.1.7

package/dist/store.js

@@ -1,4 +1,4 @@
-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";
@@ -7,6 +7,7 @@ import { applyMigrations, assertMigrationsCurrent } from "./migrations.js";
 import { operatorErrors } from "./operator-error.js";
 import { assertCanonicalUuid, assertServerDerivedPrincipal, } from "./principal.js";
 import { patchRoleSectionText } from "./role-section.js";
+import { validateMessageTaxonomy } from "./message-taxonomy.js";
 export const DEFAULT_CUBE_LIMITS = Object.freeze({
     maxCubesPerClient: 100,
     maxCubesTotal: 1_000,
@@ -53,6 +54,13 @@ export class RoleSectionConflictError extends Error {
         this.name = "RoleSectionConflictError";
     }
 }
+export class RoleInUseError extends Error {
+    code = "ROLE_IN_USE";
+    constructor() {
+        super("The human-seat role is already occupied.");
+        this.name = "RoleInUseError";
+    }
+}
 export class CursorExpiredError extends Error {
     code = "CURSOR_EXPIRED";
     constructor() {
@@ -60,11 +68,11 @@ export class CursorExpiredError extends Error {
         this.name = "CursorExpiredError";
     }
 }
-export class AttachConflictError extends Error {
-    code = "ATTACH_CONFLICT";
+export class AttachSessionRejectedError extends Error {
+    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";
     }
 }
 export class StorageCapacityError extends Error {
@@ -150,9 +158,10 @@ export async function openStore(options) {
         throw new Error("SQLite page size is unavailable.");
     }
     const capacityGuard = new StorageCapacityGuard(storageLimits, 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) => {
             assertServerDerivedPrincipal(principal);
@@ -160,6 +169,7 @@ export async function openStore(options) {
         },
         maintenance,
         credentials,
+        liveness,
         diagnostics: () => diagnostics(database),
         close: () => database.close(),
     });
@@ -267,7 +277,8 @@ class SqliteScopedStore {
     listCubes() {
         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
@@ -278,25 +289,43 @@ class SqliteScopedStore {
         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);
         return row === undefined ? null : cubeRecord(cubeRow(row));
     }
     updateDirective(cubeId, directive) {
+        this.updateCube(cubeId, { directive });
+    }
+    updateCube(cubeId, input) {
         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, message) {
         const entry = this.appendLog(cubeId, { message });
@@ -354,6 +383,7 @@ class SqliteScopedStore {
             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;
@@ -379,8 +409,8 @@ class SqliteScopedStore {
           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', ?)
-      `).run(id, cubeId, input.name, shortDescription, detailedDescription, booleanInteger(isDefault), booleanInteger(isMandatory), booleanInteger(isHumanSeat), booleanInteger(canBroadcast), booleanInteger(receivesAllDirect), this.#now());
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `).run(id, cubeId, input.name, shortDescription, detailedDescription, booleanInteger(isDefault), booleanInteger(isMandatory), booleanInteger(isHumanSeat), booleanInteger(canBroadcast), booleanInteger(receivesAllDirect), input.roleClass ?? "worker", this.#now());
             this.#mutationHook?.("role.insert");
             const row = this.#database.prepare(`
         SELECT id, cube_id, name, short_description, detailed_description,
@@ -425,6 +455,7 @@ class SqliteScopedStore {
             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 ?? "") +
             Buffer.byteLength(input.detailedDescription ?? "") + 8_192);
@@ -458,9 +489,10 @@ class SqliteScopedStore {
             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, input.shortDescription ?? existing.short_description, nextDetailedDescription, booleanInteger(input.isDefault ?? existing.is_default), booleanInteger(input.isMandatory ?? existing.is_mandatory), booleanInteger(input.isHumanSeat ?? existing.is_human_seat), booleanInteger(input.canBroadcast ?? existing.can_broadcast), booleanInteger(input.receivesAllDirect ?? existing.receives_all_direct), roleId, cubeId);
+      `).run(input.name ?? existing.name, input.shortDescription ?? existing.short_description, nextDetailedDescription, booleanInteger(input.isDefault ?? existing.is_default), booleanInteger(input.isMandatory ?? existing.is_mandatory), 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);
             const row = this.#database.prepare(`
         SELECT id, cube_id, name, short_description, detailed_description,
                is_default, is_mandatory, is_human_seat, can_broadcast,
@@ -547,6 +579,139 @@ class SqliteScopedStore {
     `).all(cubeId);
         return rows.map(droneRecord);
     }
+    listDronesSince(cubeId, since) {
+        this.#requireCube(cubeId, "read");
+        let createdAt;
+        let anchorId = 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,
+            })),
+        };
+    }
+    reassignDrone(cubeId, droneId, roleId) {
+        assertCanonicalUuid(cubeId, "Cube id");
+        assertCanonicalUuid(droneId, "Drone id");
+        assertCanonicalUuid(roleId, "Role id");
+        this.#requireCube(cubeId, "manage");
+        this.#database.exec("BEGIN IMMEDIATE");
+        try {
+            this.#requireCube(cubeId, "manage");
+            const droneRow = this.#database.prepare(`
+        SELECT id, cube_id, role_id, label FROM drones
+        WHERE id = ? AND cube_id = ? AND evicted_at IS NULL
+      `).get(droneId, cubeId);
+            const targetRoleRow = this.#database.prepare(`
+        SELECT id, is_human_seat, role_class FROM roles WHERE id = ? AND cube_id = ?
+      `).get(roleId, cubeId);
+            if (droneRow === undefined || targetRoleRow === undefined)
+                throw new ScopedStoreError();
+            const sourceRoleRow = this.#database.prepare(`
+        SELECT is_human_seat FROM roles WHERE id = ? AND cube_id = ?
+      `).get(requiredText(droneRow, "role_id"), cubeId);
+            if (sourceRoleRow === undefined)
+                throw new ScopedStoreError();
+            if (requiredText(targetRoleRow, "role_class") === "queen" &&
+                requiredInteger(sourceRoleRow, "is_human_seat") !== 1) {
+                throw new AccessDeniedError();
+            }
+            if (requiredInteger(targetRoleRow, "is_human_seat") === 1) {
+                const occupied = this.#database.prepare(`
+          SELECT 1 AS present FROM drones
+          WHERE cube_id = ? AND role_id = ? AND id <> ? AND evicted_at IS NULL
+        `).get(cubeId, roleId, droneId);
+                if (occupied !== undefined)
+                    throw new RoleInUseError();
+            }
+            this.#database.prepare("UPDATE drones SET role_id = ? WHERE id = ? AND cube_id = ?")
+                .run(roleId, droneId, cubeId);
+            const row = 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
+        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.id = ? AND drone.cube_id = ? AND drone.evicted_at IS NULL
+      `).get(droneId, cubeId);
+            if (row === undefined)
+                throw new ScopedStoreError();
+            this.#database.exec("COMMIT");
+            return droneRecord(row);
+        }
+        catch (error) {
+            try {
+                this.#database.exec("ROLLBACK");
+            }
+            catch { /* Preserve the original failure. */ }
+            throw error;
+        }
+    }
+    evictDrone(cubeId, droneId) {
+        assertCanonicalUuid(cubeId, "Cube id");
+        assertCanonicalUuid(droneId, "Drone id");
+        this.#requireCube(cubeId, "manage");
+        this.#database.exec("BEGIN IMMEDIATE");
+        try {
+            this.#requireCube(cubeId, "manage");
+            const active = this.#database.prepare(`
+        SELECT 1 AS present FROM drones WHERE id = ? AND cube_id = ? AND evicted_at IS NULL
+      `).get(droneId, cubeId);
+            if (active === undefined)
+                throw new ScopedStoreError();
+            const now = this.#now();
+            this.#database.prepare("UPDATE drones SET evicted_at = ? WHERE id = ? AND cube_id = ?")
+                .run(now, droneId, cubeId);
+            this.#database.prepare(`
+        UPDATE drone_sessions SET revoked_at = ?
+        WHERE drone_id = ? AND cube_id = ? AND revoked_at IS NULL
+      `).run(now, droneId, cubeId);
+            this.#database.exec("COMMIT");
+        }
+        catch (error) {
+            try {
+                this.#database.exec("ROLLBACK");
+            }
+            catch { /* Preserve the original failure. */ }
+            throw error;
+        }
+    }
     appendLog(cubeId, input) {
         assertCanonicalUuid(cubeId, "Cube id");
         if (input.message.length === 0 || Buffer.byteLength(input.message) > 10_240) {
@@ -592,6 +757,12 @@ class SqliteScopedStore {
       `).run(id, droneId, this.#principal.kind, this.#principal.id, input.message, 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
@@ -669,18 +840,58 @@ class SqliteScopedStore {
         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)
+        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 = {
+            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, input) {
         this.#requireCube(cubeId, "manage");
@@ -730,7 +941,6 @@ class SqliteScopedStore {
             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");
@@ -758,82 +968,95 @@ class SqliteScopedStore {
       `).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;
             let droneLabel;
-            let reattached;
-            let generation;
-            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 (?, ?, ?, ?, ?, ?, ?)
-        `).run(this.#principal.id, input.retryKey, input.cubeId, input.roleId, droneId, input.priorDroneId ?? null, now);
-            }
-            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);
+          INSERT INTO drones (id, cube_id, role_id, client_id, label, created_at, last_seen)
+          VALUES (?, ?, ?, ?, ?, ?, ?)
+        `).run(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);
             this.#database.prepare(`
         INSERT INTO drone_sessions (
           id, client_id, cube_id, drone_id, created_at, expires_at
@@ -869,10 +1092,7 @@ class SqliteScopedStore {
                 drone: { id: droneId, label: droneLabel },
                 sessionId: input.sessionId,
                 expiresAt: input.expiresAt,
-                generation,
-                posture,
-                reattached,
-                revokedSessionIds: oldSessions,
+                result: "created",
             };
         }
         catch (error) {
@@ -886,10 +1106,41 @@ class SqliteScopedStore {
     subscribeActivity(cubeId, listener) {
         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, entryId, visibility) {
+        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) {
         const scope = this.#scope("write");
         return this.#database.prepare(`
@@ -902,8 +1153,17 @@ class SqliteScopedStore {
         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) {
         const now = this.#clock().getTime();
@@ -1132,7 +1392,7 @@ class SqliteMaintenanceStore {
             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",
             ])
@@ -1234,6 +1494,54 @@ class SqliteMaintenanceStore {
         assertCanonicalUuid(sessionId, "Drone session id");
         this.#database.prepare("UPDATE drone_sessions SET revoked_at = ? WHERE id = ? AND revoked_at IS NULL").run(this.#now(), sessionId);
     }
+    expireDroneSession(sessionId) {
+        assertCanonicalUuid(sessionId, "Drone session id");
+        this.#database.prepare("UPDATE drone_sessions SET expires_at = ? WHERE id = ?")
+            .run(new Date(0).toISOString(), sessionId);
+    }
+    inspectManagedDrone(droneId) {
+        assertCanonicalUuid(droneId, "Drone id");
+        const row = this.#database.prepare(`
+      SELECT drone.role_id, drone.evicted_at,
+             EXISTS(SELECT 1 FROM drone_sessions AS session
+                    WHERE session.drone_id = drone.id AND session.revoked_at IS NOT NULL) AS session_revoked
+      FROM drones AS drone WHERE drone.id = ?
+    `).get(droneId);
+        if (row === undefined)
+            throw new ScopedStoreError();
+        return {
+            role_id: requiredText(row, "role_id"),
+            evicted: nullableText(row, "evicted_at") !== null,
+            session_revoked: requiredInteger(row, "session_revoked") === 1,
+        };
+    }
+    inspectCubeManagementState(cubeId) {
+        assertCanonicalUuid(cubeId, "Cube id");
+        const cube = this.#database.prepare("SELECT directive, message_taxonomy FROM cubes WHERE id = ?").get(cubeId);
+        if (cube === undefined)
+            throw new ScopedStoreError();
+        const taxonomy = nullableText(cube, "message_taxonomy");
+        const parsed = taxonomy === null ? null : JSON.parse(taxonomy);
+        return {
+            directive: requiredText(cube, "directive"),
+            taxonomy_marker: typeof parsed?.[0]?.class === "string" ? parsed[0].class : null,
+            role_ids: this.#database.prepare("SELECT id FROM roles WHERE cube_id = ? ORDER BY id").all(cubeId).map((row) => requiredText(row, "id")),
+            active_decision_ids: this.#database.prepare(`
+        SELECT id FROM decisions WHERE cube_id = ? AND status = 'active' ORDER BY id
+      `).all(cubeId).map((row) => requiredText(row, "id")),
+            drones: this.#database.prepare(`
+        SELECT drone.id, drone.role_id, drone.evicted_at,
+               EXISTS(SELECT 1 FROM drone_sessions AS session
+                      WHERE session.drone_id = drone.id AND session.revoked_at IS NOT NULL) AS session_revoked
+        FROM drones AS drone WHERE drone.cube_id = ? ORDER BY drone.id
+      `).all(cubeId).map((row) => ({
+                id: requiredText(row, "id"),
+                role_id: requiredText(row, "role_id"),
+                evicted: nullableText(row, "evicted_at") !== null,
+                session_revoked: requiredInteger(row, "session_revoked") === 1,
+            })),
+        };
+    }
     expireActivityCursor(cubeId, cursor) {
         assertCanonicalUuid(cubeId, "Cube id");
         assertCanonicalUuid(cursor.id, "Activity cursor id");
@@ -1275,6 +1583,70 @@ class ActivityHub {
         }
     }
 }
+class SqliteLivenessStore {
+    database;
+    clock;
+    hub;
+    capacityGuard;
+    constructor(database, clock, hub, capacityGuard) {
+        this.database = database;
+        this.clock = clock;
+        this.hub = hub;
+        this.capacityGuard = capacityGuard;
+    }
+    scan(options = {}) {
+        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 = [];
+        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 = {
+                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 {
     #database;
     #clock;
@@ -1566,9 +1938,8 @@ class SqliteCredentialStore {
       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
@@ -1579,6 +1950,20 @@ class SqliteCredentialStore {
     `).get(lookup);
         return row === undefined ? null : storedDroneSessionDigest(row);
     }
+    findActiveDroneSessionExpiry(sessionId) {
+        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) {
         assertCanonicalUuid(input.clientId, "Client id");
         assertCanonicalUuid(input.credentialId, "Credential id");
@@ -1594,6 +1979,16 @@ class SqliteCredentialStore {
             this.#database.prepare(`
         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 (
@@ -1752,6 +2147,7 @@ function cubeRecord(row) {
         ownerId: row.owner_id,
         name: row.name,
         directive: row.directive,
+        messageTaxonomy: parseTaxonomy(row.message_taxonomy),
         createdAt: row.created_at,
         updatedAt: row.updated_at,
     };
@@ -1773,6 +2169,7 @@ function cubeRow(row) {
         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"),
     };
@@ -1972,6 +2369,7 @@ function storedDroneSessionDigest(row) {
         cubeId: requiredText(row, "cube_id"),
         droneId: requiredText(row, "drone_id"),
         expiresAt: requiredText(row, "expires_at"),
+        evictedAt: nullableText(row, "evicted_at"),
     };
 }
 function requiredBuffer(row, key) {
@@ -2050,6 +2448,33 @@ function validateDirective(value) {
         throw new Error("Cube directive exceeds 100000 bytes.");
     }
 }
+function activityPreview(message) {
+    return message.replace(/\s+/gu, " ").trim().slice(0, 200);
+}
+function validateRoleClass(value) {
+    if (value !== undefined && value !== "queen" && value !== "worker") {
+        throw new TypeError("Role class must be queen or worker.");
+    }
+}
+function serializeTaxonomy(value) {
+    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) {
+    if (value === null)
+        return null;
+    try {
+        return validateMessageTaxonomy(JSON.parse(value));
+    }
+    catch {
+        throw new Error("Database contains invalid message taxonomy.");
+    }
+}
 function validateDigest(digest) {
     validateLookup(digest.lookup);
     if (digest.verifier.length !== 32)