react-native-ai-devtools 1.2.7 → 1.3.0

package/build/index.js

@@ -8,7 +8,7 @@ import { getGuideOverview, getGuideByTopic, getAvailableTopics } from "./core/gu
 import { getLicenseStatus, getDashboardUrl } from "./core/license.js";
 import { isSDKInstalled, readSDKNetworkRequests, readSDKNetworkRequest, readSDKNetworkStats, clearSDKNetwork } from "./core/sdkBridge.js";
 import { tap } from "./pro/tap.js";
-import { logBuffer, networkBuffer, bundleErrorBuffer, connectedApps, getActiveSimulatorUdid, scanMetroPorts, fetchDevices, selectMainDevice, connectToDevice, getConnectedApps, executeInApp, listDebugGlobals, inspectGlobal, reloadApp, 
+import { logBuffers, networkBuffers, getLogBuffer, getNetworkBuffer, getTotalLogCount, getConnectedAppByDevice, LogBuffer, NetworkBuffer, bundleErrorBuffer, connectedApps, scanMetroPorts, fetchDevices, selectMainDevice, filterBridgelessDevices, connectToDevice, getConnectedApps, executeInApp, listDebugGlobals, inspectGlobal, reloadApp, 
 // React Component Inspection
 getComponentTree, getScreenLayout, inspectComponent, findComponents, inspectAtPoint, toggleElementInspector, isInspectorActive, getInspectorSelection, getFirstConnectedApp, getLogs, searchLogs, getLogSummary, getNetworkRequests, searchNetworkRequests, getNetworkStats, formatRequestDetails, 
 // Connection state
@@ -43,6 +43,42 @@ startDebugHttpServer, getDebugServerPort,
 initTelemetry, trackToolInvocation, getTargetPlatform, 
 // Format utilities (TONL)
 formatLogsAsTonl, formatNetworkAsTonl } from "./core/index.js";
+// Helper: resolve log buffer for a device (or create a merged buffer from all devices)
+function resolveLogBuffer(device) {
+    if (device) {
+        const app = getConnectedAppByDevice(device);
+        if (!app)
+            throw new Error(`No connected device matches "${device}"`);
+        const deviceName = app.deviceInfo.deviceName || app.deviceInfo.title || "unknown";
+        return getLogBuffer(deviceName);
+    }
+    // Merge all logs into a temporary buffer for read operations
+    const merged = new LogBuffer(5000);
+    for (const buffer of logBuffers.values()) {
+        for (const entry of buffer.getAll()) {
+            merged.add(entry);
+        }
+    }
+    return merged;
+}
+// Helper: resolve network buffer for a device (or create a merged buffer from all devices)
+function resolveNetworkBuffer(device) {
+    if (device) {
+        const app = getConnectedAppByDevice(device);
+        if (!app)
+            throw new Error(`No connected device matches "${device}"`);
+        const deviceName = app.deviceInfo.deviceName || app.deviceInfo.title || "unknown";
+        return getNetworkBuffer(deviceName);
+    }
+    // Merge all network requests into a temporary buffer for read operations
+    const merged = new NetworkBuffer(5000);
+    for (const buffer of networkBuffers.values()) {
+        for (const req of buffer.getAll({})) {
+            merged.set(`${Math.random()}`, req);
+        }
+    }
+    return merged;
+}
 // Create MCP server
 const server = new McpServer({
     name: "react-native-ai-debugger",
@@ -239,25 +275,29 @@ registerToolWithTelemetry("scan_metro", {
             results.push(`Port ${port}: No devices found`);
             continue;
         }
-        results.push(`Port ${port}: Found ${devices.length} device(s)`);
-        const mainDevice = selectMainDevice(devices);
-        if (mainDevice) {
+        const bridgelessDevices = filterBridgelessDevices(devices);
+        if (bridgelessDevices.length === 0) {
+            results.push(`Port ${port}: No debuggable devices found`);
+            continue;
+        }
+        results.push(`Port ${port}: Found ${bridgelessDevices.length} device(s)`);
+        for (const device of bridgelessDevices) {
             try {
-                const connectionResult = await connectToDevice(mainDevice, port);
+                const connectionResult = await connectToDevice(device, port);
                 results.push(`  - ${connectionResult}`);
-                // Also connect to Metro build events for this port
-                try {
-                    await connectMetroBuildEvents(port);
-                    results.push(`  - Connected to Metro build events`);
-                }
-                catch {
-                    // Build events connection is optional, don't fail the scan
-                }
             }
             catch (error) {
-                results.push(`  - Failed: ${error}`);
+                results.push(`  - ${device.deviceName || device.title}: Failed - ${error}`);
             }
         }
+        // Connect to Metro build events for this port
+        try {
+            await connectMetroBuildEvents(port);
+            results.push(`  - Connected to Metro build events`);
+        }
+        catch {
+            // Build events connection is optional
+        }
     }
     return {
         content: [
@@ -273,33 +313,34 @@ registerToolWithTelemetry("get_apps", {
     description: "List currently connected React Native apps and their connection status. If no apps are connected, run scan_metro first to establish a connection.",
     inputSchema: {}
 }, async () => {
-    const connections = getConnectedApps();
-    if (connections.length === 0) {
+    const apps = getConnectedApps();
+    if (apps.length === 0) {
         return {
             content: [
                 {
                     type: "text",
-                    text: 'No apps connected. Run "scan_metro" first to discover and connect to running apps.'
+                    text: "No connected devices. Run scan_metro to discover and connect to Metro servers."
                 }
             ]
         };
     }
-    const status = connections.map(({ app, isConnected }) => {
-        const state = isConnected ? "Connected" : "Disconnected";
-        return `${app.deviceInfo.title} (${app.deviceInfo.deviceName}): ${state}`;
+    const deviceLines = apps
+        .filter(({ isConnected }) => isConnected)
+        .map(({ app }, i) => {
+        const name = app.deviceInfo.deviceName || app.deviceInfo.title;
+        const appId = app.deviceInfo.appId || app.deviceInfo.title.split(" (")[0] || "unknown";
+        return `  ${i + 1}. ${name} — ${appId} (${app.platform}, port ${app.port})`;
     });
-    // Include active iOS simulator info if available
-    const activeSimulatorUdid = getActiveSimulatorUdid();
-    const simulatorInfo = activeSimulatorUdid
-        ? `\nActive iOS Simulator (auto-scoped): ${activeSimulatorUdid}`
-        : "\nNo iOS simulator linked (iOS tools will use first booted simulator)";
+    const text = [
+        `Connected devices:`,
+        ...deviceLines,
+        ``,
+        `Use device="${apps[0].app.deviceInfo.deviceName}" to target a specific device.`,
+        ``,
+        `Total logs in buffer: ${getTotalLogCount()}`
+    ].join("\n");
     return {
-        content: [
-            {
-                type: "text",
-                text: `Connected apps:\n${status.join("\n")}${simulatorInfo}\n\nTotal logs in buffer: ${logBuffer.size}`
-            }
-        ]
+        content: [{ type: "text", text }]
     };
 });
 // Tool: Get connection status (detailed health and gap tracking)
@@ -492,14 +533,15 @@ registerToolWithTelemetry("get_logs", {
             .boolean()
             .optional()
             .default(false)
-            .describe("Return summary statistics instead of full logs (count by level + last 5 messages). Use for quick overview.")
+            .describe("Return summary statistics instead of full logs (count by level + last 5 messages). Use for quick overview."),
+        device: z.string().optional().describe("Target device name (substring match). Omit for all devices. Run get_apps to see connected devices.")
     }
-}, async ({ maxLogs, level, startFromText, maxMessageLength, verbose, format, summary }) => {
+}, async ({ maxLogs, level, startFromText, maxMessageLength, verbose, format, summary, device }) => {
     // Return summary if requested
     if (summary) {
-        const summaryText = getLogSummary(logBuffer, { lastN: 5, maxMessageLength: 100 });
+        const summaryText = getLogSummary(resolveLogBuffer(device), { lastN: 5, maxMessageLength: 100 });
         let connectionWarning = "";
-        if (logBuffer.size === 0) {
+        if (getTotalLogCount() === 0) {
             const status = await checkAndEnsureConnection();
             connectionWarning = status.message ? `\n\n${status.message}` : "";
         }
@@ -512,7 +554,7 @@ registerToolWithTelemetry("get_logs", {
             ]
         };
     }
-    const { logs, count, formatted } = getLogs(logBuffer, {
+    const { logs, count, formatted } = getLogs(resolveLogBuffer(device), {
         maxLogs,
         level,
         startFromText,
@@ -569,7 +611,7 @@ registerToolWithTelemetry("get_logs", {
     };
 }, 
 // Empty result detector: buffer has no entries at all
-() => logBuffer.size === 0);
+() => getTotalLogCount() === 0);
 // Tool: Search logs
 registerToolWithTelemetry("search_logs", {
     description: "Search console logs for text (case-insensitive)",
@@ -590,10 +632,11 @@ registerToolWithTelemetry("search_logs", {
             .enum(["text", "tonl"])
             .optional()
             .default("tonl")
-            .describe("Output format: 'text' or 'tonl' (default, compact token-optimized format)")
+            .describe("Output format: 'text' or 'tonl' (default, compact token-optimized format)"),
+        device: z.string().optional().describe("Target device name (substring match). Omit for all devices. Run get_apps to see connected devices.")
     }
-}, async ({ text, maxResults, maxMessageLength, verbose, format }) => {
-    const { logs, count, formatted } = searchLogs(logBuffer, text, { maxResults, maxMessageLength, verbose });
+}, async ({ text, maxResults, maxMessageLength, verbose, format, device }) => {
+    const { logs, count, formatted } = searchLogs(resolveLogBuffer(device), text, { maxResults, maxMessageLength, verbose });
     // Check connection health
     let connectionWarning = "";
     if (count === 0) {
@@ -630,17 +673,24 @@ registerToolWithTelemetry("search_logs", {
 // Tool: Clear logs
 registerToolWithTelemetry("clear_logs", {
     description: "Clear the log buffer",
-    inputSchema: {}
-}, async () => {
-    const count = logBuffer.clear();
-    return {
-        content: [
-            {
-                type: "text",
-                text: `Cleared ${count} log entries from buffer.`
-            }
-        ]
-    };
+    inputSchema: {
+        device: z.string().optional().describe("Target device name (substring match). Omit to clear all devices. Run get_apps to see connected devices.")
+    }
+}, async ({ device }) => {
+    if (device) {
+        const app = getConnectedAppByDevice(device);
+        if (!app)
+            throw new Error(`No connected device matches "${device}"`);
+        const deviceName = app.deviceInfo.deviceName || app.deviceInfo.title || "unknown";
+        const count = getLogBuffer(deviceName).clear();
+        return { content: [{ type: "text", text: `Cleared ${count} log entries from ${deviceName}.` }] };
+    }
+    // Clear all
+    let total = 0;
+    for (const buffer of logBuffers.values()) {
+        total += buffer.clear();
+    }
+    return { content: [{ type: "text", text: `Cleared ${total} log entries from all devices.` }] };
 });
 // Tool: Connect to specific Metro port
 registerToolWithTelemetry("connect_metro", {
@@ -776,10 +826,11 @@ registerToolWithTelemetry("execute_in_app", {
             .boolean()
             .optional()
             .default(false)
-            .describe("Disable result truncation. Tip: Be cautious - Redux stores or large state can return 10KB+.")
+            .describe("Disable result truncation. Tip: Be cautious - Redux stores or large state can return 10KB+."),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ expression, awaitPromise, maxResultLength, verbose }) => {
-    const result = await executeInApp(expression, awaitPromise);
+}, async ({ expression, awaitPromise, maxResultLength, verbose, device }) => {
+    const result = await executeInApp(expression, awaitPromise, {}, device);
     if (!result.success) {
         let errorText = `Error: ${result.error}`;
         // If the error is a ReferenceError (accessing a global that doesn't exist),
@@ -825,9 +876,11 @@ registerToolWithTelemetry("execute_in_app", {
 // Tool: List debug globals available in the app
 registerToolWithTelemetry("list_debug_globals", {
     description: "List globally available debugging objects in the connected React Native app (Apollo Client, Redux store, React DevTools, etc.). Use this to discover what state management and debugging tools are available.",
-    inputSchema: {}
-}, async () => {
-    const result = await listDebugGlobals();
+    inputSchema: {
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
+    }
+}, async ({ device }) => {
+    const result = await listDebugGlobals(device);
     if (!result.success) {
         return {
             content: [
@@ -854,10 +907,11 @@ registerToolWithTelemetry("inspect_global", {
     inputSchema: {
         objectName: z
             .string()
-            .describe("Name of the global object to inspect (e.g., '__EXPO_ROUTER__', '__APOLLO_CLIENT__')")
+            .describe("Name of the global object to inspect (e.g., '__EXPO_ROUTER__', '__APOLLO_CLIENT__')"),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ objectName }) => {
-    const result = await inspectGlobal(objectName);
+}, async ({ objectName, device }) => {
+    const result = await inspectGlobal(objectName, device);
     if (!result.success) {
         let errorText = `Error: ${result.error}`;
         // If the error is a ReferenceError (accessing a global that doesn't exist),
@@ -924,9 +978,10 @@ registerToolWithTelemetry("get_component_tree", {
             .enum(["json", "tonl"])
             .optional()
             .default("tonl")
-            .describe("Output format: 'json' or 'tonl' (default, compact indented tree). Ignored if structureOnly=true.")
+            .describe("Output format: 'json' or 'tonl' (default, compact indented tree). Ignored if structureOnly=true."),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ focusedOnly, structureOnly, maxDepth, includeProps, includeStyles, hideInternals, format }) => {
+}, async ({ focusedOnly, structureOnly, maxDepth, includeProps, includeStyles, hideInternals, format, device }) => {
     const result = await getComponentTree({
         focusedOnly,
         structureOnly,
@@ -934,7 +989,8 @@ registerToolWithTelemetry("get_component_tree", {
         includeProps,
         includeStyles,
         hideInternals,
-        format
+        format,
+        device
     });
     if (!result.success) {
         return {
@@ -984,10 +1040,11 @@ registerToolWithTelemetry("get_screen_layout", {
             .enum(["json", "tonl"])
             .optional()
             .default("tonl")
-            .describe("Output format: 'json' or 'tonl' (default, pipe-delimited rows, ~40% smaller)")
+            .describe("Output format: 'json' or 'tonl' (default, pipe-delimited rows, ~40% smaller)"),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ maxDepth, componentsOnly, shortPath, summary, format }) => {
-    const result = await getScreenLayout({ maxDepth, componentsOnly, shortPath, summary, format });
+}, async ({ maxDepth, componentsOnly, shortPath, summary, format, device }) => {
+    const result = await getScreenLayout({ maxDepth, componentsOnly, shortPath, summary, format, device });
     if (!result.success) {
         return {
             content: [
@@ -1036,16 +1093,18 @@ registerToolWithTelemetry("inspect_component", {
             .boolean()
             .optional()
             .default(true)
-            .describe("Simplify hooks output by hiding effects and reducing depth (default: true)")
+            .describe("Simplify hooks output by hiding effects and reducing depth (default: true)"),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ componentName, index, includeState, includeChildren, childrenDepth, shortPath, simplifyHooks }) => {
+}, async ({ componentName, index, includeState, includeChildren, childrenDepth, shortPath, simplifyHooks, device }) => {
     const result = await inspectComponent(componentName, {
         index,
         includeState,
         includeChildren,
         childrenDepth,
         shortPath,
-        simplifyHooks
+        simplifyHooks,
+        device
     });
     if (!result.success) {
         return {
@@ -1090,10 +1149,11 @@ registerToolWithTelemetry("find_components", {
             .enum(["json", "tonl"])
             .optional()
             .default("tonl")
-            .describe("Output format: 'json' or 'tonl' (default, pipe-delimited rows, ~40% smaller)")
+            .describe("Output format: 'json' or 'tonl' (default, pipe-delimited rows, ~40% smaller)"),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ pattern, maxResults, includeLayout, shortPath, summary, format }) => {
-    const result = await findComponents(pattern, { maxResults, includeLayout, shortPath, summary, format });
+}, async ({ pattern, maxResults, includeLayout, shortPath, summary, format, device }) => {
+    const result = await findComponents(pattern, { maxResults, includeLayout, shortPath, summary, format, device });
     if (!result.success) {
         return {
             content: [
@@ -1194,9 +1254,11 @@ registerToolWithTelemetry("tap", {
 // Tool: Toggle Element Inspector programmatically
 registerToolWithTelemetry("toggle_element_inspector", {
     description: "Toggle React Native's Element Inspector overlay on/off. Rarely needed directly — get_inspector_selection auto-enables the inspector when called with coordinates. Use this only when you need manual control over the overlay visibility.",
-    inputSchema: {}
-}, async () => {
-    const result = await toggleElementInspector();
+    inputSchema: {
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
+    }
+}, async ({ device }) => {
+    const result = await toggleElementInspector(device);
     if (!result.success) {
         return {
             content: [
@@ -1252,21 +1314,22 @@ registerToolWithTelemetry("get_inspector_selection", {
         y: z
             .number()
             .optional()
-            .describe("Y coordinate (in points). If provided with x, auto-taps at this location.")
+            .describe("Y coordinate (in points). If provided with x, auto-taps at this location."),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ x, y }) => {
+}, async ({ x, y, device }) => {
     // If coordinates provided, do the full flow: enable inspector -> tap -> read
     if (x !== undefined && y !== undefined) {
         // Check if inspector is active
-        const inspectorActive = await isInspectorActive();
+        const inspectorActive = await isInspectorActive(device);
         // Enable inspector if not active
         if (!inspectorActive) {
-            await toggleElementInspector();
+            await toggleElementInspector(device);
             // Wait for inspector to initialize
             await new Promise((resolve) => setTimeout(resolve, 300));
         }
         // Detect platform from connected app
-        const app = getFirstConnectedApp();
+        const app = device ? getConnectedAppByDevice(device) : getFirstConnectedApp();
         if (!app) {
             return {
                 content: [{ type: "text", text: "No app connected. Run scan_metro first." }],
@@ -1301,7 +1364,7 @@ registerToolWithTelemetry("get_inspector_selection", {
         await new Promise((resolve) => setTimeout(resolve, 200));
     }
     // Read the current selection
-    const result = await getInspectorSelection();
+    const result = await getInspectorSelection(device);
     if (!result.success) {
         return {
             content: [{ type: "text", text: `Error: ${result.error}` }],
@@ -1355,10 +1418,11 @@ registerToolWithTelemetry("inspect_at_point", {
             .boolean()
             .optional()
             .default(true)
-            .describe("Include position/dimensions (frame) in the output (default: true)")
+            .describe("Include position/dimensions (frame) in the output (default: true)"),
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
     }
-}, async ({ x, y, includeProps, includeFrame }) => {
-    const result = await inspectAtPoint(x, y, { includeProps, includeFrame });
+}, async ({ x, y, includeProps, includeFrame, device }) => {
+    const result = await inspectAtPoint(x, y, { includeProps, includeFrame, device });
     if (!result.success) {
         return {
             content: [
@@ -1422,9 +1486,10 @@ registerToolWithTelemetry("get_network_requests", {
             .boolean()
             .optional()
             .default(false)
-            .describe("Return statistics only (count, methods, domains, status codes). Use for quick overview.")
+            .describe("Return statistics only (count, methods, domains, status codes). Use for quick overview."),
+        device: z.string().optional().describe("Target device name (substring match). Omit for all devices. Run get_apps to see connected devices.")
     }
-}, async ({ maxRequests, method, urlPattern, status, format, summary }) => {
+}, async ({ maxRequests, method, urlPattern, status, format, summary, device }) => {
     // Check if SDK is installed — prefer SDK data over CDP/interceptor buffer
     const sdkAvailable = await isSDKInstalled();
     if (sdkAvailable) {
@@ -1474,9 +1539,9 @@ registerToolWithTelemetry("get_network_requests", {
     // Fallback: read from in-process buffer (CDP/interceptor)
     // Return summary if requested
     if (summary) {
-        const stats = getNetworkStats(networkBuffer);
+        const stats = getNetworkStats(resolveNetworkBuffer(device));
         let connectionWarning = "";
-        if (networkBuffer.size === 0) {
+        if (resolveNetworkBuffer(device).size === 0) {
             const connStatus = await checkAndEnsureConnection();
             connectionWarning = connStatus.message ? `\n\n${connStatus.message}` : "";
             if (!sdkAvailable) {
@@ -1492,7 +1557,7 @@ registerToolWithTelemetry("get_network_requests", {
             ]
         };
     }
-    const { requests, count, formatted } = getNetworkRequests(networkBuffer, {
+    const { requests, count, formatted } = getNetworkRequests(resolveNetworkBuffer(device), {
         maxRequests,
         method,
         urlPattern,
@@ -1550,7 +1615,8 @@ registerToolWithTelemetry("get_network_requests", {
     };
 }, 
 // Empty result detector: buffer has no entries at all
-() => networkBuffer.size === 0);
+() => { let total = 0; for (const b of networkBuffers.values())
+    total += b.size; return total === 0; });
 // Tool: Search network requests
 registerToolWithTelemetry("search_network", {
     description: "Search network requests by URL pattern (case-insensitive)",
@@ -1561,10 +1627,11 @@ registerToolWithTelemetry("search_network", {
             .enum(["text", "tonl"])
             .optional()
             .default("tonl")
-            .describe("Output format: 'text' or 'tonl' (default, compact token-optimized format)")
+            .describe("Output format: 'text' or 'tonl' (default, compact token-optimized format)"),
+        device: z.string().optional().describe("Target device name (substring match). Omit for all devices. Run get_apps to see connected devices.")
     }
-}, async ({ urlPattern, maxResults, format }) => {
-    const { requests, count, formatted } = searchNetworkRequests(networkBuffer, urlPattern, maxResults);
+}, async ({ urlPattern, maxResults, format, device }) => {
+    const { requests, count, formatted } = searchNetworkRequests(resolveNetworkBuffer(device), urlPattern, maxResults);
     // Check connection health
     let connectionWarning = "";
     if (count === 0) {
@@ -1612,9 +1679,10 @@ registerToolWithTelemetry("get_request_details", {
             .boolean()
             .optional()
             .default(false)
-            .describe("Disable body truncation. Tip: Use when you need to inspect full JSON payloads.")
+            .describe("Disable body truncation. Tip: Use when you need to inspect full JSON payloads."),
+        device: z.string().optional().describe("Target device name (substring match). Omit for all devices. Run get_apps to see connected devices.")
     }
-}, async ({ requestId, maxBodyLength, verbose }) => {
+}, async ({ requestId, maxBodyLength, verbose, device }) => {
     // Check SDK first — it has full headers and body
     const sdkAvailable = await isSDKInstalled();
     if (sdkAvailable) {
@@ -1662,7 +1730,7 @@ registerToolWithTelemetry("get_request_details", {
         }
     }
     // Fallback: read from in-process buffer
-    const request = networkBuffer.get(requestId);
+    const request = resolveNetworkBuffer(device).get(requestId);
     if (!request) {
         const status = await checkAndEnsureConnection();
         const connectionNote = status.message ? `\n\n${status.message}` : "";
@@ -1688,12 +1756,14 @@ registerToolWithTelemetry("get_request_details", {
 // Tool: Get network stats
 registerToolWithTelemetry("get_network_stats", {
     description: "Get statistics about captured network requests: counts by method, status code, and domain.",
-    inputSchema: {}
-}, async () => {
-    const stats = getNetworkStats(networkBuffer);
+    inputSchema: {
+        device: z.string().optional().describe("Target device name (substring match). Omit for all devices. Run get_apps to see connected devices.")
+    }
+}, async ({ device }) => {
+    const stats = getNetworkStats(resolveNetworkBuffer(device));
     // Check connection health
     let connectionWarning = "";
-    if (networkBuffer.size === 0) {
+    if (resolveNetworkBuffer(device).size === 0) {
         const status = await checkAndEnsureConnection();
         connectionWarning = status.message ? `\n\n${status.message}` : "";
     }
@@ -1713,13 +1783,28 @@ registerToolWithTelemetry("get_network_stats", {
     };
 }, 
 // Empty result detector: buffer has no entries at all
-() => networkBuffer.size === 0);
+() => { let total = 0; for (const b of networkBuffers.values())
+    total += b.size; return total === 0; });
 // Tool: Clear network requests
 registerToolWithTelemetry("clear_network", {
     description: "Clear the network request buffer",
-    inputSchema: {}
-}, async () => {
-    let totalCleared = networkBuffer.clear();
+    inputSchema: {
+        device: z.string().optional().describe("Target device name (substring match). Omit to clear all devices. Run get_apps to see connected devices.")
+    }
+}, async ({ device }) => {
+    let totalCleared = 0;
+    if (device) {
+        const app = getConnectedAppByDevice(device);
+        if (!app)
+            throw new Error(`No connected device matches "${device}"`);
+        const deviceName = app.deviceInfo.deviceName || app.deviceInfo.title || "unknown";
+        totalCleared = getNetworkBuffer(deviceName).clear();
+    }
+    else {
+        for (const buffer of networkBuffers.values()) {
+            totalCleared += buffer.clear();
+        }
+    }
     // Also clear SDK buffer if available
     const sdkAvailable = await isSDKInstalled();
     if (sdkAvailable) {
@@ -1740,9 +1825,11 @@ registerToolWithTelemetry("clear_network", {
 // Tool: Reload the app
 registerToolWithTelemetry("reload_app", {
     description: "Reload the React Native app (triggers JavaScript bundle reload like pressing 'r' in Metro). Will auto-connect to Metro if no connection exists. Note: After reload, the app may take a few seconds to fully restart and become responsive — wait before running other tools. IMPORTANT: React Native has Fast Refresh enabled by default - code changes are automatically applied without needing reload. Only use when: (1) logs/behavior don't reflect code changes after a few seconds, (2) app is in broken/error state, or (3) need to reset app state completely (navigation stack, context, etc.).",
-    inputSchema: {}
-}, async () => {
-    const result = await reloadApp();
+    inputSchema: {
+        device: z.string().optional().describe("Target device name (substring match). Omit for default device. Run get_apps to see connected devices.")
+    }
+}, async ({ device }) => {
+    const result = await reloadApp(device);
     if (!result.success) {
         return {
             content: [