@calo-design/cli 0.9.0 → 0.9.1

package/bin/mirror-push.js

@@ -293,21 +293,75 @@ function linkNodeModules(stage) {
   fs.symlinkSync(target, link, process.platform === "win32" ? "junction" : "dir");
 }
 
-// Overwrite the root _layout with a managed one. Returning to the launcher is now
+// Wrap the root _layout with Mirror chrome. Returning to the launcher is
 // handled natively by the Mirror shell (shake the device — see withCaloMirrorIos),
 // so no visible "back" control is injected; MirrorChrome carries the injected
-// crash reporting (Sentry init + error boundary). NOTE (v1): a custom root _layout
-// (custom providers/Tabs) is not preserved — we warn when it looks non-standard.
+// crash reporting (Sentry init + error boundary).
+//
+// The author's own root _layout is PRESERVED: it's relocated one directory up
+// (next to mirror-chrome, where expo-router won't treat it as a route — inside
+// the app dir even underscore-prefixed files become routes), its relative
+// imports are shifted for the move, and the managed layout renders it inside
+// MirrorChrome. Providers, fonts, and custom UI in the root layout all carry
+// over — the old behavior silently dropped them, and every context hook in the
+// prototype then threw "must be used inside <Provider>" at runtime.
+
+// Moving a module one directory up (src/app/_layout → src/mirror-original-layout)
+// shifts what its relative imports resolve to; rewrite the specifiers so they
+// point at the same files from the new location. Covers `from "…"`, bare
+// `import "…"`, dynamic `import("…")` and `require("…")`. Alias (@/…) and
+// package imports are untouched.
+function shiftRelativeImportsUp(source, appDirName) {
+  return source.replace(
+    /(\bfrom\s*|\bimport\s*\(?\s*|\brequire\s*\(\s*)(["'])(\.{1,2}\/[^"']+)\2/g,
+    (whole, lead, quote, spec) => {
+      let next;
+      if (spec.startsWith("../")) {
+        next = spec.slice(3);
+        if (!next.startsWith("../") && !next.startsWith("./")) next = "./" + next;
+      } else {
+        next = "./" + appDirName + "/" + spec.slice(2);
+      }
+      return `${lead}${quote}${next}${quote}`;
+    }
+  );
+}
+
 function injectBackChrome({ stagedAppDir, mirrorChromeDir, libRel, slug, owner }) {
-  const layout = path.join(stagedAppDir, "_layout.tsx");
-  if (fs.existsSync(layout)) {
-    const cur = fs.readFileSync(layout, "utf8");
-    const standard = /useFonts\(caloFonts\)/.test(cur) && /<Stack/.test(cur);
-    if (!standard) warn("custom root _layout detected — Mirror wraps it with a Stack; providers in the ROOT layout won't carry over. Move them to a nested layout (e.g. src/app/(group)/_layout.tsx), which the Mirror preserves.");
-  }
-  fs.writeFileSync(
-    layout,
-    `// MirrorChrome MUST be the first import: its module scope boots Sentry, so a
+  const exts = [".tsx", ".jsx", ".ts", ".js"];
+  const ext = exts.find((e) => fs.existsSync(path.join(stagedAppDir, "_layout" + e)));
+  const authorLayout = ext ? fs.readFileSync(path.join(stagedAppDir, "_layout" + ext), "utf8") : null;
+  // Root layouts must default-export a component; without one we can't wrap it.
+  const wrappable = authorLayout && /export\s+default\b|export\s*\{[^}]*\bdefault\b[^}]*\}/.test(authorLayout);
+
+  let managed;
+  if (wrappable) {
+    fs.writeFileSync(
+      path.join(mirrorChromeDir, "mirror-original-layout" + ext),
+      shiftRelativeImportsUp(authorLayout, path.basename(stagedAppDir))
+    );
+    fs.rmSync(path.join(stagedAppDir, "_layout" + ext));
+    log(c.dim("  root _layout preserved — wrapped with Mirror crash reporting (providers carry over)"));
+    managed = `// Managed by calo-design push. Your root _layout is preserved verbatim as
+// ../mirror-original-layout (imports shifted for the move) and rendered inside
+// Mirror's crash reporting — providers, fonts, and custom UI all carry over.
+// MirrorChrome MUST stay the first import: its module scope boots Sentry, so a
+// crash while any later module evaluates (your layout, the design system — the
+// SDK-drift class) is captured instead of dying unreported before init.
+import { MirrorChrome } from "${libRel}";
+import OriginalLayout from "../mirror-original-layout";
+
+export default function RootLayout() {
+  return (
+    <MirrorChrome>
+      <OriginalLayout />
+    </MirrorChrome>
+  );
+}
+`;
+  } else {
+    if (authorLayout) warn("root _layout has no default export — replacing it with the standard Mirror layout.");
+    managed = `// MirrorChrome MUST be the first import: its module scope boots Sentry, so a
 // crash while any later module evaluates (expo-router, the design system — the
 // SDK-drift class) is captured instead of dying unreported before init.
 import { MirrorChrome } from "${libRel}";
@@ -324,8 +378,9 @@ export default function RootLayout() {
     </MirrorChrome>
   );
 }
-`
-  );
+`;
+  }
+  fs.writeFileSync(path.join(stagedAppDir, "_layout.tsx"), managed);
   fs.writeFileSync(path.join(mirrorChromeDir, "mirror-chrome.tsx"), mirrorChromeSource({ slug, owner }));
 }
 

package/package.json

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