@calo-design/cli 0.9.2 → 0.9.4

package/bin/mirror-push.js

@@ -382,7 +382,7 @@ export default function RootLayout() {
   }
   fs.writeFileSync(path.join(stagedAppDir, "_layout.tsx"), managed);
   fs.writeFileSync(path.join(mirrorChromeDir, "mirror-chrome.tsx"), mirrorChromeSource({ slug, owner }));
-  injectNativeIntent(stagedAppDir);
+  injectNativeIntent(stagedAppDir, mirrorChromeDir, slug);
 }
 
 // The launcher opens a prototype via `designchef://open/<slug>`. That deep link is
@@ -394,35 +394,107 @@ export default function RootLayout() {
 // `+native-intent.tsx` is expo-router's hook for rewriting an incoming native URL
 // before routing: send the launcher's own path to the root and leave every other
 // deep link untouched, so a prototype's own links keep working.
-function injectNativeIntent(stagedAppDir) {
+function injectNativeIntent(stagedAppDir, mirrorChromeDir, slug) {
+  // Shared launcher-URL logic: +native-intent covers COLD starts (the initial
+  // URL), and MirrorChrome's Linking listener covers WARM arrivals — on Android
+  // a URL delivered to the running app does not reliably reach expo-router's
+  // redirectSystemPath, which left designchef://open/<other> showing the
+  // currently-loaded prototype. The `switching` latch dedupes when both fire.
+  fs.writeFileSync(
+    path.join(mirrorChromeDir, "mirror-switch.ts"),
+    `// Managed by calo-design push.
+// The Mirror launcher opens prototypes with designchef://open/<slug>. Cases
+// reaching THIS bundle:
+//  - the URL that opened this prototype survives the expo-updates reload as the
+//    initial URL (/open/<own slug>) — route it to "/" so expo-router doesn't
+//    render "Unmatched Route";
+//  - a designchef://open/<other> link arrives (cold OR while this bundle is
+//    live) — the launcher's JS isn't running, so this bundle performs the
+//    channel switch itself: point expo-updates at the other channel, download,
+//    reload. ("mirror" is the launcher's own channel — open/mirror = the feed.)
+import { Linking, Platform } from "react-native";
+import * as Updates from "expo-updates";
+
+const PROTOTYPE = ${JSON.stringify(slug)};
+const UPDATES_URL = ${JSON.stringify(UPDATES_URL)};
+const RUNTIME_VERSION = ${JSON.stringify(RUNTIME_VERSION)};
+
+// One switch at a time — a second reload racing the first crashes in JSI
+// teardown (see calo-design-mirror src/lib/mirror.ts). Reset on failure.
+let switching = false;
+function switchToChannel(channel: string): void {
+  if (switching) return;
+  let enabled = false;
+  try { enabled = Updates.isEnabled; } catch {}
+  if (!enabled) return; // dev/Expo Go — no runtime loading there
+  switching = true;
+  (async () => {
+    await Updates.setUpdateURLAndRequestHeadersOverride({
+      updateUrl: UPDATES_URL,
+      // EAS requires all three headers — channel alone is an HTTP 400.
+      requestHeaders: {
+        "expo-channel-name": channel,
+        "expo-runtime-version": Updates.runtimeVersion ?? RUNTIME_VERSION,
+        "expo-platform": Platform.OS,
+      },
+    });
+    // Download BEFORE reloading; if the channel has nothing this throws and we
+    // stay put instead of reloading into nothing.
+    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; });
+}
+
+// "/open/<slug>", "scheme://open/<slug>" (host parses as "open"), and
+// "scheme:///open/<slug>" all mean the launcher; anything else is the
+// prototype's own link. Returns the slug ("" for a bare /open), or null.
+function launcherSlug(path: string): string | null {
+  try {
+    let pathname: string;
+    if (path.startsWith("/")) pathname = path;
+    else {
+      const url = new URL(path);
+      pathname = url.host === "open" ? "/open" + url.pathname : url.pathname;
+    }
+    const m = pathname.match(/^\\/open(?:\\/([^/?#]*))?(?:[/?#]|$)/);
+    return m ? decodeURIComponent(m[1] ?? "") : null;
+  } catch {
+    return 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: subscribe to URLs arriving while this bundle runs. */
+export function subscribeLauncherLinks(): { remove: () => void } {
+  return Linking.addEventListener("url", ({ url }) => {
+    handleLauncherPath(url);
+  });
+}
+`
+  );
+
   const existing = [".tsx", ".ts", ".jsx", ".js"].find((e) =>
     fs.existsSync(path.join(stagedAppDir, "+native-intent" + e))
   );
   if (existing) {
-    warn("this prototype has its own +native-intent — leaving it alone. If opening by QR/link lands on \"Unmatched Route\", redirect paths starting with /open to \"/\".");
+    warn("this prototype has its own +native-intent — leaving it alone. Launcher URLs (/open/<slug>) won't be handled there: delegate to handleLauncherPath from ../mirror-switch.");
     return;
   }
   fs.writeFileSync(
     path.join(stagedAppDir, "+native-intent.tsx"),
-    `// Managed by calo-design push.
-// The Mirror launcher opens this prototype with designchef://open/<slug>. That URL
-// is still the native initial URL after the reload into this bundle, where /open/*
-// is not a route — without this hook expo-router renders "Unmatched Route".
-const LAUNCHER_PATH = /^\\/open(\\/|\$)/;
+    `// Managed by calo-design push — see ../mirror-switch for the rationale.
+import { handleLauncherPath } from "../mirror-switch";
 
 export function redirectSystemPath({ path }: { path: string; initial: boolean }): string {
-  try {
-    // Bare pathname, e.g. "/open/<slug>".
-    if (path.startsWith("/")) return LAUNCHER_PATH.test(path) ? "/" : path;
-    const url = new URL(path);
-    // Both shapes reach us: "designchef://open/<slug>" parses with host "open" and
-    // pathname "/<slug>", while "designchef:///open/<slug>" has an empty host and
-    // pathname "/open/<slug>". Treat either as the launcher handing us this app.
-    if (url.host === "open" || LAUNCHER_PATH.test(url.pathname)) return "/";
-  } catch {
-    // Unparseable URL — hand it back untouched rather than swallowing the link.
-  }
-  return path;
+  return handleLauncherPath(path) ?? path;
 }
 `
   );
@@ -444,19 +516,26 @@ function runtimeHasSentry() {
 // try/catch backstops that), so prototypes never crash BECAUSE of reporting.
 function mirrorChromeSource({ slug, owner }) {
   if (!SENTRY_DSN || !runtimeHasSentry()) {
-    return `import type { ReactNode } from "react";
+    return `import { useEffect, type ReactNode } from "react";
+import { subscribeLauncherLinks } from "./mirror-switch";
 
 // Returning to the Mirror launcher is handled NATIVELY by the shell binary:
 // shake the device (see calo-design-mirror/plugins/withCaloMirrorIos.js).
 // Crash reporting was NOT injected: no Sentry DSN configured or the shared
 // runtime predates @sentry/react-native (run \`calo-design update\`).
 export function MirrorChrome({ children }: { children: ReactNode }) {
+  // Warm launcher links (designchef://open/<other> while this bundle runs).
+  useEffect(() => {
+    const sub = subscribeLauncherLinks();
+    return () => sub.remove();
+  }, []);
   return <>{children}</>;
 }
 `;
   }
   return `import { Component, type ErrorInfo, type ReactNode } from "react";
 import { Pressable, ScrollView, Text, View } from "react-native";
+import { subscribeLauncherLinks } from "./mirror-switch";
 
 // Injected by \`calo-design push\` — crash reporting for this prototype.
 // Returning to the Mirror launcher stays NATIVE: shake the device.
@@ -482,6 +561,11 @@ type CrashState = { error: Error | null };
 export class MirrorChrome extends Component<{ children: ReactNode }, CrashState> {
   state: CrashState = { error: null };
 
+  // Warm launcher links (designchef://open/<other> while this bundle runs).
+  private linkSub: { remove: () => void } | null = null;
+  componentDidMount(): void { this.linkSub = subscribeLauncherLinks(); }
+  componentWillUnmount(): void { this.linkSub?.remove(); }
+
   static getDerivedStateFromError(error: Error): CrashState {
     return { error };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calo-design/cli",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "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"