feat: improve SimDeck iOS server handling

Author: DjDeveloperr

README.md

@@ -82,6 +82,12 @@ local, LAN, and Tailscale URLs when available, and shows a QR code with a
 `simdeck://pair` link. The QR contains the pairing code plus all detected
 non-loopback addresses, so pairing once can save both the LAN and Tailscale
 routes with the same service token.
+Normal service restarts preserve that token so paired clients stay connected.
+Use `simdeck service reset` only when you want to rotate the service token and
+restart the LaunchAgent.
+If port 4310 is already owned by a workspace daemon, the LaunchAgent uses the
+next available service-discovery port, up to 4320, instead of stopping that
+daemon.
 
 CLI commands automatically use the same warm daemon:
 

client/src/api/types.ts

@@ -188,6 +188,17 @@ export interface ChromeDevToolsTargetDiscovery {
 
 export interface HealthResponse {
   ok: boolean;
+  serverId?: string;
+  advertiseHost?: string;
+  hostId?: string;
+  hostName?: string;
+  httpPort?: number;
+  serverKind?:
+    | "launchAgent"
+    | "workspace"
+    | "foreground"
+    | "standalone"
+    | string;
   videoCodec?: string;
   webRtc?: {
     iceServers?: RTCIceServer[];

client/src/app/AppShell.tsx

@@ -109,6 +109,7 @@ import {
   readStoredAccessibilitySource,
   readStoredFlag,
   sanitizeAccessibilitySources,
+  shouldRetainAccessibilityTreeDuringRefresh,
   TOUCH_OVERLAY_VISIBLE_STORAGE_KEY,
   viewportStateForUDID,
   writePersistedUiState,
@@ -568,6 +569,7 @@ export function AppShell({
   >(() => {});
   const accessibilityRequestIdRef = useRef(0);
   const accessibilityLoadingRef = useRef(false);
+  const accessibilityRootsRef = useRef<AccessibilityNode[]>([]);
   const streamConfigRequestIdRef = useRef(0);
   const streamConfigUserChangeAtRef = useRef(0);
   const streamConfigUserTouchedRef = useRef(false);
@@ -588,6 +590,11 @@ export function AppShell({
   const zoomDockSize = useElementSize(zoomDockElement);
   refreshRef.current = refresh;
 
+  const updateAccessibilityRoots = useCallback((roots: AccessibilityNode[]) => {
+    accessibilityRootsRef.current = roots;
+    setAccessibilityRoots(roots);
+  }, []);
+
   const handleOuterCanvasRef = useCallback((node: HTMLDivElement | null) => {
     outerCanvasRef.current = node;
     setOuterCanvasElement(node);
@@ -1160,7 +1167,7 @@ export function AppShell({
       setChromeProfile(null);
       setChromeProfileReady(false);
       setLocalError("");
-      setAccessibilityRoots([]);
+      updateAccessibilityRoots([]);
       setAccessibilitySelectedId("");
       setAccessibilityHoveredId(null);
       setAccessibilityPickerActive(false);
@@ -1210,7 +1217,7 @@ export function AppShell({
         : nextViewportState.rotationQuarterTurns,
     );
     setLocalError("");
-    setAccessibilityRoots([]);
+    updateAccessibilityRoots([]);
     setAccessibilitySelectedId(
       persistedState.accessibilitySelectedByUDID?.[selectedSimulator.udid] ??
         "",
@@ -1231,7 +1238,7 @@ export function AppShell({
     }
 
     if (providerDisconnected) {
-      setAccessibilityRoots([]);
+      updateAccessibilityRoots([]);
       setAccessibilitySelectedId("");
       setAccessibilityHoveredId(null);
       setAccessibilityAvailableSources([]);
@@ -1242,7 +1249,7 @@ export function AppShell({
     }
 
     if (!selectedSimulator?.isBooted) {
-      setAccessibilityRoots([]);
+      updateAccessibilityRoots([]);
       setAccessibilitySelectedId("");
       setAccessibilityAvailableSources([]);
       setAccessibilitySource("");
@@ -1281,48 +1288,90 @@ export function AppShell({
         sanitizeAccessibilitySources(snapshot.availableSources),
         snapshot.source,
       );
-      setAccessibilityRoots(roots);
-      setAccessibilityAvailableSources(availableSources);
-      setAccessibilitySource(snapshot.source);
-      setAccessibilityError(
-        roots.length === 0
-          ? userFacingAccessibilityError(snapshot.fallbackReason ?? "")
-          : "",
-      );
-      const nextPreferredSource = nextAccessibilitySourcePreference(
+      const retainCurrentTree = shouldRetainAccessibilityTreeDuringRefresh(
         accessibilityPreferredSource,
+        accessibilitySource,
         snapshot.source,
-        availableSources,
+        roots.length,
+        accessibilityRootsRef.current.length,
       );
-      if (nextPreferredSource) {
-        setAccessibilityPreferredSource(nextPreferredSource);
-      }
-      if (roots.length === 0) {
-        setAccessibilitySelectedId("");
+      if (retainCurrentTree) {
+        setAccessibilityAvailableSources(
+          mergeAccessibilitySources(
+            availableSources,
+            accessibilitySource,
+            accessibilityPreferredSource,
+          ),
+        );
+        setAccessibilityError("");
+      } else {
+        updateAccessibilityRoots(roots);
+        setAccessibilityAvailableSources(availableSources);
+        setAccessibilitySource(snapshot.source);
+        setAccessibilityError(
+          roots.length === 0
+            ? userFacingAccessibilityError(snapshot.fallbackReason ?? "")
+            : "",
+        );
+        const nextPreferredSource = nextAccessibilitySourcePreference(
+          accessibilityPreferredSource,
+          snapshot.source,
+          availableSources,
+        );
+        if (nextPreferredSource) {
+          setAccessibilityPreferredSource(nextPreferredSource);
+        }
+        if (roots.length === 0) {
+          setAccessibilitySelectedId("");
+        }
       }
     } catch (snapshotError) {
       if (accessibilityRequestIdRef.current !== requestId) {
         return;
       }
-      setAccessibilityError(
-        snapshotError instanceof Error
-          ? userFacingAccessibilityError(snapshotError.message)
-          : "Failed to load accessibility hierarchy.",
+      const retainCurrentTree = shouldRetainAccessibilityTreeDuringRefresh(
+        accessibilityPreferredSource,
+        accessibilitySource,
+        "native-ax",
+        0,
+        accessibilityRootsRef.current.length,
       );
-      setAccessibilityRoots([]);
-      setAccessibilitySelectedId("");
-      setAccessibilityHoveredId(null);
-      setAccessibilitySource("");
-      if (accessibilityPreferredSource !== "auto") {
-        setAccessibilityPreferredSource("auto");
+      if (retainCurrentTree) {
+        setAccessibilityAvailableSources((current) =>
+          mergeAccessibilitySources(
+            current,
+            accessibilitySource,
+            accessibilityPreferredSource,
+          ),
+        );
+        setAccessibilityError("");
+      } else {
+        setAccessibilityError(
+          snapshotError instanceof Error
+            ? userFacingAccessibilityError(snapshotError.message)
+            : "Failed to load accessibility hierarchy.",
+        );
+        updateAccessibilityRoots([]);
+        setAccessibilitySelectedId("");
+        setAccessibilityHoveredId(null);
+        setAccessibilitySource("");
+        if (accessibilityPreferredSource !== "auto") {
+          setAccessibilityPreferredSource("auto");
+        }
       }
     } finally {
       if (accessibilityRequestIdRef.current === requestId) {
         accessibilityLoadingRef.current = false;
         setAccessibilityLoading(false);
       }
     }
-  }, [accessibilityPreferredSource, providerDisconnected, selectedSimulator]);
+  }, [
+    accessibilityPreferredSource,
+    accessibilitySource,
+    providerDisconnected,
+    selectedSimulator,
+    updateAccessibilityRoots,
+  ]);
 
   const changeAccessibilitySource = useCallback(
     (source: AccessibilitySource) => {
@@ -1332,14 +1381,14 @@ export function AppShell({
       accessibilityRequestIdRef.current += 1;
       accessibilityLoadingRef.current = false;
       setAccessibilityPreferredSource(source);
-      setAccessibilityRoots([]);
+      updateAccessibilityRoots([]);
       setAccessibilitySelectedId("");
       setAccessibilityHoveredId(null);
       setAccessibilityError("");
       setAccessibilitySource("");
       setAccessibilityLoading(false);
     },
-    [accessibilityPreferredSource],
+    [accessibilityPreferredSource, updateAccessibilityRoots],
   );
 
   useEffect(() => {

client/src/app/uiState.test.ts

@@ -7,6 +7,7 @@ import {
   readStoredFlag,
   sanitizeAccessibilitySources,
   sanitizePersistedUiState,
+  shouldRetainAccessibilityTreeDuringRefresh,
   viewportStateForUDID,
   type PersistedViewportState,
 } from "./uiState";
@@ -60,6 +61,63 @@ describe("uiState", () => {
     ).toBe("in-app-inspector");
   });
 
+  it("keeps an explicit Flutter preference through transient native fallback", () => {
+    expect(
+      nextAccessibilitySourcePreference("flutter", "native-ax", [
+        "in-app-inspector",
+        "native-ax",
+      ]),
+    ).toBeNull();
+  });
+
+  it("retains the current Flutter tree during empty or fallback refreshes", () => {
+    expect(
+      shouldRetainAccessibilityTreeDuringRefresh(
+        "auto",
+        "flutter",
+        "flutter",
+        0,
+        3,
+      ),
+    ).toBe(true);
+    expect(
+      shouldRetainAccessibilityTreeDuringRefresh(
+        "flutter",
+        "flutter",
+        "native-ax",
+        12,
+        3,
+      ),
+    ).toBe(true);
+    expect(
+      shouldRetainAccessibilityTreeDuringRefresh(
+        "auto",
+        "flutter",
+        "flutter",
+        4,
+        3,
+      ),
+    ).toBe(false);
+    expect(
+      shouldRetainAccessibilityTreeDuringRefresh(
+        "native-ax",
+        "native-ax",
+        "flutter",
+        4,
+        3,
+      ),
+    ).toBe(false);
+    expect(
+      shouldRetainAccessibilityTreeDuringRefresh(
+        "flutter",
+        "native-ax",
+        "native-ax",
+        4,
+        3,
+      ),
+    ).toBe(false);
+  });
+
   it("sanitizes persisted viewport state and falls back to defaults", () => {
     const sanitized = sanitizePersistedUiState({
       bundleIDValue: 123 as unknown as string,

client/src/app/uiState.ts

@@ -137,6 +137,13 @@ export function nextAccessibilitySourcePreference(
   availableSources: AccessibilitySource[],
 ): AccessibilitySourcePreference | null {
   const richerSource = preferredRicherAccessibilitySource(availableSources);
+  if (
+    currentPreference === "flutter" &&
+    snapshotSource !== "flutter" &&
+    !availableSources.includes("flutter")
+  ) {
+    return null;
+  }
   if (
     snapshotSource === "native-ax" &&
     currentPreference !== "native-ax" &&
@@ -154,6 +161,27 @@ export function nextAccessibilitySourcePreference(
   return null;
 }
 
+export function shouldRetainAccessibilityTreeDuringRefresh(
+  currentPreference: AccessibilitySourcePreference,
+  currentSource: AccessibilitySource | "",
+  snapshotSource: AccessibilitySource,
+  nextRootCount: number,
+  currentRootCount: number,
+): boolean {
+  if (currentRootCount <= 0) {
+    return false;
+  }
+  const retainedSource =
+    currentPreference === "auto" ? currentSource : currentPreference;
+  if (retainedSource !== "flutter" && retainedSource !== "react-native") {
+    return false;
+  }
+  if (currentSource !== retainedSource) {
+    return false;
+  }
+  return snapshotSource !== retainedSource || nextRootCount === 0;
+}
+
 export function isAccessibilitySource(
   value: unknown,
 ): value is AccessibilitySource {

client/src/features/accessibility/accessibilityTree.test.ts

@@ -325,4 +325,39 @@ describe("findAccessibilityItemAtPoint", () => {
     expect(item?.node.type).toBe("FilledButton");
     expect(item?.id).toBe("0.0");
   });
+
+  it("ignores Flutter composited followers that cover selectable content", () => {
+    const roots: AccessibilityNode[] = [
+      {
+        source: "flutter",
+        type: "View",
+        frame: { x: 0, y: 0, width: 402, height: 874 },
+        children: [
+          {
+            source: "flutter",
+            type: "Text",
+            title: "Daily budget",
+            AXLabel: "Daily budget",
+            frame: { x: 24, y: 180, width: 180, height: 32 },
+          },
+          {
+            source: "flutter",
+            type: "CompositedTransformFollower",
+            title: "CompositedTransformFollower",
+            frame: { x: 0, y: 0, width: 402, height: 874 },
+            sourceLocation: {
+              file: "file:///Users/dj/Developer/flutter/packages/flutter/lib/src/material/slider.dart",
+              line: 1057,
+              column: 35,
+            },
+          },
+        ],
+      },
+    ];
+
+    const item = findAccessibilityItemAtPoint(roots, { x: 0.2, y: 0.224 });
+
+    expect(item?.node.type).toBe("Text");
+    expect(item?.id).toBe("0.0");
+  });
 });

client/src/features/accessibility/accessibilityTree.ts

@@ -315,6 +315,8 @@ const flutterTransparentContainerTypes = new Set([
   "ClipRRect",
   "ClipRect",
   "Column",
+  "CompositedTransformFollower",
+  "CompositedTransformTarget",
   "ConstrainedBox",
   "Container",
   "CustomMultiChildLayout",