@slack/radar-mcp 1.1.0 → 1.1.2

package/dist/mcp/index.js

@@ -101,8 +101,10 @@ async function handleSessionEnable(args) {
     const forwarded = device.ensureForward();
     if (!forwarded) {
         sessionEnabled = false;
+        const reason = device.getLastForwardError?.() ?? null;
         return textResult({
-            error: "Port forwarding failed. Ensure a device is connected.",
+            error: reason ??
+                "Port forwarding failed. Ensure a device is connected.",
             enabled: false,
             platform: device.platform,
         }, true);
@@ -291,7 +293,7 @@ function buildApiPath(name, args) {
     }
 }
 // --- MCP Server ---
-const server = new Server({ name: "slack-radar", version: "1.1.0" }, { capabilities: { tools: {} }, instructions: SERVER_INSTRUCTIONS });
+const server = new Server({ name: "slack-radar", version: "1.1.2" }, { capabilities: { tools: {} }, instructions: SERVER_INSTRUCTIONS });
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
     tools: TOOL_DEFINITIONS,
 }));

package/dist/shared/android.d.ts

@@ -1,4 +1,15 @@
 import type { DeviceTransport } from "./transport.js";
+/**
+ * Resolve the adb binary. MCP servers spawned from GUI launchers (Spotlight,
+ * Raycast, Dock) do not inherit the user's shell PATH, so a bare `adb` call
+ * fails with ENOENT even when adb works fine in the user's terminal. We look
+ * in PATH first, then fall back to common Android SDK install locations.
+ *
+ * Returns either an absolute path to the adb binary or the string "adb"
+ * (PATH-relative). When all fallbacks miss, returns null so callers can
+ * surface a clear error instead of a misleading "device not connected".
+ */
+export declare function resolveAdbPath(): string | null;
 /**
  * Parse the output of `ps -A -o USER,NAME` to extract the Android user ID
  * for the debug build process. When multiple profiles are running, prefers
@@ -12,11 +23,14 @@ export declare class AndroidTransport implements DeviceTransport {
     private detectedUserId;
     private currentTimeoutMinutes;
     private radarEnabled;
+    private lastForwardError;
     ensureForward(): boolean;
+    getLastForwardError(): string | null;
     activate(timeoutMinutes: number): void;
     resetState(): void;
     isForwarded(): boolean;
     getTimeoutMinutes(): number;
+    getActiveUserId(): string | null;
     screenshot(fullRes: boolean): string;
     recordScreen(durationS: number): string;
     getAppState(): string;

package/dist/shared/android.js

@@ -1,9 +1,62 @@
 import { execSync } from "child_process";
+import fs from "fs";
 import os from "os";
 import path from "path";
 const RADAR_PORT = 8099;
 const SOCKET_NAME = "slack-radar";
 const ENABLE_ACTION = "slack.debug.ENABLE_RADAR";
+/**
+ * Resolve the adb binary. MCP servers spawned from GUI launchers (Spotlight,
+ * Raycast, Dock) do not inherit the user's shell PATH, so a bare `adb` call
+ * fails with ENOENT even when adb works fine in the user's terminal. We look
+ * in PATH first, then fall back to common Android SDK install locations.
+ *
+ * Returns either an absolute path to the adb binary or the string "adb"
+ * (PATH-relative). When all fallbacks miss, returns null so callers can
+ * surface a clear error instead of a misleading "device not connected".
+ */
+export function resolveAdbPath() {
+    // 1. PATH-relative: if `adb` resolves, use it as-is (fast path).
+    try {
+        const which = execSync("command -v adb", {
+            timeout: 2000,
+            encoding: "utf-8",
+            shell: "/bin/sh",
+        }).trim();
+        if (which && fs.existsSync(which))
+            return "adb";
+    }
+    catch {
+        // `command -v adb` returns non-zero when not found; fall through
+    }
+    // 2. Common install locations, in order of likelihood on macOS and Linux.
+    const home = os.homedir();
+    const candidates = [
+        process.env.ANDROID_HOME
+            ? path.join(process.env.ANDROID_HOME, "platform-tools", "adb")
+            : null,
+        process.env.ANDROID_SDK_ROOT
+            ? path.join(process.env.ANDROID_SDK_ROOT, "platform-tools", "adb")
+            : null,
+        path.join(home, "Library", "Android", "sdk", "platform-tools", "adb"),
+        path.join(home, "Android", "Sdk", "platform-tools", "adb"),
+        "/usr/local/bin/adb",
+        "/opt/homebrew/bin/adb",
+    ].filter((p) => p !== null);
+    for (const candidate of candidates) {
+        try {
+            if (fs.existsSync(candidate))
+                return candidate;
+        }
+        catch {
+            // Permission denied on some directory; skip
+        }
+    }
+    return null;
+}
+// Module-level resolution, done once at import time. The MCP process lifetime
+// is short enough (session-scoped) that we do not need to re-resolve.
+const ADB = resolveAdbPath();
 /**
  * Parse the output of `ps -A -o USER,NAME` to extract the Android user ID
  * for the debug build process. When multiple profiles are running, prefers
@@ -33,27 +86,40 @@ export class AndroidTransport {
     detectedUserId = null;
     currentTimeoutMinutes = 5;
     radarEnabled = false;
+    lastForwardError = null;
     ensureForward() {
         if (this.portForwarded)
             return true;
+        if (!ADB) {
+            this.lastForwardError =
+                "adb binary not found. Set ANDROID_HOME or install Android SDK platform-tools. Searched: PATH, $ANDROID_HOME/platform-tools/adb, ~/Library/Android/sdk/platform-tools/adb, ~/Android/Sdk/platform-tools/adb, /usr/local/bin/adb, /opt/homebrew/bin/adb.";
+            return false;
+        }
         try {
-            execSync(`adb forward tcp:${RADAR_PORT} localabstract:${SOCKET_NAME}`, {
+            execSync(`${ADB} forward tcp:${RADAR_PORT} localabstract:${SOCKET_NAME}`, {
                 timeout: 5000,
             });
             this.portForwarded = true;
+            this.lastForwardError = null;
             return true;
         }
-        catch {
+        catch (e) {
+            this.lastForwardError = e.message;
             return false;
         }
     }
+    getLastForwardError() {
+        return this.lastForwardError;
+    }
     activate(timeoutMinutes) {
+        if (!ADB)
+            return;
         const timeout = timeoutMinutes || this.currentTimeoutMinutes;
         if (this.radarEnabled && timeout === this.currentTimeoutMinutes)
             return;
         try {
             const userId = this.detectDebugBuildUser();
-            execSync(`adb shell am broadcast --user ${userId} -a ${ENABLE_ACTION} --ei timeout_minutes ${timeout}`, { timeout: 5000 });
+            execSync(`${ADB} shell am broadcast --user ${userId} -a ${ENABLE_ACTION} --ei timeout_minutes ${timeout}`, { timeout: 5000 });
             this.currentTimeoutMinutes = timeout;
             this.radarEnabled = true;
         }
@@ -65,6 +131,7 @@ export class AndroidTransport {
         this.portForwarded = false;
         this.detectedUserId = null;
         this.radarEnabled = false;
+        this.lastForwardError = null;
     }
     isForwarded() {
         return this.portForwarded;
@@ -72,12 +139,17 @@ export class AndroidTransport {
     getTimeoutMinutes() {
         return this.currentTimeoutMinutes;
     }
+    getActiveUserId() {
+        return this.detectedUserId;
+    }
     screenshot(fullRes) {
+        if (!ADB)
+            throw new Error("adb not found on PATH or common SDK locations");
         const tmpFile = path.join(os.tmpdir(), `slack-radar-screenshot-${Date.now()}.png`);
         const devicePath = "/data/local/tmp/slack-radar-screenshot.png";
-        execSync(`adb shell screencap -p ${devicePath}`, { timeout: 10000 });
-        execSync(`adb pull ${devicePath} "${tmpFile}"`, { timeout: 10000 });
-        execSync(`adb shell rm ${devicePath}`, { timeout: 5000 });
+        execSync(`${ADB} shell screencap -p ${devicePath}`, { timeout: 10000 });
+        execSync(`${ADB} pull ${devicePath} "${tmpFile}"`, { timeout: 10000 });
+        execSync(`${ADB} shell rm ${devicePath}`, { timeout: 5000 });
         if (!fullRes) {
             try {
                 execSync(`sips -Z 720 "${tmpFile}" 2>/dev/null`, { timeout: 5000 });
@@ -89,21 +161,27 @@ export class AndroidTransport {
         return tmpFile;
     }
     recordScreen(durationS) {
+        if (!ADB)
+            throw new Error("adb not found on PATH or common SDK locations");
         const duration = Math.min(Math.max(durationS, 1), 30);
         const tmpFile = path.join(os.tmpdir(), `slack-radar-recording-${Date.now()}.mp4`);
         const devicePath = "/data/local/tmp/slack-radar-recording.mp4";
-        execSync(`adb shell screenrecord --time-limit ${duration} --size 720x1280 ${devicePath}`, { timeout: (duration + 5) * 1000 });
-        execSync(`adb pull ${devicePath} "${tmpFile}"`, { timeout: 10000 });
-        execSync(`adb shell rm ${devicePath}`, { timeout: 5000 });
+        execSync(`${ADB} shell screenrecord --time-limit ${duration} --size 720x1280 ${devicePath}`, { timeout: (duration + 5) * 1000 });
+        execSync(`${ADB} pull ${devicePath} "${tmpFile}"`, { timeout: 10000 });
+        execSync(`${ADB} shell rm ${devicePath}`, { timeout: 5000 });
         return tmpFile;
     }
     getAppState() {
-        return execSync(`adb shell "dumpsys activity activities | grep -A 5 'com.Slack.internal'"`, { timeout: 10000, encoding: "utf-8" }).trim();
+        if (!ADB)
+            throw new Error("adb not found on PATH or common SDK locations");
+        return execSync(`${ADB} shell "dumpsys activity activities | grep -A 5 'com.Slack.internal'"`, { timeout: 10000, encoding: "utf-8" }).trim();
     }
     getRecentLogs(tag, limit, grep) {
-        let cmd = `adb logcat -d | grep -F "${tag}" | tail -${limit}`;
+        if (!ADB)
+            throw new Error("adb not found on PATH or common SDK locations");
+        let cmd = `${ADB} logcat -d | grep -F "${tag}" | tail -${limit}`;
         if (grep) {
-            cmd = `adb logcat -d | grep -F "${tag}" | grep -i "${grep.replace(/"/g, '\\"')}" | tail -${limit}`;
+            cmd = `${ADB} logcat -d | grep -F "${tag}" | grep -i "${grep.replace(/"/g, '\\"')}" | tail -${limit}`;
         }
         const output = execSync(cmd, {
             timeout: 10000,
@@ -113,8 +191,10 @@ export class AndroidTransport {
         return output.trim().split("\n").filter(Boolean);
     }
     listProfiles() {
+        if (!ADB)
+            return [{ userId: "0", label: "Personal (user 0)" }];
         try {
-            const ps = execSync(`adb shell "ps -A -o USER,NAME 2>/dev/null | grep Slack | grep debug"`, { timeout: 5000, encoding: "utf-8" }).trim();
+            const ps = execSync(`${ADB} shell "ps -A -o USER,NAME 2>/dev/null | grep Slack | grep debug"`, { timeout: 5000, encoding: "utf-8" }).trim();
             if (!ps)
                 return [{ userId: "0", label: "Personal (user 0)" }];
             const seen = new Set();
@@ -139,8 +219,10 @@ export class AndroidTransport {
         }
     }
     activateForUser(userId, timeoutMinutes) {
+        if (!ADB)
+            throw new Error("adb not found on PATH or common SDK locations");
         const timeout = timeoutMinutes || this.currentTimeoutMinutes;
-        execSync(`adb shell am broadcast --user ${userId} -a ${ENABLE_ACTION} --ei timeout_minutes ${timeout}`, { timeout: 5000 });
+        execSync(`${ADB} shell am broadcast --user ${userId} -a ${ENABLE_ACTION} --ei timeout_minutes ${timeout}`, { timeout: 5000 });
         this.detectedUserId = userId;
         this.currentTimeoutMinutes = timeout;
         this.radarEnabled = true;
@@ -148,8 +230,12 @@ export class AndroidTransport {
     detectDebugBuildUser() {
         if (this.detectedUserId !== null)
             return this.detectedUserId;
+        if (!ADB) {
+            this.detectedUserId = "0";
+            return this.detectedUserId;
+        }
         try {
-            const ps = execSync(`adb shell "ps -A -o USER,NAME 2>/dev/null | grep Slack | grep debug"`, { timeout: 5000, encoding: "utf-8" }).trim();
+            const ps = execSync(`${ADB} shell "ps -A -o USER,NAME 2>/dev/null | grep Slack | grep debug"`, { timeout: 5000, encoding: "utf-8" }).trim();
             this.detectedUserId = parseUserFromPsOutput(ps);
         }
         catch {

package/dist/shared/transport.d.ts

@@ -55,4 +55,11 @@ export interface DeviceTransport {
      * @returns Array of matching log lines
      */
     getRecentLogs(tag: string, limit: number, grep?: string): string[];
