@calo-design/cli 0.9.5 → 0.9.7

package/bin/mirror-push.js

@@ -444,7 +444,7 @@ function switchToChannel(channel: string): void {
     await Updates.fetchUpdateAsync();
     // Defer the reload off the awaited chain (JSI teardown race — mirror.ts).
     setTimeout(() => { void Updates.reloadAsync().catch(() => { switching = false; }); }, 300);
-  })().catch(() => { switching = false; });
+  })().catch((e) => { console.warn("[mirror-switch] switch to", channel, "failed:", String(e)); switching = false; });
 }
 
 // "/open/<slug>", "scheme://open/<slug>" (host parses as "open"), and
@@ -465,14 +465,6 @@ function launcherSlug(path: string): string | null {
   }
 }
 
-/** "/" when the URL is the launcher's (starting a switch if it names another prototype), null otherwise. */
-export function handleLauncherPath(path: string): string | null {
-  const slug = launcherSlug(path);
-  if (slug === null) return null;
-  if (slug && slug !== PROTOTYPE) switchToChannel(slug);
-  return "/";
-}
-
 // Warm-link coverage. After Updates.reloadAsync() the React Native
 // Linking 'url' event no longer reaches the reloaded JS context (verified on
 // Android: the launcher's original context gets warm links, a prototype's
@@ -480,27 +472,48 @@ export function handleLauncherPath(path: string): string | null {
 // URL store, so listen there — and on every foreground, sweep getLinkingURL()
 // in case the event itself was missed. lastHandled stops the sweep from
 // re-firing on URLs we've already acted on.
-let lastHandled: string | null = null;
-
-function handleWarmUrl(url: string | null): void {
-  if (!url || url === lastHandled) return;
-  lastHandled = url;
-  handleLauncherPath(url);
+/**
+ * "/" when the URL is the launcher's, null otherwise. NEVER starts a switch:
+ * the initial URL of a reloaded context can be the STALE activity intent (on
+ * Android the activity keeps the intent that cold-started the app), and
+ * switching on it ping-pongs between prototypes. Switching decisions belong to
+ * the sweep below, which reads expo-linking's always-current URL store.
+ */
+export function handleLauncherPath(path: string): string | null {
+  return launcherSlug(path) === null ? null : "/";
+}
+
+// The launcher-URL store is handle-once: after acting on a URL, clear it so a
+// context created later (e.g. by a feed tap, which carries no URL) can't
+// replay it as a phantom switch.
+function sweepLinkingURL(): void {
+  let url: string | null = null;
+  try { url = ExpoLinking.getLinkingURL() ?? null; } catch { return; }
+  if (!url) return;
+  const slug = launcherSlug(url);
+  if (slug === null) return; // the prototype's own deep link — not ours to touch
+  try { ExpoLinking.clearInitialURL(); } catch {}
+  if (slug && slug !== PROTOTYPE) switchToChannel(slug);
 }
 
 export function subscribeLauncherLinks(): { remove: () => void } {
-  // Seed with the URL that launched this context so the foreground sweep
-  // doesn't replay it (+native-intent already handled the initial URL).
-  try { lastHandled = ExpoLinking.getLinkingURL() ?? null; } catch {}
-  const linkSub = ExpoLinking.addEventListener("url", ({ url }) => handleWarmUrl(url));
+  sweepLinkingURL(); // the URL that created this context (cold link or switch)
+  const linkSub = ExpoLinking.addEventListener("url", () => sweepLinkingURL());
   const stateSub = AppState.addEventListener("change", (state) => {
-    if (state !== "active") return;
-    try { handleWarmUrl(ExpoLinking.getLinkingURL() ?? null); } catch {}
+    if (state === "active") sweepLinkingURL();
   });
+  // The load-bearing path: in a context created by Updates.reloadAsync() the
+  // native->JS EVENT bridge (RN Linking, AppState, expo-linking's emitter) is
+  // dead on Android, but expo-linking's native lifecycle listener still writes
+  // every incoming URL to the store getLinkingURL() reads — and timers are
+  // pure JS. Poll it; the listeners above cover contexts where events work,
+  // and clearInitialURL() makes whichever path runs first win cleanly.
+  const timer = setInterval(sweepLinkingURL, 1500);
   return {
     remove: () => {
       linkSub.remove();
       stateSub.remove();
+      clearInterval(timer);
     },
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calo-design/cli",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "One-line setup for Calo design tooling: logs in with your Calo email and installs the calo-design skill + design-system packages. No GitHub account needed.",
   "bin": {
     "calo-design": "bin/cli.js"