letagents 0.12.12 → 0.12.14

package/dist/mcp/server/runtime/agent-sessions.js

@@ -1,12 +1,13 @@
-import { getStoredAgentSession, isLocalRoomStorageEnabled, saveAgentSession, } from "../../local-state.js";
+import { getStoredAgentSession, isLocalRoomStorageEnabled, replaceLocalWorkerAgentSession, saveAgentSession, } from "../../local-state.js";
 import { getGitCurrentBranch } from "../../git-remote.js";
 import { randomUUID } from "node:crypto";
 import { normalizeAgentBaseName } from "../../../shared/codenames.js";
 import { formatOwnerAttribution } from "../../../shared/agent-identity.js";
 import { LETAGENTS_AGENT_SESSION_ID_HEADER, LETAGENTS_AGENT_SESSION_TOKEN_HEADER, } from "../../../shared/request-headers.js";
 import { AGENT_INSTANCE_UUID, detectAgentIdeLabel, detectAgentRuntimeLabel, ensureAgentIdentity, } from "./identity.js";
-import { isSupervisedBoundedTurn, requireValidWorkerBearerRuntime } from "./worker-bearer.js";
+import { hasSupervisedWorkerAuthority, requireValidWorkerBearerRuntime } from "./worker-bearer.js";
 import { resolveCurrentSupervisedWorkerSession } from "./supervisor-bridge.js";
+import { getDaemonToolExecutionContext, getRuntimeWorkingDirectory } from "./daemon-tool-context.js";
 // A worker bearer already represents a server-side worker session. This local
 // marker lets the MCP tool contract stay session-shaped without persisting or
 // transmitting a second set of credentials.