+    /**
+     * Returns the last error message from an `ensureForward()` failure, or null
+     * if the last attempt succeeded or has not happened. Lets callers surface
+     * concrete causes (missing adb, unauthorized device) instead of a generic
+     * "device not connected" message. Optional; implementations may omit it.
+     */
+    getLastForwardError?(): string | null;
 }

package/dist/web/public/index.html

@@ -223,8 +223,9 @@
 
   <div class="toolbar">
     <input type="text" id="filter" placeholder="Filter by URL, channel, event name, payload..." />
-    <select id="profile-select" style="display: none; margin-right: 4px; font-size: 12px; padding: 2px 4px; background: #2a2a2a; color: #ccc; border: 1px solid #444; border-radius: 3px;"></select>
+    <span id="profile-label" style="display: none; font-size: 12px; color: #616061; margin-right: 4px;"></span>
     <button id="enable-btn" style="display: none;">Enable Radar</button>
+    <button id="disconnect-btn" style="display: none;">Disconnect</button>
     <button id="pause-btn">Pause</button>
     <button id="clear-btn">Clear</button>
   </div>
@@ -256,7 +257,8 @@
     const detailEl = document.getElementById("detail");
     const filterEl = document.getElementById("filter");
     const enableBtn = document.getElementById("enable-btn");
