letagents 0.11.1 → 0.12.1

package/dist/mcp/server.js

@@ -11,13 +11,39 @@ 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, getLocalStatePath, getPendingDeviceAuth, getStoredAgentIdentity, getStoredAuth, getStoredCurrentRoom, getStoredRoomSession, saveRoomSession, setStoredAgentIdentity, setPendingDeviceAuth, setStoredAuth, touchRoomSession, updateLocalState, } from "./local-state.js";
+import { clearPendingDeviceAuth, clearStoredAuth, getCurrentCodexLiveSession, getLocalStatePath, getPendingDeviceAuth, getStoredAgentIdentity, getStoredAuth, getStoredCurrentRoom, getStoredRoomSession, listStoredCodexLiveSessions, 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 { inspectLocalCodexSession, startLocalCodexSession, stopLocalCodexSession, toPublicCodexLiveSession, } from "./codex-session.js";
 let currentRoom = null;
 let currentAgentIdentityKey = "";
 let currentAgentIdentity = null;
 let currentAuthenticatedAccount = undefined;
+// ---------------------------------------------------------------------------
+// Conversation-scoped identity (Option C: per-conversation hints)
+// ---------------------------------------------------------------------------
+const MAX_CONVERSATION_IDENTITIES = 20;
+const conversationIdentities = new Map();
+/**
+ * Get or set a conversation-scoped identity override.
+ * Falls back to the global `currentAgentIdentity` when conversationId is absent.
+ */
+function getConversationIdentity(conversationId) {
+    if (!conversationId)
+        return currentAgentIdentity;
+    return conversationIdentities.get(conversationId) ?? currentAgentIdentity;
+}
+function setConversationIdentity(conversationId, identity) {
+    // LRU-style eviction: if at cap, remove oldest entry
+    if (!conversationIdentities.has(conversationId) &&
+        conversationIdentities.size >= MAX_CONVERSATION_IDENTITIES) {
+        const oldestKey = conversationIdentities.keys().next().value;
+        if (oldestKey !== undefined)
+            conversationIdentities.delete(oldestKey);
+    }
+    conversationIdentities.set(conversationId, identity);
+}
 let currentAuthenticatedAccountSource = null;
 let currentAuthenticatedEnvToken = null;
 // ---------------------------------------------------------------------------
@@ -722,6 +748,43 @@ function getLastMessageId(payload) {
     const lastMessage = messages?.at(-1);
     return typeof lastMessage?.id === "string" ? lastMessage.id : undefined;
 }
+function withJoinRoomAgentPrompt(payload) {
+    return {
+        ...payload,
+        agent_prompt_kind: "join",
+        agent_prompt: buildRoomAgentPrompt("join"),
+    };
+}
+function normalizeJoinSessionMode(value) {
+    return String(value || "").trim().toLowerCase() === "live" ? "live" : "current";
+}
+function getCurrentLiveSessionPayload(roomId) {
+    const session = getCurrentCodexLiveSession(roomId);
+    return session ? toPublicCodexLiveSession(session) : null;
+}
+function toAgentReadableMessage(message) {
+    if (!message || typeof message !== "object") {
+        return message;
+    }
+    const record = message;
+    const kind = normalizeAgentPromptKind(record.agent_prompt_kind);
+    const text = typeof record.text === "string" ? record.text : null;
+    if (!kind || text === null) {
+        return record;
+    }
+    return {
+        ...record,
+        visible_text: text,
+        agent_prompt: buildRoomAgentPrompt(kind),
+        prompt_injected: kind === "inline",
+    };
+}
+function toAgentReadableMessages(messages) {
+    return (messages ?? []).map((message) => toAgentReadableMessage(message));
+}
+function appendIncludePromptOnly(path) {
+    return `${path}${path.includes("?") ? "&" : "?"}include_prompt_only=1`;
+}
 async function roomScopedApiCall(input) {
     if (input.room_id) {
         try {
@@ -853,18 +916,46 @@ async function createInviteRoom() {
         },
     };
 }
-async function joinInviteCode(code) {
+async function buildJoinResponse(input) {
+    const basePayload = await withAgentIdentity({
+        ...toPublicRoomResponse(input.joined.response, input.joined.room.room_id),
+        joined_via: input.joined_via,
+        session_mode: input.session_mode,
+    });
+    if (input.session_mode === "current") {
+        return withJoinRoomAgentPrompt(basePayload);
+    }
+    const liveSession = await startLocalCodexSession({
+        room_id: input.joined.room.room_id,
+        room_identifier: input.room_identifier,
+        room_code: input.joined.room.code ?? null,
+        room_display_name: input.joined.room.display_name ?? null,
+        joined_via: input.joined_via,
+        cwd: process.cwd(),
+    });
+    return withJoinRoomAgentPrompt({
+        ...basePayload,
+        local_codex_session: toPublicCodexLiveSession(liveSession.session),
+        local_codex_session_started: !liveSession.reused,
+        local_codex_session_reused: liveSession.reused,
+    });
+}
+async function joinInviteCode(code, sessionMode) {
     const joined = await joinRoomIdentifier(code, "join_code");
-    return withAgentIdentity({
-        ...toPublicRoomResponse(joined.response, joined.room.room_id),
+    return buildJoinResponse({
+        joined,
+        room_identifier: normalizeInviteCode(code),
         joined_via: "join_code",
+        session_mode: sessionMode,
     });
 }
-async function joinNamedRoom(name) {
+async function joinNamedRoom(name, sessionMode) {
     const joined = await joinRoomIdentifier(name, "join_room");
-    return withAgentIdentity({
-        ...toPublicRoomResponse(joined.response, joined.room.room_id),
+    return buildJoinResponse({
+        joined,
+        room_identifier: name.trim(),
         joined_via: "join_room",
+        session_mode: sessionMode,
     });
 }
 // ---------------------------------------------------------------------------
@@ -895,8 +986,8 @@ server.resource("room_messages", new ResourceTemplate("letagents://rooms/{room_i
         const result = await roomScopedApiCall({
             room_id: normalizedRoomId,
             project_id: storedSession?.project_id ?? null,
-            room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/messages${qs ? `?${qs}` : ""}`,
-            project_path: (projectId) => `/projects/${encodeURIComponent(projectId)}/messages${qs ? `?${qs}` : ""}`,
+            room_path: (targetRoomId) => appendIncludePromptOnly(`/rooms/${encodeRoomIdPath(targetRoomId)}/messages${qs ? `?${qs}` : ""}`),
+            project_path: (projectId) => appendIncludePromptOnly(`/projects/${encodeURIComponent(projectId)}/messages${qs ? `?${qs}` : ""}`),
         });
         const msgs = result.messages ?? [];
         allMessages.push(...msgs);
@@ -912,7 +1003,7 @@ server.resource("room_messages", new ResourceTemplate("letagents://rooms/{room_i
             {
                 uri: uri.href,
                 mimeType: "application/json",
-                text: JSON.stringify({ messages: allMessages }, null, 2),
+                text: JSON.stringify({ messages: toAgentReadableMessages(allMessages) }, null, 2),
             },
         ],
     };
@@ -924,7 +1015,7 @@ server.tool("create_room", "Create a new invite room on Let Agents Chat. Returns
         content: [
             {
                 type: "text",
-                text: JSON.stringify(created.response, null, 2),
+                text: JSON.stringify(withJoinRoomAgentPrompt(created.response), null, 2),
             },
         ],
     };
@@ -936,7 +1027,7 @@ server.tool("create_project", "Legacy alias for create_room. Creates a new invit
         content: [
             {
                 type: "text",
-                text: JSON.stringify(created.response, null, 2),
+                text: JSON.stringify(withJoinRoomAgentPrompt(created.response), null, 2),
             },
         ],
     };
@@ -944,12 +1035,16 @@ server.tool("create_project", "Legacy alias for create_room. Creates a new invit
 // -- join_code --------------------------------------------------------------
 server.tool("join_code", "Join an existing room using an invite code.", {
     code: z.string().describe("The invite code shared for the room (e.g. 'ABCX-7291')"),
-}, async ({ code }) => {
+    session_mode: z
+        .enum(["live", "current"])
+        .optional()
+        .describe("Use 'current' (default) for a normal inline join. Use 'live' to start/reuse a detached local Codex room worker."),
+}, async ({ code, session_mode }) => {
     return {
         content: [
             {
                 type: "text",
-                text: JSON.stringify(await joinInviteCode(code), null, 2),
+                text: JSON.stringify(await joinInviteCode(code, normalizeJoinSessionMode(session_mode)), null, 2),
             },
         ],
     };
@@ -957,12 +1052,16 @@ server.tool("join_code", "Join an existing room using an invite code.", {
 // -- join_project -----------------------------------------------------------
 server.tool("join_project", "Legacy alias for join_code. Join an existing room using an invite code.", {
     code: z.string().describe("The invite code shared for the room (e.g. 'ABCX-7291')"),
-}, async ({ code }) => {
+    session_mode: z
+        .enum(["live", "current"])
+        .optional()
+        .describe("Use 'current' (default) for a normal inline join. Use 'live' to start/reuse a detached local Codex room worker."),
+}, async ({ code, session_mode }) => {
     return {
         content: [
             {
                 type: "text",
-                text: JSON.stringify(await joinInviteCode(code), null, 2),
+                text: JSON.stringify(await joinInviteCode(code, normalizeJoinSessionMode(session_mode)), null, 2),
             },
         ],
     };
@@ -970,13 +1069,17 @@ server.tool("join_project", "Legacy alias for join_code. Join an existing room u
 // -- join_room --------------------------------------------------------------
 server.tool("join_room", "Join a named room on Let Agents Chat. Creates the room if it doesn't exist. Use this for repo-based room joining.", {
     name: z.string().describe("The room name to join (e.g. 'github.com/owner/repo')"),
-}, async ({ name }) => {
+    session_mode: z
+        .enum(["live", "current"])
+        .optional()
+        .describe("Use 'current' (default) for a normal inline join. Use 'live' to start/reuse a detached local Codex room worker."),
+}, async ({ name, session_mode }) => {
     try {
         return {
             content: [
                 {
                     type: "text",
-                    text: JSON.stringify(await joinNamedRoom(name), null, 2),
+                    text: JSON.stringify(await joinNamedRoom(name, normalizeJoinSessionMode(session_mode)), null, 2),
                 },
             ],
         };
@@ -995,17 +1098,156 @@ server.tool("join_room", "Join a named room on Let Agents Chat. Creates the room
         throw error;
     }
 });
+// -- 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
+        .string()
+        .describe("Invite code or room name to run as a detached local Codex worker."),
+    cwd: z
+        .string()
+        .optional()
+        .describe("Working directory for repo work. Defaults to the current process directory."),
+    stop_phrase: z
+        .string()
+        .optional()
+        .describe("Exact room message text that tells the worker to stop. Defaults to /stop-codex-room."),
+    max_minutes: z
+        .number()
+        .optional()
+        .describe("Optional hard stop in minutes. Defaults to 0, which means run until stopped."),
+}, async ({ room, cwd, stop_phrase, max_minutes }) => {
+    const joinedVia = looksLikeInviteCode(room) ? "join_code" : "join_room";
+    try {
+        const joined = await joinRoomIdentifier(room, joinedVia);
+        const liveSession = await startLocalCodexSession({
+            room_id: joined.room.room_id,
+            room_identifier: joinedVia === "join_code" ? normalizeInviteCode(room) : room.trim(),
+            room_code: joined.room.code ?? null,
+            room_display_name: joined.room.display_name ?? null,
+            joined_via: joinedVia,
+            cwd: cwd || process.cwd(),
+            stop_phrase,
+            max_minutes,
+        });
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify(await withAgentIdentity({
+                        success: true,
+                        room: toPublicRoomState(joined.room),
+                        local_codex_session: toPublicCodexLiveSession(liveSession.session),
+                        local_codex_session_started: !liveSession.reused,
+                        local_codex_session_reused: liveSession.reused,
+                    }), null, 2),
+                },
+            ],
+        };
+    }
+    catch (error) {
+        if (error instanceof RepoRoomAuthRequiredError) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: JSON.stringify(toRepoRoomAuthRequiredResult(error), null, 2),
+                    },
+                ],
+            };
+        }
+        throw error;
+    }
+});
+server.tool("status_local_codex_session", "Inspect the current detached local Codex live session, or a specific one by session_id.", {
+    session_id: z
+        .string()
+        .optional()
+        .describe("Optional session id. Defaults to the current local Codex live session."),
+}, async ({ session_id }) => {
+    const status = await inspectLocalCodexSession(session_id, currentRoom?.room_id);
+    if (!status) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({ success: false, error: "No local Codex live session found." }, null, 2),
+                },
+            ],
+        };
+    }
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify({
+                    success: true,
+                    session: toPublicCodexLiveSession(status.session),
+                    server_reachable: status.server_reachable,
+                    thread_status: status.thread_status,
+                    turn_status: status.turn_status,
+                    recent_items: status.recent_items,
+                }, null, 2),
+            },
+        ],
+    };
+});
+server.tool("stop_local_codex_session", "Stop the current detached local Codex live session, or a specific one by session_id.", {
+    session_id: z
+        .string()
+        .optional()
+        .describe("Optional session id. Defaults to the current local Codex live session."),
+    shutdown_server: z
+        .boolean()
+        .optional()
+        .describe("If true, also terminate the spawned codex app-server process when possible."),
+}, async ({ session_id, shutdown_server }) => {
+    const stopped = await stopLocalCodexSession({
+        session_id,
+        room_id: currentRoom?.room_id,
+        shutdown_server,
+    });
+    if (!stopped) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({ success: false, error: "No local Codex live session found." }, null, 2),
+                },
+            ],
+        };
+    }
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify({
+                    success: true,
+                    session: toPublicCodexLiveSession(stopped),
+                }, null, 2),
+            },
+        ],
+    };
+});
 // -- get_current_room -------------------------------------------------------
-server.tool("get_current_room", "Get information about the currently joined room, including how it was joined.", {}, async () => {
+server.tool("get_current_room", "Get information about the currently joined room, including how it was joined.", {
+    conversation_id: z
+        .string()
+        .optional()
+        .describe("Optional conversation ID to report the conversation-scoped identity instead of the global one."),
+}, async ({ conversation_id }) => {
     return {
         content: [
             {
                 type: "text",
                 text: JSON.stringify(currentRoom
-                    ? {
+                    ? withJoinRoomAgentPrompt({
                         connected: true,
                         ...toPublicRoomState(currentRoom),
-                        agent_identity: toPublicAgentIdentity(currentAgentIdentity ?? getStoredAgentIdentity(currentAgentIdentityKey)),
+                        current_local_codex_session: getCurrentLiveSessionPayload(currentRoom.room_id),
+                        local_codex_session_count: listStoredCodexLiveSessions().length,
+                        agent_identity: toPublicAgentIdentity(getConversationIdentity(conversation_id)
+                            ?? currentAgentIdentity
+                            ?? getStoredAgentIdentity(currentAgentIdentityKey)),
                         auth: getStoredAuth()
                             ? {
                                 source: process.env.LETAGENTS_TOKEN ? "env" : "local_state",
@@ -1013,8 +1255,13 @@ server.tool("get_current_room", "Get information about the currently joined room
                                 account: getStoredAuth()?.account ?? null,
                             }
                             : null,
-                    }
-                    : { connected: false, message: "Not currently in any room" }, null, 2),
+                    })
+                    : {
+                        connected: false,
+                        message: "Not currently in any room",
+                        current_local_codex_session: getCurrentLiveSessionPayload(), // no room context
+                        local_codex_session_count: listStoredCodexLiveSessions().length,
+                    }, null, 2),
             },
         ],
     };
@@ -1078,7 +1325,11 @@ server.tool("post_status", "Broadcast a lightweight status update to the current
         .string()
         .optional()
         .describe("Canonical room ID. Defaults to the current room."),
-}, async ({ sender: _sender, status, room_id }) => {
+    conversation_id: z
+        .string()
+        .optional()
+        .describe("Optional conversation ID for per-conversation identity scoping."),
+}, async ({ sender: _sender, status, room_id, conversation_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1097,7 +1348,7 @@ 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 = await ensureAgentIdentity();
+    const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
     const sender = identity.actor_label;
     const statusText = `[status] ${status}`;
     const message = await roomScopedApiCall({
@@ -1144,7 +1395,8 @@ 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."),
-}, async ({ title, description, created_by: _createdBy, source_message_id, room_id }) => {
+    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 }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1152,7 +1404,7 @@ 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 = await ensureAgentIdentity();
+    const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
     const task = await roomScopedApiCall({
         room_id: targetRoomId,
         project_id: targetProjectId,
@@ -1232,7 +1484,8 @@ 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."),
-}, async ({ task_id, assignee: _assignee, room_id }) => {
+    conversation_id: z.string().optional().describe("Optional conversation ID for per-conversation identity scoping."),
+}, async ({ task_id, assignee: _assignee, room_id, conversation_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1241,7 +1494,7 @@ server.tool("claim_task", "Claim an accepted task. The task must be in 'accepted
         };
     }
     try {
-        const identity = await ensureAgentIdentity();
+        const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
         const updated = await roomScopedApiCall({
             room_id: targetRoomId,
             project_id: targetProjectId,
@@ -1278,7 +1531,8 @@ server.tool("update_task", "Update a task's status or assignee. Status transitio
         .describe("New assignee for the task. Defaults to the current agent when status=assigned."),
     pr_url: z.string().optional().describe("PR URL to link to the task"),
     room_id: z.string().optional().describe("Canonical room ID. Defaults to current room."),
-}, async ({ task_id, status, assignee, pr_url, room_id }) => {
+    conversation_id: z.string().optional().describe("Optional conversation ID for per-conversation identity scoping."),
+}, async ({ task_id, status, assignee, pr_url, room_id, conversation_id }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1288,7 +1542,7 @@ server.tool("update_task", "Update a task's status or assignee. Status transitio
     }
     try {
         const identity = status === "assigned" && !assignee
-            ? await ensureAgentIdentity()
+            ? (getConversationIdentity(conversation_id) ?? await ensureAgentIdentity())
             : null;
         const updated = await roomScopedApiCall({
             room_id: targetRoomId,
@@ -1329,7 +1583,8 @@ 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."),
-}, async ({ task_id, pr_url, room_id }) => {
+    conversation_id: z.string().optional().describe("Optional conversation ID for per-conversation identity scoping."),
+}, async ({ task_id, pr_url, room_id, conversation_id: _conversationId }) => {
     const targetRoomId = getTargetRoomId(room_id);
     const targetProjectId = getFallbackProjectId();
     if (!targetRoomId && !targetProjectId) {
@@ -1510,13 +1765,17 @@ server.tool("send_message", "Send a message to a Let Agents Chat room.", {
         .optional()
         .describe("Deprecated override. Agent identity is resolved automatically on room entry."),
     text: z.string().describe("The message text to send"),
-}, async ({ room_id, sender: _sender, text }) => {
+    conversation_id: z
+        .string()
+        .optional()
+        .describe("Optional conversation ID for per-conversation identity scoping."),
+}, async ({ room_id, sender: _sender, text, conversation_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 = await ensureAgentIdentity();
+    const identity = getConversationIdentity(conversation_id) ?? await ensureAgentIdentity();
     const message = await roomScopedApiCall({
         room_id: targetRoomId,
         project_id: targetProjectId,
@@ -1558,8 +1817,8 @@ server.tool("read_messages", "Read all messages from a Let Agents Chat room.", {
         const result = await roomScopedApiCall({
             room_id: targetRoomId,
             project_id: targetProjectId,
-            room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/messages${qs ? `?${qs}` : ""}`,
-            project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/messages${qs ? `?${qs}` : ""}`,
+            room_path: (targetRoomId) => appendIncludePromptOnly(`/rooms/${encodeRoomIdPath(targetRoomId)}/messages${qs ? `?${qs}` : ""}`),
+            project_path: (targetProjectId) => appendIncludePromptOnly(`/projects/${encodeURIComponent(targetProjectId)}/messages${qs ? `?${qs}` : ""}`),
         });
         roomIdFromResponse = roomIdFromResponse || result.room_id || result.project_id;
         const msgs = result.messages ?? [];
@@ -1572,7 +1831,7 @@ server.tool("read_messages", "Read all messages from a Let Agents Chat room.", {
             break;
         afterCursor = lastMsg.id;
     }
-    const output = { messages: allMessages };
+    const output = { messages: toAgentReadableMessages(allMessages) };
     if (roomIdFromResponse) {
         output[targetRoomId ? "room_id" : "project_id"] = roomIdFromResponse;
     }
@@ -1611,8 +1870,8 @@ server.tool("wait_for_messages", "Wait for new messages in a Let Agents Chat roo
     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}`,
+        room_path: (targetRoomId) => appendIncludePromptOnly(`/rooms/${encodeRoomIdPath(targetRoomId)}/messages/poll?${queryString}`),
+        project_path: (targetProjectId) => appendIncludePromptOnly(`/projects/${encodeURIComponent(targetProjectId)}/messages/poll?${queryString}`),
         options: { signal: AbortSignal.timeout(clientTimeout) },
     });
     const allMessages = [...(firstResult.messages ?? [])];
@@ -1627,8 +1886,8 @@ server.tool("wait_for_messages", "Wait for new messages in a Let Agents Chat roo
             const page = await roomScopedApiCall({
                 room_id: targetRoomId,
                 project_id: targetProjectId,
-                room_path: (targetRoomId) => `/rooms/${encodeRoomIdPath(targetRoomId)}/messages?${qs}`,
-                project_path: (targetProjectId) => `/projects/${encodeURIComponent(targetProjectId)}/messages?${qs}`,
+                room_path: (targetRoomId) => appendIncludePromptOnly(`/rooms/${encodeRoomIdPath(targetRoomId)}/messages?${qs}`),
+                project_path: (targetProjectId) => appendIncludePromptOnly(`/projects/${encodeURIComponent(targetProjectId)}/messages?${qs}`),
             });
             const msgs = page.messages ?? [];
             allMessages.push(...msgs);
@@ -1639,7 +1898,7 @@ server.tool("wait_for_messages", "Wait for new messages in a Let Agents Chat roo
                 break;
         }
     }
-    const output = { messages: allMessages };
+    const output = { messages: toAgentReadableMessages(allMessages) };
     if (roomIdFromResponse) {
         output[targetRoomId ? "room_id" : "project_id"] = roomIdFromResponse;
     }
@@ -1898,7 +2157,11 @@ server.tool("set_agent_name", "Set or change the agent's display name. The agent
         .min(2)
         .max(64)
         .describe("The desired display name for this agent (2-64 characters)."),
-}, async ({ name: desiredName }) => {
+    conversation_id: z
+        .string()
+        .optional()
+        .describe("Optional conversation ID to scope this name change. When provided, only this conversation uses the new name; other conversations keep their own identity."),
+}, async ({ name: desiredName, conversation_id }) => {
     const trimmedName = desiredName.trim();
     if (trimmedName.length < 2 || trimmedName.length > 64) {
         return {
@@ -1924,14 +2187,6 @@ server.tool("set_agent_name", "Set or change the agent's display name. The agent
     const slugName = normalizeAgentBaseName(trimmedName);
     try {
         const owner = await resolveOwnerContext();
-        const registered = await apiCall("/agents", {
-            method: "POST",
-            body: JSON.stringify({
-                name: slugName,
-                display_name: trimmedName,
-                owner_label: owner.label,
-            }),
-        });
         const ideLabel = detectAgentIdeLabel();
         const ownerAttribution = formatOwnerAttribution(owner.label);
         const actorLabel = buildAgentActorLabel({
@@ -1939,6 +2194,22 @@ server.tool("set_agent_name", "Set or change the agent's display name. The agent
             owner_label: owner.label,
             ide_label: ideLabel,
         });
+        // When conversation_id is provided, skip server-side /agents registration
+        // to avoid creating stranded durable agent records from ephemeral renames.
+        let canonicalKey = owner.login ? `${owner.login}/${slugName}` : null;
+        if (!conversation_id) {
+            const registered = await apiCall("/agents", {
+                method: "POST",
+                body: JSON.stringify({
+                    name: slugName,
+                    display_name: trimmedName,
+                    owner_label: owner.label,
+                }),
+            });
+            if (typeof registered.canonical_key === "string") {
+                canonicalKey = registered.canonical_key;
+            }
+        }
         const updatedIdentity = {
             name: slugName,
             display_name: trimmedName,
@@ -1946,14 +2217,19 @@ server.tool("set_agent_name", "Set or change the agent's display name. The agent
             owner_attribution: ownerAttribution,
             ide_label: ideLabel,
             actor_label: actorLabel,
-            canonical_key: typeof registered.canonical_key === "string"
-                ? registered.canonical_key
-                : owner.login ? `${owner.login}/${slugName}` : null,
+            canonical_key: canonicalKey,
             runtime_key: currentAgentIdentityKey,
-            source: "api",
+            source: conversation_id ? "local" : "api",
             resolved_at: new Date().toISOString(),
         };
-        currentAgentIdentity = setStoredAgentIdentity(updatedIdentity, currentAgentIdentityKey);
+        if (conversation_id) {
+            // Scope to this conversation only
+            setConversationIdentity(conversation_id, updatedIdentity);
+        }
+        else {
+            // Global rename (backward compatible)
+            currentAgentIdentity = setStoredAgentIdentity(updatedIdentity, currentAgentIdentityKey);
+        }
         return {
             content: [
                 {
@@ -1961,7 +2237,9 @@ server.tool("set_agent_name", "Set or change the agent's display name. The agent
                     text: JSON.stringify({
                         success: true,
                         message: `Agent name changed to "${trimmedName}".`,
-                        agent_identity: toPublicAgentIdentity(currentAgentIdentity),
+                        agent_identity: toPublicAgentIdentity(conversation_id
+                            ? getConversationIdentity(conversation_id)
+                            : currentAgentIdentity),
                     }, null, 2),
                 },
             ],
@@ -2006,14 +2284,14 @@ server.tool("resume_room_session", "Rejoin the last locally saved room context,
             content: [
                 {
                     type: "text",
-                    text: JSON.stringify({
+                    text: JSON.stringify(withJoinRoomAgentPrompt({
                         success: true,
                         rejoined_from_local_state: true,
                         server_session_resumed: false,
                         last_message_id_before_restart: savedRoom.last_message_id ?? null,
                         room: toPublicRoomState(joined.room),
                         agent_identity: toPublicAgentIdentity(agentIdentity),
-                    }, null, 2),
+                    }), null, 2),
                 },
             ],
         };