@@ -119,7 +120,12 @@ export function requireWorkerAgentSession(roomId, sessionId) {
 export async function resolveWorkerToolIdentity(input) {
     const runtimeMode = requireValidWorkerBearerRuntime().mode;
     if (runtimeMode === "supervised") {
-        const agentSession = await resolveCurrentSupervisedWorkerSession(input.roomId);
+        const daemonContext = getDaemonToolExecutionContext();
+        const agentSession = daemonContext?.agentSession
+            ?? await resolveCurrentSupervisedWorkerSession(input.roomId);
+        if (input.roomId && input.roomId !== agentSession.room_id) {
+            throw new Error(`Daemon-supervised worker session is registered for ${agentSession.room_id}, not ${input.roomId}.`);
+        }
         if (input.agentSessionId
             && input.agentSessionId !== WORKER_BEARER_AGENT_SESSION_ID
             && input.agentSessionId !== agentSession.session_id) {
@@ -160,7 +166,7 @@ export async function resolveWorkerToolIdentity(input) {
     }
     const agentSession = input.agentSessionId
         ? requireWorkerAgentSession(input.roomId, input.agentSessionId)
-        : input.roomId && !isSupervisedBoundedTurn() && await isLocalRoomStorageEnabled(input.roomId)
+        : input.roomId && !hasSupervisedWorkerAuthority() && await isLocalRoomStorageEnabled(input.roomId)
             ? await ensureLocalWorkerAgentSession(input.roomId)
             : requireWorkerAgentSession(input.roomId, input.agentSessionId);
     return {
@@ -173,7 +179,7 @@ export async function ensureLocalWorkerAgentSession(roomId, input = {}) {
     const now = new Date().toISOString();
     const runtime = input.runtime?.trim() || detectAgentRuntimeLabel();
     const displayName = input.displayName?.trim() || identity.display_name;
-    return saveAgentSession({
+    const session = {
         session_id: `local_${randomUUID()}`,
         session_token: `local_${randomUUID()}`,
         room_id: roomId,
@@ -195,10 +201,13 @@ export async function ensureLocalWorkerAgentSession(roomId, input = {}) {
         updated_at: now,
         last_seen_at: now,
         ended_at: null,
-    });
+    };
+    return session.session_kind === "worker"
+        ? replaceLocalWorkerAgentSession(session)
+        : saveAgentSession(session);
 }
 export function getAgentSessionRepoBranch(cwd) {
-    const workingDir = cwd?.trim() || process.cwd();
+    const workingDir = cwd?.trim() || getRuntimeWorkingDirectory();
     return getGitCurrentBranch(workingDir);
 }
 export function agentSessionCredentials(agentSession) {

package/dist/mcp/server/runtime/api.js

@@ -1,4 +1,5 @@
 import { clearAuthenticatedAccountCache } from "./auth-cache.js";
+import { getDaemonToolExecutionContext } from "./daemon-tool-context.js";
 import { requireValidWorkerBearerRuntime } from "./worker-bearer.js";
 import { borrowCurrentSupervisedWorkerCredential, } from "./supervisor-bridge.js";
 let ownerAuthStoreLoader = () => import("../../local-state.js");
@@ -20,12 +21,18 @@ export class SupervisedWorkerCredentialError extends Error {
     }
 }
 async function getSupervisedCredential() {
+    const daemonContext = getDaemonToolExecutionContext();
+    if (daemonContext)
+        return daemonContext.bearer;
     const result = await supervisedCredentialBorrower();
     if (result.state === "available")
         return result.credential;
     throw new SupervisedWorkerCredentialError(result.state === "deferred" ? "SUPERVISED_CREDENTIAL_UNAVAILABLE" : "SUPERVISED_CREDENTIAL_STALE");
 }
 export const API_URL = (process.env.LETAGENTS_API_URL || "http://localhost:3001").replace(/\/+$/, "");
+export function getApiUrl() {
+    return getDaemonToolExecutionContext()?.apiUrl.replace(/\/+$/, "") ?? API_URL;
+}
 export class ApiError extends Error {
     status;
     body;
@@ -76,8 +83,9 @@ export function resolveApiPath(urlOrPath) {
         return "/auth/device/start";
     }
     try {
-        const parsed = new URL(urlOrPath, `${API_URL}/`);
-        const apiBase = new URL(`${API_URL}/`);
+        const apiUrl = getApiUrl();
+        const parsed = new URL(urlOrPath, `${apiUrl}/`);
+        const apiBase = new URL(`${apiUrl}/`);
         if (parsed.origin !== apiBase.origin) {
             return "/auth/device/start";
         }
@@ -109,7 +117,7 @@ export async function apiCall(path, options) {
             headers.set("Authorization", authorizationHeader);
         }
     }
-    const res = await fetch(`${API_URL}${path}`, {
+    const res = await fetch(`${getApiUrl()}${path}`, {
         ...options,
         headers,
     });

package/dist/mcp/server/runtime/daemon-tool-context.js

@@ -0,0 +1,11 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+const daemonToolContext = new AsyncLocalStorage();
+export function getDaemonToolExecutionContext() {
+    return daemonToolContext.getStore() ?? null;
+}
+export function runWithDaemonToolExecutionContext(context, callback) {
+    return daemonToolContext.run(context, callback);
+}
+export function getRuntimeWorkingDirectory() {
+    return getDaemonToolExecutionContext()?.cwd ?? process.cwd();
+}

package/dist/mcp/server/runtime/execution-profile.js

@@ -1,5 +1,6 @@
 export const EXECUTION_PROFILES = [
     "supervised_room_turn",
+    "supervised_mcp_polling",
     "autonomous_mcp_worker",
     "interactive_desktop",
 ];

package/dist/mcp/server/runtime/messages.js

@@ -151,6 +151,61 @@ export function toAgentReadableMessages(messages, contextMessages = []) {
     const summaries = buildThreadSummaries(records, recordsById);
     return (messages ?? []).map((message) => toAgentReadableMessage(message, recordsById, summaries));
 }
+export const AGENT_MESSAGE_OUTPUT_MAX_BYTES = 4 * 1024 * 1024;
+export const AGENT_MESSAGE_BODY_MAX_BYTES = AGENT_MESSAGE_OUTPUT_MAX_BYTES / 2;
+function jsonUtf8Bytes(value) {
+    const serialized = JSON.stringify(value);
+    return Buffer.byteLength(serialized === undefined ? "null" : serialized, "utf8");
+}
+function compactOversizedAgentMessage(message) {
+    if (!isRecord(message)) {
+        return { content_truncated: true, value_type: typeof message };
+    }
+    const text = typeof message.text === "string" ? message.text : "";
+    return {
+        ...(typeof message.id === "string" ? { id: message.id } : {}),
+        ...(typeof message.sender === "string" ? { sender: message.sender } : {}),
+        ...(typeof message.source === "string" ? { source: message.source } : {}),
+        ...(typeof message.timestamp === "string" ? { timestamp: message.timestamp } : {}),
+        ...(typeof message.thread_root_id === "string"
+            ? { thread_root_id: message.thread_root_id }
+            : {}),
+        ...(typeof message.thread_reply_to_id === "string"
+            ? { thread_reply_to_id: message.thread_reply_to_id }
+            : {}),
+        text: text.slice(0, 16 * 1024),
+        content_truncated: true,
+        original_utf8_bytes: jsonUtf8Bytes(message),
+    };
+}
+export function boundAgentMessageOutput(messages, options = {}) {
+    const direction = options.direction ?? "prefix";
+    const maxBytes = Math.max(1024, Math.floor(options.maxBytes ?? AGENT_MESSAGE_OUTPUT_MAX_BYTES));
+    const ordered = direction === "suffix" ? [...messages].reverse() : [...messages];
+    const selected = [];
+    let outputBytes = 2; // JSON array brackets.
+    for (const message of ordered) {
+        let candidate = message;
+        let candidateBytes = jsonUtf8Bytes(candidate);
+        if (candidateBytes + 2 > maxBytes) {
+            candidate = compactOversizedAgentMessage(candidate);
+            candidateBytes = jsonUtf8Bytes(candidate);
+        }
+        const separatorBytes = selected.length > 0 ? 1 : 0;
+        if (outputBytes + separatorBytes + candidateBytes > maxBytes)
+            break;
+        selected.push(candidate);
+        outputBytes += separatorBytes + candidateBytes;
+    }
+    if (direction === "suffix")
+        selected.reverse();
+    return {
+        messages: selected,
+        truncated: selected.length < messages.length,
+        omittedMessageCount: messages.length - selected.length,
+        outputBytes,
+    };
+}
 export function appendIncludePromptOnly(path) {
     return `${path}${path.includes("?") ? "&" : "?"}include_prompt_only=1`;
 }

package/dist/mcp/server/runtime/presence.js

@@ -4,7 +4,7 @@ import { isLocalRoomStorageEnabled, resolveLocalRoomStorageIdentifiers, touchRoo
 import { apiCall, isMissingRouteError } from "./api.js";
 import { agentSessionCredentials, identityFromAgentSession } from "./agent-sessions.js";
 import { getSessionLivenessRegistration } from "./identity.js";
-import { isSupervisedBoundedTurn } from "./worker-bearer.js";
+import { hasSupervisedWorkerAuthority } from "./worker-bearer.js";
 const roomPresenceByIdentity = new Map();
 export function getRememberedRoomPresence(roomId, identity) {
     if (!roomId || !identity) {
@@ -19,7 +19,7 @@ export async function syncRoomPresence(roomId, identity, presence, agentSession)
     }
     roomPresenceByIdentity.set(getRoomIdentityPresenceCacheKey(roomId, resolvedIdentity.actor_label), presence);
     const { localRoomId, cloudRoomId } = await resolveLocalRoomStorageIdentifiers(roomId);
-    if (!isSupervisedBoundedTurn() && await isLocalRoomStorageEnabled(roomId)) {
+    if (!hasSupervisedWorkerAuthority() && await isLocalRoomStorageEnabled(roomId)) {
         touchRoomSession(localRoomId || roomId);
         return;
     }
@@ -39,7 +39,7 @@ export async function syncRoomPresence(roomId, identity, presence, agentSession)
                 ...agentSessionCredentials(agentSession),
             }),
         });
-        if (!isSupervisedBoundedTurn())
+        if (!hasSupervisedWorkerAuthority())
             touchRoomSession(apiRoomId);
     }
     catch (error) {

package/dist/mcp/server/runtime/room-api.js

@@ -4,9 +4,9 @@ import { apiCall, isMissingRouteError, } from "./api.js";
 import { maybeHandleRepoRoomAuthRequired } from "./device-auth.js";
 import { getLastMessageId } from "./messages.js";
 import { currentRoom, getCurrentSupervisedRoomAuthority } from "./room-state.js";
-import { isSupervisedBoundedTurn } from "./worker-bearer.js";
+import { hasSupervisedWorkerAuthority } from "./worker-bearer.js";
 export async function roomScopedApiCall(input) {
-    const supervised = isSupervisedBoundedTurn();
+    const supervised = hasSupervisedWorkerAuthority();
     const exactRoomAuthority = supervised ? getCurrentSupervisedRoomAuthority() : null;
     if (supervised && (!exactRoomAuthority || input.room_id !== exactRoomAuthority)) {
         throw new Error("The daemon-supervised API request is missing its exact per-call room authority.");

package/dist/mcp/server/runtime/room-state.js

@@ -1,9 +1,9 @@
 import { SseClient } from "../../sse-client.js";
 import { getStoredAgentIdentity, saveRoomSession, touchRoomSession, } from "../../local-state.js";
 import { getCanonicalRoomWebPath, } from "../../room-id.js";
-import { API_URL, getLetagentsToken } from "./api.js";
+import { getApiUrl, getLetagentsToken } from "./api.js";
 import { AGENT_INSTANCE_UUID, currentAgentIdentity, currentAgentIdentityKey, } from "./identity.js";
-import { isSupervisedBoundedTurn } from "./worker-bearer.js";
+import { hasSupervisedWorkerAuthority } from "./worker-bearer.js";
 import { getCurrentSupervisedRoomAuthority, runWithSupervisedRoomAuthority, } from "./supervised-room-authority.js";
 let mcpServer = null;
 let sseClient = null;
@@ -15,7 +15,7 @@ export function shutdownRuntime() {
     sseClient?.unsubscribeAll();
 }
 function getSseClient() {
-    sseClient ??= new SseClient(API_URL, () => getLetagentsToken());
+    sseClient ??= new SseClient(getApiUrl(), () => getLetagentsToken());
     return sseClient;
 }
 function getCurrentStreamAgentIdentity() {
@@ -32,6 +32,7 @@ function getCurrentStreamAgentIdentity() {
 export function toRoomState(input) {
     return {
         room_id: input.room_id,
+        navigation_locator: input.navigation_locator ?? null,
         project_id: input.project_id ?? null,
         code: input.code ?? null,
         display_name: input.display_name ?? null,
@@ -40,8 +41,12 @@ export function toRoomState(input) {
         is_local: input.is_local ?? false,
     };
 }
+export function currentRoomMatchesLocator(locator) {
+    const value = locator?.trim();
+    return Boolean(value && currentRoom && (currentRoom.room_id === value || currentRoom.navigation_locator === value));
+}
 function getCanonicalRoomWebUrl(roomId) {
-    return new URL(getCanonicalRoomWebPath(roomId), `${API_URL}/`).toString();
+    return new URL(getCanonicalRoomWebPath(roomId), `${getApiUrl()}/`).toString();
 }
 export function withCanonicalRoomLink(roomId, payload) {
     return {
@@ -87,7 +92,7 @@ export function toPublicRoomResponse(response, fallbackRoomId) {
 }
 export function rememberRoom(state, lastMessageId) {
     currentRoom = state;
-    if (isSupervisedBoundedTurn())
+    if (hasSupervisedWorkerAuthority())
         return state;
     saveRoomSession({
         room_id: state.room_id,
@@ -109,11 +114,16 @@ export function rememberRoom(state, lastMessageId) {
     }, (_message) => {
         touchRoomSession(state.room_id);
         mcpServer?.server.sendResourceListChanged();
+    }, () => {
+        // The SSE cursor crossed a broker/bridge loss boundary. MCP resources
+        // are pull-based, so invalidating the list is the full-state repair.
+        touchRoomSession(state.room_id);
+        mcpServer?.server.sendResourceListChanged();
     });
     return state;
 }
 export function touchCurrentRoom(lastMessageId) {
-    if (isSupervisedBoundedTurn())
+    if (hasSupervisedWorkerAuthority())
         return;
     if (!currentRoom) {
         return;
@@ -121,7 +131,7 @@ export function touchCurrentRoom(lastMessageId) {
     touchRoomSession(currentRoom.room_id, lastMessageId);
 }
 export function getTargetRoomId(roomId) {
-    if (isSupervisedBoundedTurn()) {
+    if (hasSupervisedWorkerAuthority()) {
         const exactRoomAuthority = getCurrentSupervisedRoomAuthority();
         if (!exactRoomAuthority) {
             throw new Error("The daemon-supervised tool has not received its exact room authority.");
@@ -152,7 +162,7 @@ export function toPublicCurrentRoomState() {
  * repository inspection and can safely rebind after a durable room move.
  */
 export function runWithCurrentSupervisedRoom(roomId, callback) {
-    if (!isSupervisedBoundedTurn()) {
+    if (!hasSupervisedWorkerAuthority()) {
         throw new Error("Only a daemon-supervised bounded turn can bind supervisor room authority.");
     }
     const normalized = roomId.trim();
@@ -162,7 +172,7 @@ export function runWithCurrentSupervisedRoom(roomId, callback) {
     return runWithSupervisedRoomAuthority(normalized, callback);
 }
 export function getFallbackProjectId() {
-    if (isSupervisedBoundedTurn())
+    if (hasSupervisedWorkerAuthority())
         return null;
     return currentRoom?.project_id ?? null;
 }

package/dist/mcp/server/runtime/rooms.js

@@ -9,7 +9,7 @@ import { ensureAgentIdentity, toPublicAgentIdentity, withAgentIdentity, } from "
 import { withJoinRoomAgentPrompt } from "./messages.js";
 import { syncRoomPresence } from "./presence.js";
 import { rememberRoom, toPublicRoomResponse, toRoomState, } from "./room-state.js";
-import { isSupervisedBoundedTurn, requireValidWorkerBearerRuntime } from "./worker-bearer.js";
+import { hasSupervisedWorkerAuthority, requireValidWorkerBearerRuntime } from "./worker-bearer.js";
 export function normalizeJoinSessionMode(value) {
     return String(value || "").trim().toLowerCase() === "live" ? "live" : "current";
 }
@@ -20,7 +20,7 @@ function isNotFoundApiError(error) {
     return error instanceof ApiError && error.status === 404;
 }
 function parseGeneratedGitRefRoomIdentifier(identifier) {
-    const match = /^git-room:github\.com:([^/:\s]+\/[^/:\s]+):(branch|tag):[A-Za-z0-9_-]+$/.exec(identifier.trim());
+    const match = /^github\.com\/([^/\s]+\/[^/\s]+)\/focus\/git:(branch|tag):[A-Za-z0-9_-]+$/.exec(identifier.trim());
     if (!match) {
         return null;
     }
@@ -30,7 +30,7 @@ function parseGeneratedGitRefRoomIdentifier(identifier) {
     };
 }
 export async function joinRoomIdentifier(identifier, joinedVia, options = {}) {
-    if (isSupervisedBoundedTurn()) {
+    if (hasSupervisedWorkerAuthority()) {
         throw new Error("Room joins and creation are disabled during a daemon-supervised bounded turn.");
     }
     const roomId = joinedVia === "join_code" ? normalizeInviteCode(identifier) : identifier.trim();
@@ -67,6 +67,7 @@ export async function joinRoomIdentifier(identifier, joinedVia, options = {}) {
         const agentIdentity = await ensureAgentIdentity();
         const room = rememberRoom(toRoomState({
             room_id: joinedRoomId,
+            navigation_locator: joinedRoomId === roomId ? null : roomId,
             project_id: typeof response.project_id === "string" ? response.project_id : null,
             code: typeof response.code === "string"
                 ? response.code
@@ -190,7 +191,7 @@ export async function joinRoomIdentifierWithoutImplicitGitRefCreate(identifier,
     }));
 }
 export async function createInviteRoom() {
-    if (isSupervisedBoundedTurn()) {
+    if (hasSupervisedWorkerAuthority()) {
         throw new Error("Room joins and creation are disabled during a daemon-supervised bounded turn.");
     }
     const project = await apiCall("/projects", { method: "POST" });
@@ -260,7 +261,27 @@ export async function joinNamedRoom(name, sessionMode) {
         session_mode: sessionMode,
     });
 }
-function bindWorkerRoomFromContext() {
+async function bindWorkerRoomLocator(roomLocator, source) {
+    const response = await apiCall(`/rooms/resolve/${encodeURIComponent(roomLocator)}`);
+    if (response.room_exists !== true) {
+        throw new ApiError(404, JSON.stringify({ error: "Room not found", code: "ROOM_NOT_FOUND" }));
+    }
+    const roomId = typeof response.canonical_room_id === "string"
+        ? response.canonical_room_id
+        : roomLocator;
+    return {
+        room: rememberRoom(toRoomState({
+            room_id: roomId,
+            navigation_locator: roomId === roomLocator ? null : roomLocator,
+            project_id: roomId,
+            display_name: roomId,
+            git_room: response.git_room ?? null,
+            joined_via: source === ".letagents.json" ? "config" : "git-remote",
+        })),
+        source,
+    };
+}
+async function bindWorkerRoomFromContext() {
     const configRoom = getRoomFromConfig();
     if (configRoom) {
         const gitContext = buildActiveGitRoomContext({
@@ -268,26 +289,26 @@ function bindWorkerRoomFromContext() {
             currentBranch: getGitCurrentBranch(),
             defaultBranch: getGitDefaultBranch(),
         });
-        const roomId = gitContext.activeRoom ?? configRoom;
-        return {
-            room: rememberRoom(toRoomState({
-                room_id: roomId,
-                display_name: roomId,
-                joined_via: "config",
-            })),
-            source: ".letagents.json",
-        };
+        const roomId = gitContext.activeRoomLocator ?? configRoom;
+        try {
+            return await bindWorkerRoomLocator(roomId, ".letagents.json");
+        }
+        catch (error) {
+            if (roomId === configRoom || !isNotFoundApiError(error))
+                throw error;
+            return bindWorkerRoomLocator(configRoom, ".letagents.json");
+        }
     }
     const gitContext = getGitRoomContext();
-    if (gitContext.activeRoom) {
-        return {
-            room: rememberRoom(toRoomState({
-                room_id: gitContext.activeRoom,
-                display_name: gitContext.activeRoom,
-                joined_via: "git-remote",
-            })),
-            source: "git remote",
-        };
+    if (gitContext.activeRoomLocator) {
+        try {
+            return await bindWorkerRoomLocator(gitContext.activeRoomLocator, "git remote");
+        }
+        catch (error) {
+            if (!gitContext.repoRoom || !isNotFoundApiError(error))
+                throw error;
+            return bindWorkerRoomLocator(gitContext.repoRoom, "git remote");
+        }
     }
     const savedCurrentRoom = getStoredCurrentRoom();
     if (!savedCurrentRoom) {
@@ -316,9 +337,9 @@ export async function autoJoinFromContext() {
             return;
         }
         if (workerRuntime.mode === "worker") {
-            const bound = bindWorkerRoomFromContext();
+            const bound = await bindWorkerRoomFromContext();
             if (bound) {
-                console.error(`🏠 Bound worker bearer to room '${bound.room.room_id}' (from ${bound.source}; no join/create request).`);
+                console.error(`🏠 Bound worker bearer to existing room '${bound.room.room_id}' (from ${bound.source}).`);
             }
             else {
                 console.error("ℹ️ Worker bearer has no .letagents.json, git remote, or saved room to bind locally.");
@@ -332,17 +353,17 @@ export async function autoJoinFromContext() {
                 currentBranch: getGitCurrentBranch(),
                 defaultBranch: getGitDefaultBranch(),
             });
-            if (gitContext.activeRefRoom && gitContext.currentBranch) {
-                const joinedBranchRoom = await joinExistingRoomIdentifier(gitContext.activeRefRoom, "config");
+            if (gitContext.activeRefRoomLocator && gitContext.currentBranch) {
+                const joinedBranchRoom = await joinExistingRoomIdentifier(gitContext.activeRefRoomLocator, "config");
                 if (joinedBranchRoom) {
                     await ensureAgentIdentity();
-                    console.error(`🏠 Auto-joined existing branch room '${gitContext.activeRefRoom}' (from .letagents.json + branch '${gitContext.currentBranch}')`);
+                    console.error(`🏠 Auto-joined existing branch room '${gitContext.activeRefRoomLocator}' (from .letagents.json + branch '${gitContext.currentBranch}')`);
                     return;
                 }
             }
             await joinRoomIdentifier(configRoom, "config");
             await ensureAgentIdentity();
-            const branchNote = gitContext.activeRefRoom && gitContext.currentBranch
+            const branchNote = gitContext.activeRefRoomLocator && gitContext.currentBranch
                 ? `; branch '${gitContext.currentBranch}' has no existing Git Room`
                 : "";
             console.error(`🏠 Auto-joined room '${configRoom}' (from .letagents.json${branchNote})`);
@@ -350,17 +371,17 @@ export async function autoJoinFromContext() {
         }
         const gitContext = getGitRoomContext();
         if (gitContext.repoRoom) {
-            if (gitContext.activeRefRoom && gitContext.currentBranch) {
-                const joinedBranchRoom = await joinExistingRoomIdentifier(gitContext.activeRefRoom, "git-remote");
+            if (gitContext.activeRefRoomLocator && gitContext.currentBranch) {
+                const joinedBranchRoom = await joinExistingRoomIdentifier(gitContext.activeRefRoomLocator, "git-remote");
                 if (joinedBranchRoom) {
                     await ensureAgentIdentity();
-                    console.error(`🏠 Auto-joined existing branch room '${gitContext.activeRefRoom}' (inferred from git remote and branch '${gitContext.currentBranch}' — consider adding a .letagents.json)`);
+                    console.error(`🏠 Auto-joined existing branch room '${gitContext.activeRefRoomLocator}' (inferred from git remote and branch '${gitContext.currentBranch}' — consider adding a .letagents.json)`);
                     return;
                 }
             }
             await joinRoomIdentifier(gitContext.repoRoom, "git-remote");
             await ensureAgentIdentity();
-            const branchNote = gitContext.activeRefRoom && gitContext.currentBranch
+            const branchNote = gitContext.activeRefRoomLocator && gitContext.currentBranch
                 ? `; branch '${gitContext.currentBranch}' has no existing Git Room`
                 : "";
             console.error(`🏠 Auto-joined room '${gitContext.repoRoom}' (inferred from git remote${branchNote} — consider adding a .letagents.json)`);