letagents 0.12.8 → 0.12.9

package/dist/mcp/server.js

@@ -11,13 +11,15 @@ import { SseClient } from "./sse-client.js";
 import { getRoomFromConfig } from "./config-reader.js";
 import { getGitRemoteIdentity } from "./git-remote.js";
 import { AGENT_CODENAME_SPACE, normalizeSlugSegment, normalizeAgentBaseName, pickLocalCodename, } from "./codenames.js";
-import { clearPendingDeviceAuth, clearStoredAuth, getCurrentCodexLiveSession, getLocalStatePath, getPendingDeviceAuth, getStoredAgentIdentity, getStoredAuth, getStoredCurrentRoom, getStoredRoomSession, listStoredCodexLiveSessions, saveRoomSession, setStoredAgentIdentity, setPendingDeviceAuth, setStoredAuth, touchRoomSession, updateLocalState, } from "./local-state.js";
+import { clearPendingDeviceAuth, clearStoredAuth, endStoredAgentSession, getCurrentCodexLiveSession, getLocalStatePath, getPendingDeviceAuth, getCurrentAgentSession, getStoredAgentSession, getStoredAgentIdentity, getStoredAuth, getStoredCurrentRoom, getStoredRoomSession, listStoredCodexLiveSessions, saveAgentSession, saveRoomSession, setStoredAgentIdentity, setPendingDeviceAuth, setStoredAuth, touchRoomSession, updateLocalState, } from "./local-state.js";
 import { encodeRoomIdPath, getCanonicalRoomWebPath, looksLikeInviteCode, normalizeInviteCode, } from "./room-id.js";
 import { buildAgentActorLabel, formatOwnerAttribution, inferAgentIdeLabel, toTitleCaseCodename, } from "../shared/agent-identity.js";
 import { buildRoomAgentPrompt, normalizeAgentPromptKind, } from "../shared/room-agent-prompts.js";
+import { LETAGENTS_AGENT_SESSION_ID_HEADER, LETAGENTS_AGENT_SESSION_TOKEN_HEADER, LETAGENTS_ORIGIN_ROOM_ID_HEADER, } from "../shared/request-headers.js";
 import { inspectLocalCodexSession, startLocalCodexSession, stopLocalCodexSession, toPublicCodexLiveSession, } from "./codex-session.js";
 import { classifyPresenceStatusText, deriveTaskPresenceStatus, getRoomIdentityPresenceCacheKey, } from "./agent-presence.js";
 import { buildRoomEventsQueryString } from "./room-events-query.js";
+import { AGENT_PRESENCE_STATUSES, } from "../shared/agent-presence.js";
 import { getPollTimeoutCapMs } from "../shared/poll-timeout-cap.js";
 let currentRoom = null;
 let currentAgentIdentityKey = "";
@@ -712,6 +714,17 @@ async function withAgentIdentity(payload) {
         agent_identity: toPublicAgentIdentity(await ensureAgentIdentity()),
     };
 }
