@chrrxs/robloxstudio-mcp 2.17.0 → 2.18.0

package/studio-plugin/src/modules/Communication.ts

@@ -152,7 +152,6 @@ const routeMap: Record<string, Handler> = {
 	"/api/multiplayer-test-add-players": TestHandlers.multiplayerTestAddPlayers,
 	"/api/multiplayer-test-leave-client": TestHandlers.multiplayerTestLeaveClient,
 	"/api/multiplayer-test-end": TestHandlers.multiplayerTestEnd,
-	"/api/character-navigation": TestHandlers.characterNavigation,
 
 	"/api/export-build": BuildHandlers.exportBuild,
 	"/api/import-build": BuildHandlers.importBuild,
@@ -308,6 +307,7 @@ function sendReady(conn: Connection): void {
 		lastReadyInstanceId = parseOk && typeIs(readyData.instanceId, "string") && readyData.instanceId !== ""
 			? readyData.instanceId
 			: instanceId;
+		ServerUrlSettings.rememberServerUrl(conn.serverUrl);
 		const connectedRole = assignedRole ?? detectRole();
 		if (readyFailureLogKeys.has(readyLogKey)) {
 			readyFailureLogKeys.delete(readyLogKey);
@@ -503,13 +503,15 @@ function activatePlugin(connIndex?: number) {
 	conn.currentRetryDelay = 0.5;
 
 	if (idx === State.getActiveTabIndex()) {
-		conn.serverUrl = ui.urlInput.Text;
-		const [portStr] = conn.serverUrl.match(":(%d+)$");
-		if (portStr) conn.port = tonumber(portStr) ?? conn.port;
+		const normalizedUrl = ServerUrlSettings.normalizeServerUrl(ui.urlInput.Text);
+		conn.serverUrl = normalizedUrl !== "" ? normalizedUrl : conn.serverUrl;
+		if (conn.serverUrl === "") conn.serverUrl = ClientBroker.DEFAULT_MCP_URL;
+		ui.urlInput.Text = conn.serverUrl;
+		const port = ServerUrlSettings.extractPort(conn.serverUrl);
+		if (port !== undefined) conn.port = port;
 		UI.updateTabLabel(idx);
 		UI.updateUIState();
 	}
-	ServerUrlSettings.rememberServerUrl(conn.serverUrl);
 	UI.updateTabDot(idx);
 
 	if (!conn.heartbeatConnection) {

package/studio-plugin/src/modules/ServerUrlSettings.ts

@@ -1,6 +1,8 @@
 import { HttpService, ServerStorage } from "@rbxts/services";
 
-const SETTING_KEY_PREFIX = "MCP_SERVER_URL_";
+const LEGACY_SETTING_KEY_PREFIX = "MCP_SERVER_URL_";
+const SETTING_KEY_PREFIX = "MCP_LAST_SUCCESSFUL_SERVER_URL_";
+const GLOBAL_SETTING_KEY = "MCP_LAST_SUCCESSFUL_SERVER_URL_GLOBAL_V1";
 
 let pluginRef: Plugin | undefined;
 
@@ -8,6 +10,31 @@ function init(p: Plugin): void {
 	pluginRef = p;
 }
 
+function normalizeServerUrl(serverUrl: string | undefined): string {
+	let normalized = (serverUrl ?? "").gsub("^%s+", "")[0].gsub("%s+$", "")[0];
+	if (normalized === "") return "";
+
+	if (normalized.match("^%a[%w+.-]*://")[0] === undefined) {
+		normalized = `http://${normalized}`;
+	}
+
+	while (
+		normalized.size() > 0 &&
+		normalized.sub(-1) === "/" &&
+		normalized.match("^%a[%w+.-]*://$")[0] === undefined
+	) {
+		normalized = normalized.sub(1, -2);
+	}
+
+	return normalized;
+}
+
+function extractPort(serverUrl: string): number | undefined {
+	const [portStr] = serverUrl.match(":(%d+)$");
+	if (portStr === undefined) return undefined;
+	return tonumber(portStr);
+}
+
 function addUnique(values: string[], value: string): void {
 	if (!values.includes(value)) {
 		values.push(value);
@@ -34,28 +61,54 @@ function settingKey(instanceId: string): string {
 	return SETTING_KEY_PREFIX + instanceId;
 }
 
+function legacySettingKey(instanceId: string): string {
+	return LEGACY_SETTING_KEY_PREFIX + instanceId;
+}
+
+function readSettingString(key: string): string | undefined {
+	if (!pluginRef) return undefined;
+	const [ok, value] = pcall(() => pluginRef!.GetSetting(key));
+	if (!ok || !typeIs(value, "string")) return undefined;
+
+	const normalized = normalizeServerUrl(value as string);
+	return normalized !== "" ? normalized : undefined;
+}
+
+function writeSettingString(key: string, serverUrl: string): void {
+	if (!pluginRef) return;
+	pcall(() => pluginRef!.SetSetting(key, serverUrl));
+}
+
 function rememberServerUrl(serverUrl: string): void {
-	if (!pluginRef || serverUrl === "") return;
+	const normalized = normalizeServerUrl(serverUrl);
+	if (!pluginRef || normalized === "") return;
+	writeSettingString(GLOBAL_SETTING_KEY, normalized);
 	for (const instanceId of computeInstanceIds()) {
-		const key = settingKey(instanceId);
-		pcall(() => pluginRef!.SetSetting(key, serverUrl));
+		writeSettingString(settingKey(instanceId), normalized);
+		writeSettingString(legacySettingKey(instanceId), normalized);
 	}
 }
 
 function readServerUrl(): string | undefined {
 	if (!pluginRef) return undefined;
 	for (const instanceId of computeInstanceIds()) {
-		const key = settingKey(instanceId);
-		const [ok, value] = pcall(() => pluginRef!.GetSetting(key));
-		if (ok && typeIs(value, "string") && value !== "") {
-			return value as string;
-		}
+		const remembered = readSettingString(settingKey(instanceId));
+		if (remembered !== undefined) return remembered;
 	}
+	const globalRemembered = readSettingString(GLOBAL_SETTING_KEY);
+	if (globalRemembered !== undefined) return globalRemembered;
+	for (const instanceId of computeInstanceIds()) {
+		const legacyRemembered = readSettingString(legacySettingKey(instanceId));
+		if (legacyRemembered !== undefined) return legacyRemembered;
+	}
+
 	return undefined;
 }
 
 export = {
 	init,
+	normalizeServerUrl,
+	extractPort,
 	rememberServerUrl,
 	readServerUrl,
 };

package/studio-plugin/src/modules/UI.ts

@@ -1,5 +1,6 @@
 import { TweenService } from "@rbxts/services";
 import State from "./State";
+import ServerUrlSettings from "./ServerUrlSettings";
 import { Connection } from "../types";
 
 interface UIElements {
@@ -473,7 +474,7 @@ function init(pluginRef: Plugin) {
 	urlInput.Size = new UDim2(1, 0, 0, 26);
 	urlInput.BackgroundColor3 = C.bg;
 	urlInput.BorderSizePixel = 0;
-	urlInput.Text = "http://localhost:58741";
+	urlInput.Text = State.getActiveConnection().serverUrl;
 	urlInput.TextColor3 = C.label;
 	urlInput.TextSize = 11;
 	urlInput.Font = Enum.Font.GothamMedium;
@@ -495,9 +496,15 @@ function init(pluginRef: Plugin) {
 	urlInput.FocusLost.Connect(() => {
 		const conn = State.getActiveConnection();
 		if (!conn || conn.isActive) return;
-		conn.serverUrl = urlInput.Text;
-		const [portStr] = conn.serverUrl.match(":(%d+)$");
-		if (portStr) conn.port = tonumber(portStr) ?? conn.port;
+		const normalizedUrl = ServerUrlSettings.normalizeServerUrl(urlInput.Text);
+		if (normalizedUrl === "") {
+			urlInput.Text = conn.serverUrl;
+			return;
+		}
+		conn.serverUrl = normalizedUrl;
+		urlInput.Text = normalizedUrl;
+		const port = ServerUrlSettings.extractPort(conn.serverUrl);
+		if (port !== undefined) conn.port = port;
 		updateTabLabel(State.getActiveTabIndex());
 	});
 

package/studio-plugin/src/modules/Utils.ts

@@ -1,5 +1,11 @@
 const ScriptEditorService = game.GetService("ScriptEditorService");
 
+const LUAU_KEYWORDS = new Set<string>([
+	"and", "break", "continue", "do", "else", "elseif", "end", "export",
+	"false", "for", "function", "if", "in", "local", "nil", "not", "or",
+	"repeat", "return", "then", "true", "type", "until", "while",
+]);
+
 function safeCall<T>(func: (...args: never[]) => T, ...args: never[]): T | undefined {
 	const [success, result] = pcall(func, ...args);
 	if (success) {
@@ -10,6 +16,125 @@ function safeCall<T>(func: (...args: never[]) => T, ...args: never[]): T | undef
 	}
 }
 
+function isSimplePathSegment(segment: string): boolean {
+	return segment.match("^[%a_][%w_]*$")[0] !== undefined && !LUAU_KEYWORDS.has(segment);
+}
+
+function quotePathSegment(segment: string): string {
+	let escaped = segment.gsub("\\", "\\\\")[0];
+	escaped = escaped.gsub("\n", "\\n")[0];
+	escaped = escaped.gsub("\r", "\\r")[0];
+	escaped = escaped.gsub("\t", "\\t")[0];
+	escaped = escaped.gsub('"', '\\"')[0];
+	return `"${escaped}"`;
+}
+
+function unescapePathSegment(segment: string): string {
+	const chars: string[] = [];
+	let i = 1;
+	while (i <= segment.size()) {
+		const ch = segment.sub(i, i);
+		if (ch === "\\" && i < segment.size()) {
+			const nextChar = segment.sub(i + 1, i + 1);
+			if (nextChar === "n") {
+				chars.push("\n");
+			} else if (nextChar === "r") {
+				chars.push("\r");
+			} else if (nextChar === "t") {
+				chars.push("\t");
+			} else {
+				chars.push(nextChar);
+			}
+			i += 2;
+		} else {
+			chars.push(ch);
+			i += 1;
+		}
+	}
+	return chars.join("");
+}
+
+function isCanonicalBracketStart(path: string, index: number): boolean {
+	const quote = path.sub(index + 1, index + 1);
+	return (quote === '"' || quote === "'") && path.sub(index - 1, index - 1) !== ".";
+}
+
+function parseInstancePath(path: string): string[] | undefined {
+	let i = 1;
+	const len = path.size();
+	const parts: string[] = [];
+	let current = "";
+
+	if (path === "" || path === "game") return parts;
+	if (path.sub(1, 5) === "game.") {
+		i = 6;
+	} else if (path.sub(1, 5) === "game[") {
+		i = 5;
+	}
+
+	while (i <= len) {
+		const ch = path.sub(i, i);
+
+		if (ch === ".") {
+			if (current !== "") {
+				parts.push(current);
+				current = "";
+				i += 1;
+			} else if (i > 1 && path.sub(i - 1, i - 1) === "." && i < len && path.sub(i + 1, i + 1) !== "[") {
+				// Back-compat for previously emitted paths such as
+				// game.ServerScriptService..dir.ReproScript, where ".dir"
+				// was an actual instance name.
+				current = ".";
+				i += 1;
+			} else {
+				i += 1;
+			}
+		} else if (ch === "[" && i < len && isCanonicalBracketStart(path, i)) {
+			if (current !== "") {
+				parts.push(current);
+				current = "";
+			}
+
+			const quote = path.sub(i + 1, i + 1);
+			if (quote !== '"' && quote !== "'") return undefined;
+			let j = i + 2;
+			let raw = "";
+			while (j <= len) {
+				const c = path.sub(j, j);
+				if (c === "\\") {
+					if (j >= len) return undefined;
+					raw += c + path.sub(j + 1, j + 1);
+					j += 2;
+				} else if (c === quote) {
+					break;
+				} else {
+					raw += c;
+					j += 1;
+				}
+			}
+			if (j > len || path.sub(j, j) !== quote || path.sub(j + 1, j + 1) !== "]") return undefined;
+			parts.push(unescapePathSegment(raw));
+			i = j + 2;
+		} else {
+			current += ch;
+			i += 1;
+		}
+	}
+
+	if (current !== "") parts.push(current);
+	return parts;
+}
+
+function getRootSegment(instance: Instance): string {
+	if (instance.Parent === game) {
+		const [ok, service] = pcall(() => game.GetService(instance.ClassName as keyof Services));
+		if (ok && service === instance) {
+			return instance.ClassName;
+		}
+	}
+	return instance.Name;
+}
+
 function getInstancePath(instance: Instance): string {
 	if (!instance || instance === game) {
 		return "game";
@@ -19,26 +144,35 @@ function getInstancePath(instance: Instance): string {
 	let current: Instance | undefined = instance;
 
 	while (current && current !== game) {
-		pathParts.unshift(current.Name);
+		pathParts.unshift(getRootSegment(current));
 		current = current.Parent as Instance | undefined;
 	}
 
-	return `game.${pathParts.join(".")}`;
+	let path = "game";
+	for (const part of pathParts) {
+		if (isSimplePathSegment(part)) {
+			path += `.${part}`;
+		} else {
+			path += `[${quotePathSegment(part)}]`;
+		}
+	}
+	return path;
 }
 
-function getInstanceByPath(path: string): Instance | undefined {
-	if (path === "game" || path === "") {
-		return game;
-	}
+function getRootInstance(segment: string): Instance | undefined {
+	const [ok, service] = pcall(() => game.GetService(segment as keyof Services));
+	if (ok && service) return service as Instance;
+	return game.FindFirstChild(segment);
+}
 
-	const cleaned = path.gsub("^game%.", "")[0];
-	const parts: string[] = [];
-	for (const [part] of cleaned.gmatch("[^%.]+")) {
-		parts.push(part as string);
-	}
+function getInstanceByPath(path: string): Instance | undefined {
+	const parts = parseInstancePath(path);
+	if (parts === undefined) return undefined;
+	if (parts.size() === 0) return game;
 
-	let current: Instance | undefined = game;
-	for (const part of parts) {
+	let current: Instance | undefined = getRootInstance(parts[0]);
+	for (let i = 1; i < parts.size(); i++) {
+		const part = parts[i];
 		if (!current) return undefined;
 		current = current.FindFirstChild(part);
 	}

package/studio-plugin/src/modules/handlers/ScriptHandlers.ts

@@ -132,6 +132,9 @@ function setScriptSource(requestData: Record<string, unknown>) {
 		const oldSourceLength = readScriptSource(instance).size();
 
 		ScriptEditorService.UpdateSourceAsync(instance, () => sourceToSet);
+		if (readScriptSource(instance) !== sourceToSet) {
+			error("UpdateSourceAsync completed without updating the script source");
+		}
 
 		return {
 			success: true, instancePath,

package/studio-plugin/src/modules/handlers/TestHandlers.ts

@@ -1,4 +1,4 @@
-import { HttpService, LogService, Players, RunService } from "@rbxts/services";
+import { HttpService, Players, RunService } from "@rbxts/services";
 import StopPlayMonitor from "../StopPlayMonitor";
 
 interface StudioTestServiceMultiplayer extends StudioTestService {
@@ -10,20 +10,8 @@ interface StudioTestServiceMultiplayer extends StudioTestService {
 }
 
 const StudioTestService = game.GetService("StudioTestService") as StudioTestServiceMultiplayer;
-const ServerScriptService = game.GetService("ServerScriptService");
-const ScriptEditorService = game.GetService("ScriptEditorService");
-
-// NAV_SIGNAL flows from the edit DM to the play-server DM via the injected
-// __MCP_CommandListener Script + LogService.MessageOut. Stop signaling moved
-// off this path entirely (see StopPlayMonitor) because cross-DM MessageOut
-// reflection from edit -> play-server does not work in practice.
-const NAV_SIGNAL = "__MCP_NAV__";
-const NAV_RESULT = "__MCP_NAV_RESULT__";
 
 let testRunning = false;
-let navLogConnection: RBXScriptConnection | undefined;
-let stopListenerScript: Script | undefined;
-let navResultCallback: ((json: string) => void) | undefined;
 
 type MultiplayerPhase = "idle" | "starting" | "running" | "completed" | "failed";
 
@@ -78,102 +66,6 @@ function normalizeNumPlayers(value: unknown): number | undefined {
 	return n;
 }
 
-function buildCommandListenerSource(): string {
-	return `local LogService = game:GetService("LogService")
-local PathfindingService = game:GetService("PathfindingService")
-local Players = game:GetService("Players")
-local HttpService = game:GetService("HttpService")
-local NAV_SIG = "${NAV_SIGNAL}"
-local NAV_RES = "${NAV_RESULT}"
-LogService.MessageOut:Connect(function(msg)
-	if string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then
-		local json = string.sub(msg, #NAV_SIG + 2)
-		task.spawn(function()
-			local ok, d = pcall(function() return HttpService:JSONDecode(json) end)
-			if not ok or not d then
-				print(NAV_RES .. ':{"success":false,"error":"parse_error"}')
-				return
-			end
-			local ps = Players:GetPlayers()
-			if #ps == 0 then
-				print(NAV_RES .. ':{"success":false,"error":"no_players"}')
-				return
-			end
-			local char = ps[1].Character or ps[1].CharacterAdded:Wait()
-			local hum = char:FindFirstChildOfClass("Humanoid")
-			local root = char:FindFirstChild("HumanoidRootPart")
-			if not hum or not root then
-				print(NAV_RES .. ':{"success":false,"error":"no_humanoid"}')
-				return
-			end
-			local target
-			if d.instancePath then
-				local parts = string.split(d.instancePath, ".")
-				local cur = game
-				for i = 2, #parts do
-					cur = cur:FindFirstChild(parts[i])
-					if not cur then
-						print(NAV_RES .. ':{"success":false,"error":"instance_not_found"}')
-						return
-					end
-				end
-				if cur:IsA("BasePart") then target = cur.Position
-				elseif cur:IsA("Model") and cur.PrimaryPart then target = cur.PrimaryPart.Position
-				else target = cur:GetPivot().Position end
-			else
-				target = Vector3.new(d.x or 0, d.y or 0, d.z or 0)
-			end
-			local path = PathfindingService:CreatePath({AgentRadius=2,AgentHeight=5,AgentCanJump=true})
-			local pok = pcall(function() path:ComputeAsync(root.Position, target) end)
-			local method = "direct"
-			if pok and path.Status == Enum.PathStatus.Success then
-				method = "pathfinding"
-				for _, wp in ipairs(path:GetWaypoints()) do
-					hum:MoveTo(wp.Position)
-					if wp.Action == Enum.PathWaypointAction.Jump then hum.Jump = true end
-					hum.MoveToFinished:Wait()
-				end
-			else
-				hum:MoveTo(target)
-				hum.MoveToFinished:Wait()
-			end
-			local fp = root.Position
-			print(NAV_RES .. ':{"success":true,"method":"' .. method .. '","position":[' .. fp.X .. ',' .. fp.Y .. ',' .. fp.Z .. ']}')
-		end)
-	end
-end)`;
-}
-
-function injectStopListener() {
-	const listener = new Instance("Script");
-	listener.Name = "__MCP_CommandListener";
-	listener.Parent = ServerScriptService;
-
-	const source = buildCommandListenerSource();
-	const [seOk] = pcall(() => {
-		ScriptEditorService.UpdateSourceAsync(listener, () => source);
-	});
-	if (!seOk) {
-		(listener as unknown as { Source: string }).Source = source;
-	}
-
-	stopListenerScript = listener;
-}
-
-function cleanupStopListener() {
-	if (stopListenerScript) {
-		pcall(() => stopListenerScript!.Destroy());
-		stopListenerScript = undefined;
-	}
-}
-
-function disconnectNavLogListener() {
-	if (navLogConnection) {
-		navLogConnection.Disconnect();
-		navLogConnection = undefined;
-	}
-}
-
 function startPlaytest(requestData: Record<string, unknown>) {
 	const mode = requestData.mode as string | undefined;
 	const numPlayers = requestData.numPlayers as number | undefined;
@@ -192,8 +84,6 @@ function startPlaytest(requestData: Record<string, unknown>) {
 	// Reset it so subsequent starts don't hit a false "already running".
 	if (testRunning && !RunService.IsRunning()) {
 		testRunning = false;
-		disconnectNavLogListener();
-		cleanupStopListener();
 		// Runtime eval bridges are created by the play server/client plugin
 		// peers and disappear with the play DataModels.
 	}
@@ -204,22 +94,6 @@ function startPlaytest(requestData: Record<string, unknown>) {
 
 	testRunning = true;
 
-	cleanupStopListener();
-	disconnectNavLogListener();
-
-	navLogConnection = LogService.MessageOut.Connect((message) => {
-		if (message.sub(1, NAV_RESULT.size() + 1) === `${NAV_RESULT}:`) {
-			if (navResultCallback) {
-				navResultCallback(message.sub(NAV_RESULT.size() + 2));
-			}
-		}
-	});
-
-	const [injected, injErr] = pcall(() => injectStopListener());
-	if (!injected) {
-		warn(`[robloxstudio-mcp] Failed to inject stop listener: ${injErr}`);
-	}
-
 	task.spawn(() => {
 		const [ok, result] = pcall(() => {
 			if (mode === "play") {
@@ -232,10 +106,7 @@ function startPlaytest(requestData: Record<string, unknown>) {
 			warn(`[robloxstudio-mcp] Playtest ended with error: ${result}`);
 		}
 
-		disconnectNavLogListener();
 		testRunning = false;
-
-		cleanupStopListener();
 	});
 
 	const response: Record<string, unknown> = {
@@ -468,52 +339,6 @@ function multiplayerTestEnd(requestData: Record<string, unknown>) {
 	};
 }
 
-function characterNavigation(requestData: Record<string, unknown>) {
-	if (!testRunning) {
-		return { error: "Playtest must be running. Start a playtest in 'play' mode first." };
-	}
-
-	const position = requestData.position as number[] | undefined;
-	const instancePath = requestData.instancePath as string | undefined;
-	const waitForCompletion = (requestData.waitForCompletion as boolean) ?? true;
-	const timeout = (requestData.timeout as number) ?? 25;
-
-	if (!position && !instancePath) {
-		return { error: "Either position [x, y, z] or instancePath is required" };
-	}
-
-	let navData: string;
-	if (position) {
-		navData = HttpService.JSONEncode({ x: position[0], y: position[1], z: position[2] });
-	} else {
-		navData = HttpService.JSONEncode({ instancePath });
-	}
-
-	warn(`${NAV_SIGNAL}:${navData}`);
-
-	if (!waitForCompletion) {
-		return { success: true, message: "Navigation command sent" };
-	}
-
-	let result: string | undefined;
-	navResultCallback = (json: string) => {
-		result = json;
-	};
-
-	const startTime = tick();
-	while (!result && tick() - startTime < timeout) {
-		task.wait(0.2);
-	}
-	navResultCallback = undefined;
-
-	if (result) {
-		const [ok, parsed] = pcall(() => HttpService.JSONDecode(result!));
-		if (ok) return parsed;
-		return { success: true, rawResult: result };
-	}
-	return { error: `Navigation timed out after ${timeout} seconds` };
-}
-
 export = {
 	startPlaytest,
 	stopPlaytest,
@@ -522,5 +347,4 @@ export = {
 	multiplayerTestAddPlayers,
 	multiplayerTestLeaveClient,
 	multiplayerTestEnd,
-	characterNavigation,
 };

package/studio-plugin/src/server/index.server.ts

@@ -26,6 +26,19 @@ StopPlayMonitor.init(plugin);
 BreakpointHandlers.init(plugin);
 ServerUrlSettings.init(plugin);
 
+function applyRememberedServerUrl(): void {
+	const rememberedServerUrl = ServerUrlSettings.readServerUrl();
+	if (rememberedServerUrl === undefined) return;
+
+	const conn = State.getActiveConnection();
+	conn.serverUrl = rememberedServerUrl;
+	const port = ServerUrlSettings.extractPort(rememberedServerUrl);
+	if (port !== undefined) conn.port = port;
+	ClientBroker.setServerUrl(rememberedServerUrl);
+}
+
+applyRememberedServerUrl();
+
 UI.init(plugin);
 const elements = UI.getElements();
 
@@ -93,11 +106,11 @@ task.delay(2, () => {
 			if (conn && !conn.isActive) {
 				if (role === "server") {
 					const inheritedServerUrl = ServerUrlSettings.readServerUrl() ?? ClientBroker.DEFAULT_MCP_URL;
-					conn.serverUrl = inheritedServerUrl;
-					elements.urlInput.Text = inheritedServerUrl;
-					const [portStr] = conn.serverUrl.match(":(%d+)$");
-					if (portStr) conn.port = tonumber(portStr) ?? conn.port;
-					ClientBroker.setServerUrl(inheritedServerUrl);
+					conn.serverUrl = ServerUrlSettings.normalizeServerUrl(inheritedServerUrl);
+					elements.urlInput.Text = conn.serverUrl;
+					const port = ServerUrlSettings.extractPort(conn.serverUrl);
+					if (port !== undefined) conn.port = port;
+					ClientBroker.setServerUrl(conn.serverUrl);
 				}
 				// Defensive default: in invisible play-DM UIs, the input field
 				// may not be populated by the time we activate.