-    const profileSelect = document.getElementById("profile-select");
+    const profileLabel = document.getElementById("profile-label");
+    const disconnectBtn = document.getElementById("disconnect-btn");
     const pauseBtn = document.getElementById("pause-btn");
     const clearBtn = document.getElementById("clear-btn");
     const statusDot = document.getElementById("status-dot");
@@ -307,22 +309,25 @@
       enableBtn.disabled = true;
       enableBtn.textContent = "Enabling…";
       try {
-        const selectedUser = profileSelect.value;
-        const qs = selectedUser ? `?user_id=${selectedUser}` : "";
-        const res = await fetch(`/_control/activate${qs}`, { method: "POST" });
+        const res = await fetch("/_control/activate", { method: "POST" });
         const data = await res.json();
         if (!data.ok) {
           statusText.textContent = "enable failed";
           alert(data.error || "Failed to enable radar");
         } else {
           statusText.textContent = "connecting";
+          // Device-side server needs a moment to start after the broadcast.
+          // Without this delay, the SSE connect races the server startup and
+          // gets connection-refused, snapping back to disconnected instantly.
+          await new Promise((r) => setTimeout(r, 1500));
+          connectStream();
+          return; // skip the finally reset — stay in "connecting" state
         }
       } catch (e) {
         alert("Failed to reach server: " + e.message);
-      } finally {
-        enableBtn.disabled = false;
-        enableBtn.textContent = "Enable Radar";
       }
