agent-protocols 0.8.0 → 0.10.0

package/dist/local-connector/engine.js

@@ -1,23 +1,27 @@
-import { HttpResponseError } from "../http-client.js";
-import { validateDelegationEventAuthority } from "../delegation.js";
 // The stateful local connector engine. `LocalConnector` is transport-neutral:
-// it signs on the active agent's behalf, calls an Agent Discourse host over
+// it signs on the active agent's behalf, calls Agent Protocols services over
 // HTTP, materializes local room state by projecting accepted records, derives
-// an actionable inbox, and holds drafts on a room-head mismatch — all behind a
-// single `callTool` dispatcher. The agent never sees the signing key or a
-// reusable request JWT. This is one deep module; its methods are mutually
-// recursive over `this`, so the class stays whole here while the data shapes
-// and pure projection live in sibling submodules.
-import { discourseEvent, eventType, roomCreateEvent, validateDiscourseEnvelope, validateRoomPath, verifyServerRecord, } from "../discourse.js";
+// an actionable inbox, tracks the head presented to the agent, and holds
+// head-bound drafts on a room-head mismatch — all behind a single `callTool`
+// dispatcher. The agent never sees the signing key or a reusable request JWT.
+// This is one deep module; its methods are mutually recursive over `this`, so
+// the class stays whole here while the data shapes and pure projection live in
+// sibling submodules.
+import { canJoinDirectly, discourseEvent, eventType, isRedactedRecord, roomCreateEvent, roomJoinRequestEvent, validateDiscourseEnvelope, validateRoomPath, verifyServerRecord, } from "../discourse.js";
 import { ClientNonceManager, DEFAULT_REQUEST_JWT_TTL_SECS, createRequestBinding, createRequestJwtClaims, publicKeyBytes, serviceOrigin, unixTimeMillis, unixTimeSecs, withMentions, } from "../identity.js";
-import { DelegationClient, DiscourseClient, ProfileClient, } from "../http-client.js";
-import { delegationGrantEvent, delegationRevokeEvent, isPrincipalAlias, } from "../delegation.js";
+import { DelegationClient, DiscourseClient, HttpResponseError, ProfileClient, } from "../http-client.js";
+import { delegationGrantEvent, delegationRevokeEvent, isPrincipalAlias, validateDelegationEventAuthority, verifyDelegationCredential, } from "../delegation.js";
 import { profileUpdateEvent, } from "../profile.js";
-import { TOOL_AGENT_STATUS_CLEAR, TOOL_AGENT_STATUS_GET, TOOL_AGENT_STATUS_LIST, TOOL_AGENT_STATUS_SET, TOOL_DRAFTS_LIST, TOOL_DRAFT_COMMIT, TOOL_DRAFT_DROP, TOOL_DRAFT_GET, TOOL_HOSTS_LIST, TOOL_IDENTITY_CURRENT, TOOL_INBOX_ACK, TOOL_INBOX_NEXT, TOOL_JOIN_REQUESTS_LIST, TOOL_JOIN_REQUEST_REVIEW, TOOL_PROFILE_UPDATE, TOOL_ROOMS_LIST, TOOL_PRINCIPAL_RESOLVE, TOOL_DELEGATION_CHECK, TOOL_DELEGATIONS_LIST, TOOL_DELEGATION_GRANT, TOOL_DELEGATION_REVOKE, TOOL_ROOMS_SEARCH, TOOL_ROOM_CREATE, TOOL_ROOM_JOIN, TOOL_ROOM_JOIN_REQUEST, TOOL_ROOM_JOIN_WHEN_APPROVED, TOOL_ROOM_LEAVE, TOOL_ROOM_MARK_READ, TOOL_ROOM_MEMBERS_LIST, TOOL_ROOM_MEMBER_GET, TOOL_ROOM_OPEN, TOOL_ROOM_SEND_MESSAGE, TOOL_ROOM_STATE, TOOL_ROOM_SUBMIT_EVENT, TOOL_ROOM_TIMELINE, TOOL_ROOM_UNREAD, } from "./catalog.js";
+import { TOOL_AGENT_STATUS_LIST, TOOL_AGENT_STATUS_SET, TOOL_DELEGATIONS_LIST, TOOL_DELEGATION_CHECK, TOOL_DELEGATION_GRANT, TOOL_DELEGATION_REVOKE, TOOL_DRAFTS_LIST, TOOL_DRAFT_COMMIT, TOOL_IDENTITY_CURRENT, TOOL_INBOX_ACK, TOOL_INBOX_NEXT, TOOL_JOIN_REQUESTS_LIST, TOOL_JOIN_REQUEST_REVIEW, TOOL_PRINCIPAL_RESOLVE, TOOL_PROFILE_UPDATE, TOOL_ROOMS_LIST, TOOL_ROOM_CREATE, TOOL_ROOM_JOIN, TOOL_ROOM_MEMBERS_LIST, TOOL_ROOM_SEND_MESSAGE, TOOL_ROOM_STATE, TOOL_ROOM_SUBMIT_EVENT, TOOL_ROOM_TIMELINE, } from "./catalog.js";
 import { invalidPayload, isRecord, normalizeHost, permissionDenied, } from "./internal.js";
-import { applyRecordProjection, eventTypeAdvancesRoomHead, inboxEntryReady, isDuplicateRecord, materializeCreator, membershipFilter, recordAdvancesRoomHead, validateNextRecord, validateRecordBasePrecondition, } from "./projection.js";
-import { LocalConnectorState } from "./state.js";
+import { validateRoomsListScope, } from "./inputs.js";
+import { applyRecordProjection, baseIsCurrent, eventTypeRequiresRoomHead, inboxEntryReady, isDuplicateRecord, materializeCreator, membershipFilter, recordAdvancesRoomHead, validateNextRecord, validateRecordBasePrecondition, } from "./projection.js";
+import { LocalConnectorState, } from "./state.js";
 import { roomSummaryFromResponse, timelineItemFromRecord, } from "./views.js";
+/** Automatic `send_anyway` re-sign attempts before a draft is held. */
+export const SEND_ANYWAY_MAX_ATTEMPTS = 3;
+/** Lease on an inbox item claimed with `claim: true`. */
+export const INBOX_CLAIM_LEASE_MS = 60_000;
 function roomKeyString(key) {
     return `${key.host} ${key.roomId}`;
 }