+function getCurrentStreamAgentIdentity() {
+    const identity = currentAgentIdentity ?? getStoredAgentIdentity(currentAgentIdentityKey);
+    if (!identity?.actor_label || !identity.canonical_key) {
+        return null;
+    }
+    return {
+        actorLabel: identity.actor_label,
+        actorKey: identity.canonical_key,
+        actorInstanceId: AGENT_INSTANCE_UUID,
+    };
+}
 function rememberRoom(state, lastMessageId) {
     currentRoom = state;
     saveRoomSession({
@@ -726,6 +739,7 @@ function rememberRoom(state, lastMessageId) {
     sseClient.subscribe({
         roomId: state.room_id,
         projectId: state.project_id ?? null,
+        agentIdentity: getCurrentStreamAgentIdentity(),
     }, (_message) => {
         touchRoomSession(state.room_id);
         server.server.sendResourceListChanged();
@@ -744,22 +758,24 @@ function getRememberedRoomPresence(roomId, identity) {
     }
     return (roomPresenceByIdentity.get(getRoomIdentityPresenceCacheKey(roomId, identity.actor_label)) ?? { status: "idle", status_text: null });
 }
-async function syncRoomPresence(roomId, identity, presence) {
-    if (!roomId || !identity) {
+async function syncRoomPresence(roomId, identity, presence, agentSession) {
+    const resolvedIdentity = agentSession ? identityFromAgentSession(agentSession) : identity;
+    if (!roomId || !resolvedIdentity || !agentSession) {
         return;
     }
-    roomPresenceByIdentity.set(getRoomIdentityPresenceCacheKey(roomId, identity.actor_label), presence);
+    roomPresenceByIdentity.set(getRoomIdentityPresenceCacheKey(roomId, resolvedIdentity.actor_label), presence);
     try {
         await apiCall(`/rooms/${encodeRoomIdPath(roomId)}/presence`, {
             method: "POST",
             body: JSON.stringify({
-                actor_label: identity.actor_label,
-                agent_key: identity.canonical_key,
-                display_name: identity.display_name,
-                owner_label: identity.owner_label,
-                ide_label: identity.ide_label,
+                actor_label: resolvedIdentity.actor_label,
+                agent_key: resolvedIdentity.canonical_key,
+                display_name: resolvedIdentity.display_name,
+                owner_label: resolvedIdentity.owner_label,
+                ide_label: resolvedIdentity.ide_label,
                 status: presence.status,
                 status_text: presence.status_text,
+                ...agentSessionCredentials(agentSession),
             }),
         });
         touchRoomSession(roomId);
@@ -774,6 +790,15 @@ async function syncRoomPresence(roomId, identity, presence) {
 async function heartbeatRoomPresence(roomId, identity) {
     await syncRoomPresence(roomId, identity, getRememberedRoomPresence(roomId, identity));
 }
+function buildAgentDeliveryHeaders(agentSession) {
+    if (!agentSession) {
+        return {};
+    }
+    return {
+        [LETAGENTS_AGENT_SESSION_ID_HEADER]: agentSession.session_id,
+        [LETAGENTS_AGENT_SESSION_TOKEN_HEADER]: agentSession.session_token,
+    };
+}
 function getTargetRoomId(roomId) {
     return roomId || currentRoom?.room_id || null;
 }
@@ -802,6 +827,81 @@ function getCurrentLiveSessionPayload(roomId) {
     const session = getCurrentCodexLiveSession(roomId);
     return session ? toPublicCodexLiveSession(session) : null;
 }
+function toPublicAgentSession(session) {
+    if (!session) {
+        return null;
+    }
+    return {
+        session_id: session.session_id,
+        room_id: session.room_id,
+        session_kind: session.session_kind,
+        runtime: session.runtime,
+        actor_label: session.actor_label,
+        agent_key: session.agent_key,
+        agent_instance_id: session.agent_instance_id ?? null,
+        display_name: session.display_name,
+        owner_label: session.owner_label,
+        ide_label: session.ide_label,
+        created_at: session.created_at,
+        updated_at: session.updated_at,
+        last_seen_at: session.last_seen_at,
+        ended_at: session.ended_at ?? null,
+    };
+}
+function resolveAgentSession(roomId, sessionId) {
+    if (!sessionId) {
+        return getCurrentAgentSession(roomId);
+    }
+    const session = getStoredAgentSession(sessionId);
+    if (!session) {
+        throw new Error(`Unknown agent_session_id: ${sessionId}`);
+    }
+    if (session.ended_at) {
+        throw new Error(`agent_session_id ${sessionId} ended at ${session.ended_at}`);
+    }
+    if (roomId && session.room_id !== roomId) {
+        throw new Error(`agent_session_id ${sessionId} is registered for ${session.room_id}, not ${roomId}`);
+    }
+    return session;
+}
+function identityFromAgentSession(session) {
+    return {
+        name: normalizeAgentBaseName(session.display_name),
+        display_name: session.display_name,
+        owner_label: session.owner_label,
+        owner_attribution: formatOwnerAttribution(session.owner_label),
+        ide_label: session.ide_label,
+        actor_label: session.actor_label,
+        canonical_key: session.agent_key,
+        runtime_key: `agent_session:${session.session_id}`,
+        source: "api",
+        resolved_at: session.updated_at,
+    };
+}
+function requireWorkerAgentSession(roomId, sessionId) {
+    const session = resolveAgentSession(roomId, sessionId);
+    if (!session) {
+        throw new Error("Registered worker agent_session_id is required for this write action. " +
+            "Call register_agent_session for this room first, then pass the returned agent_session_id.");
+    }
+    if (session.session_kind !== "worker") {
+        throw new Error("Worker agent_session_id is required for this write action.");
+    }
+    return session;
+}
+async function resolveWorkerToolIdentity(input) {
+    const agentSession = requireWorkerAgentSession(input.roomId, input.agentSessionId);
+    return {
+        identity: identityFromAgentSession(agentSession),
+        agentSession,
+    };
+}
+function agentSessionCredentials(agentSession) {
+    return {
+        agent_session_id: agentSession.session_id,
+        agent_session_token: agentSession.session_token,
+    };
+}
 function toAgentReadableMessage(message) {
     if (!message || typeof message !== "object") {
         return message;
@@ -826,9 +926,20 @@ function appendIncludePromptOnly(path) {
     return `${path}${path.includes("?") ? "&" : "?"}include_prompt_only=1`;
 }
 async function roomScopedApiCall(input) {
+    const headers = {
+        ...input.options?.headers,
+    };
+    if (currentRoom?.room_id &&
+        !Object.keys(headers).some((key) => key.toLowerCase() === LETAGENTS_ORIGIN_ROOM_ID_HEADER.toLowerCase())) {
+        headers[LETAGENTS_ORIGIN_ROOM_ID_HEADER] = currentRoom.room_id;
+    }
+    const options = {
+        ...input.options,
+        headers,
+    };
     if (input.room_id) {
         try {
-            const result = await apiCall(input.room_path(input.room_id), input.options);
+            const result = await apiCall(input.room_path(input.room_id), options);
             touchRoomSession(input.room_id, getLastMessageId(result));
             return result;
         }
@@ -842,12 +953,16 @@ async function roomScopedApiCall(input) {
     if (!input.project_id) {
         throw new Error("No room is available for this request.");
     }
-    const result = await apiCall(input.project_path(input.project_id), input.options);
+    const result = await apiCall(input.project_path(input.project_id), options);
     if (input.room_id) {
         touchRoomSession(input.room_id, getLastMessageId(result));
     }
     return result;
 }
+function normalizeOptionalToolString(value) {
+    const trimmed = value?.trim();
+    return trimmed ? trimmed : undefined;
+}
 async function joinRoomIdentifier(identifier, joinedVia) {
     const roomId = joinedVia === "join_code" ? normalizeInviteCode(identifier) : identifier.trim();
     try {
@@ -855,6 +970,7 @@ async function joinRoomIdentifier(identifier, joinedVia) {
         const joinedRoomId = typeof response.room_id === "string"
             ? response.room_id
             : roomId;
+        const agentIdentity = await ensureAgentIdentity();
         const room = rememberRoom(toRoomState({
             room_id: joinedRoomId,
             project_id: typeof response.project_id === "string" ? response.project_id : null,
@@ -866,10 +982,9 @@ async function joinRoomIdentifier(identifier, joinedVia) {
             display_name: typeof response.display_name === "string" ? response.display_name : null,
             joined_via: joinedVia,
         }));
-        const agentIdentity = await ensureAgentIdentity();
         await syncRoomPresence(room.room_id, agentIdentity, {
             status: "idle",
-            status_text: "online in room",
+            status_text: "available in room",
         });
         return {
             room,
@@ -891,6 +1006,7 @@ async function joinRoomIdentifier(identifier, joinedVia) {
         const legacyRoomId = typeof project.code === "string"
             ? project.code
             : roomId;
+        const agentIdentity = await ensureAgentIdentity();
         const room = rememberRoom(toRoomState({
             room_id: legacyRoomId,
             project_id: typeof project.id === "string" ? project.id : null,
@@ -898,10 +1014,9 @@ async function joinRoomIdentifier(identifier, joinedVia) {
             display_name: typeof project.display_name === "string" ? project.display_name : null,
             joined_via: joinedVia,
         }));
-        const agentIdentity = await ensureAgentIdentity();
         await syncRoomPresence(room.room_id, agentIdentity, {
             status: "idle",
-            status_text: "online in room",
+            status_text: "available in room",
         });
         return {
             room,
@@ -919,6 +1034,7 @@ async function joinRoomIdentifier(identifier, joinedVia) {
         : typeof project.code === "string" && project.code.trim()
             ? project.code
             : roomId;
+    const agentIdentity = await ensureAgentIdentity();
     const room = rememberRoom(toRoomState({
         room_id: legacyRoomId,
         project_id: typeof project.id === "string" ? project.id : null,
@@ -930,10 +1046,9 @@ async function joinRoomIdentifier(identifier, joinedVia) {
         display_name: typeof project.display_name === "string" ? project.display_name : null,
         joined_via: joinedVia,
     }));
-    const agentIdentity = await ensureAgentIdentity();
     await syncRoomPresence(room.room_id, agentIdentity, {
         status: "idle",
-        status_text: "online in room",
+        status_text: "available in room",
     });
     return {
         room,
@@ -962,7 +1077,7 @@ async function createInviteRoom() {
     const agentIdentity = await ensureAgentIdentity();
     await syncRoomPresence(room.room_id, agentIdentity, {
         status: "idle",
-        status_text: "online in room",
+        status_text: "available in room",
     });
     return {
         room,
@@ -1154,6 +1269,186 @@ server.tool("join_room", "Join a named room on Let Agents Chat. Creates the room
         throw error;
     }
 });
+// -- register_agent_session -------------------------------------------------
+server.tool("register_agent_session", "Register this MCP client as an explicit room agent session. Unregistered MCP traffic is treated as controller traffic and stays out of the connected-agent roster.", {
+    room_id: z
+        .string()
+        .optional()
+        .describe("Canonical room ID. Defaults to the current room."),
+    session_kind: z
+        .enum(["worker", "controller"])
+        .optional()
+        .describe("Agent session kind. Workers appear in connected agent activity; controllers do not. Defaults to worker."),
+    runtime: z
+        .string()
+        .optional()
+        .describe("Runtime label such as codex, antigravity, or custom harness name."),
+    display_name: z
+        .string()
+        .optional()
+        .describe("Human-readable label for this worker session. Use distinct labels when one MCP process controls multiple workers."),
+}, async ({ room_id, session_kind, runtime, display_name }) => {
+    const targetRoomId = getTargetRoomId(room_id);
+    if (!targetRoomId) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({
+                        success: false,
+                        error: "No room_id provided and not currently in a room.",
+                        hint: "Join a room first, or pass room_id explicitly.",
+                    }, null, 2),
+                },
+            ],
+        };
+    }
+    const identity = await ensureAgentIdentity();
+    if (!identity.canonical_key) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({
+                        success: false,
+                        error: "Authenticated agent identity is required before registering an agent session.",
+                    }, null, 2),
+                },
+            ],
+        };
+    }
+    const created = await apiCall(`/rooms/${encodeRoomIdPath(targetRoomId)}/agent-sessions`, {
+        method: "POST",
+        body: JSON.stringify({
+            actor_key: identity.canonical_key,
+            actor_label: identity.actor_label,
+            ide_label: identity.ide_label ?? detectAgentIdeLabel(),
+            agent_instance_id: AGENT_INSTANCE_UUID,
+            display_name: display_name?.trim() || identity.display_name,
+            session_kind: session_kind ?? "worker",
+            runtime: runtime?.trim() || detectAgentIdeLabel().toLowerCase(),
+        }),
+    });
+    const sessionId = typeof created.session_id === "string" ? created.session_id : "";
+    const sessionToken = typeof created.session_token === "string" ? created.session_token : "";
+    if (!sessionId || !sessionToken) {
+        throw new Error("Agent session registration response was missing session credentials.");
+    }
+    const session = saveAgentSession({
+        session_id: sessionId,
+        session_token: sessionToken,
+        room_id: typeof created.room_id === "string" ? created.room_id : targetRoomId,
+        session_kind: created.session_kind === "controller" ? "controller" : "worker",
+        runtime: typeof created.runtime === "string" ? created.runtime : "unknown",
+        actor_label: typeof created.actor_label === "string" ? created.actor_label : identity.actor_label,
+        agent_key: typeof created.agent_key === "string" ? created.agent_key : identity.canonical_key,
+        agent_instance_id: typeof created.agent_instance_id === "string" ? created.agent_instance_id : AGENT_INSTANCE_UUID,
+        display_name: typeof created.display_name === "string" ? created.display_name : identity.display_name,
+        owner_label: typeof created.owner_label === "string" ? created.owner_label : identity.owner_label,
+        ide_label: typeof created.ide_label === "string" ? created.ide_label : identity.ide_label ?? detectAgentIdeLabel(),
+        created_at: typeof created.created_at === "string" ? created.created_at : new Date().toISOString(),
+        updated_at: typeof created.updated_at === "string" ? created.updated_at : new Date().toISOString(),
+        last_seen_at: typeof created.last_seen_at === "string" ? created.last_seen_at : new Date().toISOString(),
+        ended_at: typeof created.ended_at === "string" ? created.ended_at : null,
+    });
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify({
+                    success: true,
+                    agent_session: toPublicAgentSession(session),
+                    agent_session_id: session.session_id,
+                    use_agent_session_id: "Pass this agent_session_id to wait_for_messages, send_message, post_status, and task tools for this specific worker.",
+                }, null, 2),
+            },
+        ],
+    };
+});
+// -- disconnect_agent_session ----------------------------------------------
+server.tool("disconnect_agent_session", "Disconnect/end a registered worker session from a room. Defaults to the current worker session; admins may pass another agent_session_id.", {
+    room_id: z.string().optional().describe("Canonical room ID. Defaults to the current room or the stored session room."),
+    agent_session_id: z.string().optional().describe("Registered agent session to disconnect. Defaults to the current session for the room."),
+}, async ({ room_id, agent_session_id }) => {
+    let targetRoomId = getTargetRoomId(room_id);
+    const localSession = agent_session_id
+        ? getStoredAgentSession(agent_session_id)
+        : getCurrentAgentSession(targetRoomId ?? currentRoom?.room_id ?? null);
+    if (!targetRoomId && localSession) {
+        targetRoomId = localSession.room_id;
+    }
+    if (!targetRoomId) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({
+                        success: false,
+                        error: "No room_id provided and not currently in a room.",
+                        hint: "Join a room first, pass room_id, or pass a locally stored agent_session_id.",
+                    }, null, 2),
+                },
+            ],
+        };
+    }
+    const targetSessionId = agent_session_id || localSession?.session_id;
+    if (!targetSessionId) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({
+                        success: false,
+                        error: "No registered agent session was found for this room.",
+                        hint: "Pass agent_session_id or call register_agent_session first.",
+                    }, null, 2),
+                },
+            ],
+        };
+    }
+    if (localSession?.ended_at) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({
+                        success: true,
+                        already_ended: true,
+                        agent_session: toPublicAgentSession(localSession),
+                    }, null, 2),
+                },
+            ],
+        };
+    }
+    const requestBody = localSession?.session_id === targetSessionId && localSession.session_kind === "worker"
+        ? agentSessionCredentials(localSession)
+        : {};
+    const result = await apiCall(`/rooms/${encodeRoomIdPath(targetRoomId)}/agent-sessions/${encodeURIComponent(targetSessionId)}/disconnect`, {
+        method: "POST",
+        body: JSON.stringify(requestBody),
+    });
+    const endedAt = result.agent_session && typeof result.agent_session === "object" && "ended_at" in result.agent_session
+        ? String(result.agent_session.ended_at ?? new Date().toISOString())
+        : new Date().toISOString();
+    const endedLocalSession = localSession?.session_id === targetSessionId
+        ? endStoredAgentSession(targetSessionId, endedAt)
+        : null;
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify({
+                    success: true,
+                    room_id: targetRoomId,
+                    agent_session_id: targetSessionId,
+                    agent_session: result.agent_session ?? toPublicAgentSession(endedLocalSession),
+                    delivery_session: result.delivery_session ?? null,
+                    local_state: endedLocalSession ? "ended" : "unchanged",
+                }, null, 2),
+            },
+        ],
+    };
+});
 // -- local Codex live sessions ---------------------------------------------
 server.tool("start_local_codex_session", "Start or reuse a detached local Codex live session for a LetAgents room. The worker will join the room, keep polling, contribute in discussion, and do repo work from the current working directory when asked.", {
     room: z
@@ -1384,8 +1679,12 @@ server.tool("post_status", "Broadcast a lightweight status update to the current
     conversation_id: z
         .string()
         .optional()
-        .describe("Optional conversation ID for per-conversation identity scoping."),
-}, async ({ sender: _sender, status, room_id, conversation_id }) => {
+        .describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z
+        .string()
+        .optional()
+        .describe("Registered agent session to use for this status update."),
+}, async ({ sender: _sender, status, room_id, conversation_id: _conversation_id, agent_session_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1404,7 +1703,10 @@ server.tool("post_status", "Broadcast a lightweight status update to the current
     }
     // Status messages use a reserved prefix so the UI (and agents) can distinguish
     // them from normal chat messages without changing the data model.
-    const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
+    const { identity, agentSession } = await resolveWorkerToolIdentity({
+        roomId: targetRoomId ?? currentRoom?.room_id ?? null,
+        agentSessionId: agent_session_id,
+    });
     const sender = identity.actor_label;
     const statusText = `[status] ${status}`;
     const message = await roomScopedApiCall({
@@ -1414,14 +1716,18 @@ server.tool("post_status", "Broadcast a lightweight status update to the current
         project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/messages`,
         options: {
             method: "POST",
-            body: JSON.stringify({ sender, text: statusText }),
+            body: JSON.stringify({
+                sender,
+                text: statusText,
+                ...agentSessionCredentials(agentSession),
+            }),
         },
     });
     touchCurrentRoom(typeof message.id === "string" ? message.id : undefined);
     await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, {
         status: classifyPresenceStatusText(status, getRememberedRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity).status),
         status_text: status,
-    });
+    }, agentSession);
     return {
         content: [
             {
@@ -1438,14 +1744,170 @@ server.tool("post_status", "Broadcast a lightweight status update to the current
         ],
     };
 });
+// -- post_reasoning ---------------------------------------------------------
+server.tool("post_reasoning", "Update a structured, replace-in-place reasoning trace for the current room without spamming chat. " +
+    "Use this for visible thought-process updates such as goal, hypothesis, checks in progress, blockers, " +
+    "and next action. Optionally persist a milestone summary into room history when something durable changed.", {
+    summary: z.string().describe("Short current reasoning summary shown in the room UI."),
+    goal: z.string().optional().describe("What the agent is trying to achieve right now."),
+    checking: z.string().optional().describe("What the agent is verifying or inspecting."),
+    hypothesis: z.string().optional().describe("Current working theory or approach."),
+    blocker: z.string().optional().describe("Current blocker, if any."),
+    next_action: z.string().optional().describe("Immediate next step the agent plans to take."),
+    milestone: z.string().optional().describe("Optional durable milestone summary to append to room history."),
+    confidence: z.number().min(0).max(1).optional().describe("Optional confidence score between 0 and 1."),
+    status: z.enum(AGENT_PRESENCE_STATUSES).optional().describe("Optional explicit presence state override."),
+    room_id: z.string().optional().describe("Canonical room ID. Defaults to the current room."),
+    conversation_id: z
+        .string()
+        .optional()
+        .describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z
+        .string()
+        .optional()
+        .describe("Registered agent session to use for this reasoning update."),
+}, async ({ summary, goal, checking, hypothesis, blocker, next_action, milestone, confidence, status, room_id, conversation_id: _conversation_id, agent_session_id, }) => {
+    const targetRoomId = getTargetRoomId(room_id);
+    const targetProjectId = getFallbackProjectId();
+    if (!targetRoomId && !targetProjectId) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({
+                        success: false,
+                        error: "No room_id provided and not currently in a room.",
+                        hint: "Join or create a room first, or pass room_id explicitly.",
+                    }, null, 2),
+                },
+            ],
+        };
+    }
+    const normalizedSummary = summary.trim();
+    if (!normalizedSummary) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({ success: false, error: "summary is required" }, null, 2),
+                },
+            ],
+        };
+    }
+    const { identity, agentSession } = await resolveWorkerToolIdentity({
+        roomId: targetRoomId ?? currentRoom?.room_id ?? null,
+        agentSessionId: agent_session_id,
+    });
+    const snapshot = {
+        summary: normalizedSummary,
+        goal: normalizeOptionalToolString(goal),
+        checking: normalizeOptionalToolString(checking),
+        hypothesis: normalizeOptionalToolString(hypothesis),
+        blocker: normalizeOptionalToolString(blocker),
+        next_action: normalizeOptionalToolString(next_action),
+        milestone: normalizeOptionalToolString(milestone),
+        confidence,
+        status,
+    };
+    const query = new URLSearchParams({
+        open: "true",
+        actor_label: identity.actor_label,
+    });
+    const sessionsResult = await roomScopedApiCall({
+        room_id: targetRoomId,
+        project_id: targetProjectId,
+        room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/reasoning-sessions?${query.toString()}`,
+        project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/reasoning-sessions?${query.toString()}`,
+    });
+    const existingSession = sessionsResult.sessions?.[0];
+    let result = null;
+    if (existingSession?.id) {
+        result = await roomScopedApiCall({
+            room_id: targetRoomId,
+            project_id: targetProjectId,
+            room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/reasoning-sessions/${encodeURIComponent(existingSession.id)}/updates`,
+            project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/reasoning-sessions/${encodeURIComponent(existingSession.id)}/updates`,
+            options: {
+                method: "POST",
+                body: JSON.stringify({
+                    actor_label: identity.actor_label,
+                    ...agentSessionCredentials(agentSession),
+                    ...snapshot,
+                }),
+            },
+        });
+    }
+    else {
+        result = await roomScopedApiCall({
+            room_id: targetRoomId,
+            project_id: targetProjectId,
+            room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/reasoning-sessions`,
+            project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/reasoning-sessions`,
+            options: {
+                method: "POST",
+                body: JSON.stringify({
+                    actor_label: identity.actor_label,
+                    agent_key: identity.canonical_key,
+                    ...agentSessionCredentials(agentSession),
+                    ...snapshot,
+                }),
+            },
+        });
+    }
+    let milestoneMessageId = null;
+    const normalizedMilestone = normalizeOptionalToolString(milestone);
+    if (normalizedMilestone) {
+        const milestoneMessage = await roomScopedApiCall({
+            room_id: targetRoomId,
+            project_id: targetProjectId,
+            room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/messages`,
+            project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/messages`,
+            options: {
+                method: "POST",
+                body: JSON.stringify({
+                    sender: identity.actor_label,
+                    text: normalizedMilestone,
+                    ...agentSessionCredentials(agentSession),
+                }),
+            },
+        });
+        milestoneMessageId =
+            typeof milestoneMessage.id === "string" ? milestoneMessage.id : null;
+        touchCurrentRoom(milestoneMessageId ?? undefined);
+    }
+    if (status) {
+        await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, {
+            status,
+            status_text: normalizedSummary,
+        }, agentSession);
+    }
+    else {
+        await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, getRememberedRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity), agentSession);
+    }
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify({
+                    success: true,
+                    room_id: result?.room_id ?? targetRoomId ?? targetProjectId ?? null,
+                    session: result?.session ?? null,
+                    update: result?.update ?? null,
+                    milestone_message_id: milestoneMessageId,
+                    agent_identity: toPublicAgentIdentity(identity),
+                }, null, 2),
+            },
+        ],
+    };
+});
 // -- Task Board Tools -------------------------------------------------------
 const TASK_STATUSES = [
     "proposed", "accepted", "assigned", "in_progress",
     "blocked", "in_review", "merged", "done", "cancelled",
 ];
 server.tool("add_task", "Add a new task to the room board. Tasks normally start as 'proposed' and must be " +
-    "accepted before an agent can claim them, but tasks created by trusted agents already " +
-    "active in the room may be auto-accepted. Use this when a human or agent identifies " +
+    "accepted before an agent can claim them. Agent-created tasks require coordinator " +
+    "acceptance before they become claimable. Use this when a human or agent identifies " +
     "work that needs to be done.", {
     title: z.string().describe("Short task title, e.g. 'Wire up Jest test runner'"),
     description: z.string().optional().describe("Longer description of what needs to be done"),
@@ -1455,8 +1917,9 @@ server.tool("add_task", "Add a new task to the room board. Tasks normally start
         .describe("Deprecated override. Agent identity is resolved automatically on room entry."),
     source_message_id: z.string().optional().describe("Optional message ID where task was agreed, e.g. 'msg_42'"),
     room_id: z.string().optional().describe("Canonical room ID. Defaults to current room."),
-    conversation_id: z.string().optional().describe("Optional conversation ID for per-conversation identity scoping."),
-}, async ({ title, description, created_by: _createdBy, source_message_id, room_id, conversation_id }) => {
+    conversation_id: z.string().optional().describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z.string().optional().describe("Registered agent session to use for this task action."),
+}, async ({ title, description, created_by: _createdBy, source_message_id, room_id, conversation_id: _conversation_id, agent_session_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1464,7 +1927,10 @@ server.tool("add_task", "Add a new task to the room board. Tasks normally start
             content: [{ type: "text", text: JSON.stringify({ success: false, error: "Not in a room. Join one first." }) }],
         };
     }
-    const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
+    const { identity, agentSession } = await resolveWorkerToolIdentity({
+        roomId: targetRoomId ?? currentRoom?.room_id ?? null,
+        agentSessionId: agent_session_id,
+    });
     const task = await roomScopedApiCall({
         room_id: targetRoomId,
         project_id: targetProjectId,
@@ -1476,11 +1942,15 @@ server.tool("add_task", "Add a new task to the room board. Tasks normally start
                 title,
                 description,
                 created_by: identity.actor_label,
+                actor_label: identity.actor_label,
+                actor_key: identity.canonical_key,
+                actor_instance_id: agentSession?.agent_instance_id || AGENT_INSTANCE_UUID,
                 source_message_id,
+                ...agentSessionCredentials(agentSession),
             }),
         },
     });
-    await heartbeatRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity);
+    await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, getRememberedRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity), agentSession);
     return {
         content: [
             {
@@ -1584,8 +2054,9 @@ server.tool("claim_task", "Claim an accepted task. The task must be in 'accepted
         .optional()
         .describe("Deprecated override. Agent identity is resolved automatically on room entry."),
     room_id: z.string().optional().describe("Canonical room ID. Defaults to current room."),
-    conversation_id: z.string().optional().describe("Optional conversation ID for per-conversation identity scoping."),
-}, async ({ task_id, assignee: _assignee, room_id, conversation_id }) => {
+    conversation_id: z.string().optional().describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z.string().optional().describe("Registered agent session to use for this task action."),
+}, async ({ task_id, assignee: _assignee, room_id, conversation_id: _conversation_id, agent_session_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1594,7 +2065,10 @@ server.tool("claim_task", "Claim an accepted task. The task must be in 'accepted
         };
     }
     try {
-        const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
+        const { identity, agentSession } = await resolveWorkerToolIdentity({
+            roomId: targetRoomId ?? currentRoom?.room_id ?? null,
+            agentSessionId: agent_session_id,
+        });
         const updated = await roomScopedApiCall({
             room_id: targetRoomId,
             project_id: targetProjectId,
@@ -1607,14 +2081,16 @@ server.tool("claim_task", "Claim an accepted task. The task must be in 'accepted
                     assignee: identity.actor_label,
                     actor_label: identity.actor_label,
                     actor_key: identity.canonical_key,
+                    actor_instance_id: agentSession?.agent_instance_id || AGENT_INSTANCE_UUID,
                     assignee_agent_key: identity.canonical_key,
+                    ...agentSessionCredentials(agentSession),
                 }),
             },
         });
         await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, {
             status: "working",
             status_text: `claimed ${task_id}`,
-        });
+        }, agentSession);
         return {
             content: [
                 {
@@ -1655,8 +2131,9 @@ server.tool("update_task", "Update a task's status or assignee. Status transitio
         .optional()
         .describe("Persisted provider-neutral task workflow artifacts to attach to the task"),
     room_id: z.string().optional().describe("Canonical room ID. Defaults to current room."),
-    conversation_id: z.string().optional().describe("Optional conversation ID for per-conversation identity scoping."),
-}, async ({ task_id, status, assignee, pr_url, workflow_artifacts, room_id, conversation_id }) => {
+    conversation_id: z.string().optional().describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z.string().optional().describe("Registered agent session to use for this task action."),
+}, async ({ task_id, status, assignee, pr_url, workflow_artifacts, room_id, conversation_id: _conversation_id, agent_session_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1665,7 +2142,10 @@ server.tool("update_task", "Update a task's status or assignee. Status transitio
         };
     }
     try {
-        const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
+        const { identity, agentSession } = await resolveWorkerToolIdentity({
+            roomId: targetRoomId ?? currentRoom?.room_id ?? null,
+            agentSessionId: agent_session_id,
+        });
         const nextAssignee = status === "assigned" && !assignee ? identity.actor_label : assignee;
         const nextAssigneeAgentKey = nextAssignee === identity.actor_label ? identity.canonical_key : undefined;
         const updated = await roomScopedApiCall({
@@ -1683,6 +2163,8 @@ server.tool("update_task", "Update a task's status or assignee. Status transitio
                     workflow_artifacts,
                     actor_label: identity.actor_label,
                     actor_key: identity.canonical_key,
+                    actor_instance_id: agentSession?.agent_instance_id || AGENT_INSTANCE_UUID,
+                    ...agentSessionCredentials(agentSession),
                 }),
             },
         });
@@ -1691,7 +2173,7 @@ server.tool("update_task", "Update a task's status or assignee. Status transitio
             status_text: status
                 ? `${task_id} -> ${status}`
                 : getRememberedRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity).status_text,
-        });
+        }, agentSession);
         return {
             content: [
                 {
@@ -1717,8 +2199,9 @@ server.tool("complete_task", "Submit a task for review. Moves the task to 'in_re
     task_id: z.string().describe("The task ID to submit for review"),
     pr_url: z.string().optional().describe("GitHub PR URL for the work"),
     room_id: z.string().optional().describe("Canonical room ID. Defaults to current room."),
-    conversation_id: z.string().optional().describe("Optional conversation ID for per-conversation identity scoping."),
-}, async ({ task_id, pr_url, room_id, conversation_id }) => {
+    conversation_id: z.string().optional().describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z.string().optional().describe("Registered agent session to use for this task action."),
+}, async ({ task_id, pr_url, room_id, conversation_id: _conversation_id, agent_session_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1727,7 +2210,10 @@ server.tool("complete_task", "Submit a task for review. Moves the task to 'in_re
         };
     }
     try {
-        const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
+        const { identity, agentSession } = await resolveWorkerToolIdentity({
+            roomId: targetRoomId ?? currentRoom?.room_id ?? null,
+            agentSessionId: agent_session_id,
+        });
         const updated = await roomScopedApiCall({
             room_id: targetRoomId,
             project_id: targetProjectId,
@@ -1740,13 +2226,15 @@ server.tool("complete_task", "Submit a task for review. Moves the task to 'in_re
                     pr_url,
                     actor_label: identity.actor_label,
                     actor_key: identity.canonical_key,
+                    actor_instance_id: agentSession?.agent_instance_id || AGENT_INSTANCE_UUID,
+                    ...agentSessionCredentials(agentSession),
                 }),
             },
         });
         await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, {
             status: "reviewing",
             status_text: `${task_id} -> in_review`,
-        });
+        }, agentSession);
         return {
             content: [{
                     type: "text",
@@ -1764,6 +2252,114 @@ server.tool("complete_task", "Submit a task for review. Moves the task to 'in_re
         };
     }
 });
+server.tool("release_task_lease", "Release or forcibly clear the active work lease on a task so it can be claimed again. " +
+    "Use this when the current worker is blocked, gone, or needs to give the lane back to the room.", {
+    task_id: z.string().describe("The task whose active work lease should be cleared"),
+    lease_id: z.string().optional().describe("Optional expected active lease id for stale-checking"),
+    reason: z.string().optional().describe("Why the lease is being released"),
+    room_id: z.string().optional().describe("Canonical room ID. Defaults to current room."),
+    conversation_id: z.string().optional().describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z.string().optional().describe("Registered agent session to use for this lease action."),
+}, async ({ task_id, lease_id, reason, room_id, conversation_id: _conversation_id, agent_session_id }) => {
+    const targetRoomId = getTargetRoomId(room_id);
+    if (!targetRoomId) {
+        return {
+            content: [{ type: "text", text: JSON.stringify({ success: false, error: "Not in a canonical room." }) }],
+        };
+    }
+    try {
+        const { identity, agentSession } = await resolveWorkerToolIdentity({
+            roomId: targetRoomId,
+            agentSessionId: agent_session_id,
+        });
+        const result = await apiCall(`/rooms/${encodeRoomIdPath(targetRoomId)}/tasks/${encodeURIComponent(task_id)}/lease-action`, {
+            method: "POST",
+            body: JSON.stringify({
+                action: "release",
+                lease_id: lease_id ?? undefined,
+                reason,
+                actor_label: identity.actor_label,
+                actor_key: identity.canonical_key,
+                actor_instance_id: agentSession?.agent_instance_id || AGENT_INSTANCE_UUID,
+                ...agentSessionCredentials(agentSession),
+            }),
+        });
+        await syncRoomPresence(targetRoomId, identity, {
+            status: "working",
+            status_text: `released lease on ${task_id}`,
+        }, agentSession);
+        return {
+            content: [{
+                    type: "text",
+                    text: JSON.stringify({
+                        success: true,
+                        ...result,
+                        agent_identity: toPublicAgentIdentity(identity),
+                    }, null, 2),
+                }],
+        };
+    }
+    catch (error) {
+        return {
+            content: [{ type: "text", text: JSON.stringify({ success: false, error: String(error) }) }],
+        };
+    }
+});
+server.tool("handoff_task_lease", "Transfer the active work lease on a task to another agent. " +
+    "This reassigns the task and mints a fresh work lease for the target agent key.", {
+    task_id: z.string().describe("The task whose active work lease should be transferred"),
+    target_agent_key: z.string().describe("Canonical agent key to receive the new work lease"),
+    lease_id: z.string().optional().describe("Optional expected active lease id for stale-checking"),
+    reason: z.string().optional().describe("Why the lane is being handed off"),
+    room_id: z.string().optional().describe("Canonical room ID. Defaults to current room."),
+    conversation_id: z.string().optional().describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z.string().optional().describe("Registered agent session to use for this lease action."),
+}, async ({ task_id, target_agent_key, lease_id, reason, room_id, conversation_id: _conversation_id, agent_session_id }) => {
+    const targetRoomId = getTargetRoomId(room_id);
+    if (!targetRoomId) {
+        return {
+            content: [{ type: "text", text: JSON.stringify({ success: false, error: "Not in a canonical room." }) }],
+        };
+    }
+    try {
+        const { identity, agentSession } = await resolveWorkerToolIdentity({
+            roomId: targetRoomId,
+            agentSessionId: agent_session_id,
+        });
+        const result = await apiCall(`/rooms/${encodeRoomIdPath(targetRoomId)}/tasks/${encodeURIComponent(task_id)}/lease-action`, {
+            method: "POST",
+            body: JSON.stringify({
+                action: "handoff",
+                lease_id: lease_id ?? undefined,
+                reason,
+                target_actor_key: target_agent_key,
+                actor_label: identity.actor_label,
+                actor_key: identity.canonical_key,
+                actor_instance_id: agentSession?.agent_instance_id || AGENT_INSTANCE_UUID,
+                ...agentSessionCredentials(agentSession),
+            }),
+        });
+        await syncRoomPresence(targetRoomId, identity, {
+            status: "working",
+            status_text: `handed off ${task_id} to ${target_agent_key}`,
+        }, agentSession);
+        return {
+            content: [{
+                    type: "text",
+                    text: JSON.stringify({
+                        success: true,
+                        ...result,
+                        agent_identity: toPublicAgentIdentity(identity),
+                    }, null, 2),
+                }],
+        };
+    }
+    catch (error) {
+        return {
+            content: [{ type: "text", text: JSON.stringify({ success: false, error: String(error) }) }],
+        };
+    }
+});
 server.tool("initialize_repo", "Initialize the current repo for Let Agents Chat by creating a .letagents.json config file. " +
     "This explicitly sets up repo-based room auto-join. Reads git remote to derive the room name, " +
     "or accepts a custom room name. Will NOT overwrite an existing .letagents.json. " +
@@ -1923,14 +2519,21 @@ server.tool("send_message", "Send a message to a Let Agents Chat room. Use a sho
     conversation_id: z
         .string()
         .optional()
-        .describe("Optional conversation ID for per-conversation identity scoping."),
-}, async ({ room_id, sender: _sender, text, reply_to, conversation_id }) => {
+        .describe("Deprecated for worker writes; registered worker session identity is used."),
+    agent_session_id: z
+        .string()
+        .optional()
+        .describe("Registered agent session to use for this message."),
+}, async ({ room_id, sender: _sender, text, reply_to, conversation_id: _conversation_id, agent_session_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
         throw new Error("No room is currently selected. Join a room first or pass room_id.");
     }
-    const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
+    const { identity, agentSession } = await resolveWorkerToolIdentity({
+        roomId: targetRoomId ?? currentRoom?.room_id ?? null,
+        agentSessionId: agent_session_id,
+    });
     const message = await roomScopedApiCall({
         room_id: targetRoomId,
         project_id: targetProjectId,
@@ -1938,11 +2541,16 @@ server.tool("send_message", "Send a message to a Let Agents Chat room. Use a sho
         project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/messages`,
         options: {
             method: "POST",
-            body: JSON.stringify({ sender: identity.actor_label, text, reply_to }),
+            body: JSON.stringify({
+                sender: identity.actor_label,
+                text,
+                reply_to,
+                ...agentSessionCredentials(agentSession),
+            }),
         },
     });
     touchCurrentRoom(typeof message.id === "string" ? message.id : undefined);
-    await heartbeatRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity);
+    await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, getRememberedRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity), agentSession);
     return {
         content: [
             {
@@ -2013,11 +2621,16 @@ server.tool("wait_for_messages", "Wait for new messages in a Let Agents Chat roo
         .number()
         .optional()
         .describe("Maximum wait time in milliseconds (min 1000, capped by LETAGENTS_POLL_MAX_MS / server). If set to 0, the default timeout will be used."),
-}, async ({ room_id, after_message_id, timeout }) => {
+    agent_session_id: z
+        .string()
+        .optional()
+        .describe("Registered agent session to use. Without this, the MCP transport is treated as a controller and is hidden from connected-agent activity."),
+}, async ({ room_id, after_message_id, timeout, agent_session_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     const identity = await ensureAgentIdentity();
-    await heartbeatRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity);
+    const agentSession = resolveAgentSession(targetRoomId ?? currentRoom?.room_id ?? null, agent_session_id);
+    await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, getRememberedRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, agentSession ? identityFromAgentSession(agentSession) : identity), agentSession);
     const maxPollMs = getPollTimeoutCapMs();
     const serverTimeout = Math.min(Math.max(timeout || DEFAULT_POLL_TIMEOUT_MS, 1000), maxPollMs);
     const clientTimeout = serverTimeout + (serverTimeout > 120_000 ? 120_000 : 5_000);
@@ -2026,12 +2639,16 @@ server.tool("wait_for_messages", "Wait for new messages in a Let Agents Chat roo
         params.set("after", after_message_id);
     params.set("timeout", String(serverTimeout));
     const queryString = params.toString();
+    const deliveryHeaders = buildAgentDeliveryHeaders(agentSession);
     const firstResult = await roomScopedApiCall({
         room_id: targetRoomId,
         project_id: targetProjectId,
         room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/messages/poll?${queryString}`,
         project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/messages/poll?${queryString}`,
-        options: { signal: AbortSignal.timeout(clientTimeout) },
+        options: {
+            signal: AbortSignal.timeout(clientTimeout),
+            headers: deliveryHeaders,
+        },
     });
     const allMessages = [...(firstResult.messages ?? [])];
     const roomIdFromResponse = firstResult.room_id || firstResult.project_id;
@@ -2064,7 +2681,7 @@ server.tool("wait_for_messages", "Wait for new messages in a Let Agents Chat roo
     if (targetRoomId) {
         touchRoomSession(targetRoomId, getLastMessageId(output));
     }
-    await heartbeatRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity);
+    await syncRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, identity, getRememberedRoomPresence(targetRoomId ?? currentRoom?.room_id ?? null, agentSession ? identityFromAgentSession(agentSession) : identity), agentSession);
     return {
         content: [
             {