+      enableBtn.disabled = false;
+      enableBtn.textContent = "Enable Radar";
     });
 
     async function fetchProfiles() {
@@ -330,32 +335,47 @@
         const res = await fetch("/_control/profiles");
         const data = await res.json();
         const profiles = data.profiles || [];
-        profileSelect.innerHTML = "";
-        if (profiles.length > 1) {
-          for (const p of profiles) {
-            const opt = document.createElement("option");
-            opt.value = p.userId;
-            opt.textContent = p.label;
-            profileSelect.appendChild(opt);
-          }
-          profileSelect.style.display = "";
+        const activeId = data.active_user_id;
+
+        if (activeId && profiles.length >= 1) {
+          const active = profiles.find((p) => p.userId === activeId) ?? profiles[0];
+          profileLabel.textContent = active.label;
+          profileLabel.style.display = "";
+        } else if (profiles.length >= 1) {
+          profileLabel.textContent = profiles[0].label;
+          profileLabel.style.display = "";
         } else {
-          profileSelect.style.display = "none";
+          profileLabel.style.display = "none";
         }
       } catch {
-        profileSelect.style.display = "none";
+        profileLabel.style.display = "none";
       }
     }
 
     function setDisconnectedUi(disconnected) {
       enableBtn.style.display = disconnected ? "" : "none";
+      disconnectBtn.style.display = disconnected ? "none" : "";
       if (disconnected) {
-        fetchProfiles();
-      } else {
-        profileSelect.style.display = "none";
+        uptimeBadge.textContent = "";
+        extendBtn.style.display = "none";
       }
+      fetchProfiles();
     }
 