@@ -102,7 +106,7 @@ function eventDraftValue(input) {
     };
 }
 function heldDraftOptions() {
-    return ["revise", "send_as_is", "stay_silent", "send_anyway"];
+    return ["revise", "send", "drop"];
 }
 function profileToMemberProfile(profile) {
     return {
@@ -123,11 +127,22 @@ function parseCursor(cursor) {
     const parsed = Number.parseInt(cursor, 10);
     return Number.isNaN(parsed) ? 0 : parsed;
 }
+/** Offset-cursor page over a sorted list, with `next_cursor` when more follow. */
+function page(items, cursor, limit) {
+    const offset = parseCursor(cursor);
+    const slice = items.slice(offset, offset + limit);
+    return offset + limit < items.length
+        ? { items: slice, next_cursor: String(offset + limit) }
+        : { items: slice };
+}
 function sortedAgentStatuses(statuses) {
     return [...statuses.entries()]
         .sort((a, b) => compareStrings(a[0], b[0]))
         .map(([, status]) => status);
 }
+function isHttpError(error, code) {
+    return error instanceof HttpResponseError && error.code === code;
+}
 export class LocalConnector {
     signer;
     state;
@@ -183,8 +198,10 @@ export class LocalConnector {
         this.applyRecordTo(key, record);
     }
     applyRecordTo(key, record) {
-        validateDiscourseEnvelope(record.envelope);
-        validateRoomPath(record.envelope, record.room_id);
+        if (!isRedactedRecord(record)) {
+            validateDiscourseEnvelope(record.envelope);
+            validateRoomPath(record.envelope, record.room_id);
+        }
         verifyServerRecord(record);
         const activeAgent = this.agentId();
         const room = this.state.rooms.get(roomKeyString(key));
@@ -195,11 +212,11 @@ export class LocalConnector {
             return;
         validateNextRecord(room, record);
         validateRecordBasePrecondition(room, record);
-        const item = timelineItemFromRecord(record);
+        const item = timelineItemFromRecord(record, room.room.types ?? []);
         const newInbox = [];
         applyRecordProjection(room, record, item, activeAgent, newInbox);
         let clearedStatus;
-        if (record.envelope.event.type === eventType.ROOM_MEMBER_REMOVE) {
+        if (!isRedactedRecord(record) && record.envelope.event.type === eventType.ROOM_MEMBER_REMOVE) {
             const payload = record.envelope.event.payload;
             clearedStatus = payload?.member;
         }
@@ -236,8 +253,6 @@ export class LocalConnector {
         switch (name) {
             case TOOL_IDENTITY_CURRENT:
                 return this.identityCurrent();
-            case TOOL_HOSTS_LIST:
-                return this.hostsList();
             case TOOL_PRINCIPAL_RESOLVE:
                 return this.principalResolve(input);
             case TOOL_DELEGATION_CHECK:
@@ -248,56 +263,32 @@ export class LocalConnector {
                 return this.delegationGrant(input);
             case TOOL_DELEGATION_REVOKE:
                 return this.delegationRevoke(input);
-            case TOOL_ROOMS_SEARCH:
-                return this.roomsSearch(input);
             case TOOL_ROOMS_LIST:
                 return this.roomsList(input);
-            case TOOL_ROOM_OPEN:
-                return this.roomOpen(input);
             case TOOL_ROOM_STATE:
-                return this.roomStateTool(input);
+                return this.roomState(input);
             case TOOL_ROOM_MEMBERS_LIST:
                 return this.roomMembersList(input);
-            case TOOL_ROOM_MEMBER_GET:
-                return this.roomMemberGet(input);
             case TOOL_AGENT_STATUS_LIST:
                 return this.agentStatusList(input);
-            case TOOL_AGENT_STATUS_GET:
-                return this.agentStatusGet(input);
             case TOOL_AGENT_STATUS_SET:
                 return this.agentStatusSet(input);
-            case TOOL_AGENT_STATUS_CLEAR:
-                return this.agentStatusClear(input);
             case TOOL_ROOM_TIMELINE:
                 return this.roomTimeline(input);
-            case TOOL_ROOM_UNREAD:
-                return this.roomUnread(input);
-            case TOOL_ROOM_MARK_READ:
-                return this.roomMarkRead(input);
             case TOOL_INBOX_NEXT:
                 return this.inboxNext(input);
             case TOOL_INBOX_ACK:
                 return this.inboxAck(input);
             case TOOL_DRAFTS_LIST:
                 return this.draftsList(input);
-            case TOOL_DRAFT_GET:
-                return this.draftGet(input);
             case TOOL_DRAFT_COMMIT:
                 return this.draftCommit(input);
-            case TOOL_DRAFT_DROP:
-                return this.draftDrop(input);
             case TOOL_PROFILE_UPDATE:
                 return this.profileUpdate(input);
             case TOOL_ROOM_CREATE:
                 return this.roomCreate(input);
             case TOOL_ROOM_JOIN:
                 return this.roomJoin(input);
-            case TOOL_ROOM_JOIN_REQUEST:
-                return this.roomJoinRequest(input);
-            case TOOL_ROOM_JOIN_WHEN_APPROVED:
-                return this.roomJoinWhenApproved(input);
-            case TOOL_ROOM_LEAVE:
-                return this.roomLeave(input);
             case TOOL_ROOM_SEND_MESSAGE:
                 return this.roomSendMessage(input);
             case TOOL_ROOM_SUBMIT_EVENT:
@@ -319,13 +310,14 @@ export class LocalConnector {
             hosts: this.sortedHosts(),
         };
     }
-    hostsList() {
-        return { hosts: this.sortedHosts() };
+    async roomsList(input) {
+        validateRoomsListScope(input);
+        return (input.scope ?? "known") === "public" ? this.publicRooms(input) : this.knownRooms(input);
     }
-    async roomsSearch(input) {
+    async publicRooms(input) {
         const host = normalizeHost(input.host);
         this.requireAllowedHost(host);
-        const rooms = await this.discourse(host).publicRooms({
+        const response = await this.discourse(host).publicRooms({
             status: input.status,
             tag: input.tag,
             keyword: input.keyword,
@@ -336,72 +328,86 @@ export class LocalConnector {
             limit: input.limit,
             cursor: input.cursor,
         });
-        for (const room of rooms)
+        for (const room of response.result)
             this.observeRoom(host, room);
-        const summaries = rooms.map((room) => this.summaryForResponse(host, room));
-        return { rooms: summaries };
+        const rooms = response.result.map((room) => this.summaryForResponse(host, room));
+        return response.next_cursor !== undefined
+            ? { rooms, next_cursor: response.next_cursor }
+            : { rooms };
     }
-    roomsList(input) {
-        const offset = parseCursor(input.cursor);
-        const limit = input.limit ?? 50;
+    knownRooms(input) {
         const agentId = this.agentId();
-        const rooms = [...this.state.rooms.values()]
-            .sort((a, b) => compareStrings(a.host, b.host) ||
+        const host = input.host === undefined ? undefined : normalizeHost(input.host);
+        const rooms = [...this.state.rooms.entries()]
+            .filter(([, room]) => host === undefined || room.host === host)
+            .sort(([, a], [, b]) => compareStrings(a.host, b.host) ||
             compareStrings(a.room.id, b.room.id))
-            .filter((room) => input.status !== undefined ? room.room.status === input.status : true)
-            .filter((room) => membershipFilter(room, agentId, input.membership))
-            .slice(offset, offset + limit)
-            .map((room) => this.summaryForRoom(room));
-        return { rooms };
-    }
-    async roomOpen(input) {
-        const host = normalizeHost(input.host);
-        this.requireAllowedHost(host);
-        const key = { host, roomId: input.room_id };
-        const previousSeq = this.state.rooms.get(roomKeyString(key))?.syncedSeq ?? 0;
-        if (input.refresh || previousSeq === 0) {
-            const client = this.discourse(host);
-            const room = await client.room(input.room_id);
-            this.observeRoom(host, room);
-            const jwt = this.requestJwt(host);
-            const records = await client.events(input.room_id, {
-                afterSeq: previousSeq > 0 ? previousSeq : undefined,
+            .filter(([, room]) => input.status !== undefined ? room.room.status === input.status : true)
+            .filter(([keyStr, room]) => membershipFilter(room, agentId, input.membership, this.state.ownJoinRequests.get(keyStr)?.status === "pending"))
+            .map(([, room]) => this.summaryForRoom(room));
+        const result = page(rooms, input.cursor, input.limit ?? 50);
+        return { rooms: result.items, ...(result.next_cursor ? { next_cursor: result.next_cursor } : {}) };
+    }
+    /** Reads the room resource and every record after the local tip, then verifies and applies them. */
+    async syncRoom(key) {
+        const client = this.discourse(key.host);
+        const jwt = this.requestJwt(key.host);
+        const room = await client.room(key.roomId, jwt);
+        this.observeRoom(key.host, room);
+        // The cursor continues the first query, so its after_seq stays fixed.
+        const syncedSeq = this.localRoom(key).syncedSeq;
+        let cursor;
+        for (;;) {
+            const response = await client.events(key.roomId, {
+                afterSeq: syncedSeq > 0 ? syncedSeq : undefined,
+                cursor,
                 jwt,
             });
-            for (const record of records)
-                this.applyHostRecord(host, record);
+            for (const record of response.result)
+                this.applyHostRecord(key.host, record);
+            cursor = response.next_cursor;
+            if (cursor === undefined)
+                break;
+        }
+    }
+    async roomState(input) {
+        let key;
+        if (input.host !== undefined) {
+            key = { host: normalizeHost(input.host), roomId: input.room_id };
         }
-        const opened = this.state.rooms.get(roomKeyString(key));
-        if (opened)
-            opened.subscribed = input.subscribe ?? false;
+        else {
+            key = this.resolveRoomKey(undefined, input.room_id);
+        }
+        this.requireAllowedHost(key.host);
+        const known = (this.state.rooms.get(roomKeyString(key))?.syncedSeq ?? 0) > 0;
+        if (!known || input.refresh)
+            await this.syncRoom(key);
         const room = this.localRoom(key);
+        if (input.subscribe !== undefined)
+            room.subscribed = input.subscribe;
+        // The first state read in a session is the agent's starting view.
+        if (room.presentedSeq === undefined)
+            this.presentHead(room, room.headSeq);
         return {
             room: this.roomStateView(room),
             sync: this.syncState(key),
             active_turn: room.activeTurn,
         };
     }
-    async roomStateTool(input) {
-        void input.include_types;
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        if (input.refresh) {
-            const host = this.localRoom(key).host;
-            return this.roomOpen({ host, room_id: input.room_id, refresh: true });
-        }
-        const room = this.localRoom(key);
-        return { room: this.roomStateView(room), sync: this.syncState(key) };
-    }
     roomMembersList(input) {
         const key = this.resolveRoomKey(input.host, input.room_id);
         const room = this.localRoom(key);
-        const offset = parseCursor(input.cursor);
-        const limit = input.limit ?? 100;
         const members = [...room.members.values()]
             .sort((a, b) => compareStrings(a.agent_id, b.agent_id))
-            .filter((member) => input.status !== undefined ? member.status === input.status : true)
+            .filter((member) => input.agent_id !== undefined ? member.agent_id === input.agent_id : true)
+            .filter((member) => input.status !== undefined && input.status !== "all"
+            ? member.status === input.status
+            : true)
             .filter((member) => input.role !== undefined ? member.role === input.role : true)
-            .slice(offset, offset + limit)
             .map((member) => ({ ...member }));
+        if (input.agent_id !== undefined && members.length === 0) {
+            throw invalidPayload("room member not found");
+        }
         if (input.include_profiles) {
             for (const member of members) {
                 if (member.profile === undefined) {
@@ -411,152 +417,114 @@ export class LocalConnector {
                 }
             }
         }
-        return { members, sync: this.syncState(key) };
-    }
-    roomMemberGet(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const room = this.localRoom(key);
-        const found = room.members.get(input.agent_id);
-        if (!found)
-            throw invalidPayload("room member not found");
-        const member = { ...found };
-        if (input.include_profile && member.profile === undefined) {
-            const profile = this.state.profiles.get(member.agent_id);
-            if (profile)
-                member.profile = profileToMemberProfile(profile);
-        }
-        const recent = input.include_recent_activity
+        const result = page(members, input.cursor, input.limit ?? 100);
+        const recent = input.agent_id !== undefined && input.include_recent_activity
             ? room.timeline
                 .filter((item) => item.actor === input.agent_id)
                 .slice(-10)
                 .reverse()
-            : [];
-        return { member, recent, sync: this.syncState(key) };
+            : undefined;
+        return {
+            members: result.items,
+            ...(recent !== undefined ? { recent } : {}),
+            ...(result.next_cursor ? { next_cursor: result.next_cursor } : {}),
+            sync: this.syncState(key),
+        };
     }
     async agentStatusList(input) {
         const key = this.resolveRoomKey(input.host, input.room_id);
         const keyStr = roomKeyString(key);
-        if (!input.refresh) {
-            const cached = this.state.agentStatuses.get(keyStr);
-            if (cached) {
-                return {
-                    statuses: sortedAgentStatuses(cached),
-                    sync: this.syncState(key),
-                };
+        const cached = this.state.agentStatuses.get(keyStr);
+        if (input.agent_id !== undefined) {
+            const hit = input.refresh ? undefined : cached?.get(input.agent_id);
+            if (hit)
+                return { statuses: [hit], sync: this.syncState(key) };
+            const host = this.allowedRoomHost(key);
+            let status;
+            try {
+                status = await this.discourse(host).agentStatus(input.room_id, input.agent_id, this.requestJwt(host));
             }
+            catch (error) {
+                if (isHttpError(error, "agent_status_not_found"))
+                    return { statuses: [], sync: this.syncState(key) };
+                throw error;
+            }
+            this.cacheAgentStatus(keyStr, status);
+            return { statuses: [status], sync: this.syncState(key) };
+        }
+        if (!input.refresh && cached) {
+            return { statuses: sortedAgentStatuses(cached), sync: this.syncState(key) };
         }
         const host = this.allowedRoomHost(key);
-        const jwt = this.requestJwt(host);
-        const response = await this.discourse(host).agentStatuses(input.room_id, jwt);
+        const response = await this.discourse(host).agentStatuses(input.room_id, this.requestJwt(host));
         const statuses = new Map();
-        for (const status of response.statuses) {
+        for (const status of response.result)
             statuses.set(status.agent_id, status);
-        }
         this.state.agentStatuses.set(keyStr, statuses);
         return { statuses: sortedAgentStatuses(statuses), sync: this.syncState(key) };
     }
-    async agentStatusGet(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const keyStr = roomKeyString(key);
-        if (!input.refresh) {
-            const cached = this.state.agentStatuses.get(keyStr)?.get(input.agent_id);
-            if (cached)
-                return { status: cached, sync: this.syncState(key) };
-        }
-        const host = this.allowedRoomHost(key);
-        const jwt = this.requestJwt(host);
-        const response = await this.discourse(host).agentStatus(input.room_id, input.agent_id, jwt);
-        let statuses = this.state.agentStatuses.get(keyStr);
-        if (!statuses) {
-            statuses = new Map();
-            this.state.agentStatuses.set(keyStr, statuses);
-        }
-        statuses.set(response.status.agent_id, response.status);
-        return { status: response.status, sync: this.syncState(key) };
-    }
     async agentStatusSet(input) {
         const key = this.resolveRoomKey(input.host, input.room_id);
         const keyStr = roomKeyString(key);
         const host = this.allowedRoomHost(key);
-        const jwt = this.requestJwt(host);
+        const room = this.localRoom(key);
         const request = {
             state: input.state,
             summary: input.summary,
-            seen_seq: input.seen_seq,
-            seen_hash: input.seen_hash,
+            seen_seq: input.seen_seq ?? (room.syncedSeq > 0 ? room.syncedSeq : undefined),
+            seen_hash: input.seen_hash ?? (input.seen_seq === undefined ? room.syncedHash : undefined),
             claim_id: input.claim_id,
             activity: input.activity,
             expires_at: input.expires_at,
             extra: input.extra,
         };
-        const status = await this.discourse(host).setAgentStatus(input.room_id, jwt, request);
+        const status = await this.discourse(host).setAgentStatus(input.room_id, this.requestJwt(host), request);
+        if (status.expires_at <= unixTimeMillis()) {
+            this.state.agentStatuses.get(keyStr)?.delete(status.agent_id);
+        }
+        else {
+            this.cacheAgentStatus(keyStr, status);
+        }
+        return { status, sync: this.syncState(key) };
+    }
+    cacheAgentStatus(keyStr, status) {
         let statuses = this.state.agentStatuses.get(keyStr);
         if (!statuses) {
             statuses = new Map();
             this.state.agentStatuses.set(keyStr, statuses);
         }
         statuses.set(status.agent_id, status);
-        return { status, sync: this.syncState(key) };
     }
-    async agentStatusClear(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const host = this.allowedRoomHost(key);
-        const jwt = this.requestJwt(host);
-        const request = {
-            state: "away",
-            expires_at: unixTimeMillis() - 1,
-        };
-        await this.discourse(host).setAgentStatus(input.room_id, jwt, request);
-        this.state.agentStatuses.get(roomKeyString(key))?.delete(this.agentId());
-        return { cleared: true, room_id: input.room_id };
-    }
-    roomTimeline(input) {
-        void input.refresh;
-        void input.include_records;
+    async roomTimeline(input) {
         const key = this.resolveRoomKey(input.host, input.room_id);
+        if (input.refresh)
+            await this.syncRoom(key);
         const room = this.localRoom(key);
         const items = room.timeline
             .filter((item) => input.after_seq !== undefined ? item.seq > input.after_seq : true)
             .filter((item) => input.before_seq !== undefined ? item.seq < input.before_seq : true)
             .filter((item) => input.types !== undefined ? input.types.includes(item.type) : true)
-            .filter((item) => input.actors !== undefined ? input.actors.includes(item.actor) : true)
+            .filter((item) => input.actors !== undefined
+            ? item.actor !== undefined && input.actors.includes(item.actor)
+            : true)
             .filter((item) => !input.unread_only || item.seq > room.readSeq)
             .slice(0, input.limit ?? 50);
-        const nextAfterSeq = items.length > 0 ? items[items.length - 1].seq : undefined;
-        return {
-            items,
-            sync: this.syncState(key),
-            next_after_seq: nextAfterSeq,
-        };
-    }
-    roomUnread(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const room = this.localRoom(key);
-        let items = room.timeline
-            .filter((item) => item.seq > room.readSeq)
-            .slice(0, input.limit ?? 50);
-        const throughSeq = items.length > 0 ? items[items.length - 1].seq : undefined;
-        if (input.mark_read) {
-            if (throughSeq !== undefined)
-                room.readSeq = throughSeq;
-            items =
-                throughSeq !== undefined
-                    ? room.timeline.filter((item) => item.seq <= throughSeq)
-                    : [];
+        const lastSeq = items.length > 0 ? items[items.length - 1].seq : undefined;
+        if (input.mark_read && lastSeq !== undefined) {
+            room.readSeq = Math.max(room.readSeq, lastSeq);
+        }
+        // An unfiltered, gap-free read from the presented head presents the latest
+        // head it reaches (local connector Section 4.2).
+        if (input.types === undefined && input.actors === undefined && items.length > 0) {
+            const base = room.presentedSeq ?? 0;
+            const contiguous = items.every((item, index) => index === 0 || item.seq === items[index - 1].seq + 1);
+            if (contiguous && items[0].seq <= base + 1)
+                this.presentThrough(room, lastSeq);
         }
         return {
             items,
-            unread_count: unreadCount(room),
             sync: this.syncState(key),
-        };
-    }
-    roomMarkRead(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const room = this.localRoom(key);
-        room.readSeq = Math.max(room.readSeq, input.through_seq);
-        return {
-            room_id: input.room_id,
-            read_seq: room.readSeq,
+            ...(lastSeq !== undefined ? { next_after_seq: lastSeq } : {}),
             unread_count: unreadCount(room),
         };
     }
@@ -579,8 +547,9 @@ export class LocalConnector {
             const entry = this.state.inbox.get(id);
             if (entry) {
                 items.push(entry.item);
+                // A claim is a lease, so a crashed session cannot hold the item forever.
                 if (input.claim)
-                    entry.state = { kind: "claimed" };
+                    entry.state = { kind: "claimed", until: now + INBOX_CLAIM_LEASE_MS };
             }
         }
         return { items, pending_count: this.pendingInboxCount() };
@@ -600,8 +569,20 @@ export class LocalConnector {
         return { acknowledged, pending_count: this.pendingInboxCount() };
     }
     draftsList(input) {
-        const offset = parseCursor(input.cursor);
-        const limit = input.limit ?? 50;
+        if (input.draft_id !== undefined) {
+            const entry = this.state.drafts.get(input.draft_id);
+            if (!entry)
+                throw invalidPayload("draft not found");
+            const key = {
+                host: entry.draft.current_sync.host,
+                roomId: entry.draft.room_id,
+            };
+            const room = this.localRoom(key);
+            const changes = this.roomChangesSince(key, entry.draft.base_seq);
+            // The changes reach the current head, which is now presented.
+            this.presentHead(room, room.headSeq);
+            return { drafts: [entry.draft], changes, sync: this.syncState(key) };
+        }
         const host = input.host !== undefined ? normalizeHost(input.host) : undefined;
         const drafts = [...this.state.drafts.values()]
             .sort((a, b) => compareStrings(a.draft.id, b.draft.id))
@@ -609,103 +590,66 @@ export class LocalConnector {
             ? entry.draft.room_id === input.room_id
             : true)
             .filter((entry) => host !== undefined ? entry.draft.current_sync.host === host : true)
-            .slice(offset, offset + limit + 1)
             .map((entry) => entry.draft);
-        let nextCursor;
-        if (drafts.length > limit) {
-            drafts.pop();
-            nextCursor = String(offset + limit);
-        }
-        return { drafts, next_cursor: nextCursor };
-    }
-    draftGet(input) {
-        const entry = this.state.drafts.get(input.draft_id);
-        if (!entry)
-            throw invalidPayload("draft not found");
-        const key = {
-            host: entry.draft.current_sync.host,
-            roomId: entry.draft.room_id,
-        };
-        return {
-            draft: entry.draft,
-            changes: this.roomChangesSince(key, entry.draft.base_seq),
-            sync: this.syncState(key),
-        };
+        const result = page(drafts, input.cursor, input.limit ?? 50);
+        return { drafts: result.items, ...(result.next_cursor ? { next_cursor: result.next_cursor } : {}) };
     }
     async draftCommit(input) {
         const entry = this.state.drafts.get(input.draft_id);
         if (!entry)
             throw invalidPayload("draft not found");
-        if (input.action === "stay_silent") {
+        if (input.action === "drop") {
             this.state.drafts.delete(input.draft_id);
             return { status: "dropped", draft_id: input.draft_id };
         }
-        let result;
+        if (input.action !== "revise" && input.action !== "send") {
+            throw invalidPayload(`invalid draft action: ${input.action}`);
+        }
+        // Both actions sign against the presented head; a further mismatch is
+        // handled by on_head_mismatch.
+        let request;
         if (entry.request.kind === "message") {
-            const request = { ...entry.request.input };
-            if (input.action === "send_anyway") {
-                request.base_seq = undefined;
-                request.base_hash = undefined;
-                request.on_head_mismatch = "send_anyway";
-                result = await this.submitMessageUnchecked(request);
-            }
-            else {
-                if (input.action === "revise") {
-                    if (input.content !== undefined)
-                        request.content = input.content;
-                    if (input.content_type !== undefined)
-                        request.content_type = input.content_type;
-                    if (input.mentions !== undefined)
-                        request.mentions = input.mentions;
-                    if (input.references !== undefined)
-                        request.references = input.references;
-                    if (input.extra !== undefined)
-                        request.extra = input.extra;
-                }
-                request.base_seq = input.base_seq;
-                request.base_hash = input.base_hash;
-                request.on_head_mismatch = input.on_head_mismatch;
-                result = await this.roomSendMessage(request);
+            const message = { ...entry.request.input };
+            if (input.action === "revise") {
+                if (input.content !== undefined)
+                    message.content = input.content;
+                if (input.content_type !== undefined)
+                    message.content_type = input.content_type;
+                if (input.mentions !== undefined)
+                    message.mentions = input.mentions;
+                if (input.references !== undefined)
+                    message.references = input.references;
+                if (input.extra !== undefined)
+                    message.extra = input.extra;
             }
+            message.base_seq = undefined;
+            message.base_hash = undefined;
+            message.on_head_mismatch = input.on_head_mismatch;
+            request = { kind: "message", input: message };
         }
         else {
-            const request = { ...entry.request.input };
-            if (input.action === "send_anyway") {
-                request.base_seq = undefined;
-                request.base_hash = undefined;
-                request.on_head_mismatch = "send_anyway";
-                result = await this.submitEventUnchecked(request);
-            }
-            else {
-                if (input.action === "revise") {
-                    if (input.type !== undefined)
-                        request.type = input.type;
-                    if (input.payload !== undefined)
-                        request.payload = input.payload;
-                    if (input.mentions !== undefined)
-                        request.mentions = input.mentions;
-                    if (input.references !== undefined)
-                        request.references = input.references;
-                }
-                request.base_seq = input.base_seq;
-                request.base_hash = input.base_hash;
-                request.on_head_mismatch = input.on_head_mismatch;
-                result = await this.roomSubmitEvent(request);
+            const event = { ...entry.request.input };
+            if (input.action === "revise") {
+                if (input.type !== undefined)
+                    event.type = input.type;
+                if (input.payload !== undefined)
+                    event.payload = input.payload;
+                if (input.mentions !== undefined)
+                    event.mentions = input.mentions;
+                if (input.references !== undefined)
+                    event.references = input.references;
             }
+            event.base_seq = undefined;
+            event.base_hash = undefined;
+            event.on_head_mismatch = input.on_head_mismatch;
+            request = { kind: "event", input: event };
         }
+        const result = await this.submitRoomWrite(request);
         if (result.status === "sent" || result.status === "held") {
             this.state.drafts.delete(input.draft_id);
         }
         return result;
     }
-    draftDrop(input) {
-        this.state.drafts.delete(input.draft_id);
-        return {
-            status: "dropped",
-            draft_id: input.draft_id,
-            pending_count: this.state.drafts.size,
-        };
-    }
     /**
      * Resolves a principal per Agent Delegation Section 3 and reports whether
      * the requested URL is an alias the principal acknowledges. Any origin can
@@ -713,16 +657,26 @@ export class LocalConnector {
      * for it.
      */
     async resolvePrincipal(url) {
-        const document = await this.delegationClient(url).principal(url);
+        const document = await new DelegationClient(url, this.fetchImpl).principal(url);
         return {
             document,
             alias: document.id !== url && isPrincipalAlias(document, url),
         };
     }
+    /** The principal's authoritative delegation service, located from its `delegation_query_url`. */
+    async principalDelegationService(document) {
+        const queryUrl = document.delegation_query_url;
+        if (queryUrl === undefined) {
+            throw invalidPayload(`principal ${document.id} publishes no delegation_query_url`);
+        }
+        const origin = serviceOrigin(queryUrl);
+        this.requireAllowedHost(origin);
+        return DelegationClient.discover(origin, this.fetchImpl);
+    }
     /**
      * Resolves the principal and refuses when the active Agent ID is not one of
-     * its controller keys, so a grant that could never be accepted is not signed
-     * or transmitted.
+     * its current controller keys with delegation authority, so a grant that
+     * could never be accepted is not signed or transmitted.
      */
     async controllerPrincipal(principalId) {
         const { document } = await this.resolvePrincipal(principalId);
@@ -742,43 +696,52 @@ export class LocalConnector {
         };
     }
     async delegationCheck(input) {
+        if (typeof input.audience !== "string")
+            throw invalidPayload("audience is required");
         const { document } = await this.resolvePrincipal(input.principal_id);
         // The authoritative service is the one the principal names, never one
         // supplied by whoever presented a credential.
+        const service = await this.principalDelegationService(document);
         const queryUrl = document.delegation_query_url;
-        if (queryUrl === undefined) {
-            throw invalidPayload(`principal ${document.id} publishes no delegation_query_url`);
-        }
-        const response = await this.delegationClient(queryUrl).queryDelegationsAt(queryUrl, {
+        const response = await service.queryDelegationsAt(queryUrl, {
             subject: input.subject ?? this.agentId(),
             principal_id: document.id,
             id: input.id,
-            status: input.status,
         });
-        return {
-            canonical_id: document.id,
-            query_url: queryUrl,
-            delegations: response.result,
-        };
+        const now = unixTimeMillis();
+        const delegations = [];
+        for (const credential of response.result) {
+            let records = [];
+            try {
+                records = await service.allDelegationEvents(credential.id);
+            }
+            catch (error) {
+                delegations.push({ credential, verified: false, usable: false, reasons: [`history unavailable: ${error instanceof Error ? error.message : error}`] });
+                continue;
+            }
+            delegations.push(verifyDelegationCredential(credential, records, document, document.id, input.audience, now));
+        }
+        return { canonical_id: document.id, query_url: queryUrl, delegations };
     }
     async delegationsList(input) {
         // Enumerating one subject requires authorization; the connector proves the
         // active identity and never enumerates anyone else.
-        const jwt = this.requestJwt(input.delegation_service);
-        const response = await this.delegationClient(input.delegation_service).queryDelegations({
+        const origin = serviceOrigin(input.delegation_service);
+        const jwt = this.requestJwt(origin);
+        const service = await DelegationClient.discover(origin, this.fetchImpl);
+        const response = await service.queryDelegations({
             subject: this.agentId(),
             status: input.status,
             limit: input.limit,
+            cursor: input.cursor,
         }, jwt);
-        return { delegations: response.result };
+        return response.next_cursor !== undefined
+            ? { delegations: response.result, next_cursor: response.next_cursor }
+            : { delegations: response.result };
     }
-    async delegationPrevious(principal, service, id) {
-        this.requestJwt(service); // Enforce the operator host policy before any service request.
-        if (principal.delegation_query_url !== `${service.replace(/\/$/, "")}/v1/delegations/query`) {
-            throw invalidPayload("delegation service does not match principal authority");
-        }
+    async delegationPrevious(service, id) {
         try {
-            return await this.delegationClient(service).delegation(id);
+            return await service.delegation(id);
         }
         catch (error) {
             if (error instanceof HttpResponseError && error.status === 404)
@@ -786,37 +749,56 @@ export class LocalConnector {
             throw error;
         }
     }
+    async submitDelegation(service, sign) {
+        let envelope = sign();
+        try {
+            return { credential: await service.submitDelegationEvent(envelope), envelope };
+        }
+        catch (error) {
+            if (!this.resyncNonce(error))
+                throw error;
+            envelope = sign();
+            return { credential: await service.submitDelegationEvent(envelope), envelope };
+        }
+    }
     async delegationGrant(input) {
         const principal = await this.controllerPrincipal(input.principal_id);
-        const previous = await this.delegationPrevious(principal, input.delegation_service, input.id);
+        const service = await this.principalDelegationService(principal);
+        const previous = await this.delegationPrevious(service, input.id);
         const payload = {
-            id: input.id, principal: { id: principal.id }, subject: input.subject,
+            id: input.id, principal_id: principal.id, subject: input.subject,
             relationship: input.relationship, scopes: input.scopes, audiences: input.audiences,
             constraints: input.constraints, not_before: input.not_before, expires_at: input.expires_at,
         };
-        const createdAt = unixTimeMillis();
-        const event = delegationGrantEvent(this.agentId(), createdAt, this.nonces.nextNonce(), payload);
-        validateDelegationEventAuthority(event, principal, createdAt, previous);
-        const envelope = this.signer.signEvent(event);
-        const credential = await this.delegationClient(input.delegation_service).submitDelegationEvent(envelope);
-        return { credential, envelope };
+        for (const field of ["relationship", "constraints", "not_before", "expires_at"]) {
+            if (payload[field] === undefined)
+                delete payload[field];
+        }
+        return this.submitDelegation(service, () => {
+            const createdAt = unixTimeMillis();
+            const event = delegationGrantEvent(this.agentId(), createdAt, this.nonces.nextNonce(createdAt), payload);
+            validateDelegationEventAuthority(event, principal, createdAt, previous);
+            return this.signer.signEvent(event);
+        });
     }
     async delegationRevoke(input) {
         const principal = await this.controllerPrincipal(input.principal_id);
-        const previous = await this.delegationPrevious(principal, input.delegation_service, input.id);
-        const createdAt = unixTimeMillis();
-        const event = delegationRevokeEvent(this.agentId(), createdAt, this.nonces.nextNonce(), {
-            id: input.id, principal_id: principal.id, reason: input.reason,
+        const service = await this.principalDelegationService(principal);
+        const previous = await this.delegationPrevious(service, input.id);
+        return this.submitDelegation(service, () => {
+            const createdAt = unixTimeMillis();
+            const event = delegationRevokeEvent(this.agentId(), createdAt, this.nonces.nextNonce(createdAt), {
+                id: input.id, principal_id: principal.id, ...(input.reason !== undefined ? { reason: input.reason } : {}),
+            });
+            validateDelegationEventAuthority(event, principal, createdAt, previous);
+            return this.signer.signEvent(event);
         });
-        validateDelegationEventAuthority(event, principal, createdAt, previous);
-        const envelope = this.signer.signEvent(event);
-        const result = await this.delegationClient(input.delegation_service).submitDelegationEvent(envelope);
-        return { result, envelope };
     }
     async profileUpdate(input) {
         if (!isRecord(input.profile)) {
             throw invalidPayload("profile must be an object");
         }
+        this.requireAllowedOrigin(input.profile_service);
         const profile = { ...input.profile };
         // payload.id is always the active Agent ID; reject an input that names a
         // different agent instead of silently rewriting it.
@@ -827,8 +809,18 @@ export class LocalConnector {
         else if (profile.id !== activeId) {
             throw invalidPayload("profile.id must be the active Agent ID");
         }
-        const envelope = this.signProfileUpdate(profile);
-        const materialized = await this.profileClient(input.profile_service).submitProfileUpdate(envelope);
+        const client = this.profileClient(input.profile_service);
+        let envelope = this.signProfileUpdate(profile);
+        let materialized;
+        try {
+            materialized = await client.submitProfileUpdate(envelope);
+        }
+        catch (error) {
+            if (!this.resyncNonce(error))
+                throw error;
+            envelope = this.signProfileUpdate(profile);
+            materialized = await client.submitProfileUpdate(envelope);
+        }
         this.state.profiles.set(materialized.id, materialized);
         return { profile: materialized, envelope };
     }
@@ -836,6 +828,8 @@ export class LocalConnector {
         const host = normalizeHost(input.host);
         this.requireAllowedHost(host);
         const payload = {
+            // Binds the signed event to this host (ADP Section 8.1).
+            host: serviceOrigin(host),
             topic: input.topic,
             visibility: input.visibility,
             start_time: input.start_time,
@@ -846,250 +840,283 @@ export class LocalConnector {
             language: input.language,
             policy: input.policy,
             types: input.types,
+            extra: input.extra,
         };
-        const envelope = this.signRoomCreate(payload);
-        const room = await this.discourse(host).createRoom(envelope);
+        for (const field of ["agenda", "guidance", "tags", "language", "policy", "types", "extra"]) {
+            if (payload[field] === undefined)
+                delete payload[field];
+        }
+        const client = this.discourse(host);
+        let envelope = this.signRoomCreate(payload);
+        let room;
+        try {
+            room = await client.createRoom(envelope);
+        }
+        catch (error) {
+            if (!this.resyncNonce(error))
+                throw error;
+            envelope = this.signRoomCreate(payload);
+            room = await client.createRoom(envelope);
+        }
         if (!room.envelope)
             room.envelope = envelope;
         this.acceptRoomResponse(host, room);
         const key = { host, roomId: room.id };
+        const local = this.localRoom(key);
+        // The creator has seen its own room.
+        this.presentHead(local, local.headSeq);
         return {
-            room: this.roomStateView(this.localRoom(key)),
+            room: this.roomStateView(local),
             envelope,
             sync: this.syncState(key),
         };
     }
     async roomJoin(input) {
         const roomId = input.room_id;
-        let key;
-        if (input.host !== undefined) {
-            const host = normalizeHost(input.host);
-            this.requireAllowedHost(host);
-            key = { host, roomId };
-        }
-        else {
-            key = this.resolveRoomKey(undefined, roomId);
-            this.requireAllowedHost(key.host);
-        }
+        const key = input.host !== undefined
+            ? { host: normalizeHost(input.host), roomId }
+            : this.resolveRoomKey(undefined, roomId);
         const host = key.host;
-        if (!this.state.rooms.has(roomKeyString(key))) {
-            const room = await this.discourse(host).room(roomId);
-            this.acceptRoomResponse(host, room);
-        }
-        if (input.request_id !== undefined) {
-            const status = await this.approvedJoinRequest(host, roomId, input.request_id);
-            const approvedRole = status.approved_role ?? status.request.role;
-            // The completion call signs room.join with the approved role; a differing
-            // input role is a mismatch error, never a silent substitution.
-            if (input.role !== approvedRole) {
-                throw invalidPayload(`join_request_role_mismatch: approved role is ${approvedRole}`);
+        this.requireAllowedHost(host);
+        const keyStr = roomKeyString(key);
+        const agentId = this.agentId();
+        // A stored request decides the outcome until it resolves.
+        const own = this.state.ownJoinRequests.get(keyStr);
+        if (own && own.status === "pending") {
+            const current = await this.discourse(host).joinRequest(roomId, own.id, this.requestJwt(host));
+            this.state.ownJoinRequests.set(keyStr, current);
+            if (current.status === "pending")
+                return { status: "approval_required", join_request: current, sync: this.maybeSync(key) };
+            if (current.status === "rejected")
+                return { status: "rejected", join_request: current, sync: this.maybeSync(key) };
+            if (current.status === "approved") {
+                // The approving review record is the membership event.
+                await this.syncRoom(key);
+                const member = this.localRoom(key).members.get(agentId);
+                if (member?.status !== "active")
+                    throw invalidPayload("approved membership is not yet visible");
+                return { status: "joined", member, join_request: current, sync: this.syncState(key) };
             }
-            const payload = {
-                request_id: input.request_id,
-                role: approvedRole,
-            };
-            return this.completeJoin(host, key, payload);
         }
-        if (roomVisibility(this.localRoom(key).room) === "public") {
-            const payload = {
-                request_id: undefined,
-                role: input.role,
-                perspective: input.perspective,
-            };
-            return this.completeJoin(host, key, payload);
-        }
-        const jwt = this.requestJwt(host);
-        const request = {
-            role: input.role,
-            perspective: input.perspective,
-            reason: input.reason,
-            extra: input.extra,
-        };
-        const status = await this.discourse(host).requestJoin(roomId, jwt, request);
-        this.pushJoinRequest(key, status);
-        let sync;
-        try {
-            sync = this.syncState(key);
+        // Read the room when possible: invitees and public rooms are readable.
+        if (!this.state.rooms.has(keyStr)) {
+            try {
+                const room = await this.discourse(host).room(roomId, this.requestJwt(host));
+                this.acceptRoomResponse(host, room);
+            }
+            catch (error) {
+                if (!(error instanceof HttpResponseError))
+                    throw error;
+            }
         }
-        catch {
-            sync = undefined;
+        const local = this.state.rooms.get(keyStr);
+        const visibility = local ? roomVisibility(local.room) : undefined;
+        const direct = local !== undefined &&
+            visibility !== undefined &&
+            local.members.get(agentId)?.status !== "banned" &&
+            canJoinDirectly(visibility, roomPolicy(local.room), agentId, input.role);
+        if (direct) {
+            const payload = { role: input.role };
+            if (input.perspective !== undefined)
+                payload.perspective = input.perspective;
+            let record;
+            try {
+                record = await this.submitSigned(() => this.signRoomEvent(eventType.ROOM_JOIN, key, undefined, undefined, [], payload), (envelope) => this.discourse(host).joinRoom(roomId, envelope));
+            }
+            catch (error) {
+                // A ban may have arrived since the local snapshot; request review below.
+                if (!isHttpError(error, "member_banned"))
+                    throw error;
+            }
+            if (record) {
+                await this.applyOwnRecord(key, record);
+                const member = this.localRoom(key).members.get(agentId);
+                if (!member)
+                    throw invalidPayload("joined member not materialized");
+                return { status: "joined", record, member, sync: this.syncState(key) };
+            }
         }
-        return { status: "approval_required", join_request: status, sync };
+        const requestPayload = { role: input.role };
+        if (input.perspective !== undefined)
+            requestPayload.perspective = input.perspective;
+        if (input.reason !== undefined)
+            requestPayload.reason = input.reason;
+        if (input.extra !== undefined)
+            requestPayload.extra = input.extra;
+        const request = await this.submitSigned(() => this.signJoinRequest(roomId, requestPayload), (envelope) => this.discourse(host).requestJoin(roomId, envelope));
+        this.state.ownJoinRequests.set(keyStr, request);
+        return { status: "approval_required", join_request: request, sync: this.maybeSync(key) };
     }
-    async roomJoinRequest(input) {
-        const host = normalizeHost(input.host);
-        this.requireAllowedHost(host);
-        const jwt = this.requestJwt(host);
-        const request = {
-            role: input.role,
-            perspective: input.perspective,
-            reason: input.reason,
-            extra: input.extra,
-        };
-        const status = await this.discourse(host).requestJoin(input.room_id, jwt, request);
-        this.pushJoinRequest({ host, roomId: input.room_id }, status);
-        return { join_request: status };
+    async roomSendMessage(input) {
+        return this.submitRoomWrite({ kind: "message", input: { ...input } });
     }
-    async roomJoinWhenApproved(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const host = this.allowedRoomHost(key);
-        const status = await this.approvedJoinRequest(host, input.room_id, input.request_id);
-        const role = status.approved_role ?? status.request.role;
-        const payload = {
-            request_id: input.request_id,
-            role,
-        };
-        const result = await this.completeJoin(host, key, payload);
-        return { record: result.record, member: result.member, sync: result.sync };
+    async roomSubmitEvent(input) {
+        return this.submitRoomWrite({ kind: "event", input: { ...input } });
     }
-    async roomLeave(input) {
+    /**
+     * One room write under the Section 5.1 freshness rules. Contract and signal
+     * writes only anchor, so they are signed against the base and never held.
+     * Message and control writes apply `on_head_mismatch` when the local head
+     * moved past their base or the host returns `room_head_mismatch`.
+     */
+    async submitRoomWrite(request) {
+        const input = request.input;
         const key = this.resolveRoomKey(input.host, input.room_id);
         const host = this.allowedRoomHost(key);
-        const payload = {
-            reason: input.reason,
-            references: [],
-            extra: {},
-        };
-        const envelope = this.signRoomEvent(eventType.ROOM_LEAVE, key, undefined, undefined, [], payload);
-        const record = await this.discourse(host).leaveRoom(input.room_id, envelope);
-        this.applyHostRecord(host, record);
-        return { record, sync: this.syncState(key) };
+        const type = request.kind === "message" ? eventType.MESSAGE_CREATE : request.input.type;
+        const headBound = eventTypeRequiresRoomHead(this.localRoom(key), type);
+        if ((input.base_seq === undefined) !== (input.base_hash === undefined)) {
+            throw invalidPayload("base_seq and base_hash must be provided together");
+        }
+        let base = this.writeBase(key, input.base_seq, input.base_hash);
+        const policy = input.on_head_mismatch ?? "hold";
+        for (let attempts = 0;; attempts++) {
+            if (headBound) {
+                const room = this.localRoom(key);
+                if (!baseIsCurrent(room, base)) {
+                    if (policy === "send_anyway" && attempts < SEND_ANYWAY_MAX_ATTEMPTS) {
+                        base = [room.headSeq, room.headHash];
+                    }
+                    else {
+                        return policy === "reject"
+                            ? this.rejectedHeadMismatch(key, base[0])
+                            : this.holdDraft(key, request, base);
+                    }
+                }
+            }
+            const presentedSeq = this.localRoom(key).presentedSeq;
+            const previousHeadSeq = this.localRoom(key).headSeq;
+            try {
+                const record = await this.submitSigned(() => this.signWrite(request, key, base), (envelope) => this.discourse(host).submitEvent(input.room_id, envelope));
+                await this.applyOwnRecord(key, record);
+                const after = this.localRoom(key);
+                // The agent's own write extends what it saw only when nothing it has
+                // not seen advanced the head in between.
+                if (after.headSeq === record.seq && this.headBefore(after, record.seq, previousHeadSeq) === presentedSeq) {
+                    this.presentHead(after, record.seq);
+                }
+                return {
+                    status: "sent",
+                    record: record,
+                    item: this.timelineItemByEvent(key, record.envelope.hash),
+                    sync: this.syncState(key),
+                };
+            }
+            catch (error) {
+                if (!headBound || !isHttpError(error, "room_head_mismatch"))
+                    throw error;
+                await this.syncRoom(key);
+                // A host that reports a mismatch the verified history does not show
+                // cannot be resolved by retrying.
+                if (baseIsCurrent(this.localRoom(key), base))
+                    throw error;
+            }
+        }
     }
-    async roomSendMessage(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const held = this.headMismatchMessageResult(key, input);
-        if (held)
-            return held;
-        return this.submitMessageUnchecked(input);
+    /**
+     * Applies the record the host returned for the agent's own write, first
+     * syncing any records accepted before it that the connector has not seen.
+     */
+    async applyOwnRecord(key, record) {
+        const room = this.localRoom(key);
+        if (record.seq > room.syncedSeq + 1)
+            await this.syncRoom(key);
+        else
+            this.applyHostRecord(key.host, record);
+    }
+    /** Seq of the latest head-advancing record before `seq`, or 0. */
+    headBefore(room, seq, previousHeadSeq) {
+        for (let s = seq - 1; s > 0; s--) {
+            const record = room.records.find((candidate) => candidate.seq === s);
+            if (record && recordAdvancesRoomHead(room, record))
+                return s;
+        }
+        // A room snapshot may provide a verified head without its older records.
+        return previousHeadSeq < seq ? previousHeadSeq : 0;
     }
-    async submitMessageUnchecked(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const host = this.allowedRoomHost(key);
-        const payload = {
-            content_type: input.content_type ?? "text/plain",
-            content: input.content,
-        };
-        if (input.references && input.references.length > 0) {
-            payload.references = input.references;
+    /** Signs and submits once, re-signing a single time after a bounded Max-Seen-Nonce resync. */
+    async submitSigned(sign, submit) {
+        try {
+            return await submit(sign());
         }
-        if (input.extra && Object.keys(input.extra).length > 0) {
-            payload.extra = input.extra;
+        catch (error) {
+            if (!this.resyncNonce(error))
+                throw error;
+            return submit(sign());
         }
-        const envelope = this.signRoomEvent(eventType.MESSAGE_CREATE, key, input.base_seq, input.base_hash, input.mentions ?? [], payload);
-        const record = await this.discourse(host).submitEvent(input.room_id, envelope);
-        this.applyHostRecord(host, record);
-        const item = this.timelineItemByEvent(key, record.envelope.hash);
-        return {
-            status: "sent",
-            record: record,
-            item,
-            sync: this.syncState(key),
-        };
     }
-    async roomSubmitEvent(input) {
-        // For signal-kind writes — including the membership events — the base is
-        // only an anchor: never hold the draft, ignore on_head_mismatch.
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const room = this.state.rooms.get(roomKeyString(key));
-        const advancesHead = room
-            ? eventTypeAdvancesRoomHead(room, input.type)
-            : true;
-        if (advancesHead) {
-            const held = this.headMismatchEventResult(key, input);
-            if (held)
-                return held;
-        }
-        return this.submitEventUnchecked(input);
+    /** Applies `Max-Seen-Nonce` from a `nonce_not_greater` rejection; reports whether to retry. */
+    resyncNonce(error) {
+        if (!isHttpError(error, "nonce_not_greater") || error.maxSeenNonce === undefined)
+            return false;
+        this.nonces.observeMaxNonce(error.maxSeenNonce);
+        return true;
     }
-    async submitEventUnchecked(input) {
-        const key = this.resolveRoomKey(input.host, input.room_id);
-        const host = this.allowedRoomHost(key);
-        const payload = payloadWithReferences(input.payload, input.references ?? []);
-        const envelope = this.signRoomEvent(input.type, key, input.base_seq, input.base_hash, input.mentions ?? [], payload);
-        const record = await this.discourse(host).submitEvent(input.room_id, envelope);
-        this.applyHostRecord(host, record);
-        const item = this.timelineItemByEvent(key, record.envelope.hash);
-        return {
-            status: "sent",
-            record: record,
-            item,
-            sync: this.syncState(key),
-        };
+    signWrite(request, key, base) {
+        if (request.kind === "message") {
+            const input = request.input;
+            const payload = {
+                content_type: input.content_type ?? "text/plain",
+                content: input.content,
+            };
+            if (input.references && input.references.length > 0)
+                payload.references = input.references;
+            if (input.extra && Object.keys(input.extra).length > 0)
+                payload.extra = input.extra;
+            return this.signRoomEvent(eventType.MESSAGE_CREATE, key, base[0], base[1], input.mentions ?? [], payload);
+        }
+        const input = request.input;
+        const payload = payloadWithReferences({ ...input.payload }, input.references ?? []);
+        return this.signRoomEvent(input.type, key, base[0], base[1], input.mentions ?? [], payload);
     }
     async joinRequestsList(input) {
         const key = this.resolveRoomKey(input.host, input.room_id);
         const host = this.allowedRoomHost(key);
-        const jwt = this.requestJwt(host);
-        let requests = await this.discourse(host).joinRequests(input.room_id, jwt);
-        if (input.status !== undefined) {
-            requests = requests.filter((request) => request.status === input.status);
-        }
-        const offset = parseCursor(input.cursor);
-        if (offset > 0)
-            requests = requests.slice(offset);
-        if (input.limit !== undefined)
-            requests = requests.slice(0, input.limit);
-        this.state.joinRequests.set(roomKeyString(key), requests);
-        return { join_requests: requests };
+        const response = await this.discourse(host).joinRequests(input.room_id, this.requestJwt(host), {
+            status: input.status,
+            limit: input.limit,
+            cursor: input.cursor,
+        });
+        this.state.joinRequests.set(roomKeyString(key), response.result);
+        return response.next_cursor !== undefined
+            ? { join_requests: response.result, next_cursor: response.next_cursor }
+            : { join_requests: response.result };
     }
     async joinRequestReview(input) {
         const key = this.resolveRoomKey(input.host, input.room_id);
         const host = this.allowedRoomHost(key);
-        const jwt = this.requestJwt(host);
-        const status = await this.discourse(host).joinRequest(input.room_id, input.request_id, jwt);
+        if (input.decision === "approve" && input.role === undefined) {
+            throw invalidPayload("approving a join request requires a role");
+        }
+        const joinRequest = await this.discourse(host).joinRequest(input.room_id, input.request_id, this.requestJwt(host));
         const payload = {
-            request: status.request,
+            request: joinRequest.request,
             decision: input.decision,
-            role: input.role,
-            reason: input.reason,
-            extra: {},
         };
-        const envelope = this.signRoomEvent(eventType.ROOM_JOIN_REVIEW, key, undefined, undefined, [], payload);
-        const record = await this.discourse(host).submitEvent(input.room_id, envelope);
-        this.applyHostRecord(host, record);
+        if (input.role !== undefined)
+            payload.role = input.role;
+        if (input.reason !== undefined)
+            payload.reason = input.reason;
+        const record = await this.submitSigned(() => this.signRoomEvent(eventType.ROOM_JOIN_REVIEW, key, undefined, undefined, [], payload), (envelope) => this.discourse(host).submitEvent(input.room_id, envelope));
+        await this.applyOwnRecord(key, record);
         return { record, sync: this.syncState(key) };
     }
-    // ── Join helpers shared by the join tools.
-    async approvedJoinRequest(host, roomId, requestId) {
-        const jwt = this.requestJwt(host);
-        const status = await this.discourse(host).joinRequest(roomId, requestId, jwt);
-        if (status.request.applicant !== this.agentId()) {
-            throw invalidPayload("join request belongs to another agent");
-        }
-        if (status.status !== "approved") {
-            throw invalidPayload("join request is not approved");
-        }
-        return status;
-    }
-    async completeJoin(host, key, payload) {
-        const envelope = this.signRoomEvent(eventType.ROOM_JOIN, key, undefined, undefined, [], payload);
-        const record = await this.discourse(host).joinRoom(key.roomId, envelope);
-        this.applyHostRecord(host, record);
-        const member = this.localRoom(key).members.get(this.agentId());
-        if (!member)
-            throw invalidPayload("joined member not materialized");
-        return {
-            status: "joined",
-            record: record,
-            member,
-            sync: this.syncState(key),
-        };
-    }
-    pushJoinRequest(key, status) {
-        const keyStr = roomKeyString(key);
-        const existing = this.state.joinRequests.get(keyStr);
-        if (existing)
-            existing.push(status);
-        else
-            this.state.joinRequests.set(keyStr, [status]);
-    }
     // ── Signing.
     signProfileUpdate(payload) {
-        const event = profileUpdateEvent(this.agentId(), unixTimeMillis(), this.nonces.nextNonce(), payload);
+        const createdAt = unixTimeMillis();
+        const event = profileUpdateEvent(this.agentId(), createdAt, this.nonces.nextNonce(createdAt), payload);
         return this.signer.signEvent(event);
     }
     signRoomCreate(payload) {
-        const event = roomCreateEvent(this.agentId(), unixTimeMillis(), this.nonces.nextNonce(), payload);
+        const createdAt = unixTimeMillis();
+        const event = roomCreateEvent(this.agentId(), createdAt, this.nonces.nextNonce(createdAt), payload);
+        const envelope = this.signer.signEvent(event);
+        validateDiscourseEnvelope(envelope);
+        return envelope;
+    }
+    signJoinRequest(roomId, payload) {
+        const createdAt = unixTimeMillis();
+        const event = roomJoinRequestEvent(this.agentId(), createdAt, this.nonces.nextNonce(createdAt), roomId, payload);
         const envelope = this.signer.signEvent(event);
         validateDiscourseEnvelope(envelope);
         return envelope;
@@ -1097,26 +1124,37 @@ export class LocalConnector {
     signRoomEvent(type, key, baseSeq, baseHash, mentions, payload) {
         const host = this.localRoom(key).host;
         this.requireAllowedHost(host);
-        const [resolvedSeq, resolvedHash] = this.roomHeadForWrite(key, baseSeq, baseHash);
-        const event = withMentions(discourseEvent(type, this.agentId(), unixTimeMillis(), this.nonces.nextNonce(), key.roomId, resolvedSeq, resolvedHash, payload), mentions);
+        const [resolvedSeq, resolvedHash] = this.writeBase(key, baseSeq, baseHash);
+        const createdAt = unixTimeMillis();
+        let event = discourseEvent(type, this.agentId(), createdAt, this.nonces.nextNonce(createdAt), key.roomId, resolvedSeq, resolvedHash, payload);
+        if (mentions.length > 0)
+            event = withMentions(event, mentions);
         const envelope = this.signer.signEvent(event);
         validateDiscourseEnvelope(envelope);
         return envelope;
     }
-    roomHeadForWrite(key, baseSeq, baseHash) {
+    /**
+     * The base for a write: the explicit base, else the presented head, else the
+     * current verified head (local connector Section 4.2).
+     */
+    writeBase(key, baseSeq, baseHash) {
         if (baseSeq !== undefined && baseHash !== undefined) {
             if (baseSeq > 0 && baseHash.trim() !== "")
                 return [baseSeq, baseHash];
             throw invalidPayload("base_seq and base_hash must identify a valid room head");
         }
-        if (baseSeq === undefined && baseHash === undefined) {
-            const sync = this.syncState(key);
-            if (sync.head_seq === 0 || sync.head_hash.trim() === "") {
-                throw invalidPayload("current room head is not known locally");
-            }
-            return [sync.head_seq, sync.head_hash];
+        if (baseSeq !== undefined || baseHash !== undefined) {
+            throw invalidPayload("base_seq and base_hash must be provided together");
+        }
+        const room = this.localRoom(key);
+        if (room.presentedSeq !== undefined && room.presentedHash !== undefined) {
+            return [room.presentedSeq, room.presentedHash];
         }
-        throw invalidPayload("base_seq and base_hash must be provided together");
+        const sync = this.syncState(key);
+        if (sync.head_seq === 0 || sync.head_hash.trim() === "") {
+            throw invalidPayload("current room head is not known locally");
+        }
+        return [sync.head_seq, sync.head_hash];
     }
     requestJwt(host) {
         // The request JWT aud is always the origin of the host API.
@@ -1126,107 +1164,77 @@ export class LocalConnector {
         const claims = createRequestJwtClaims(this.agentId(), createRequestBinding(audience), unixTimeSecs(), DEFAULT_REQUEST_JWT_TTL_SECS);
         return this.signer.signRequestJwt(claims);
     }
-    // ── Head-mismatch handling and draft holding.
-    headMismatchMessageResult(key, input) {
-        const headMismatch = this.headMismatchWriteState(key, input.base_seq, input.base_hash);
-        if (!headMismatch)
-            return undefined;
-        switch (input.on_head_mismatch ?? "hold") {
-            case "send_anyway":
-                input.base_seq = undefined;
-                input.base_hash = undefined;
-                return undefined;
-            case "reject":
-                return this.rejectedHeadMismatchResult(headMismatch);
-            default:
-                return this.holdMessageDraft(input, headMismatch);
-        }
-    }
-    headMismatchEventResult(key, input) {
-        const headMismatch = this.headMismatchWriteState(key, input.base_seq, input.base_hash);
-        if (!headMismatch)
-            return undefined;
-        switch (input.on_head_mismatch ?? "hold") {
-            case "send_anyway":
-                input.base_seq = undefined;
-                input.base_hash = undefined;
-                return undefined;
-            case "reject":
-                return this.rejectedHeadMismatchResult(headMismatch);
-            default:
-                return this.holdEventDraft(input, headMismatch);
+    // ── Presented head.
+    /** Presents the head at `seq`, which must be a known head-advancing record or the current head. */
+    presentHead(room, seq) {
+        if (seq <= 0)
+            return;
+        const hash = seq === room.headSeq
+            ? room.headHash
+            : room.records.find((record) => record.seq === seq)?.hash;
+        if (hash === undefined)
+            return;
+        room.presentedSeq = seq;
+        room.presentedHash = hash;
+    }
+    /** Presents the latest head-advancing record at or before `seq`, if it moves the presented head forward. */
+    presentThrough(room, seq) {
+        const base = room.presentedSeq ?? 0;
+        for (let s = Math.min(seq, room.syncedSeq); s > base; s--) {
+            const record = room.records.find((candidate) => candidate.seq === s);
+            if (record && recordAdvancesRoomHead(room, record)) {
+                room.presentedSeq = s;
+                room.presentedHash = record.hash;
+                return;
+            }
         }
     }
-    headMismatchWriteState(key, baseSeq, baseHash) {
-        if (baseSeq === undefined && baseHash === undefined)
-            return undefined;
-        const sync = this.syncState(key);
-        const seqMismatch = baseSeq !== undefined && baseSeq !== sync.head_seq;
-        const hashMismatch = baseHash !== undefined && sync.head_hash !== baseHash;
-        if (!seqMismatch && !hashMismatch)
-            return undefined;
-        return { sync, changes: this.roomChangesSince(key, baseSeq) };
-    }
-    rejectedHeadMismatchResult(headMismatch) {
+    // ── Head-mismatch handling and draft holding.
+    rejectedHeadMismatch(key, baseSeq) {
+        const room = this.localRoom(key);
+        const changes = this.roomChangesSince(key, baseSeq);
+        this.presentHead(room, room.headSeq);
         return {
             status: "rejected",
             reason: "room_head_mismatch",
-            changes: headMismatch.changes,
-            sync: headMismatch.sync,
-        };
-    }
-    holdMessageDraft(input, headMismatch) {
-        input.host = headMismatch.sync.host;
-        const draftId = this.nextDraftId(input.room_id);
-        const draft = {
-            id: draftId,
-            room_id: input.room_id,
-            kind: "message",
-            created_at: unixTimeMillis(),
-            base_seq: input.base_seq,
-            base_hash: input.base_hash,
-            current_sync: headMismatch.sync,
-            draft: messageDraftValue(input),
-            reason: "room_head_mismatch",
-            options: heldDraftOptions(),
-        };
-        this.state.drafts.set(draftId, {
-            draft,
-            request: { kind: "message", input },
-        });
-        return {
-            status: "held",
-            reason: "room_head_mismatch",
-            draft,
-            changes: headMismatch.changes,
-            sync: headMismatch.sync,
+            changes,
+            sync: this.syncState(key),
         };
     }
-    holdEventDraft(input, headMismatch) {
-        input.host = headMismatch.sync.host;
+    holdDraft(key, request, base) {
+        const room = this.localRoom(key);
+        const changes = this.roomChangesSince(key, base[0]);
+        // The held result shows every change up to the current head.
+        this.presentHead(room, room.headSeq);
+        const sync = this.syncState(key);
+        const input = { ...request.input, host: sync.host, base_seq: base[0], base_hash: base[1] };
         const draftId = this.nextDraftId(input.room_id);
         const draft = {
             id: draftId,
             room_id: input.room_id,
-            kind: "event",
+            kind: request.kind,
             created_at: unixTimeMillis(),
-            base_seq: input.base_seq,
-            base_hash: input.base_hash,
-            current_sync: headMismatch.sync,
-            draft: eventDraftValue(input),
+            base_seq: base[0],
+            base_hash: base[1],
+            current_sync: sync,
+            draft: request.kind === "message"
+                ? messageDraftValue(input)
+                : eventDraftValue(input),
             reason: "room_head_mismatch",
             options: heldDraftOptions(),
         };
         this.state.drafts.set(draftId, {
             draft,
-            request: { kind: "event", input },
+            request: request.kind === "message"
+                ? { kind: "message", input: input }
+                : { kind: "event", input: input },
         });
         return {
             status: "held",
             reason: "room_head_mismatch",
             draft,
-            changes: headMismatch.changes,
-            sync: headMismatch.sync,
+            changes,
+            sync,
         };
     }
     roomChangesSince(key, baseSeq) {
@@ -1240,7 +1248,10 @@ export class LocalConnector {
         const room = [...roomId]
             .map((ch) => (/[A-Za-z0-9_-]/.test(ch) ? ch : "_"))
             .join("");
-        return `draft_${room}_${this.state.drafts.size + 1}`;
+        let n = this.state.drafts.size + 1;
+        while (this.state.drafts.has(`draft_${room}_${n}`))
+            n += 1;
+        return `draft_${room}_${n}`;
     }
     // ── Views.
     syncState(key) {
@@ -1251,6 +1262,9 @@ export class LocalConnector {
             room_id: key.roomId,
             head_seq: room.headSeq,
             head_hash: headHash,
+            ...(room.presentedSeq !== undefined
+                ? { presented_seq: room.presentedSeq, presented_hash: room.presentedHash }
+                : {}),
             synced_seq: room.syncedSeq,
             remote_seq: Math.max(room.room.seq, room.syncedSeq),
             subscribed: room.subscribed,
@@ -1258,6 +1272,9 @@ export class LocalConnector {
             pending_inbox_count: this.pendingInboxCount(key.roomId),
         };
     }
+    maybeSync(key) {
+        return this.state.rooms.has(roomKeyString(key)) ? this.syncState(key) : undefined;
+    }
     roomStateView(room) {
         const selfMember = room.members.get(this.agentId());
         return {
@@ -1268,8 +1285,8 @@ export class LocalConnector {
             topic: roomTopic(room.room),
             agenda: roomAgenda(room.room),
             guidance: roomGuidance(room.room),
-            creator: room.room.envelope?.event.actor,
-            created_at: room.room.envelope?.event.created_at,
+            creator: room.room.creator ?? room.room.envelope?.event.actor,
+            created_at: room.room.created_at ?? room.room.envelope?.event.created_at,
             start_time: roomStartTime(room.room),
             end_time: roomEndTime(room.room),
             tags: roomTags(room.room),
@@ -1310,10 +1327,24 @@ export class LocalConnector {
         return room;
     }
     requireAllowedHost(host) {
-        const record = this.state.hosts.get(host);
+        const record = this.state.hosts.get(normalizeHost(host));
         if (!record || !record.allowed)
             throw permissionDenied();
     }
+    /**
+     * Operator policy for a service URL that is not a discourse host: its origin
+     * must be an allowed host or the profile service of one.
+     */
+    requireAllowedOrigin(url) {
+        const origin = serviceOrigin(url);
+        if (this.state.hosts.get(origin)?.allowed)
+            return;
+        for (const host of this.state.hosts.values()) {
+            if (host.allowed && host.profile_service !== undefined && serviceOrigin(host.profile_service) === origin)
+                return;
+        }
+        throw permissionDenied();
+    }
     allowedRoomHost(key) {
         const host = this.localRoom(key).host;
         this.requireAllowedHost(host);
@@ -1352,8 +1383,5 @@ export class LocalConnector {
     profileClient(url) {
         return new ProfileClient(url, this.fetchImpl);
     }
-    delegationClient(url) {
-        return new DelegationClient(url, this.fetchImpl);
-    }
 }
 //# sourceMappingURL=engine.js.map