@princeofscale/bloxforge 2.20.2 → 3.0.0

package/studio-plugin/MCPPlugin.rbxmx

@@ -240,11 +240,41 @@ local CLIENT_BROKER_ALLOWED_ENDPOINTS = {
 -- Throttle re-ready calls per proxyId so a brief window of unknownInstance
 -- polls doesn't cause a re-register stampede.
 local lastReadyByProxy = {}
-local postJson
-local function reRegisterProxy(proxyId, role)
+local completedProxyRequests = {}
+local completedProxyRequestOrder = {}
+local COMPLETED_PROXY_REQUEST_LIMIT = 500
+local function rememberCompletedProxyRequest(requestId, response)
+	local _requestId = requestId
+	local _arg1 = {
+		response = response,
+	}
+	completedProxyRequests[_requestId] = _arg1
+	local _requestId_1 = requestId
+	table.insert(completedProxyRequestOrder, _requestId_1)
+	if #completedProxyRequestOrder > COMPLETED_PROXY_REQUEST_LIMIT then
+		local _arg0 = table.remove(completedProxyRequestOrder, 1)
+		completedProxyRequests[_arg0] = nil
+	end
+end
+local postJson, formatPostJsonFailure
+local function sendProxyResponse(requestId, response, proxy, fence)
+	local _object = {
+		requestId = requestId,
+		pluginSessionId = proxy.pluginSessionId,
+		response = response,
+	}
+	for _k, _v in fence do
+		_object[_k] = _v
+	end
+	local ok, result = postJson("/response", _object, proxy.sessionToken)
+	if not ok or not result or not result.Success then
+		warn(`[BloxForge] proxy response delivery failed: {formatPostJsonFailure("/response", ok, result)}`)
+	end
+end
+local function reRegisterProxy(proxy, role)
+	local proxyId = proxy.pluginSessionId
 	local now = tick()
-	local _proxyId = proxyId
-	local _condition = lastReadyByProxy[_proxyId]
+	local _condition = lastReadyByProxy[proxyId]
 	if _condition == nil then
 		_condition = 0
 	end
@@ -252,10 +282,9 @@ local function reRegisterProxy(proxyId, role)
 	if now - last < 2 then
 		return nil
 	end
-	local _proxyId_1 = proxyId
-	lastReadyByProxy[_proxyId_1] = now
+	lastReadyByProxy[proxyId] = now
 	pcall(function()
-		return postJson("/ready", {
+		local ok, result = postJson("/ready", {
 			pluginSessionId = proxyId,
 			instanceId = computeInstanceId(),
 			role = role,
@@ -267,6 +296,12 @@ local function reRegisterProxy(proxyId, role)
 			pluginVariant = State.PLUGIN_VARIANT,
 			protocolVersion = State.PROTOCOL_VERSION,
 		})
+		if ok and result and result.Success then
+			local body = HttpService:JSONDecode(result.Body)
+			if body.sessionToken ~= nil then
+				proxy.sessionToken = body.sessionToken
+			end
+		end
 	end)
 end
 local function forkRole()
@@ -278,19 +313,23 @@ local function forkRole()
 	end
 	return "client"
 end
-function postJson(endpoint, body)
+function postJson(endpoint, body, sessionToken)
+	local headers = {
+		["Content-Type"] = "application/json",
+	}
+	if sessionToken ~= nil and sessionToken ~= "" then
+		headers.Authorization = `Bearer {sessionToken}`
+	end
 	return pcall(function()
 		return HttpService:RequestAsync({
 			Url = `{mcpUrl}{endpoint}`,
 			Method = "POST",
-			Headers = {
-				["Content-Type"] = "application/json",
-			},
+			Headers = headers,
 			Body = HttpService:JSONEncode(body),
 		})
 	end)
 end
-local function formatPostJsonFailure(endpoint, ok, res)
+function formatPostJsonFailure(endpoint, ok, res)
 	return HttpDiagnostics.formatRequestFailure(`{mcpUrl}{endpoint}`, ok, res)
 end
 local function setServerUrl(serverUrl)
@@ -471,7 +510,7 @@ local function unregisterProxy(player, entry)
 	proxyRegisterFailuresByPlayer[_player_1] = nil
 	postJson("/disconnect", {
 		pluginSessionId = proxy.pluginSessionId,
-	})
+	}, proxy.sessionToken)
 end
 local function disconnectAllProxies()
 	for player, entry in proxyByPlayer do
@@ -480,7 +519,8 @@ local function disconnectAllProxies()
 	table.clear(proxyByPlayer)
 	table.clear(proxyRegisterFailuresByPlayer)
 end
-local function pollProxy(proxyId, player, rf)
+local function pollProxy(proxy, player, rf)
+	local proxyId = proxy.pluginSessionId
 	while true do
 		local _condition = player.Parent ~= nil
 		if _condition then
@@ -498,11 +538,17 @@ local function pollProxy(proxyId, player, rf)
 			return HttpService:RequestAsync({
 				Url = `{mcpUrl}/poll?pluginSessionId={proxyId}`,
 				Method = "GET",
-				Headers = {
+				Headers = if proxy.sessionToken ~= "" then {
+					["Content-Type"] = "application/json",
+					Authorization = `Bearer {proxy.sessionToken}`,
+				} else {
 					["Content-Type"] = "application/json",
 				},
 			})
 		end)
+		if ok and res and res.StatusCode == 401 then
+			reRegisterProxy(proxy, "client")
+		end
 		if ok and res and (res.Success or res.StatusCode == 503) then
 			local okJson, body = pcall(function()
 				return HttpService:JSONDecode(res.Body)
@@ -511,9 +557,41 @@ local function pollProxy(proxyId, player, rf)
 				-- Server lost our proxy registration (process restart, etc.) -
 				-- re-register so the next poll cycle starts routing again.
 				if body.knownInstance == false then
-					reRegisterProxy(proxyId, "client")
+					reRegisterProxy(proxy, "client")
 				end
 				if body.request and body.requestId ~= nil then
+					local _value = body.serverEpoch
+					local _condition_1 = not (_value ~= "" and _value)
+					if not _condition_1 then
+						_condition_1 = body.deliveryAttempt == nil
+						if not _condition_1 then
+							local _value_1 = body.leaseToken
+							_condition_1 = not (_value_1 ~= "" and _value_1)
+						end
+					end
+					if _condition_1 then
+						continue
+					end
+					local fence = {
+						serverEpoch = body.serverEpoch,
+						deliveryAttempt = body.deliveryAttempt,
+						leaseToken = body.leaseToken,
+					}
+					local _requestId = body.requestId
+					local cached = completedProxyRequests[_requestId]
+					if cached ~= nil then
+						sendProxyResponse(body.requestId, cached.response, proxy, fence)
+						task.wait(0.5)
+						continue
+					end
+					local _object = {
+						requestId = body.requestId,
+						pluginSessionId = proxyId,
+					}
+					for _k, _v in fence do
+						_object[_k] = _v
+					end
+					postJson("/ack", _object, proxy.sessionToken)
 					local request = body.request
 					local response
 					local _endpoint = request.endpoint
@@ -547,10 +625,8 @@ local function pollProxy(proxyId, player, rf)
 							error = `Client-proxy does not forward {tostring(request.endpoint)}. ` .. `Allowed: {table.concat(allowed, ", ")}.`,
 						}
 					end
-					postJson("/response", {
-						requestId = body.requestId,
-						response = response,
-					})
+					rememberCompletedProxyRequest(body.requestId, response)
+					sendProxyResponse(body.requestId, response, proxy, fence)
 				end
 			end
 		end
@@ -587,19 +663,26 @@ local function registerProxy(player, rf)
 		_condition = "client"
 	end
 	local assigned = _condition
-	local _player_1 = player
-	local _arg1 = {
+	local _object = {
 		pluginSessionId = proxyId,
 		role = assigned,
 	}
-	proxyByPlayer[_player_1] = _arg1
+	local _left = "sessionToken"
+	local _condition_1 = body.sessionToken
+	if _condition_1 == nil then
+		_condition_1 = ""
+	end
+	_object[_left] = _condition_1
+	local entry = _object
+	local _player_1 = player
+	proxyByPlayer[_player_1] = entry
 	local _player_2 = player
 	if proxyRegisterFailuresByPlayer[_player_2] ~= nil then
 		local _player_3 = player
 		proxyRegisterFailuresByPlayer[_player_3] = nil
 		print(`[BloxForge] proxy registered for {player.Name} as {assigned} via {mcpUrl}`)
 	end
-	task.spawn(pollProxy, proxyId, player, rf)
+	task.spawn(pollProxy, entry, player, rf)
 end
 -- (Removed: startEditProxyLoop. The play-server DM no longer registers an
 -- "edit-proxy" peer with the MCP server. stop_playtest now uses a cross-DM
@@ -708,8 +791,10 @@ local function computeInstanceId()
 end
 local assignedRole
 local duplicateInstanceRole = false
-local hasVersionMismatch = false
+local versionMismatchConnections = {}
 local lastVersionMismatchWarningKey
+local protocolMismatchConnections = {}
+local lastProtocolMismatchWarningKey
 local lastReadyInstanceId
 local readyFailureLogKeys = {}
 -- Cache the published place name from MarketplaceService:GetProductInfo so
@@ -753,6 +838,20 @@ local function detectRole()
 	return "client"
 end
 local initialRole = detectRole()
+local activeRequests = {}
+local completedRequests = {}
+local completedRequestOrder = {}
+local COMPLETED_REQUEST_LIMIT = 500
+local syncThreadRequests = {}
+local cancelledSyncRequests = {}
+local function isCancelledForThread(co)
+	local _co = co
+	local reqId = syncThreadRequests[_co]
+	if reqId == nil then
+		return false
+	end
+	return cancelledSyncRequests[reqId] ~= nil
+end
 local routeMap = {
 	["/api/file-tree"] = QueryHandlers.getFileTree,
 	["/api/search-files"] = QueryHandlers.searchFiles,
@@ -841,19 +940,119 @@ local function processRequest(request)
 		}
 	end
 end
-local function sendResponse(conn, requestId, responseData)
-	pcall(function()
-		HttpService:RequestAsync({
+local function sendResponse(conn, requestId, responseData, serverEpoch, deliveryAttempt, leaseToken)
+	local body = {
+		requestId = requestId,
+		response = responseData,
+	}
+	if serverEpoch ~= nil then
+		body.serverEpoch = serverEpoch
+	end
+	if deliveryAttempt ~= nil then
+		body.deliveryAttempt = deliveryAttempt
+	end
+	if leaseToken ~= nil then
+		body.leaseToken = leaseToken
+	end
+	local ok, result = pcall(function()
+		local _object = {
 			Url = `{conn.serverUrl}/response`,
 			Method = "POST",
-			Headers = {
-				["Content-Type"] = "application/json",
-			},
-			Body = HttpService:JSONEncode({
-				requestId = requestId,
-				response = responseData,
-			}),
-		})
+		}
+		local _left = "Headers"
+		local _object_1 = {
+			["Content-Type"] = "application/json",
+		}
+		local _value = conn.sessionToken
+		for _k, _v in (if _value ~= "" and _value then {
+			Authorization = `Bearer {conn.sessionToken}`,
+		} else {}) do
+			_object_1[_k] = _v
+		end
+		_object[_left] = _object_1
+		_object.Body = HttpService:JSONEncode(body)
+		return HttpService:RequestAsync(_object)
+	end)
+	if not ok then
+		warn(`[BloxForge] Plugin response serialization failed for {requestId}: {tostring(result)}`)
+	elseif not result.Success then
+		warn(`[BloxForge] Failed to deliver response for {requestId}: HTTP {result.StatusCode}`)
+	end
+end
+local function handleRequestOnce(conn, requestId, request, serverEpoch, deliveryAttempt, leaseToken)
+	-- If we've already completed this request, just re-deliver the cached response
+	local _requestId = requestId
+	local completed = completedRequests[_requestId]
+	if completed then
+		sendResponse(conn, requestId, completed.response, serverEpoch, deliveryAttempt, leaseToken)
+		return nil
+	end
+	-- If it's actively being processed, do nothing. The running thread will deliver
+	-- the response when it finishes.
+	local _requestId_1 = requestId
+	if activeRequests[_requestId_1] ~= nil then
+		return nil
+	end
+	-- Acknowledge the fenced request so the server knows we've started work.
+	-- This prevents the lease from expiring while we're executing long-running operations.
+	if serverEpoch ~= nil and deliveryAttempt ~= nil and leaseToken ~= nil then
+		task.spawn(function()
+			pcall(function()
+				local _object = {
+					Url = `{conn.serverUrl}/ack`,
+					Method = "POST",
+				}
+				local _left = "Headers"
+				local _object_1 = {
+					["Content-Type"] = "application/json",
+				}
+				local _value = conn.sessionToken
+				for _k, _v in (if _value ~= "" and _value then {
+					Authorization = `Bearer {conn.sessionToken}`,
+				} else {}) do
+					_object_1[_k] = _v
+				end
+				_object[_left] = _object_1
+				_object.Body = HttpService:JSONEncode({
+					pluginSessionId = pluginSessionId,
+					requestId = requestId,
+					serverEpoch = serverEpoch,
+					deliveryAttempt = deliveryAttempt,
+					leaseToken = leaseToken,
+				})
+				HttpService:RequestAsync(_object)
+			end)
+		end)
+	end
+	local _requestId_2 = requestId
+	activeRequests[_requestId_2] = true
+	task.spawn(function()
+		local co = coroutine.running()
+		local _requestId_3 = requestId
+		syncThreadRequests[co] = _requestId_3
+		local ok, result = pcall(function()
+			return processRequest(request)
+		end)
+		syncThreadRequests[co] = nil
+		local response = if ok then result else {
+			error = tostring(result),
+		}
+		local _requestId_4 = requestId
+		activeRequests[_requestId_4] = nil
+		if #completedRequestOrder >= COMPLETED_REQUEST_LIMIT then
+			local oldest = table.remove(completedRequestOrder, 1)
+			if oldest ~= nil then
+				completedRequests[oldest] = nil
+			end
+		end
+		local _requestId_5 = requestId
+		local _arg1 = {
+			response = response,
+		}
+		completedRequests[_requestId_5] = _arg1
+		local _requestId_6 = requestId
+		table.insert(completedRequestOrder, _requestId_6)
+		sendResponse(conn, requestId, response, serverEpoch, deliveryAttempt, leaseToken)
 	end)
 end
 local function getConnectionStatus(connIndex)
@@ -969,8 +1168,12 @@ function sendReady(conn)
 		local parseOk, readyData = pcall(function()
 			return HttpService:JSONDecode(readyResult.Body)
 		end)
-		local _value = parseOk and readyData.assignedRole
+		local _value = parseOk and readyData.sessionToken
 		if _value ~= "" and _value then
+			conn.sessionToken = readyData.sessionToken
+		end
+		local _value_1 = parseOk and readyData.assignedRole
+		if _value_1 ~= "" and _value_1 then
 			assignedRole = readyData.assignedRole
 		end
 		local _condition = parseOk
@@ -982,12 +1185,51 @@ function sendReady(conn)
 			end
 		end
 		lastReadyInstanceId = if _condition then readyData.instanceId else instanceId
+		local _condition_1 = parseOk
+		if _condition_1 then
+			_condition_1 = readyData.serverEpoch
+			if _condition_1 ~= "" and _condition_1 then
+				-- ▼ ReadonlyMap.size ▼
+				local _size = 0
+				for _ in completedRequests do
+					_size += 1
+				end
+				-- ▲ ReadonlyMap.size ▲
+				_condition_1 = _size > 0
+			end
+		end
+		if _condition_1 ~= "" and _condition_1 then
+			local receipts = {}
+			for id, _ in completedRequests do
+				local _arg0 = {
+					requestId = id,
+					completedAt = tick() * 1000,
+				}
+				table.insert(receipts, _arg0)
+			end
+			task.spawn(function()
+				pcall(function()
+					return HttpService:RequestAsync({
+						Url = `{conn.serverUrl}/reconcile`,
+						Method = "POST",
+						Headers = {
+							["Content-Type"] = "application/json",
+						},
+						Body = HttpService:JSONEncode({
+							pluginSessionId = pluginSessionId,
+							serverEpoch = readyData.serverEpoch,
+							receipts = receipts,
+						}),
+					})
+				end)
+			end)
+		end
 		ServerUrlSettings.rememberServerUrl(conn.serverUrl)
-		local _condition_1 = assignedRole
-		if _condition_1 == nil then
-			_condition_1 = detectRole()
+		local _condition_2 = assignedRole
+		if _condition_2 == nil then
+			_condition_2 = detectRole()
 		end
-		local connectedRole = _condition_1
+		local connectedRole = _condition_2
 		if readyFailureLogKeys[readyLogKey] ~= nil then
 			readyFailureLogKeys[readyLogKey] = nil
 			print(`[BloxForge] /ready connected for {instanceId}/{connectedRole} via {conn.serverUrl}`)
@@ -998,30 +1240,53 @@ local function streamUrl(serverUrl)
 	local websocketUrl = string.gsub(serverUrl, "^http", "ws")
 	return `{websocketUrl}/stream?pluginSessionId={pluginSessionId}`
 end
-local function sendStreamResponse(conn, requestId, response)
+local function sendStreamResponse(conn, requestId, response, serverEpoch, deliveryAttempt, leaseToken)
 	if not conn.streamOpen or not conn.streamClient then
 		return nil
 	end
-	pcall(function()
-		return conn.streamClient:Send(HttpService:JSONEncode({
-			type = "response",
-			requestId = requestId,
-			response = response,
-		}))
+	local body = {
+		type = "response",
+		requestId = requestId,
+		response = response,
+	}
+	if serverEpoch ~= nil then
+		body.serverEpoch = serverEpoch
+	end
+	if deliveryAttempt ~= nil then
+		body.deliveryAttempt = deliveryAttempt
+	end
+	if leaseToken ~= nil then
+		body.leaseToken = leaseToken
+	end
+	local ok, result = pcall(function()
+		return conn.streamClient:Send(HttpService:JSONEncode(body))
 	end)
+	if not ok then
+		warn(`[BloxForge] Failed to send stream response for {requestId}: {tostring(result)}`)
+	end
 end
 local function startRequestStream(conn)
 	if not conn.isActive or conn.streamClient then
 		return nil
 	end
 	local ok, stream = pcall(function()
-		return HttpService:CreateWebStreamClient(Enum.WebStreamClientType.WebSocket, {
+		local _exp = Enum.WebStreamClientType.WebSocket
+		local _object = {
 			Url = streamUrl(conn.serverUrl),
 			Method = "GET",
-			Headers = {
-				["Content-Type"] = "application/json",
-			},
-		})
+		}
+		local _left = "Headers"
+		local _object_1 = {
+			["Content-Type"] = "application/json",
+		}
+		local _value = conn.sessionToken
+		for _k, _v in (if _value ~= "" and _value then {
+			Authorization = `Bearer {conn.sessionToken}`,
+		} else {}) do
+			_object_1[_k] = _v
+		end
+		_object[_left] = _object_1
+		return HttpService:CreateWebStreamClient(_exp, _object)
 	end)
 	if not ok or not stream then
 		return nil
@@ -1053,14 +1318,7 @@ local function startRequestStream(conn)
 		if _condition then
 			return nil
 		end
-		task.spawn(function()
-			local handled, response = pcall(function()
-				return processRequest(frame.request)
-			end)
-			sendStreamResponse(conn, frame.requestId, if handled then response else {
-				error = tostring(response),
-			})
-		end)
+		handleRequestOnce(conn, frame.requestId, frame.request, frame.serverEpoch, frame.deliveryAttempt, frame.leaseToken)
 	end)
 	local close = function()
 		if conn.streamClient ~= stream then
@@ -1083,13 +1341,22 @@ local function pollForRequests(connIndex)
 	end
 	conn.isPolling = true
 	local success, result = pcall(function()
-		return HttpService:RequestAsync({
+		local _object = {
 			Url = `{conn.serverUrl}/poll?pluginSessionId={pluginSessionId}`,
 			Method = "GET",
-			Headers = {
-				["Content-Type"] = "application/json",
-			},
-		})
+		}
+		local _left = "Headers"
+		local _object_1 = {
+			["Content-Type"] = "application/json",
+		}
+		local _value = conn.sessionToken
+		for _k, _v in (if _value ~= "" and _value then {
+			Authorization = `Bearer {conn.sessionToken}`,
+		} else {}) do
+			_object_1[_k] = _v
+		end
+		_object[_left] = _object_1
+		return HttpService:RequestAsync(_object)
 	end)
 	conn.isPolling = false
 	local ui = UI.getElements()
@@ -1118,16 +1385,49 @@ local function pollForRequests(connIndex)
 		end
 		local serverVersion = _condition
 		if data.versionMismatch == true then
-			hasVersionMismatch = true
+			versionMismatchConnections[conn] = true
 			local warningKey = `{State.CURRENT_VERSION}:{serverVersion}`
 			if lastVersionMismatchWarningKey ~= warningKey then
 				lastVersionMismatchWarningKey = warningKey
 				warn(`[BloxForge] Version mismatch: Studio plugin v{State.CURRENT_VERSION} / MCP v{serverVersion}. Run npx -y @princeofscale/bloxforge@latest --auto-install-plugin and restart Studio.`)
 			end
 			UI.showBanner("version-mismatch", `Plugin v{State.CURRENT_VERSION} / MCP v{serverVersion} mismatch`)
-		elseif hasVersionMismatch then
-			hasVersionMismatch = false
-			UI.hideBanner("version-mismatch")
+		else
+			versionMismatchConnections[conn] = nil
+			-- ▼ ReadonlySet.size ▼
+			local _size = 0
+			for _ in versionMismatchConnections do
+				_size += 1
+			end
+			-- ▲ ReadonlySet.size ▲
+			if _size == 0 then
+				UI.hideBanner("version-mismatch")
+			end
+		end
+		local _condition_1 = data.serverProtocolVersion
+		if _condition_1 == nil then
+			_condition_1 = 0
+		end
+		local serverProtocol = _condition_1
+		if data.protocolMismatch == true then
+			protocolMismatchConnections[conn] = true
+			local warningKey = `{State.PROTOCOL_VERSION}:{serverProtocol}`
+			if lastProtocolMismatchWarningKey ~= warningKey then
+				lastProtocolMismatchWarningKey = warningKey
+				warn(`[BloxForge] Protocol mismatch: Studio plugin protocol v{State.PROTOCOL_VERSION} / MCP protocol v{serverProtocol}. Run npx -y @princeofscale/bloxforge@latest --auto-install-plugin and restart Studio.`)
+			end
+			UI.showBanner("protocol-mismatch", `Protocol mismatch: Plugin protocol v{State.PROTOCOL_VERSION} / MCP protocol v{serverProtocol}`)
+		else
+			protocolMismatchConnections[conn] = nil
+			-- ▼ ReadonlySet.size ▼
+			local _size = 0
+			for _ in protocolMismatchConnections do
+				_size += 1
+			end
+			-- ▲ ReadonlySet.size ▲
+			if _size == 0 then
+				UI.hideBanner("protocol-mismatch")
+			end
 		end
 		-- Server tells us when its in-memory instances map doesn't have us
 		-- (e.g. after an MCP process restart, or after it reaped us during a
@@ -1146,12 +1446,12 @@ local function pollForRequests(connIndex)
 			local el = ui
 			el.step1Dot.BackgroundColor3 = Color3.fromRGB(34, 197, 94)
 			el.step1Label.Text = "HTTP server (OK)"
-			local _condition_1 = mcpConnected
-			if _condition_1 then
+			local _condition_2 = mcpConnected
+			if _condition_2 then
 				local _value = (string.find(el.statusLabel.Text, "Connected"))
-				_condition_1 = not (_value ~= 0 and _value == _value and _value)
+				_condition_2 = not (_value ~= 0 and _value == _value and _value)
 			end
-			if _condition_1 then
+			if _condition_2 then
 				el.statusLabel.Text = "Connected"
 				el.statusLabel.TextColor3 = Color3.fromRGB(34, 197, 94)
 				el.statusIndicator.BackgroundColor3 = Color3.fromRGB(34, 197, 94)
@@ -1182,28 +1482,22 @@ local function pollForRequests(connIndex)
 					conn.mcpWaitStartTime = tick()
 				end
 				local _exp = tick()
-				local _condition_2 = conn.mcpWaitStartTime
-				if _condition_2 == nil then
-					_condition_2 = tick()
+				local _condition_3 = conn.mcpWaitStartTime
+				if _condition_3 == nil then
+					_condition_3 = tick()
 				end
-				local elapsed = _exp - _condition_2
+				local elapsed = _exp - _condition_3
 				el.troubleshootLabel.Visible = elapsed > 8
 				UI.startPulseAnimation()
 			end
 		end
+		if data.cancellations then
+			for _, c in data.cancellations do
+				cancelledSyncRequests[c] = true
+			end
+		end
 		if data.request and mcpConnected then
-			task.spawn(function()
-				local ok, response = pcall(function()
-					return processRequest(data.request)
-				end)
-				if ok then
-					sendResponse(conn, data.requestId, response)
-				else
-					sendResponse(conn, data.requestId, {
-						error = tostring(response),
-					})
-				end
-			end)
+			handleRequestOnce(conn, data.requestId, data.request, data.serverEpoch, data.deliveryAttempt, data.leaseToken)
 		end
 	elseif conn.isActive then
 		conn.consecutiveFailures += 1
@@ -1356,6 +1650,26 @@ function deactivatePlugin(connIndex)
 	end
 	conn.isActive = false
 	conn.lastMcpOk = false
+	versionMismatchConnections[conn] = nil
+	protocolMismatchConnections[conn] = nil
+	-- ▼ ReadonlySet.size ▼
+	local _size = 0
+	for _ in versionMismatchConnections do
+		_size += 1
+	end
+	-- ▲ ReadonlySet.size ▲
+	if _size == 0 then
+		UI.hideBanner("version-mismatch")
+	end
+	-- ▼ ReadonlySet.size ▼
+	local _size_1 = 0
+	for _ in protocolMismatchConnections do
+		_size_1 += 1
+	end
+	-- ▲ ReadonlySet.size ▲
+	if _size_1 == 0 then
+		UI.hideBanner("protocol-mismatch")
+	end
 	if idx == State.getActiveTabIndex() then
 		UI.updateUIState()
 	end
@@ -1418,7 +1732,13 @@ local function checkForUpdates()
 			if _condition ~= "" and _condition then
 				local latestVersion = data.version
 				if Utils.compareVersions(State.CURRENT_VERSION, latestVersion) < 0 then
-					if not hasVersionMismatch then
+					-- ▼ ReadonlySet.size ▼
+					local _size = 0
+					for _ in versionMismatchConnections do
+						_size += 1
+					end
+					-- ▲ ReadonlySet.size ▲
+					if _size == 0 then
 						UI.showBanner("update", `v{latestVersion} available - github.com/princeofscale/bloxforge`)
 					end
 				end
@@ -1428,6 +1748,7 @@ local function checkForUpdates()
 end
 return {
 	getConnectionStatus = getConnectionStatus,
+	isCancelledForThread = isCancelledForThread,
 	activatePlugin = activatePlugin,
 	deactivatePlugin = deactivatePlugin,
 	deactivateAll = deactivateAll,
@@ -1556,9 +1877,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.20.2" is replaced with the package version at package time
+	-- "3.0.0" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.20.2`
+	return `{tostring(h)}-3.0.0`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -4239,6 +4560,7 @@ local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
 -- discard its result on completion.
 local LuauExec = TS.import(script, script.Parent.Parent, "LuauExec")
 local JobRegistry = TS.import(script, script.Parent.Parent, "JobRegistry")
+local Communication = TS.import(script, script.Parent.Parent, "Communication")
 -- Install a sanctioned progress/cancel API once. Server-generated long-running
 -- Luau (terrain/template/batch builders) can call _G.__mcp.progress(done,total,msg)
 -- and _G.__mcp.checkCancelled() to report progress and bail early. We do NOT
@@ -4252,7 +4574,7 @@ local function installMcpGlobal()
 			JobRegistry.reportProgress(coroutine.running(), done, total, message, stage)
 		end,
 		checkCancelled = function()
-			return JobRegistry.isCancelledForThread(coroutine.running())
+			return JobRegistry.isCancelledForThread(coroutine.running()) or Communication.isCancelledForThread(coroutine.running())
 		end,
 	}
 end
@@ -10353,7 +10675,6 @@ local function computeWrapperLineOffset()
 	local before = string.sub(probe, 1, start - 1)
 	return countLines(before) - 1
 end
-local WRAPPER_LINE_OFFSET = computeWrapperLineOffset()
 -- Count source lines so the wrapper can filter traceback frames that fall
 -- outside the user code range (the wrapper's own preamble/postamble lines).
 function countLines(s)
@@ -10388,7 +10709,7 @@ end
 -- instead of hand-maintained, so reordering preamble lines can never desync
 -- __mcp_LINE_OFFSET / remapPayloadLines from the real line count.
 function renderWrapper(lineOffset, userLines, code, payloadPattern)
-	return `return ((function()\
+	return `return (function()\
 \tlocal __mcp_traceback\
 \tlocal __mcp_remap\
 \tlocal __mcp_LINE_OFFSET = {lineOffset}\
@@ -10505,7 +10826,7 @@ function renderWrapper(lineOffset, userLines, code, payloadPattern)
 \t__mcp_remap = function(s)\
 \t\t-- Two chunk-name formats can reference our payload:\
 \t\t--   * "Workspace.__MCPExecLuauPayload:N" — ModuleScript:require fallback path\
-\t\t--   * "[string \\"return ((function()...\\"]:N" — loadstring() (default in plugin)\
+\t\t--   * "[string \\"return (function()...\\"]:N" — loadstring() (default in plugin)\
 \t\t-- Subtract LINE_OFFSET to get the user-relative number, then clamp.\
 \t\t-- Clamping matters for unclosed constructs ("local x = (") where the\
 \t\t-- parser keeps reading into wrapper postamble and reports a payload\
@@ -10568,6 +10889,9 @@ function renderWrapper(lineOffset, userLines, code, payloadPattern)
 \treturn \{ ok = ok, value = errOrValue, output = __mcp_output \}\
 end)()`
 end
+-- roblox-ts emits function declarations as ordered local assignments, so this
+-- must run after every helper used by computeWrapperLineOffset is initialized.
+local WRAPPER_LINE_OFFSET = computeWrapperLineOffset()
 local function buildWrapper(code, payloadInstanceName)
 	if payloadInstanceName == nil then
 		payloadInstanceName = PAYLOAD_INSTANCE_NAME
@@ -10930,6 +11254,36 @@ end
 local function nowSec()
 	return DateTime.now().UnixTimestampMillis / 1000
 end
+-- Studio can expose binary-bearing Output messages that JSONEncode rejects.
+-- Preserve valid UTF-8 and make only malformed bytes visible and JSON-safe.
+local function escapeInvalidUtf8(message)
+	local valid = utf8.len(message)
+	if type(valid) == "number" then
+		return message
+	end
+	local parts = {}
+	local cursor = 1
+	while cursor <= #message do
+		local suffixValid, invalidPosition = utf8.len(message, cursor)
+		if type(suffixValid) == "number" then
+			local _arg0 = string.sub(message, cursor)
+			table.insert(parts, _arg0)
+			break
+		end
+		if not (type(invalidPosition) == "number") then
+			break
+		end
+		if invalidPosition > cursor then
+			local _arg0 = string.sub(message, cursor, invalidPosition - 1)
+			table.insert(parts, _arg0)
+		end
+		local invalidByte = string.byte(message, invalidPosition)
+		local _arg0 = string.format("\\x%02X", invalidByte)
+		table.insert(parts, _arg0)
+		cursor = invalidPosition + 1
+	end
+	return table.concat(parts, "")
+end
 local function dropOldestUntilFits(incomingBytes)
 	while #entries > 0 and (totalBytes + incomingBytes > MAX_BYTES or #entries >= HARD_ENTRY_CAP) do
 		local dropped = table.remove(entries, 1)
@@ -10938,13 +11292,18 @@ local function dropOldestUntilFits(incomingBytes)
 	end
 end
 local function pushEntry(message, level, ts)
-	local bytes = #message
+	local safeMessage = escapeInvalidUtf8(message)
+	local bytes = #safeMessage
+	if bytes > MAX_BYTES then
+		totalDropped += 1
+		return nil
+	end
 	dropOldestUntilFits(bytes)
 	local _arg0 = {
 		seq = nextSeq,
 		ts = ts,
 		level = level,
-		message = message,
+		message = safeMessage,
 	}
 	table.insert(entries, _arg0)
 	nextSeq += 1
@@ -11236,9 +11595,9 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.20.2"
+local CURRENT_VERSION = "3.0.0"
 local PLUGIN_VARIANT = "main"
-local PROTOCOL_VERSION = 1
+local PROTOCOL_VERSION = 3
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0