+    disconnectBtn.addEventListener("click", () => {
+      if (activeStream) {
+        activeStream.close();
+        activeStream = null;
+      }
+      state.connected = false;
+      statusDot.classList.remove("connected");
+      statusText.textContent = "disconnected";
+      enableBtn.disabled = false;
+      enableBtn.textContent = "Enable Radar";
+      setDisconnectedUi(true);
+      renderList();
+    });
+
     // --- SSE ---
     function insertReconnectMarker() {
       const marker = {
@@ -363,14 +383,18 @@
         timestamp: Date.now(),
         label: `reconnected @ ${new Date().toLocaleTimeString("en-US", { hour12: false })}`,
       };
+      const buffers = state.buffers;
       for (const type of ["network", "rtm", "clog"]) {
-        const buf = state.buffers[type];
+        const buf = buffers[type];
         if (buf.length > 0) buf.push({ ...marker }); // avoid empty-list markers
       }
     }
 
+    let activeStream = null;
+
     function connectStream() {
       const es = new EventSource("/api/stream");
+      activeStream = es;
       es.onopen = () => {
         const wasDisconnected = !state.connected && state.hadConnection;
         state.connected = true;
@@ -394,15 +418,21 @@
         state.connected = false;
         statusDot.classList.remove("connected");
         statusText.textContent = "disconnected";
+        enableBtn.disabled = false;
+        enableBtn.textContent = "Enable Radar";
         setDisconnectedUi(true);
         renderList();
         es.close();
-        setTimeout(connectStream, 2000);
       };
     }
 
     function ingest(type, event) {
-      const buf = state.buffers[type];
+      // Attribute incoming events to whichever profile is currently active.
+      // There is a small misattribution window right at a switch boundary
+      // (a few events in flight may land in the wrong bucket), which is an
+      // acceptable cost relative to server-side event tagging.
+      const buffers = state.buffers;
+      const buf = buffers[type];
       if (!buf) return;
       buf.push(event);
       if (buf.length > state.MAX_BUFFER) buf.shift();
@@ -411,9 +441,10 @@
     }
 
     function updateCounts() {
-      document.getElementById("network-count").textContent = state.buffers.network.length;
-      document.getElementById("rtm-count").textContent = state.buffers.rtm.length;
-      document.getElementById("clog-count").textContent = state.buffers.clog.length;
+      const buffers = state.buffers;
+      document.getElementById("network-count").textContent = buffers.network.length;
+      document.getElementById("rtm-count").textContent = buffers.rtm.length;
+      document.getElementById("clog-count").textContent = buffers.clog.length;
     }
 
     // --- Rendering ---
@@ -665,6 +696,7 @@ ${escapeHtml(tryPretty(data.data))}
     });
 
     async function pollPing() {
+      if (!state.connected) return;
       try {
         const res = await fetch("/api/ping");
         const data = await res.json();
@@ -683,11 +715,13 @@ ${escapeHtml(tryPretty(data.data))}
         extendBtn.style.display = "none";
       }
     }
-    pollPing();
+    // pollPing runs on interval; skips when not connected.
     setInterval(pollPing, 5000);
 
     // --- Go ---
-    connectStream();
+    // Start in disconnected state. User picks a profile and clicks Enable.
+    // connectStream() is called after Enable succeeds.
+    setDisconnectedUi(true);
     updateCounts();
     renderList();
   </script>

package/dist/web/server.js

@@ -43,10 +43,14 @@ export function createServer() {
 }
 function listProfiles(res) {
     const profiles = transport.listProfiles();
+    const activeUserId = transport.getActiveUserId();
     res.writeHead(200, { "Content-Type": "application/json; charset=utf-8" });
-    res.end(JSON.stringify({ profiles }));
+    res.end(JSON.stringify({ profiles, active_user_id: activeUserId }));
 }
 function activateRadar(res, userId) {
+    // Reset cached state so ensureForward() re-runs adb forward. This handles
+    // stale forwards after device-side idle timeout or profile switching.
+    transport.resetState();
     const forwarded = transport.ensureForward();
     if (!forwarded) {
         res.writeHead(502, { "Content-Type": "application/json; charset=utf-8" });
@@ -73,7 +77,7 @@ function activateRadar(res, userId) {
         return;
     }
     res.writeHead(200, { "Content-Type": "application/json; charset=utf-8" });
-    res.end(JSON.stringify({ ok: true, user_id: userId ?? "auto" }));
+    res.end(JSON.stringify({ ok: true, user_id: userId ?? transport.getActiveUserId() ?? "auto" }));
 }
 function proxyToRadar(req, res) {
     const upstream = http.request({

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@slack/radar-mcp",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "MCP server and web dashboard for on-device debugging of the Slack Android app via ADB",
   "type": "module",
   "main": "dist/mcp/index.js",
   "bin": {
+    "radar-mcp": "dist/mcp/index.js",
     "slack-radar-mcp": "dist/mcp/index.js",
     "slack-radar-web": "dist/web/bin.js"
   },