@chrrxs/robloxstudio-mcp 2.10.0 → 2.11.0

package/studio-plugin/MCPPlugin.rbxmx

@@ -17,8 +17,16 @@ local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer"
 RuntimeLogBuffer.install()
 UI.init(plugin)
 local elements = UI.getElements()
+local ICON_DISCONNECTED = "rbxassetid://75876056391496"
+local ICON_CONNECTING = "rbxassetid://71302583919560"
+local ICON_CONNECTED = "rbxassetid://130958234173611"
 local toolbar = plugin:CreateToolbar("MCP Integration")
-local button = toolbar:CreateButton("MCP Server", "Connect to MCP Server for AI Integration", "rbxassetid://10734944444")
+local button = toolbar:CreateButton("MCP Server", "Connect to MCP Server for AI Integration", ICON_DISCONNECTED)
+UI.setToolbarButton(button, {
+	disconnected = ICON_DISCONNECTED,
+	connecting = ICON_CONNECTING,
+	connected = ICON_CONNECTED,
+})
 elements.connectButton.Activated:Connect(function()
 	local conn = State.getActiveConnection()
 	if conn and conn.isActive then
@@ -78,6 +86,7 @@ local Players = _services.Players
 local ReplicatedStorage = _services.ReplicatedStorage
 local RunService = _services.RunService
 local RuntimeLogBuffer = TS.import(script, script.Parent, "RuntimeLogBuffer")
+local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
 -- The client peer cannot reach the MCP HTTP server - Roblox forbids
 -- HttpService:RequestAsync from the client DM even under PluginSecurity, and
 -- HttpEnabled reads as false there regardless of identity. So the server peer
@@ -99,6 +108,7 @@ local BROKER_NAME = "__MCPClientBroker"
 local CLIENT_BROKER_ALLOWED_ENDPOINTS = {
 	["/api/execute-luau"] = true,
 	["/api/get-runtime-logs"] = true,
+	["/api/get-memory-breakdown"] = true,
 }
 -- Throttle re-ready calls per proxyId so a brief window of unknownInstance
 -- polls doesn't cause a re-register stampede.
@@ -211,6 +221,9 @@ local function setupClientBroker()
 		if payload and payload.endpoint == "/api/get-runtime-logs" then
 			return handleGetRuntimeLogs(payload.data)
 		end
+		if payload and payload.endpoint == "/api/get-memory-breakdown" then
+			return MemoryHandlers.getMemoryBreakdown(payload.data or {})
+		end
 		if payload and payload.endpoint == "/api/execute-luau" then
 			return handleExecuteLuau(payload.data)
 		end
@@ -435,6 +448,8 @@ local AssetHandlers = TS.import(script, script.Parent, "handlers", "AssetHandler
 local CaptureHandlers = TS.import(script, script.Parent, "handlers", "CaptureHandlers")
 local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandlers")
 local LogHandlers = TS.import(script, script.Parent, "handlers", "LogHandlers")
+local SerializationHandlers = TS.import(script, script.Parent, "handlers", "SerializationHandlers")
+local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
 local instanceId = HttpService:GenerateGUID(false)
 local assignedRole
 local function detectRole()
@@ -504,6 +519,9 @@ local routeMap = {
 	["/api/simulate-keyboard-input"] = InputHandlers.simulateKeyboardInput,
 	["/api/find-and-replace-in-scripts"] = ScriptHandlers.findAndReplaceInScripts,
 	["/api/get-runtime-logs"] = LogHandlers.getRuntimeLogs,
+	["/api/export-rbxm"] = SerializationHandlers.exportRbxm,
+	["/api/import-rbxm"] = SerializationHandlers.importRbxm,
+	["/api/get-memory-breakdown"] = MemoryHandlers.getMemoryBreakdown,
 }
 local function processRequest(request)
 	local endpoint = request.endpoint
@@ -603,6 +621,9 @@ local function pollForRequests(connIndex)
 	conn.isPolling = false
 	local ui = UI.getElements()
 	UI.updateTabDot(connIndex)
+	if connIndex == State.getActiveTabIndex() then
+		UI.updateToolbarIcon()
+	end
 	if success and (result.Success or result.StatusCode == 503) then
 		conn.consecutiveFailures = 0
 		conn.currentRetryDelay = 0.5
@@ -759,7 +780,6 @@ local function activatePlugin(connIndex)
 	conn.isActive = true
 	conn.consecutiveFailures = 0
 	conn.currentRetryDelay = 0.5
-	ui.screenGui.Enabled = true
 	if idx == State.getActiveTabIndex() then
 		conn.serverUrl = ui.urlInput.Text
 		local portStr = string.match(conn.serverUrl, ":(%d+)$")
@@ -889,15 +909,22 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- `require(SomeModule)` returns a fresh copy, not the one the running game
 -- scripts hold. So runtime-mutated module state is invisible to probes.
 --
--- These bridges fix that by living inside the user's game scripts:
---   - Server: a Script in ServerScriptService that creates a BindableFunction
---     (for our server-peer plugin to invoke directly) plus a RemoteFunction
---     (kept for parity with the upstream primitive's client-callable shape).
+-- These bridges fix that by living inside the user's game scripts. Both
+-- peers use the same symmetric shape:
+--   - Server: a Script in ServerScriptService that creates a BindableFunction.
+--     Plugin (server peer) invokes it with a fresh ModuleScript payload;
+--     require() runs inside the Script VM so it shares the running server's
+--     require cache.
 --   - Client: a LocalScript in StarterPlayer.StarterPlayerScripts that
 --     creates a BindableFunction. Plugin invokes it with a fresh ModuleScript
 --     payload; require() runs inside the LocalScript VM so it shares the
 --     game's require cache.
 --
+-- Why ModuleScript+require on both sides (no loadstring): require'd modules
+-- run with the security level they were created at and don't need
+-- ServerScriptService.LoadStringEnabled, so eval_server_runtime works even
+-- when LoadStringEnabled=false (the default in fresh places).
+--
 -- Lifecycle: TestHandlers.startPlaytest inserts both scripts into the EDIT
 -- DM right before ExecutePlayModeAsync. ExecutePlayModeAsync clones the
 -- DataModel into the play DMs, so the scripts come along and run there.
@@ -928,7 +955,6 @@ local CLIENT_SCRIPT_NAME = "__MCP_ClientEvalBridge"
 local BRIDGE_NAMES = {
 	serverScript = SERVER_SCRIPT_NAME,
 	clientScript = CLIENT_SCRIPT_NAME,
-	serverRemote = "__MCP_ServerEvalRemote",
 	serverLocal = "__MCP_ServerEvalLocal",
 	clientLocal = "__MCP_ClientEvalBridge",
 }
@@ -939,7 +965,6 @@ local SERVER_BRIDGE_SOURCE = `\
 -- stop_playtest. Provides shared-require-cache eval on the server peer for\
 -- the eval_server_runtime MCP tool.\
 \
-local ReplicatedStorage = game:GetService("ReplicatedStorage")\
 local ServerScriptService = game:GetService("ServerScriptService")\
 local RunService = game:GetService("RunService")\
 \
@@ -947,49 +972,18 @@ if not RunService:IsStudio() then\
 	return\
 end\
 \
-local function evalCode(source)\
-	if type(source) ~= "string" then\
-		return false, "source must be a string"\
-	end\
-	local fn, compileErr = loadstring(source, "MCPServerEval")\
-	if not fn then\
-		local errStr = tostring(compileErr or "loadstring returned nil")\
-		-- Roblox returns nil from loadstring when LoadStringEnabled=false.\
-		-- Surface a clear, actionable error.\
-		if string.find(errStr, "not enabled", 1, true)\
-			or string.find(errStr, "disabled", 1, true)\
-			or errStr == "loadstring returned nil"\
-		then\
-			return false,\
-				"ServerScriptService.LoadStringEnabled is false. eval_server_runtime requires it. "\
-				.. "Enable it in Studio (ServerScriptService > Properties > LoadStringEnabled = true) "\
-				.. "and restart the playtest."\
-		end\
-		return false, errStr\
-	end\
-	return pcall(fn)\
-end\
-\
--- Defensive cleanup of stale instances from a prior session.\
-local prevRf = ReplicatedStorage:FindFirstChild("{BRIDGE_NAMES.serverRemote}")\
-if prevRf then prevRf:Destroy() end\
 local prevBf = ServerScriptService:FindFirstChild("{BRIDGE_NAMES.serverLocal}")\
 if prevBf then prevBf:Destroy() end\
 \
-local rf = Instance.new("RemoteFunction")\
-rf.Name = "{BRIDGE_NAMES.serverRemote}"\
-rf.Archivable = false\
-rf.Parent = ReplicatedStorage\
-rf.OnServerInvoke = function(_player, source)\
-	return evalCode(source)\
-end\
-\
 local bf = Instance.new("BindableFunction")\
 bf.Name = "{BRIDGE_NAMES.serverLocal}"\
 bf.Archivable = false\
 bf.Parent = ServerScriptService\
-bf.OnInvoke = function(source)\
-	return evalCode(source)\
+bf.OnInvoke = function(payload)\
+	if typeof(payload) ~= "Instance" or not payload:IsA("ModuleScript") then\
+		return false, "payload must be a ModuleScript instance"\
+	end\
+	return pcall(require, payload)\
 end\
 `
 local CLIENT_BRIDGE_SOURCE = `\
@@ -1086,20 +1080,9 @@ local function installBridges()
 		installed = true,
 	}
 end
--- Heuristic check so start_playtest can surface a warning when
--- LoadStringEnabled is false (eval_server_runtime won't work in that mode).
--- We can't import the runtime LoadStringEnabled value cleanly without
--- pulling in the type — read defensively.
-local function loadStringEnabled()
-	local ok, value = pcall(function()
-		return ServerScriptService.LoadStringEnabled
-	end)
-	return ok and value == true
-end
 return {
 	cleanupBridges = cleanupBridges,
 	installBridges = installBridges,
-	loadStringEnabled = loadStringEnabled,
 	BRIDGE_NAMES = BRIDGE_NAMES,
 }
 ]]></string>
@@ -2815,6 +2798,74 @@ return {
           </Properties>
         </Item>
         <Item class="ModuleScript" referent="12">
+          <Properties>
+            <string name="Name">MemoryHandlers</string>
+            <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local Stats = game:GetService("Stats")
+-- GetMemoryUsageMbAllCategories is gated by capability "InternalTest" and not
+-- callable from plugin context. GetMemoryUsageMbForTag is not - so we iterate
+-- Enum.DeveloperMemoryTag and ask per-tag.
+local function getMemoryBreakdown(requestData)
+	if not Stats.MemoryTrackingEnabled then
+		return {
+			error = "MemoryTrackingEnabled is false on this peer",
+		}
+	end
+	local requested = requestData.tags
+	local _result
+	if requested and #requested > 0 then
+		local _set = {}
+		for _, _v in requested do
+			_set[_v] = true
+		end
+		_result = _set
+	else
+		_result = nil
+	end
+	local requestedSet = _result
+	local categories = {}
+	for _, item in Enum.DeveloperMemoryTag:GetEnumItems() do
+		local name = item.Name
+		if requestedSet and not (requestedSet[name] ~= nil) then
+			continue
+		end
+		local ok, mb = pcall(function()
+			return Stats:GetMemoryUsageMbForTag(item)
+		end)
+		categories[name] = if ok then mb else 0
+	end
+	local unknownTags = {}
+	if requestedSet then
+		local known = {}
+		for _, i in Enum.DeveloperMemoryTag:GetEnumItems() do
+			local _name = i.Name
+			known[_name] = true
+		end
+		for t in requestedSet do
+			if not (known[t] ~= nil) then
+				table.insert(unknownTags, t)
+				categories[t] = 0
+			end
+		end
+	end
+	local result = {
+		total_mb = Stats:GetTotalMemoryUsageMb(),
+		categories = categories,
+		memory_tracking_enabled = true,
+		timestamp = DateTime.now().UnixTimestampMillis,
+	}
+	if #unknownTags > 0 then
+		result.unknown_tags = unknownTags
+	end
+	return result
+end
+return {
+	getMemoryBreakdown = getMemoryBreakdown,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <Item class="ModuleScript" referent="13">
           <Properties>
             <string name="Name">MetadataHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3451,7 +3502,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="13">
+        <Item class="ModuleScript" referent="14">
           <Properties>
             <string name="Name">PropertyHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3703,7 +3754,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="14">
+        <Item class="ModuleScript" referent="15">
           <Properties>
             <string name="Name">QueryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3811,8 +3862,23 @@ local function searchFiles(requestData)
 	}
 end
 local function getPlaceInfo(_requestData)
+	local dataModelName = game.Name
+	local placeName = dataModelName
+	if game.PlaceId > 0 then
+		local MarketplaceService = game:GetService("MarketplaceService")
+		local ok, info = pcall(function()
+			return MarketplaceService:GetProductInfo(game.PlaceId)
+		end)
+		if ok and info ~= nil then
+			local name = info.Name
+			if type(name) == "string" and name ~= "" then
+				placeName = name
+			end
+		end
+	end
 	return {
-		placeName = game.Name,
+		placeName = placeName,
+		dataModelName = dataModelName,
 		placeId = game.PlaceId,
 		gameId = game.GameId,
 		jobId = game.JobId,
@@ -4730,7 +4796,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="15">
+        <Item class="ModuleScript" referent="16">
           <Properties>
             <string name="Name">ScriptHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5426,7 +5492,193 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="16">
+        <Item class="ModuleScript" referent="17">
+          <Properties>
+            <string name="Name">SerializationHandlers</string>
+            <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
+local RunService = TS.import(script, script.Parent.Parent.Parent, "node_modules", "@rbxts", "services").RunService
+local Utils = TS.import(script, script.Parent.Parent, "Utils")
+local Recording = TS.import(script, script.Parent.Parent, "Recording")
+-- SerializationService:SerializeInstancesAsync / DeserializeInstancesAsync were
+-- added in engine v668 and are PluginSecurity. They are not in @rbxts/types yet,
+-- so we resolve the service through an untyped GetService cast and treat the
+-- methods as opaque (buffer in / buffer out).
+local SerializationService = game:GetService("SerializationService")
+-- EncodingService:Base64Encode / Base64Decode take and return `buffer` (not
+-- `string`). The signature is in @rbxts/types under None.d.ts so a normal
+-- GetService("EncodingService") would already give correct types, but @rbxts
+-- generates a per-service nominal interface and roblox.d.ts doesn't re-export
+-- EncodingService from the services barrel module - so the typed cast below
+-- matches what GetService would give us if it did.
+local EncodingService = game:GetService("EncodingService")
+local _binding = Utils
+local getInstanceByPath = _binding.getInstanceByPath
+local getInstancePath = _binding.getInstancePath
+local _binding_1 = Recording
+local beginRecording = _binding_1.beginRecording
+local finishRecording = _binding_1.finishRecording
+local function exportRbxm(requestData)
+	local instancePaths = requestData.instance_paths
+	if not instancePaths or not (type(instancePaths) == "table") or #instancePaths == 0 then
+		return {
+			error = "instance_paths must be a non-empty array",
+		}
+	end
+	local instances = {}
+	for _, p in instancePaths do
+		local inst = getInstanceByPath(p)
+		if not inst then
+			return {
+				error = `instance not found: {p}`,
+			}
+		end
+		table.insert(instances, inst)
+	end
+	local serializeOk, serializeResult = pcall(function()
+		return SerializationService:SerializeInstancesAsync(instances)
+	end)
+	if not serializeOk then
+		return {
+			error = `SerializeInstancesAsync failed: {tostring(serializeResult)}`,
+		}
+	end
+	local buf = serializeResult
+	local encodeOk, encodeResult = pcall(function()
+		return EncodingService:Base64Encode(buf)
+	end)
+	if not encodeOk then
+		return {
+			error = `EncodingService:Base64Encode failed: {tostring(encodeResult)}`,
+		}
+	end
+	-- Base64Encode returns a buffer of ASCII bytes; convert to a Lua string so
+	-- HttpService:JSONEncode (called by the harness in Communication.ts) accepts
+	-- it. Base64 is by definition pure ASCII so this round-trips cleanly.
+	local base64Str = buffer.tostring(encodeResult)
+	return {
+		base64 = base64Str,
+		instance_count = #instances,
+	}
+end
+local function importRbxm(requestData)
+	local b64 = requestData.base64
+	local parentPath = requestData.parent_path
+	local _condition = (requestData.source_label)
+	if _condition == nil then
+		_condition = "unknown"
+	end
+	local sourceLabel = _condition
+	if not (b64 ~= "" and b64) or not (type(b64) == "string") then
+		return {
+			error = "base64 payload is required",
+		}
+	end
+	if not (parentPath ~= "" and parentPath) or not (type(parentPath) == "string") then
+		return {
+			error = "parent_path is required",
+		}
+	end
+	local parentInstance = getInstanceByPath(parentPath)
+	if not parentInstance then
+		return {
+			error = `parent instance not found: {parentPath}`,
+		}
+	end
+	-- b64 is an ASCII-only Lua string from the wire; lift it into a buffer for
+	-- EncodingService:Base64Decode, which returns a buffer of raw rbxm bytes
+	-- ready for DeserializeInstancesAsync.
+	local b64BufOk, b64BufResult = pcall(function()
+		return buffer.fromstring(b64)
+	end)
+	if not b64BufOk then
+		return {
+			error = `buffer.fromstring(base64) failed: {tostring(b64BufResult)}`,
+		}
+	end
+	local decodeOk, decodeResult = pcall(function()
+		return EncodingService:Base64Decode(b64BufResult)
+	end)
+	if not decodeOk then
+		return {
+			error = `EncodingService:Base64Decode failed: {tostring(decodeResult)}`,
+		}
+	end
+	local buf = decodeResult
+	local deserOk, deserResult = pcall(function()
+		return SerializationService:DeserializeInstancesAsync(buf)
+	end)
+	if not deserOk then
+		return {
+			error = `DeserializeInstancesAsync failed: {tostring(deserResult)}`,
+		}
+	end
+	local deserialized = deserResult
+	-- All-or-nothing parenting. Track every instance we've attached and roll back
+	-- (unparent + Destroy) if any later one fails - partial imports leave the DM
+	-- in a worse state than failing cleanly.
+	local isEdit = not RunService:IsRunning()
+	local recordingId = if isEdit then beginRecording(`Import rbxm`) else nil
+	local attached = {}
+	local failureMessage
+	for _, inst in deserialized do
+		local parentOk, parentErr = pcall(function()
+			inst.Parent = parentInstance
+		end)
+		if not parentOk then
+			failureMessage = `failed to parent {inst.Name} ({inst.ClassName}) under {parentPath}: {tostring(parentErr)}`
+			break
+		end
+		table.insert(attached, inst)
+	end
+	if failureMessage ~= nil then
+		for _, inst in attached do
+			pcall(function()
+				inst.Parent = nil
+				inst:Destroy()
+			end)
+		end
+		-- Also destroy any unparented deserialized instances so they don't leak.
+		for _, inst in deserialized do
+			if inst.Parent == nil then
+				pcall(function()
+					return inst:Destroy()
+				end)
+			end
+		end
+		finishRecording(recordingId, false)
+		return {
+			error = failureMessage,
+		}
+	end
+	local names = {}
+	local paths = {}
+	for _, inst in attached do
+		local _name = inst.Name
+		table.insert(names, _name)
+		local _arg0 = getInstancePath(inst)
+		table.insert(paths, _arg0)
+	end
+	-- The recording shows "MCP: Import rbxm" in Studio's undo stack -
+	-- ChangeHistoryService doesn't expose a way to set a richer displayName
+	-- after TryBeginRecording, so the count/source only land in the JSON response.
+	finishRecording(recordingId, true)
+	return {
+		instance_count = #attached,
+		instance_names = names,
+		instance_paths = paths,
+		parent_path = parentPath,
+		source = sourceLabel,
+	}
+end
+return {
+	exportRbxm = exportRbxm,
+	importRbxm = importRbxm,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <Item class="ModuleScript" referent="18">
           <Properties>
             <string name="Name">TestHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5437,7 +5689,6 @@ local LogService = _services.LogService
 local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
 local installBridges = _EvalBridges.installBridges
 local cleanupBridges = _EvalBridges.cleanupBridges
-local loadStringEnabled = _EvalBridges.loadStringEnabled
 local StudioTestService = game:GetService("StudioTestService")
 local ServerScriptService = game:GetService("ServerScriptService")
 local ScriptEditorService = game:GetService("ScriptEditorService")
@@ -5598,7 +5849,6 @@ local function startPlaytest(requestData)
 	-- so eval_server_runtime / eval_client_runtime work without manual setup.
 	-- Bridges are cleaned up from the edit DM after the play DMs tear down.
 	local bridgeInstall = installBridges()
-	local hasLoadString = loadStringEnabled()
 	if not bridgeInstall.installed then
 		warn(`[MCP] Eval bridge install failed: {bridgeInstall.error}`)
 	end
@@ -5632,13 +5882,6 @@ local function startPlaytest(requestData)
 		message = msg,
 		evalBridges = if bridgeInstall.installed then "installed" else `failed: {bridgeInstall.error}`,
 	}
-	-- Surface loadstring availability up-front so callers know whether
-	-- eval_server_runtime will work before they try it. eval_client_runtime
-	-- doesn't need loadstring (it uses ModuleScript+require), so this only
-	-- affects the server bridge.
-	if not hasLoadString then
-		response.serverEvalNote = "ServerScriptService.LoadStringEnabled is false. eval_server_runtime will not work " .. "until you enable it (ServerScriptService > Properties > LoadStringEnabled = true) " .. "and restart the playtest. eval_client_runtime is unaffected."
-	end
 	return response
 end
 local function stopPlaytest(_requestData)
@@ -5745,7 +5988,7 @@ return {
           </Properties>
         </Item>
       </Item>
-      <Item class="ModuleScript" referent="17">
+      <Item class="ModuleScript" referent="19">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5775,7 +6018,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="18">
+      <Item class="ModuleScript" referent="20">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5956,11 +6199,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="19">
+      <Item class="ModuleScript" referent="21">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.10.0"
+local CURRENT_VERSION = "2.11.0"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -6052,7 +6295,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="20">
+      <Item class="ModuleScript" referent="22">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6062,6 +6305,34 @@ local State = TS.import(script, script.Parent, "State")
 local elements = nil
 local pulseAnimation
 local buttonHover = false
+local toolbarButton
+local toolbarIcons
+local lastToolbarIcon
+local updateToolbarIcon
+local function setToolbarButton(btn, icons)
+	toolbarButton = btn
+	toolbarIcons = icons
+	lastToolbarIcon = nil
+	updateToolbarIcon()
+end
+function updateToolbarIcon()
+	if not toolbarButton or not toolbarIcons then
+		return nil
+	end
+	local conn = State.getActiveConnection()
+	local nextIcon
+	if not conn or not conn.isActive then
+		nextIcon = toolbarIcons.disconnected
+	elseif conn.lastHttpOk and conn.lastMcpOk then
+		nextIcon = toolbarIcons.connected
+	else
+		nextIcon = toolbarIcons.connecting
+	end
+	if nextIcon ~= lastToolbarIcon then
+		toolbarButton.Icon = nextIcon
+		lastToolbarIcon = nextIcon
+	end
+end
 local tabButtons = {}
 local TWEEN_QUICK = TweenInfo.new(0.15, Enum.EasingStyle.Quad, Enum.EasingDirection.Out)
 local function tweenProp(instance, props)
@@ -6640,6 +6911,7 @@ local function init(pluginRef)
 	refreshTabBar()
 end
 function updateUIState()
+	updateToolbarIcon()
 	local conn = State.getActiveConnection()
 	if not conn then
 		return nil
@@ -6765,6 +7037,8 @@ return {
 	updateTabLabel = updateTabLabel,
 	stopPulseAnimation = stopPulseAnimation,
 	startPulseAnimation = startPulseAnimation,
+	setToolbarButton = setToolbarButton,
+	updateToolbarIcon = updateToolbarIcon,
 	getElements = function()
 		return elements
 	end,
@@ -6772,7 +7046,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="21">
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7302,11 +7576,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="25">
+    <Item class="Folder" referent="27">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="22">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -9380,7 +9654,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -9647,15 +9921,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="26">
+    <Item class="Folder" referent="28">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="27">
+      <Item class="Folder" referent="29">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {