@tamer4lynx/cli 0.0.14 → 0.0.15

package/dist/index.js

@@ -7,8 +7,8 @@ process.on("warning", (w) => {
 });
 
 // index.ts
-import fs28 from "fs";
-import path29 from "path";
+import fs29 from "fs";
+import path30 from "path";
 import { fileURLToPath } from "url";
 import { program } from "commander";
 
@@ -2229,8 +2229,8 @@ $1$2`
 var autolink_default = autolink;
 
 // src/android/bundle.ts
-import fs10 from "fs";
-import path10 from "path";
+import fs11 from "fs";
+import path11 from "path";
 import { execSync as execSync3 } from "child_process";
 
 // src/common/copyDistAssets.ts
@@ -2256,19 +2256,117 @@ function copyDistAssets(distDir, destDir, bundleFile) {
   }
 }
 
-// src/android/syncDevClient.ts
+// src/common/tsconfigUtils.ts
 import fs9 from "fs";
 import path9 from "path";
+function stripJsonCommentsAndTrailingCommas(str) {
+  return str.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/.*$/gm, "").replace(/,\s*([\]}])/g, "$1");
+}
+function parseTsconfigJson(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return JSON.parse(stripJsonCommentsAndTrailingCommas(raw));
+  }
+}
+function readTsconfig(filePath) {
+  if (!fs9.existsSync(filePath)) return null;
+  try {
+    return parseTsconfigJson(fs9.readFileSync(filePath, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function resolveExtends(tsconfig, dir) {
+  if (!tsconfig.extends) return tsconfig;
+  const basePath = path9.resolve(dir, tsconfig.extends);
+  const base = readTsconfig(basePath);
+  if (!base) return tsconfig;
+  const baseDir = path9.dirname(basePath);
+  const resolved = resolveExtends(base, baseDir);
+  return {
+    ...resolved,
+    ...tsconfig,
+    compilerOptions: { ...resolved.compilerOptions, ...tsconfig.compilerOptions }
+  };
+}
+function fixTsconfigReferencesForBuild(tsconfigPath) {
+  const dir = path9.dirname(tsconfigPath);
+  const tsconfig = readTsconfig(tsconfigPath);
+  if (!tsconfig?.references?.length) return false;
+  const refsWithNoEmit = [];
+  for (const ref of tsconfig.references) {
+    const refPath = path9.resolve(dir, ref.path);
+    const refConfigPath = refPath.endsWith(".json") ? refPath : path9.join(refPath, "tsconfig.json");
+    const refConfig = readTsconfig(refConfigPath);
+    if (refConfig?.compilerOptions?.noEmit === true) {
+      refsWithNoEmit.push(refConfigPath);
+    }
+  }
+  if (refsWithNoEmit.length === 0) return false;
+  const merged = {
+    ...tsconfig,
+    references: void 0,
+    files: void 0
+  };
+  const includes = [];
+  const compilerOpts = { ...tsconfig.compilerOptions };
+  for (const ref of tsconfig.references) {
+    const refPath = path9.resolve(dir, ref.path);
+    const refConfigPath = refPath.endsWith(".json") ? refPath : path9.join(refPath, "tsconfig.json");
+    const refConfig = readTsconfig(refConfigPath);
+    if (!refConfig) continue;
+    const refDir = path9.dirname(refConfigPath);
+    const resolved = resolveExtends(refConfig, refDir);
+    const inc = resolved.include;
+    if (inc) {
+      const arr = Array.isArray(inc) ? inc : [inc];
+      const baseDir = path9.relative(dir, refDir);
+      for (const p of arr) {
+        const clean = typeof p === "string" && p.startsWith("./") ? p.slice(2) : p;
+        includes.push(!baseDir || baseDir === "." ? clean : `${baseDir}/${clean}`);
+      }
+    }
+    const opts = resolved.compilerOptions;
+    if (opts) {
+      for (const [k, v] of Object.entries(opts)) {
+        if (k !== "composite" && k !== "noEmit" && compilerOpts[k] === void 0) {
+          compilerOpts[k] = v;
+        }
+      }
+    }
+  }
+  if (includes.length > 0) merged.include = [...new Set(includes)];
+  compilerOpts.noEmit = true;
+  merged.compilerOptions = compilerOpts;
+  fs9.writeFileSync(tsconfigPath, JSON.stringify(merged, null, 2));
+  return true;
+}
+function addTamerTypesInclude(tsconfigPath, tamerTypesInclude) {
+  const tsconfig = readTsconfig(tsconfigPath);
+  if (!tsconfig) return false;
+  const include = tsconfig.include ?? [];
+  const arr = Array.isArray(include) ? include : [include];
+  if (arr.some((p) => (typeof p === "string" ? p : "").includes("tamer-"))) return false;
+  arr.push(tamerTypesInclude);
+  tsconfig.include = arr;
+  fs9.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2));
+  return true;
+}
+
+// src/android/syncDevClient.ts
+import fs10 from "fs";
+import path10 from "path";
 function readAndSubstituteTemplate2(templatePath, vars) {
-  const raw = fs9.readFileSync(templatePath, "utf-8");
+  const raw = fs10.readFileSync(templatePath, "utf-8");
   return Object.entries(vars).reduce(
     (s, [k, v]) => s.replace(new RegExp(`\\{\\{${k}\\}\\}`, "g"), v),
     raw
   );
 }
 function patchAppLogService(appPath) {
-  if (!fs9.existsSync(appPath)) return;
-  const raw = fs9.readFileSync(appPath, "utf-8");
+  if (!fs10.existsSync(appPath)) return;
+  const raw = fs10.readFileSync(appPath, "utf-8");
   const patched = raw.replace(
     /private void initLynxService\(\)\s*\{[\s\S]*?\n\s*}\s*\n\s*private void initFresco\(\)/,
     `private void initLynxService() {
@@ -2287,7 +2385,7 @@ function patchAppLogService(appPath) {
   private void initFresco()`
   );
   if (patched !== raw) {
-    fs9.writeFileSync(appPath, patched);
+    fs10.writeFileSync(appPath, patched);
   }
 }
 async function syncDevClient(opts) {
@@ -2302,9 +2400,9 @@ async function syncDevClient(opts) {
   const packageName = config.android?.packageName;
   const appName = config.android?.appName;
   const packagePath = packageName.replace(/\./g, "/");
-  const javaDir = path9.join(rootDir, "app", "src", "main", "java", packagePath);
-  const kotlinDir = path9.join(rootDir, "app", "src", "main", "kotlin", packagePath);
-  if (!fs9.existsSync(javaDir) || !fs9.existsSync(kotlinDir)) {
+  const javaDir = path10.join(rootDir, "app", "src", "main", "java", packagePath);
+  const kotlinDir = path10.join(rootDir, "app", "src", "main", "kotlin", packagePath);
+  if (!fs10.existsSync(javaDir) || !fs10.existsSync(kotlinDir)) {
     console.error("\u274C Android project not found. Run `tamer android create` first.");
     process.exit(1);
   }
@@ -2320,14 +2418,14 @@ async function syncDevClient(opts) {
   const [templateProviderSource] = await Promise.all([
     fetchAndPatchTemplateProvider(vars)
   ]);
-  fs9.writeFileSync(path9.join(javaDir, "TemplateProvider.java"), templateProviderSource);
-  fs9.writeFileSync(path9.join(kotlinDir, "MainActivity.kt"), getStandaloneMainActivity(vars));
-  patchAppLogService(path9.join(javaDir, "App.java"));
-  const appDir = path9.join(rootDir, "app");
-  const mainDir = path9.join(appDir, "src", "main");
-  const manifestPath = path9.join(mainDir, "AndroidManifest.xml");
+  fs10.writeFileSync(path10.join(javaDir, "TemplateProvider.java"), templateProviderSource);
+  fs10.writeFileSync(path10.join(kotlinDir, "MainActivity.kt"), getStandaloneMainActivity(vars));
+  patchAppLogService(path10.join(javaDir, "App.java"));
+  const appDir = path10.join(rootDir, "app");
+  const mainDir = path10.join(appDir, "src", "main");
+  const manifestPath = path10.join(mainDir, "AndroidManifest.xml");
   if (hasDevClient) {
-    const templateDir = path9.join(devClientPkg, "android", "templates");
+    const templateDir = path10.join(devClientPkg, "android", "templates");
     const templateVars = { PACKAGE_NAME: packageName, APP_NAME: appName };
     const devClientFiles = [
       "DevClientManager.kt",
@@ -2336,13 +2434,13 @@ async function syncDevClient(opts) {
       "PortraitCaptureActivity.kt"
     ];
     for (const f of devClientFiles) {
-      const src = path9.join(templateDir, f);
-      if (fs9.existsSync(src)) {
+      const src = path10.join(templateDir, f);
+      if (fs10.existsSync(src)) {
         const content = readAndSubstituteTemplate2(src, templateVars);
-        fs9.writeFileSync(path9.join(kotlinDir, f), content);
+        fs10.writeFileSync(path10.join(kotlinDir, f), content);
       }
     }
-    let manifest = fs9.readFileSync(manifestPath, "utf-8");
+    let manifest = fs10.readFileSync(manifestPath, "utf-8");
     const projectActivityEntry = '        <activity android:name=".ProjectActivity" android:exported="false" android:taskAffinity="" android:launchMode="singleTask" android:documentLaunchMode="always" android:windowSoftInputMode="adjustResize" />';
     const portraitCaptureEntry = '        <activity android:name=".PortraitCaptureActivity" android:screenOrientation="portrait" android:stateNotNeeded="true" android:theme="@style/zxing_CaptureTheme" android:windowSoftInputMode="stateAlwaysHidden" />';
     if (!manifest.includes("ProjectActivity")) {
@@ -2364,16 +2462,16 @@ $1$2`);
         '$1 android:windowSoftInputMode="adjustResize"$2'
       );
     }
-    fs9.writeFileSync(manifestPath, manifest);
+    fs10.writeFileSync(manifestPath, manifest);
     console.log("\u2705 Synced dev client (TemplateProvider, MainActivity, ProjectActivity, DevClientManager)");
   } else {
     for (const f of ["DevClientManager.kt", "DevServerPrefs.kt", "ProjectActivity.kt", "PortraitCaptureActivity.kt", "DevLauncherActivity.kt"]) {
       try {
-        fs9.rmSync(path9.join(kotlinDir, f));
+        fs10.rmSync(path10.join(kotlinDir, f));
       } catch {
       }
     }
-    let manifest = fs9.readFileSync(manifestPath, "utf-8");
+    let manifest = fs10.readFileSync(manifestPath, "utf-8");
     manifest = manifest.replace(/\s*<activity android:name="\.ProjectActivity"[^\/]*\/>\n?/g, "");
     manifest = manifest.replace(/\s*<activity android:name="\.PortraitCaptureActivity"[^\/]*\/>\n?/g, "");
     const mainActivityTag = manifest.match(/<activity[^>]*android:name="\.MainActivity"[^>]*>/);
@@ -2383,7 +2481,7 @@ $1$2`);
         '$1 android:windowSoftInputMode="adjustResize"$2'
       );
     }
-    fs9.writeFileSync(manifestPath, manifest);
+    fs10.writeFileSync(manifestPath, manifest);
     console.log("\u2705 Synced (dev client disabled - use -d for debug build with dev client)");
   }
 }
@@ -2407,13 +2505,17 @@ async function bundleAndDeploy(opts = {}) {
   await syncDevClient_default({ includeDevClient });
   const iconPaths = resolveIconPaths(projectRoot, resolved.config);
   if (iconPaths) {
-    const resDir = path10.join(resolved.androidAppDir, "src", "main", "res");
+    const resDir = path11.join(resolved.androidAppDir, "src", "main", "res");
     if (applyAndroidLauncherIcons(resDir, iconPaths)) {
       console.log("\u2705 Synced Android launcher icon(s) from tamer.config.json");
-      ensureAndroidManifestLauncherIcon(path10.join(resolved.androidAppDir, "src", "main", "AndroidManifest.xml"));
+      ensureAndroidManifestLauncherIcon(path11.join(resolved.androidAppDir, "src", "main", "AndroidManifest.xml"));
     }
   }
   try {
+    const lynxTsconfig = path11.join(lynxProjectDir, "tsconfig.json");
+    if (fs11.existsSync(lynxTsconfig)) {
+      fixTsconfigReferencesForBuild(lynxTsconfig);
+    }
     console.log("\u{1F4E6} Building Lynx bundle...");
     execSync3("npm run build", { stdio: "inherit", cwd: lynxProjectDir });
     console.log("\u2705 Build completed successfully.");
@@ -2421,8 +2523,8 @@ async function bundleAndDeploy(opts = {}) {
     console.error("\u274C Build process failed.");
     process.exit(1);
   }
-  if (includeDevClient && devClientBundlePath && !fs10.existsSync(devClientBundlePath)) {
-    const devClientDir = path10.dirname(path10.dirname(devClientBundlePath));
+  if (includeDevClient && devClientBundlePath && !fs11.existsSync(devClientBundlePath)) {
+    const devClientDir = path11.dirname(path11.dirname(devClientBundlePath));
     try {
       console.log("\u{1F4E6} Building dev launcher (tamer-dev-client)...");
       execSync3("npm run build", { stdio: "inherit", cwd: devClientDir });
@@ -2433,22 +2535,22 @@ async function bundleAndDeploy(opts = {}) {
     }
   }
   try {
-    fs10.mkdirSync(destinationDir, { recursive: true });
+    fs11.mkdirSync(destinationDir, { recursive: true });
     if (release) {
-      const devClientAsset = path10.join(destinationDir, "dev-client.lynx.bundle");
-      if (fs10.existsSync(devClientAsset)) {
-        fs10.rmSync(devClientAsset);
+      const devClientAsset = path11.join(destinationDir, "dev-client.lynx.bundle");
+      if (fs11.existsSync(devClientAsset)) {
+        fs11.rmSync(devClientAsset);
         console.log(`\u2728 Removed dev-client.lynx.bundle from assets (production build)`);
       }
-    } else if (includeDevClient && devClientBundlePath && fs10.existsSync(devClientBundlePath)) {
-      fs10.copyFileSync(devClientBundlePath, path10.join(destinationDir, "dev-client.lynx.bundle"));
+    } else if (includeDevClient && devClientBundlePath && fs11.existsSync(devClientBundlePath)) {
+      fs11.copyFileSync(devClientBundlePath, path11.join(destinationDir, "dev-client.lynx.bundle"));
       console.log(`\u2728 Copied dev-client.lynx.bundle to assets`);
     }
-    if (!fs10.existsSync(lynxBundlePath)) {
+    if (!fs11.existsSync(lynxBundlePath)) {
       console.error(`\u274C Build output not found at: ${lynxBundlePath}`);
       process.exit(1);
     }
-    const distDir = path10.dirname(lynxBundlePath);
+    const distDir = path11.dirname(lynxBundlePath);
     copyDistAssets(distDir, destinationDir, resolved.lynxBundleFile);
     console.log(`\u2728 Copied ${resolved.lynxBundleFile} to assets`);
   } catch (error) {
@@ -2459,7 +2561,7 @@ async function bundleAndDeploy(opts = {}) {
 var bundle_default = bundleAndDeploy;
 
 // src/android/build.ts
-import path11 from "path";
+import path12 from "path";
 import { execSync as execSync4 } from "child_process";
 async function buildApk(opts = {}) {
   let resolved;
@@ -2471,7 +2573,7 @@ async function buildApk(opts = {}) {
   const release = opts.release === true || opts.production === true;
   await bundle_default({ release, production: opts.production });
   const androidDir = resolved.androidDir;
-  const gradlew = path11.join(androidDir, process.platform === "win32" ? "gradlew.bat" : "gradlew");
+  const gradlew = path12.join(androidDir, process.platform === "win32" ? "gradlew.bat" : "gradlew");
   const variant = release ? "Release" : "Debug";
   const task = opts.install ? `install${variant}` : `assemble${variant}`;
   console.log(`
@@ -2496,13 +2598,13 @@ async function buildApk(opts = {}) {
 var build_default = buildApk;
 
 // src/ios/create.ts
-import fs12 from "fs";
-import path13 from "path";
+import fs13 from "fs";
+import path14 from "path";
 
 // src/ios/getPod.ts
 import { execSync as execSync5 } from "child_process";
-import fs11 from "fs";
-import path12 from "path";
+import fs12 from "fs";
+import path13 from "path";
 function isCocoaPodsInstalled() {
   try {
     execSync5("command -v pod >/dev/null 2>&1");
@@ -2524,8 +2626,8 @@ async function setupCocoaPods(rootDir) {
   }
   try {
     console.log("\u{1F4E6} CocoaPods is installed. Proceeding with dependency installation...");
-    const podfilePath = path12.join(rootDir, "Podfile");
-    if (!fs11.existsSync(podfilePath)) {
+    const podfilePath = path13.join(rootDir, "Podfile");
+    if (!fs12.existsSync(podfilePath)) {
       throw new Error(`Podfile not found at ${podfilePath}`);
     }
     console.log(`\u{1F680} Executing pod install in: ${rootDir}`);
@@ -2551,7 +2653,7 @@ async function setupCocoaPods(rootDir) {
 // src/ios/create.ts
 import { randomBytes } from "crypto";
 function readAndSubstituteTemplate3(templatePath, vars) {
-  const raw = fs12.readFileSync(templatePath, "utf-8");
+  const raw = fs13.readFileSync(templatePath, "utf-8");
   return Object.entries(vars).reduce(
     (s, [k, v]) => s.replace(new RegExp(`\\{\\{${k}\\}\\}`, "g"), v),
     raw
@@ -2574,17 +2676,17 @@ var create2 = () => {
     process.exit(1);
   }
   const iosDir = config.paths?.iosDir ?? "ios";
-  const rootDir = path13.join(process.cwd(), iosDir);
-  const projectDir = path13.join(rootDir, appName);
-  const xcodeprojDir = path13.join(rootDir, `${appName}.xcodeproj`);
+  const rootDir = path14.join(process.cwd(), iosDir);
+  const projectDir = path14.join(rootDir, appName);
+  const xcodeprojDir = path14.join(rootDir, `${appName}.xcodeproj`);
   const bridgingHeader = `${appName}-Bridging-Header.h`;
   function writeFile2(filePath, content) {
-    fs12.mkdirSync(path13.dirname(filePath), { recursive: true });
-    fs12.writeFileSync(filePath, content.trimStart(), "utf8");
+    fs13.mkdirSync(path14.dirname(filePath), { recursive: true });
+    fs13.writeFileSync(filePath, content.trimStart(), "utf8");
   }
-  if (fs12.existsSync(rootDir)) {
+  if (fs13.existsSync(rootDir)) {
     console.log(`\u{1F9F9} Removing existing directory: ${rootDir}`);
-    fs12.rmSync(rootDir, { recursive: true, force: true });
+    fs13.rmSync(rootDir, { recursive: true, force: true });
   }
   console.log(`\u{1F680} Creating a new Tamer4Lynx project in: ${rootDir}`);
   const ids = {
@@ -2620,7 +2722,7 @@ var create2 = () => {
     targetDebugConfig: generateId(),
     targetReleaseConfig: generateId()
   };
-  writeFile2(path13.join(rootDir, "Podfile"), `
+  writeFile2(path14.join(rootDir, "Podfile"), `
 source 'https://cdn.cocoapods.org/'
 
 platform :ios, '13.0'
@@ -2705,15 +2807,15 @@ end
   const hostPkg = findTamerHostPackage(process.cwd());
   const templateVars = { PACKAGE_NAME: bundleId, APP_NAME: appName, BUNDLE_ID: bundleId };
   if (hostPkg) {
-    const templateDir = path13.join(hostPkg, "ios", "templates");
+    const templateDir = path14.join(hostPkg, "ios", "templates");
     for (const f of ["AppDelegate.swift", "SceneDelegate.swift", "ViewController.swift", "LynxProvider.swift", "LynxInitProcessor.swift"]) {
-      const srcPath = path13.join(templateDir, f);
-      if (fs12.existsSync(srcPath)) {
-        writeFile2(path13.join(projectDir, f), readAndSubstituteTemplate3(srcPath, templateVars));
+      const srcPath = path14.join(templateDir, f);
+      if (fs13.existsSync(srcPath)) {
+        writeFile2(path14.join(projectDir, f), readAndSubstituteTemplate3(srcPath, templateVars));
       }
     }
   } else {
-    writeFile2(path13.join(projectDir, "AppDelegate.swift"), `
+    writeFile2(path14.join(projectDir, "AppDelegate.swift"), `
 import UIKit
 
 @UIApplicationMain
@@ -2728,7 +2830,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   }
 }
 	`);
-    writeFile2(path13.join(projectDir, "SceneDelegate.swift"), `
+    writeFile2(path14.join(projectDir, "SceneDelegate.swift"), `
 import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
@@ -2742,7 +2844,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
   }
 }
 	`);
-    writeFile2(path13.join(projectDir, "ViewController.swift"), `
+    writeFile2(path14.join(projectDir, "ViewController.swift"), `
 import UIKit
 import Lynx
 import tamerinsets
@@ -2758,7 +2860,9 @@ class ViewController: UIViewController {
 	additionalSafeAreaInsets = .zero
 	view.insetsLayoutMarginsFromSafeArea = false
 	view.preservesSuperviewLayoutMargins = false
-	viewRespectsSystemMinimumLayoutMargins = false
+	if #available(iOS 15.0, *) {
+		viewRespectsSystemMinimumLayoutMargins = false
+	}
   }
 
   override func viewDidLayoutSubviews() {
@@ -2813,7 +2917,7 @@ class ViewController: UIViewController {
   }
 }
 	`);
-    writeFile2(path13.join(projectDir, "LynxProvider.swift"), `
+    writeFile2(path14.join(projectDir, "LynxProvider.swift"), `
 import Foundation
 
 class LynxProvider: NSObject, LynxTemplateProvider {
@@ -2832,7 +2936,7 @@ class LynxProvider: NSObject, LynxTemplateProvider {
     }
 }
 	`);
-    writeFile2(path13.join(projectDir, "LynxInitProcessor.swift"), `
+    writeFile2(path14.join(projectDir, "LynxInitProcessor.swift"), `
 // Copyright 2024 The Lynx Authors. All rights reserved.
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
@@ -2872,7 +2976,7 @@ final class LynxInitProcessor {
 }
 	`);
   }
-  writeFile2(path13.join(projectDir, bridgingHeader), `
+  writeFile2(path14.join(projectDir, bridgingHeader), `
 #import <Lynx/LynxConfig.h>
 #import <Lynx/LynxEnv.h>
 #import <Lynx/LynxTemplateProvider.h>
@@ -2881,7 +2985,7 @@ final class LynxInitProcessor {
 #import <SDWebImage/SDWebImage.h>
 #import <SDWebImageWebPCoder/SDWebImageWebPCoder.h>
 	`);
-  writeFile2(path13.join(projectDir, "Info.plist"), `
+  writeFile2(path14.join(projectDir, "Info.plist"), `
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -2939,21 +3043,21 @@ final class LynxInitProcessor {
 </dict>
 </plist>
 	`);
-  const appIconDir = path13.join(projectDir, "Assets.xcassets", "AppIcon.appiconset");
-  fs12.mkdirSync(appIconDir, { recursive: true });
+  const appIconDir = path14.join(projectDir, "Assets.xcassets", "AppIcon.appiconset");
+  fs13.mkdirSync(appIconDir, { recursive: true });
   const iconPaths = resolveIconPaths(process.cwd(), config);
   if (applyIosAppIconAssets(appIconDir, iconPaths)) {
     console.log(iconPaths?.ios ? "\u2705 Copied iOS icon from tamer.config.json icon.ios" : "\u2705 Copied app icon from tamer.config.json icon.source");
   } else {
-    writeFile2(path13.join(appIconDir, "Contents.json"), `
+    writeFile2(path14.join(appIconDir, "Contents.json"), `
 {
   "images" : [ { "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" } ],
   "info" : { "author" : "xcode", "version" : 1 }
 }
 	`);
   }
-  fs12.mkdirSync(xcodeprojDir, { recursive: true });
-  writeFile2(path13.join(xcodeprojDir, "project.pbxproj"), `
+  fs13.mkdirSync(xcodeprojDir, { recursive: true });
+  writeFile2(path14.join(xcodeprojDir, "project.pbxproj"), `
 // !$*UTF8*$!
 {
 	archiveVersion = 1;
@@ -3239,8 +3343,8 @@ final class LynxInitProcessor {
 var create_default2 = create2;
 
 // src/ios/autolink.ts
-import fs14 from "fs";
-import path15 from "path";
+import fs15 from "fs";
+import path16 from "path";
 import { execSync as execSync6 } from "child_process";
 
 // src/common/hostNativeModulesManifest.ts
@@ -3251,8 +3355,8 @@ function buildHostNativeModulesManifestJson(moduleClassNames) {
 }
 
 // src/ios/syncHost.ts
-import fs13 from "fs";
-import path14 from "path";
+import fs14 from "fs";
+import path15 from "path";
 import crypto from "crypto";
 function deterministicUUID(seed) {
   return crypto.createHash("sha256").update(seed).digest("hex").substring(0, 24).toUpperCase();
@@ -3300,7 +3404,7 @@ function getLaunchScreenStoryboard() {
 `;
 }
 function addLaunchScreenToXcodeProject(pbxprojPath, appName) {
-  let content = fs13.readFileSync(pbxprojPath, "utf8");
+  let content = fs14.readFileSync(pbxprojPath, "utf8");
   if (content.includes("LaunchScreen.storyboard")) return;
   const baseFileRefUUID = deterministicUUID(`launchScreenBase:${appName}`);
   const variantGroupUUID = deterministicUUID(`launchScreenGroup:${appName}`);
@@ -3337,11 +3441,11 @@ function addLaunchScreenToXcodeProject(pbxprojPath, appName) {
   );
   content = content.replace(groupPattern, `$1
 				${variantGroupUUID} /* LaunchScreen.storyboard */,`);
-  fs13.writeFileSync(pbxprojPath, content, "utf8");
+  fs14.writeFileSync(pbxprojPath, content, "utf8");
   console.log("\u2705 Registered LaunchScreen.storyboard in Xcode project");
 }
 function addSwiftSourceToXcodeProject(pbxprojPath, appName, filename) {
-  let content = fs13.readFileSync(pbxprojPath, "utf8");
+  let content = fs14.readFileSync(pbxprojPath, "utf8");
   const escaped = filename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   if (new RegExp(`path = "?${escaped}"?;`).test(content)) return;
   const fileRefUUID = deterministicUUID(`fileRef:${appName}:${filename}`);
@@ -3366,11 +3470,11 @@ function addSwiftSourceToXcodeProject(pbxprojPath, appName, filename) {
   );
   content = content.replace(groupPattern, `$1
 				${fileRefUUID} /* ${filename} */,`);
-  fs13.writeFileSync(pbxprojPath, content, "utf8");
+  fs14.writeFileSync(pbxprojPath, content, "utf8");
   console.log(`\u2705 Registered ${filename} in Xcode project sources`);
 }
 function addResourceToXcodeProject(pbxprojPath, appName, filename) {
-  let content = fs13.readFileSync(pbxprojPath, "utf8");
+  let content = fs14.readFileSync(pbxprojPath, "utf8");
   const escaped = filename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   if (new RegExp(`path = "?${escaped}"?;`).test(content)) return;
   const fileRefUUID = deterministicUUID(`fileRef:${appName}:${filename}`);
@@ -3395,12 +3499,12 @@ function addResourceToXcodeProject(pbxprojPath, appName, filename) {
   );
   content = content.replace(groupPattern, `$1
 				${fileRefUUID} /* ${filename} */,`);
-  fs13.writeFileSync(pbxprojPath, content, "utf8");
+  fs14.writeFileSync(pbxprojPath, content, "utf8");
   console.log(`\u2705 Registered ${filename} in Xcode project resources`);
 }
 function writeFile(filePath, content) {
-  fs13.mkdirSync(path14.dirname(filePath), { recursive: true });
-  fs13.writeFileSync(filePath, content, "utf8");
+  fs14.mkdirSync(path15.dirname(filePath), { recursive: true });
+  fs14.writeFileSync(filePath, content, "utf8");
 }
 function getAppDelegateSwift() {
   return `import UIKit
@@ -3460,7 +3564,9 @@ class ViewController: UIViewController {
         additionalSafeAreaInsets = .zero
         view.insetsLayoutMarginsFromSafeArea = false
         view.preservesSuperviewLayoutMargins = false
-        viewRespectsSystemMinimumLayoutMargins = false
+        if #available(iOS 15.0, *) {
+            viewRespectsSystemMinimumLayoutMargins = false
+        }
     }
 
     override func viewDidLayoutSubviews() {
@@ -3521,6 +3627,7 @@ function getDevViewControllerSwift() {
 import Lynx
 import tamerdevclient
 import tamerinsets
+import tamersystemui
 
 class ViewController: UIViewController {
     private var lynxView: LynxView?
@@ -3533,7 +3640,9 @@ class ViewController: UIViewController {
         additionalSafeAreaInsets = .zero
         view.insetsLayoutMarginsFromSafeArea = false
         view.preservesSuperviewLayoutMargins = false
-        viewRespectsSystemMinimumLayoutMargins = false
+        if #available(iOS 15.0, *) {
+            viewRespectsSystemMinimumLayoutMargins = false
+        }
         setupLynxView()
         setupDevClientModule()
     }
@@ -3550,7 +3659,7 @@ class ViewController: UIViewController {
         TamerInsetsModule.reRequestInsets()
     }
 
-    override var preferredStatusBarStyle: UIStatusBarStyle { TamerPreferredStatusBar.style }
+    override var preferredStatusBarStyle: UIStatusBarStyle { SystemUIModule.statusBarStyleForHost }
 
     private func setupLynxView() {
         let size = fullscreenBounds().size
@@ -3612,8 +3721,8 @@ class ViewController: UIViewController {
 `;
 }
 function patchInfoPlist(infoPlistPath) {
-  if (!fs13.existsSync(infoPlistPath)) return;
-  let content = fs13.readFileSync(infoPlistPath, "utf8");
+  if (!fs14.existsSync(infoPlistPath)) return;
+  let content = fs14.readFileSync(infoPlistPath, "utf8");
   content = content.replace(/\s*<key>UIMainStoryboardFile<\/key>\s*<string>[^<]*<\/string>/g, "");
   if (!content.includes("UILaunchStoryboardName")) {
     content = content.replace("</dict>\n</plist>", `	<key>UILaunchStoryboardName</key>
@@ -3645,7 +3754,7 @@ function patchInfoPlist(infoPlistPath) {
 </plist>`);
     console.log("\u2705 Added UIApplicationSceneManifest to Info.plist");
   }
-  fs13.writeFileSync(infoPlistPath, content, "utf8");
+  fs14.writeFileSync(infoPlistPath, content, "utf8");
 }
 function getSimpleLynxProviderSwift() {
   return `import Foundation
@@ -3670,9 +3779,9 @@ class LynxProvider: NSObject, LynxTemplateProvider {
 }
 function readTemplateOrFallback(devClientPkg, templateName, fallback, vars = {}) {
   if (devClientPkg) {
-    const tplPath = path14.join(devClientPkg, "ios", "templates", templateName);
-    if (fs13.existsSync(tplPath)) {
-      let content = fs13.readFileSync(tplPath, "utf8");
+    const tplPath = path15.join(devClientPkg, "ios", "templates", templateName);
+    if (fs14.existsSync(tplPath)) {
+      let content = fs14.readFileSync(tplPath, "utf8");
       for (const [k, v] of Object.entries(vars)) {
         content = content.replace(new RegExp(`\\{\\{${k}\\}\\}`, "g"), v);
       }
@@ -3690,19 +3799,19 @@ function syncHostIos(opts) {
   if (!appName) {
     throw new Error('"ios.appName" must be defined in tamer.config.json');
   }
-  const projectDir = path14.join(resolved.iosDir, appName);
-  const infoPlistPath = path14.join(projectDir, "Info.plist");
-  if (!fs13.existsSync(projectDir)) {
+  const projectDir = path15.join(resolved.iosDir, appName);
+  const infoPlistPath = path15.join(projectDir, "Info.plist");
+  if (!fs14.existsSync(projectDir)) {
     throw new Error(`iOS project not found at ${projectDir}. Run \`tamer ios create\` first.`);
   }
-  const pbxprojPath = path14.join(resolved.iosDir, `${appName}.xcodeproj`, "project.pbxproj");
-  const baseLprojDir = path14.join(projectDir, "Base.lproj");
-  const launchScreenPath = path14.join(baseLprojDir, "LaunchScreen.storyboard");
+  const pbxprojPath = path15.join(resolved.iosDir, `${appName}.xcodeproj`, "project.pbxproj");
+  const baseLprojDir = path15.join(projectDir, "Base.lproj");
+  const launchScreenPath = path15.join(baseLprojDir, "LaunchScreen.storyboard");
   patchInfoPlist(infoPlistPath);
-  writeFile(path14.join(projectDir, "AppDelegate.swift"), getAppDelegateSwift());
-  writeFile(path14.join(projectDir, "SceneDelegate.swift"), getSceneDelegateSwift());
-  if (!fs13.existsSync(launchScreenPath)) {
-    fs13.mkdirSync(baseLprojDir, { recursive: true });
+  writeFile(path15.join(projectDir, "AppDelegate.swift"), getAppDelegateSwift());
+  writeFile(path15.join(projectDir, "SceneDelegate.swift"), getSceneDelegateSwift());
+  if (!fs14.existsSync(launchScreenPath)) {
+    fs14.mkdirSync(baseLprojDir, { recursive: true });
     writeFile(launchScreenPath, getLaunchScreenStoryboard());
     addLaunchScreenToXcodeProject(pbxprojPath, appName);
   }
@@ -3711,33 +3820,33 @@ function syncHostIos(opts) {
     const devClientPkg2 = findDevClientPackage(resolved.projectRoot);
     const segment = resolved.lynxProjectDir.split("/").filter(Boolean).pop() ?? "";
     const tplVars = { PROJECT_BUNDLE_SEGMENT: segment };
-    writeFile(path14.join(projectDir, "ViewController.swift"), getDevViewControllerSwift());
-    writeFile(path14.join(projectDir, "LynxProvider.swift"), getSimpleLynxProviderSwift());
+    writeFile(path15.join(projectDir, "ViewController.swift"), getDevViewControllerSwift());
+    writeFile(path15.join(projectDir, "LynxProvider.swift"), getSimpleLynxProviderSwift());
     addSwiftSourceToXcodeProject(pbxprojPath, appName, "LynxProvider.swift");
     const devTPContent = readTemplateOrFallback(devClientPkg2, "DevTemplateProvider.swift", "", tplVars);
     if (devTPContent) {
-      writeFile(path14.join(projectDir, "DevTemplateProvider.swift"), devTPContent);
+      writeFile(path15.join(projectDir, "DevTemplateProvider.swift"), devTPContent);
       addSwiftSourceToXcodeProject(pbxprojPath, appName, "DevTemplateProvider.swift");
     }
     const projectVCContent = readTemplateOrFallback(devClientPkg2, "ProjectViewController.swift", "", tplVars);
     if (projectVCContent) {
-      writeFile(path14.join(projectDir, "ProjectViewController.swift"), projectVCContent);
+      writeFile(path15.join(projectDir, "ProjectViewController.swift"), projectVCContent);
       addSwiftSourceToXcodeProject(pbxprojPath, appName, "ProjectViewController.swift");
     }
     const devCMContent = readTemplateOrFallback(devClientPkg2, "DevClientManager.swift", "", tplVars);
     if (devCMContent) {
-      writeFile(path14.join(projectDir, "DevClientManager.swift"), devCMContent);
+      writeFile(path15.join(projectDir, "DevClientManager.swift"), devCMContent);
       addSwiftSourceToXcodeProject(pbxprojPath, appName, "DevClientManager.swift");
     }
     const qrContent = readTemplateOrFallback(devClientPkg2, "QRScannerViewController.swift", "", tplVars);
     if (qrContent) {
-      writeFile(path14.join(projectDir, "QRScannerViewController.swift"), qrContent);
+      writeFile(path15.join(projectDir, "QRScannerViewController.swift"), qrContent);
       addSwiftSourceToXcodeProject(pbxprojPath, appName, "QRScannerViewController.swift");
     }
     console.log("\u2705 Synced iOS host app (embedded dev mode) \u2014 ViewController, DevTemplateProvider, ProjectViewController, DevClientManager, QRScannerViewController");
   } else {
-    writeFile(path14.join(projectDir, "ViewController.swift"), getViewControllerSwift());
-    writeFile(path14.join(projectDir, "LynxProvider.swift"), getSimpleLynxProviderSwift());
+    writeFile(path15.join(projectDir, "ViewController.swift"), getViewControllerSwift());
+    writeFile(path15.join(projectDir, "LynxProvider.swift"), getSimpleLynxProviderSwift());
     addSwiftSourceToXcodeProject(pbxprojPath, appName, "LynxProvider.swift");
     console.log("\u2705 Synced iOS host app controller files");
   }
@@ -3756,11 +3865,11 @@ var autolink2 = () => {
   const projectRoot = resolved.projectRoot;
   const iosProjectPath = resolved.iosDir;
   function updateGeneratedSection(filePath, newContent, startMarker, endMarker) {
-    if (!fs14.existsSync(filePath)) {
+    if (!fs15.existsSync(filePath)) {
       console.warn(`\u26A0\uFE0F File not found, skipping update: ${filePath}`);
       return;
     }
-    let fileContent = fs14.readFileSync(filePath, "utf8");
+    let fileContent = fs15.readFileSync(filePath, "utf8");
     const escapedStartMarker = startMarker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const escapedEndMarker = endMarker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const regex = new RegExp(`${escapedStartMarker}[\\s\\S]*?${escapedEndMarker}`, "g");
@@ -3780,33 +3889,33 @@ ${replacementBlock}
 `;
       }
     } else {
-      console.warn(`\u26A0\uFE0F Could not find autolink markers in ${path15.basename(filePath)}. Appending to the end of the file.`);
+      console.warn(`\u26A0\uFE0F Could not find autolink markers in ${path16.basename(filePath)}. Appending to the end of the file.`);
       fileContent += `
 ${replacementBlock}
 `;
     }
-    fs14.writeFileSync(filePath, fileContent, "utf8");
-    console.log(`\u2705 Updated autolinked section in ${path15.basename(filePath)}`);
+    fs15.writeFileSync(filePath, fileContent, "utf8");
+    console.log(`\u2705 Updated autolinked section in ${path16.basename(filePath)}`);
   }
   function resolvePodDirectory(pkg) {
-    const configuredDir = path15.join(pkg.packagePath, pkg.config.ios?.podspecPath || ".");
-    if (fs14.existsSync(configuredDir)) {
+    const configuredDir = path16.join(pkg.packagePath, pkg.config.ios?.podspecPath || ".");
+    if (fs15.existsSync(configuredDir)) {
       return configuredDir;
     }
-    const iosDir = path15.join(pkg.packagePath, "ios");
-    if (fs14.existsSync(iosDir)) {
+    const iosDir = path16.join(pkg.packagePath, "ios");
+    if (fs15.existsSync(iosDir)) {
       const stack = [iosDir];
       while (stack.length > 0) {
         const current = stack.pop();
         try {
-          const entries = fs14.readdirSync(current, { withFileTypes: true });
+          const entries = fs15.readdirSync(current, { withFileTypes: true });
           const podspec = entries.find((entry) => entry.isFile() && entry.name.endsWith(".podspec"));
           if (podspec) {
             return current;
           }
           for (const entry of entries) {
             if (entry.isDirectory()) {
-              stack.push(path15.join(current, entry.name));
+              stack.push(path16.join(current, entry.name));
             }
           }
         } catch {
@@ -3817,9 +3926,9 @@ ${replacementBlock}
   }
   function resolvePodName(pkg) {
     const fullPodspecDir = resolvePodDirectory(pkg);
-    if (fs14.existsSync(fullPodspecDir)) {
+    if (fs15.existsSync(fullPodspecDir)) {
       try {
-        const files = fs14.readdirSync(fullPodspecDir);
+        const files = fs15.readdirSync(fullPodspecDir);
         const podspecFile = files.find((f) => f.endsWith(".podspec"));
         if (podspecFile) return podspecFile.replace(".podspec", "");
       } catch {
@@ -3828,13 +3937,13 @@ ${replacementBlock}
     return pkg.name.split("/").pop().replace(/-/g, "");
   }
   function updatePodfile(packages) {
-    const podfilePath = path15.join(iosProjectPath, "Podfile");
+    const podfilePath = path16.join(iosProjectPath, "Podfile");
     let scriptContent = `  # This section is automatically generated by Tamer4Lynx.
   # Manual edits will be overwritten.`;
     const iosPackages = packages.filter((p) => p.config.ios);
     if (iosPackages.length > 0) {
       iosPackages.forEach((pkg) => {
-        const relativePath = path15.relative(iosProjectPath, resolvePodDirectory(pkg));
+        const relativePath = path16.relative(iosProjectPath, resolvePodDirectory(pkg));
         const podName = resolvePodName(pkg);
         scriptContent += `
   pod '${podName}', :path => '${relativePath}'`;
@@ -3846,9 +3955,9 @@ ${replacementBlock}
     updateGeneratedSection(podfilePath, scriptContent.trim(), "# GENERATED AUTOLINK DEPENDENCIES START", "# GENERATED AUTOLINK DEPENDENCIES END");
   }
   function ensureXElementPod() {
-    const podfilePath = path15.join(iosProjectPath, "Podfile");
-    if (!fs14.existsSync(podfilePath)) return;
-    let content = fs14.readFileSync(podfilePath, "utf8");
+    const podfilePath = path16.join(iosProjectPath, "Podfile");
+    if (!fs15.existsSync(podfilePath)) return;
+    let content = fs15.readFileSync(podfilePath, "utf8");
     if (content.includes("pod 'XElement'")) return;
     const lynxVersionMatch = content.match(/pod\s+'Lynx',\s*'([^']+)'/);
     const lynxVersion = lynxVersionMatch?.[1] ?? "3.6.0";
@@ -3873,13 +3982,13 @@ ${replacementBlock}
 `;
       }
     }
-    fs14.writeFileSync(podfilePath, content, "utf8");
+    fs15.writeFileSync(podfilePath, content, "utf8");
     console.log(`\u2705 Added XElement pod (v${lynxVersion}) to Podfile`);
   }
   function ensureLynxPatchInPodfile() {
-    const podfilePath = path15.join(iosProjectPath, "Podfile");
-    if (!fs14.existsSync(podfilePath)) return;
-    let content = fs14.readFileSync(podfilePath, "utf8");
+    const podfilePath = path16.join(iosProjectPath, "Podfile");
+    if (!fs15.existsSync(podfilePath)) return;
+    let content = fs15.readFileSync(podfilePath, "utf8");
     if (content.includes("content.gsub(/\\btypeof\\(/, '__typeof__(')")) return;
     const patch = `
   Dir.glob(File.join(installer.sandbox.root, 'Lynx/platform/darwin/**/*.{m,mm}')).each do |lynx_source|
@@ -3891,13 +4000,13 @@ ${replacementBlock}
   end`;
     content = content.replace(/(\n  end\s*\n)(end\s*)$/, `$1${patch}
 $2`);
-    fs14.writeFileSync(podfilePath, content, "utf8");
+    fs15.writeFileSync(podfilePath, content, "utf8");
     console.log("\u2705 Added Lynx typeof patch to Podfile post_install.");
   }
   function ensurePodBuildSettings() {
-    const podfilePath = path15.join(iosProjectPath, "Podfile");
-    if (!fs14.existsSync(podfilePath)) return;
-    let content = fs14.readFileSync(podfilePath, "utf8");
+    const podfilePath = path16.join(iosProjectPath, "Podfile");
+    if (!fs15.existsSync(podfilePath)) return;
+    let content = fs15.readFileSync(podfilePath, "utf8");
     let changed = false;
     if (!content.includes("CLANG_ENABLE_EXPLICIT_MODULES")) {
       content = content.replace(
@@ -3940,7 +4049,7 @@ $2`);
       changed = true;
     }
     if (changed) {
-      fs14.writeFileSync(podfilePath, content, "utf8");
+      fs15.writeFileSync(podfilePath, content, "utf8");
       console.log("\u2705 Added Xcode compatibility build settings to Podfile post_install.");
     }
   }
@@ -3948,10 +4057,10 @@ $2`);
     const appNameFromConfig = resolved.config.ios?.appName;
     const candidatePaths = [];
     if (appNameFromConfig) {
-      candidatePaths.push(path15.join(iosProjectPath, appNameFromConfig, "LynxInitProcessor.swift"));
+      candidatePaths.push(path16.join(iosProjectPath, appNameFromConfig, "LynxInitProcessor.swift"));
     }
-    candidatePaths.push(path15.join(iosProjectPath, "LynxInitProcessor.swift"));
-    const found = candidatePaths.find((p) => fs14.existsSync(p));
+    candidatePaths.push(path16.join(iosProjectPath, "LynxInitProcessor.swift"));
+    const found = candidatePaths.find((p) => fs15.existsSync(p));
     const lynxInitPath = found ?? candidatePaths[0];
     const iosPackages = packages.filter((p) => getIosModuleClassNames(p.config.ios).length > 0 || Object.keys(getIosElements(p.config.ios)).length > 0);
     const seenModules = /* @__PURE__ */ new Set();
@@ -3990,7 +4099,7 @@ $2`);
         const podName = resolvePodName(pkg);
         return `import ${podName}`;
       }).join("\n");
-      const fileContent = fs14.readFileSync(filePath, "utf8");
+      const fileContent = fs15.readFileSync(filePath, "utf8");
       if (fileContent.indexOf(startMarker) !== -1) {
         updateGeneratedSection(filePath, imports, startMarker, endMarker);
         return;
@@ -4027,8 +4136,8 @@ ${after}`;
 ${fileContent}`;
         }
       }
-      fs14.writeFileSync(filePath, newContent, "utf8");
-      console.log(`\u2705 Updated imports in ${path15.basename(filePath)}`);
+      fs15.writeFileSync(filePath, newContent, "utf8");
+      console.log(`\u2705 Updated imports in ${path16.basename(filePath)}`);
     }
     updateImportsSection(lynxInitPath, importPackages);
     if (importPackages.length === 0) {
@@ -4072,7 +4181,7 @@ ${androidNames.map((n) => `            "${n.replace(/\\/g, "\\\\").replace(/"/g,
     } else {
       devClientSupportedBody = "        // @tamer4lynx/tamer-dev-client not linked";
     }
-    if (fs14.readFileSync(lynxInitPath, "utf8").includes("GENERATED DEV_CLIENT_SUPPORTED START")) {
+    if (fs15.readFileSync(lynxInitPath, "utf8").includes("GENERATED DEV_CLIENT_SUPPORTED START")) {
       updateGeneratedSection(lynxInitPath, devClientSupportedBody, "// GENERATED DEV_CLIENT_SUPPORTED START", "// GENERATED DEV_CLIENT_SUPPORTED END");
     }
   }
@@ -4080,13 +4189,13 @@ ${androidNames.map((n) => `            "${n.replace(/\\/g, "\\\\").replace(/"/g,
     const appNameFromConfig = resolved.config.ios?.appName;
     const candidates = [];
     if (appNameFromConfig) {
-      candidates.push(path15.join(iosProjectPath, appNameFromConfig, "Info.plist"));
+      candidates.push(path16.join(iosProjectPath, appNameFromConfig, "Info.plist"));
     }
-    candidates.push(path15.join(iosProjectPath, "Info.plist"));
-    return candidates.find((p) => fs14.existsSync(p)) ?? null;
+    candidates.push(path16.join(iosProjectPath, "Info.plist"));
+    return candidates.find((p) => fs15.existsSync(p)) ?? null;
   }
   function readPlistXml(plistPath) {
-    return fs14.readFileSync(plistPath, "utf8");
+    return fs15.readFileSync(plistPath, "utf8");
   }
   function syncInfoPlistPermissions(packages) {
     const plistPath = findInfoPlist();
@@ -4117,7 +4226,7 @@ ${androidNames.map((n) => `            "${n.replace(/\\/g, "\\\\").replace(/"/g,
       added++;
     }
     if (added > 0) {
-      fs14.writeFileSync(plistPath, plist, "utf8");
+      fs15.writeFileSync(plistPath, plist, "utf8");
       console.log(`\u2705 Synced ${added} Info.plist permission description(s)`);
     }
   }
@@ -4164,16 +4273,16 @@ ${schemesXml}
 $1`
       );
     }
-    fs14.writeFileSync(plistPath, plist, "utf8");
+    fs15.writeFileSync(plistPath, plist, "utf8");
     console.log(`\u2705 Synced ${urlSchemes.length} iOS URL scheme(s) into Info.plist`);
   }
   function runPodInstall(forcePath) {
-    const podfilePath = forcePath ?? path15.join(iosProjectPath, "Podfile");
-    if (!fs14.existsSync(podfilePath)) {
+    const podfilePath = forcePath ?? path16.join(iosProjectPath, "Podfile");
+    if (!fs15.existsSync(podfilePath)) {
       console.log("\u2139\uFE0F No Podfile found in ios directory; skipping `pod install`.");
       return;
     }
-    const cwd = path15.dirname(podfilePath);
+    const cwd = path16.dirname(podfilePath);
     try {
       console.log(`\u2139\uFE0F Running \`pod install\` in ${cwd}...`);
       try {
@@ -4207,8 +4316,8 @@ $1`
     syncInfoPlistUrlSchemes();
     const appNameFromConfig = resolved.config.ios?.appName;
     if (appNameFromConfig) {
-      const appPodfile = path15.join(iosProjectPath, appNameFromConfig, "Podfile");
-      if (fs14.existsSync(appPodfile)) {
+      const appPodfile = path16.join(iosProjectPath, appNameFromConfig, "Podfile");
+      if (fs15.existsSync(appPodfile)) {
         runPodInstall(appPodfile);
         console.log("\u2728 Autolinking complete for iOS.");
         return;
@@ -4223,13 +4332,13 @@ $1`
     const appFolder = resolved.config.ios?.appName;
     if (!hasDevClient || !appFolder) return;
     const androidNames = getDedupedAndroidModuleClassNames(allPkgs);
-    const appDir = path15.join(iosProjectPath, appFolder);
-    fs14.mkdirSync(appDir, { recursive: true });
-    const manifestPath = path15.join(appDir, TAMER_HOST_NATIVE_MODULES_FILENAME);
-    fs14.writeFileSync(manifestPath, buildHostNativeModulesManifestJson(androidNames), "utf8");
+    const appDir = path16.join(iosProjectPath, appFolder);
+    fs15.mkdirSync(appDir, { recursive: true });
+    const manifestPath = path16.join(appDir, TAMER_HOST_NATIVE_MODULES_FILENAME);
+    fs15.writeFileSync(manifestPath, buildHostNativeModulesManifestJson(androidNames), "utf8");
     console.log(`\u2705 Wrote ${TAMER_HOST_NATIVE_MODULES_FILENAME} (native module ids for dev-client checks)`);
-    const pbxprojPath = path15.join(iosProjectPath, `${appFolder}.xcodeproj`, "project.pbxproj");
-    if (fs14.existsSync(pbxprojPath)) {
+    const pbxprojPath = path16.join(iosProjectPath, `${appFolder}.xcodeproj`, "project.pbxproj");
+    if (fs15.existsSync(pbxprojPath)) {
       addResourceToXcodeProject(pbxprojPath, appFolder, TAMER_HOST_NATIVE_MODULES_FILENAME);
     }
   }
@@ -4238,8 +4347,8 @@ $1`
 var autolink_default2 = autolink2;
 
 // src/ios/bundle.ts
-import fs15 from "fs";
-import path16 from "path";
+import fs16 from "fs";
+import path17 from "path";
 import { execSync as execSync7 } from "child_process";
 function bundleAndDeploy2(opts = {}) {
   const release = opts.release === true || opts.production === true;
@@ -4257,18 +4366,22 @@ function bundleAndDeploy2(opts = {}) {
   const includeDevClient = !release && !!devClientPkg;
   const appName = resolved.config.ios.appName;
   const sourceBundlePath = resolved.lynxBundlePath;
-  const destinationDir = path16.join(resolved.iosDir, appName);
-  const destinationBundlePath = path16.join(destinationDir, resolved.lynxBundleFile);
+  const destinationDir = path17.join(resolved.iosDir, appName);
+  const destinationBundlePath = path17.join(destinationDir, resolved.lynxBundleFile);
   syncHost_default({ release, includeDevClient });
   autolink_default2();
   const iconPaths = resolveIconPaths(resolved.projectRoot, resolved.config);
   if (iconPaths) {
-    const appIconDir = path16.join(destinationDir, "Assets.xcassets", "AppIcon.appiconset");
+    const appIconDir = path17.join(destinationDir, "Assets.xcassets", "AppIcon.appiconset");
     if (applyIosAppIconAssets(appIconDir, iconPaths)) {
       console.log("\u2705 Synced iOS AppIcon from tamer.config.json");
     }
   }
   try {
+    const lynxTsconfig = path17.join(resolved.lynxProjectDir, "tsconfig.json");
+    if (fs16.existsSync(lynxTsconfig)) {
+      fixTsconfigReferencesForBuild(lynxTsconfig);
+    }
     console.log("\u{1F4E6} Building Lynx bundle...");
     execSync7("npm run build", { stdio: "inherit", cwd: resolved.lynxProjectDir });
     console.log("\u2705 Build completed successfully.");
@@ -4277,40 +4390,40 @@ function bundleAndDeploy2(opts = {}) {
     process.exit(1);
   }
   try {
-    if (!fs15.existsSync(sourceBundlePath)) {
+    if (!fs16.existsSync(sourceBundlePath)) {
       console.error(`\u274C Build output not found at: ${sourceBundlePath}`);
       process.exit(1);
     }
-    if (!fs15.existsSync(destinationDir)) {
+    if (!fs16.existsSync(destinationDir)) {
       console.error(`Destination directory not found at: ${destinationDir}`);
       process.exit(1);
     }
-    const distDir = path16.dirname(sourceBundlePath);
+    const distDir = path17.dirname(sourceBundlePath);
     console.log(`\u{1F69A} Copying bundle and assets to iOS project...`);
     copyDistAssets(distDir, destinationDir, resolved.lynxBundleFile);
     console.log(`\u2728 Successfully copied bundle to: ${destinationBundlePath}`);
-    const pbxprojPath = path16.join(resolved.iosDir, `${appName}.xcodeproj`, "project.pbxproj");
-    if (fs15.existsSync(pbxprojPath)) {
+    const pbxprojPath = path17.join(resolved.iosDir, `${appName}.xcodeproj`, "project.pbxproj");
+    if (fs16.existsSync(pbxprojPath)) {
       const skip = /* @__PURE__ */ new Set([".rspeedy", "stats.json"]);
-      for (const entry of fs15.readdirSync(distDir)) {
-        if (skip.has(entry) || fs15.statSync(path16.join(distDir, entry)).isDirectory()) continue;
+      for (const entry of fs16.readdirSync(distDir)) {
+        if (skip.has(entry) || fs16.statSync(path17.join(distDir, entry)).isDirectory()) continue;
         addResourceToXcodeProject(pbxprojPath, appName, entry);
       }
     }
     if (includeDevClient && devClientPkg) {
-      const devClientBundle = path16.join(destinationDir, "dev-client.lynx.bundle");
+      const devClientBundle = path17.join(destinationDir, "dev-client.lynx.bundle");
       console.log("\u{1F4E6} Building dev-client bundle...");
       try {
         execSync7("npm run build", { stdio: "inherit", cwd: devClientPkg });
       } catch {
         console.warn("\u26A0\uFE0F  dev-client build failed; skipping dev-client bundle");
       }
-      const builtBundle = path16.join(devClientPkg, "dist", "dev-client.lynx.bundle");
-      if (fs15.existsSync(builtBundle)) {
-        fs15.copyFileSync(builtBundle, devClientBundle);
+      const builtBundle = path17.join(devClientPkg, "dist", "dev-client.lynx.bundle");
+      if (fs16.existsSync(builtBundle)) {
+        fs16.copyFileSync(builtBundle, devClientBundle);
         console.log("\u2728 Copied dev-client.lynx.bundle to iOS project");
-        const pbxprojPath2 = path16.join(resolved.iosDir, `${appName}.xcodeproj`, "project.pbxproj");
-        if (fs15.existsSync(pbxprojPath2)) {
+        const pbxprojPath2 = path17.join(resolved.iosDir, `${appName}.xcodeproj`, "project.pbxproj");
+        if (fs16.existsSync(pbxprojPath2)) {
           addResourceToXcodeProject(pbxprojPath2, appName, "dev-client.lynx.bundle");
         }
       }
@@ -4324,8 +4437,8 @@ function bundleAndDeploy2(opts = {}) {
 var bundle_default2 = bundleAndDeploy2;
 
 // src/ios/build.ts
-import fs16 from "fs";
-import path17 from "path";
+import fs17 from "fs";
+import path18 from "path";
 import os3 from "os";
 import { execSync as execSync8 } from "child_process";
 function hostArch() {
@@ -4356,11 +4469,11 @@ async function buildIpa(opts = {}) {
   const configuration = release ? "Release" : "Debug";
   bundle_default2({ release, production: opts.production });
   const scheme = appName;
-  const workspacePath = path17.join(iosDir, `${appName}.xcworkspace`);
-  const projectPath = path17.join(iosDir, `${appName}.xcodeproj`);
-  const xcproject = fs16.existsSync(workspacePath) ? workspacePath : projectPath;
+  const workspacePath = path18.join(iosDir, `${appName}.xcworkspace`);
+  const projectPath = path18.join(iosDir, `${appName}.xcodeproj`);
+  const xcproject = fs17.existsSync(workspacePath) ? workspacePath : projectPath;
   const flag = xcproject.endsWith(".xcworkspace") ? "-workspace" : "-project";
-  const derivedDataPath = path17.join(iosDir, "build");
+  const derivedDataPath = path18.join(iosDir, "build");
   const sdk = opts.install ? "iphonesimulator" : "iphoneos";
   const signingArgs = opts.install ? "" : " CODE_SIGNING_ALLOWED=NO CODE_SIGNING_REQUIRED=NO";
   const archFlag = opts.install ? `-arch ${hostArch()} ` : "";
@@ -4376,14 +4489,14 @@ async function buildIpa(opts = {}) {
   );
   console.log(`\u2705 Build completed.`);
   if (opts.install) {
-    const appGlob = path17.join(
+    const appGlob = path18.join(
       derivedDataPath,
       "Build",
       "Products",
       `${configuration}-iphonesimulator`,
       `${appName}.app`
     );
-    if (!fs16.existsSync(appGlob)) {
+    if (!fs17.existsSync(appGlob)) {
       console.error(`\u274C Built app not found at: ${appGlob}`);
       process.exit(1);
     }
@@ -4406,8 +4519,8 @@ async function buildIpa(opts = {}) {
 var build_default2 = buildIpa;
 
 // src/common/init.tsx
-import fs17 from "fs";
-import path18 from "path";
+import fs18 from "fs";
+import path19 from "path";
 import { useState as useState4, useEffect as useEffect2, useCallback as useCallback3 } from "react";
 import { render, Text as Text9, Box as Box8 } from "ink";
 
@@ -4720,34 +4833,23 @@ function InitWizard() {
       paths: { androidDir: "android", iosDir: "ios" }
     };
     if (lynxProject.trim()) config.lynxProject = lynxProject.trim();
-    const configPath = path18.join(process.cwd(), "tamer.config.json");
-    fs17.writeFileSync(configPath, JSON.stringify(config, null, 2));
+    const configPath = path19.join(process.cwd(), "tamer.config.json");
+    fs18.writeFileSync(configPath, JSON.stringify(config, null, 2));
     const lines = [`Generated tamer.config.json at ${configPath}`];
     const tamerTypesInclude = "node_modules/@tamer4lynx/tamer-*/src/**/*.d.ts";
     const tsconfigCandidates = lynxProject.trim() ? [
-      path18.join(process.cwd(), lynxProject.trim(), "tsconfig.json"),
-      path18.join(process.cwd(), "tsconfig.json")
-    ] : [path18.join(process.cwd(), "tsconfig.json")];
-    function parseTsconfigJson(raw) {
-      try {
-        return JSON.parse(raw);
-      } catch {
-        const noTrailingCommas = raw.replace(/,\s*([\]}])/g, "$1");
-        return JSON.parse(noTrailingCommas);
-      }
-    }
+      path19.join(process.cwd(), lynxProject.trim(), "tsconfig.json"),
+      path19.join(process.cwd(), "tsconfig.json")
+    ] : [path19.join(process.cwd(), "tsconfig.json")];
     for (const tsconfigPath of tsconfigCandidates) {
-      if (!fs17.existsSync(tsconfigPath)) continue;
+      if (!fs18.existsSync(tsconfigPath)) continue;
       try {
-        const raw = fs17.readFileSync(tsconfigPath, "utf-8");
-        const tsconfig = parseTsconfigJson(raw);
-        const include = tsconfig.include ?? [];
-        const arr = Array.isArray(include) ? include : [include];
-        if (arr.some((p) => (typeof p === "string" ? p : "").includes("tamer-"))) continue;
-        arr.push(tamerTypesInclude);
-        tsconfig.include = arr;
-        fs17.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2));
-        lines.push(`Updated ${path18.relative(process.cwd(), tsconfigPath)} for tamer types`);
+        if (fixTsconfigReferencesForBuild(tsconfigPath)) {
+          lines.push(`Flattened ${path19.relative(process.cwd(), tsconfigPath)} (fixed TS6310)`);
+        }
+        if (addTamerTypesInclude(tsconfigPath, tamerTypesInclude)) {
+          lines.push(`Updated ${path19.relative(process.cwd(), tsconfigPath)} for tamer types`);
+        }
         break;
       } catch (e) {
         lines.push(`Could not update ${tsconfigPath}: ${e.message}`);
@@ -4783,7 +4885,8 @@ function InitWizard() {
         defaultValue: androidAppName,
         onSubmitValue: (v) => setAndroidAppName(v),
         onSubmit: () => setStep("android-pkg")
-      }
+      },
+      step
     ) });
   }
   if (step === "android-pkg") {
@@ -4804,7 +4907,8 @@ function InitWizard() {
           setPkgError(void 0);
         },
         onSubmit: () => setStep("android-sdk")
-      }
+      },
+      step
     ) });
   }
   if (step === "android-sdk") {
@@ -4820,7 +4924,8 @@ function InitWizard() {
         },
         onSubmit: () => setStep("ios-reuse"),
         hint: sdkHint
-      }
+      },
+      step
     ) });
   }
   if (step === "ios-reuse") {
@@ -4850,7 +4955,8 @@ function InitWizard() {
         defaultValue: iosAppName,
         onSubmitValue: (v) => setIosAppName(v),
         onSubmit: () => setStep("ios-bundle")
-      }
+      },
+      step
     ) });
   }
   if (step === "ios-bundle") {
@@ -4871,7 +4977,8 @@ function InitWizard() {
           setBundleError(void 0);
         },
         onSubmit: () => setStep("lynx-path")
-      }
+      },
+      step
     ) });
   }
   if (step === "lynx-path") {
@@ -4883,7 +4990,8 @@ function InitWizard() {
         onSubmitValue: (v) => setLynxProject(v),
         onSubmit: () => setStep("saving"),
         hint: "Press Enter with empty to skip"
-      }
+      },
+      step
     ) });
   }
   if (step === "saving") {
@@ -4900,8 +5008,8 @@ async function init() {
 }
 
 // src/common/create.ts
-import fs18 from "fs";
-import path19 from "path";
+import fs19 from "fs";
+import path20 from "path";
 import readline from "readline";
 var rl = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: false });
 function ask(question) {
@@ -4963,13 +5071,13 @@ async function create3(opts) {
   const simpleModuleName = extName.split("-").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("") + "Module";
   const fullModuleClassName = `${packageName}.${simpleModuleName}`;
   const cwd = process.cwd();
-  const root = path19.join(cwd, extName);
-  if (fs18.existsSync(root)) {
+  const root = path20.join(cwd, extName);
+  if (fs19.existsSync(root)) {
     console.error(`\u274C Directory ${extName} already exists.`);
     rl.close();
     process.exit(1);
   }
-  fs18.mkdirSync(root, { recursive: true });
+  fs19.mkdirSync(root, { recursive: true });
   const lynxExt = {
     platforms: {
       android: {
@@ -4984,7 +5092,7 @@ async function create3(opts) {
       web: {}
     }
   };
-  fs18.writeFileSync(path19.join(root, "lynx.ext.json"), JSON.stringify(lynxExt, null, 2));
+  fs19.writeFileSync(path20.join(root, "lynx.ext.json"), JSON.stringify(lynxExt, null, 2));
   const pkg = {
     name: extName,
     version: "0.0.1",
@@ -4997,20 +5105,20 @@ async function create3(opts) {
     engines: { node: ">=18" }
   };
   if (includeModule) pkg.types = "src/index.d.ts";
-  fs18.writeFileSync(path19.join(root, "package.json"), JSON.stringify(pkg, null, 2));
+  fs19.writeFileSync(path20.join(root, "package.json"), JSON.stringify(pkg, null, 2));
   const pkgPath = packageName.replace(/\./g, "/");
   const hasSrc = includeModule || includeElement || includeService;
   if (hasSrc) {
-    fs18.mkdirSync(path19.join(root, "src"), { recursive: true });
+    fs19.mkdirSync(path20.join(root, "src"), { recursive: true });
   }
   if (includeModule) {
-    fs18.writeFileSync(path19.join(root, "src", "index.d.ts"), `/** @lynxmodule */
+    fs19.writeFileSync(path20.join(root, "src", "index.d.ts"), `/** @lynxmodule */
 export declare class ${simpleModuleName} {
   // Add your module methods here
 }
 `);
-    fs18.mkdirSync(path19.join(root, "android", "src", "main", "kotlin", pkgPath), { recursive: true });
-    fs18.writeFileSync(path19.join(root, "android", "build.gradle.kts"), `plugins {
+    fs19.mkdirSync(path20.join(root, "android", "src", "main", "kotlin", pkgPath), { recursive: true });
+    fs19.writeFileSync(path20.join(root, "android", "build.gradle.kts"), `plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
 }
@@ -5031,7 +5139,7 @@ dependencies {
     implementation(libs.lynx.jssdk)
 }
 `);
-    fs18.writeFileSync(path19.join(root, "android", "src", "main", "AndroidManifest.xml"), `<?xml version="1.0" encoding="utf-8"?>
+    fs19.writeFileSync(path20.join(root, "android", "src", "main", "AndroidManifest.xml"), `<?xml version="1.0" encoding="utf-8"?>
 <manifest />
 `);
     const ktContent = `package ${packageName}
@@ -5048,8 +5156,8 @@ class ${simpleModuleName}(context: Context) : LynxModule(context) {
     }
 }
 `;
-    fs18.writeFileSync(path19.join(root, "android", "src", "main", "kotlin", pkgPath, `${simpleModuleName}.kt`), ktContent);
-    fs18.mkdirSync(path19.join(root, "ios", extName, extName, "Classes"), { recursive: true });
+    fs19.writeFileSync(path20.join(root, "android", "src", "main", "kotlin", pkgPath, `${simpleModuleName}.kt`), ktContent);
+    fs19.mkdirSync(path20.join(root, "ios", extName, extName, "Classes"), { recursive: true });
     const podspec = `Pod::Spec.new do |s|
   s.name             = '${extName}'
   s.version          = '0.0.1'
@@ -5063,7 +5171,7 @@ class ${simpleModuleName}(context: Context) : LynxModule(context) {
   s.dependency       'Lynx'
 end
 `;
-    fs18.writeFileSync(path19.join(root, "ios", extName, `${extName}.podspec`), podspec);
+    fs19.writeFileSync(path20.join(root, "ios", extName, `${extName}.podspec`), podspec);
     const swiftContent = `import Foundation
 
 @objc public class ${simpleModuleName}: NSObject {
@@ -5072,18 +5180,18 @@ end
     }
 }
 `;
-    fs18.writeFileSync(path19.join(root, "ios", extName, extName, "Classes", `${simpleModuleName}.swift`), swiftContent);
+    fs19.writeFileSync(path20.join(root, "ios", extName, extName, "Classes", `${simpleModuleName}.swift`), swiftContent);
   }
   if (includeElement && !includeModule) {
     const elementName = extName.split("-").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("");
-    fs18.writeFileSync(path19.join(root, "src", "index.tsx"), `import type { FC } from '@lynx-js/react';
+    fs19.writeFileSync(path20.join(root, "src", "index.tsx"), `import type { FC } from '@lynx-js/react';
 
 export const ${elementName}: FC = () => {
   return null;
 };
 `);
   }
-  fs18.writeFileSync(path19.join(root, "index.js"), `'use strict';
+  fs19.writeFileSync(path20.join(root, "index.js"), `'use strict';
 module.exports = {};
 `);
   const tsconfigCompiler = {
@@ -5096,11 +5204,11 @@ module.exports = {};
     tsconfigCompiler.jsx = "preserve";
     tsconfigCompiler.jsxImportSource = "@lynx-js/react";
   }
-  fs18.writeFileSync(path19.join(root, "tsconfig.json"), JSON.stringify({
+  fs19.writeFileSync(path20.join(root, "tsconfig.json"), JSON.stringify({
     compilerOptions: tsconfigCompiler,
     include: includeElement ? ["src", "src/**/*.tsx"] : ["src"]
   }, null, 2));
-  fs18.writeFileSync(path19.join(root, "README.md"), `# ${extName}
+  fs19.writeFileSync(path20.join(root, "README.md"), `# ${extName}
 
 Lynx extension for ${extName}.
 
@@ -5125,8 +5233,8 @@ This package uses \`lynx.ext.json\` (RFC-compliant) for autolinking.
 var create_default3 = create3;
 
 // src/common/codegen.ts
-import fs19 from "fs";
-import path20 from "path";
+import fs20 from "fs";
+import path21 from "path";
 function codegen() {
   const cwd = process.cwd();
   const config = loadExtensionConfig(cwd);
@@ -5134,9 +5242,9 @@ function codegen() {
     console.error("\u274C No lynx.ext.json or tamer.json found. Run from an extension package root.");
     process.exit(1);
   }
-  const srcDir = path20.join(cwd, "src");
-  const generatedDir = path20.join(cwd, "generated");
-  fs19.mkdirSync(generatedDir, { recursive: true });
+  const srcDir = path21.join(cwd, "src");
+  const generatedDir = path21.join(cwd, "generated");
+  fs20.mkdirSync(generatedDir, { recursive: true });
   const dtsFiles = findDtsFiles(srcDir);
   const modules = extractLynxModules(dtsFiles);
   if (modules.length === 0) {
@@ -5146,28 +5254,28 @@ function codegen() {
   for (const mod of modules) {
     const tsContent = `export type { ${mod} } from '../src/index.js';
 `;
-    const outPath = path20.join(generatedDir, `${mod}.ts`);
-    fs19.writeFileSync(outPath, tsContent);
+    const outPath = path21.join(generatedDir, `${mod}.ts`);
+    fs20.writeFileSync(outPath, tsContent);
     console.log(`\u2705 Generated ${outPath}`);
   }
   if (config.android) {
-    const androidGenerated = path20.join(cwd, "android", "src", "main", "kotlin", config.android.moduleClassName.replace(/\./g, "/").replace(/[^/]+$/, ""), "generated");
-    fs19.mkdirSync(androidGenerated, { recursive: true });
+    const androidGenerated = path21.join(cwd, "android", "src", "main", "kotlin", config.android.moduleClassName.replace(/\./g, "/").replace(/[^/]+$/, ""), "generated");
+    fs20.mkdirSync(androidGenerated, { recursive: true });
     console.log(`\u2139\uFE0F Android generated dir: ${androidGenerated} (spec generation coming soon)`);
   }
   if (config.ios) {
-    const iosGenerated = path20.join(cwd, "ios", "generated");
-    fs19.mkdirSync(iosGenerated, { recursive: true });
+    const iosGenerated = path21.join(cwd, "ios", "generated");
+    fs20.mkdirSync(iosGenerated, { recursive: true });
     console.log(`\u2139\uFE0F iOS generated dir: ${iosGenerated} (spec generation coming soon)`);
   }
   console.log("\u2728 Codegen complete.");
 }
 function findDtsFiles(dir) {
   const result = [];
-  if (!fs19.existsSync(dir)) return result;
-  const entries = fs19.readdirSync(dir, { withFileTypes: true });
+  if (!fs20.existsSync(dir)) return result;
+  const entries = fs20.readdirSync(dir, { withFileTypes: true });
   for (const e of entries) {
-    const full = path20.join(dir, e.name);
+    const full = path21.join(dir, e.name);
     if (e.isDirectory()) result.push(...findDtsFiles(full));
     else if (e.name.endsWith(".d.ts")) result.push(full);
   }
@@ -5177,7 +5285,7 @@ function extractLynxModules(files) {
   const modules = [];
   const seen = /* @__PURE__ */ new Set();
   for (const file of files) {
-    const content = fs19.readFileSync(file, "utf8");
+    const content = fs20.readFileSync(file, "utf8");
     const regex = /\/\*\*\s*@lynxmodule\s*\*\/\s*export\s+declare\s+class\s+(\w+)/g;
     let m;
     while ((m = regex.exec(content)) !== null) {
@@ -5194,10 +5302,10 @@ var codegen_default = codegen;
 // src/common/devServer.tsx
 import { useState as useState5, useEffect as useEffect3, useRef, useCallback as useCallback4 } from "react";
 import { spawn } from "child_process";
-import fs20 from "fs";
+import fs21 from "fs";
 import http from "http";
 import os4 from "os";
-import path21 from "path";
+import path22 from "path";
 import { render as render2, useInput, useApp } from "ink";
 import { WebSocketServer } from "ws";
 import { jsx as jsx10 } from "react/jsx-runtime";
@@ -5213,13 +5321,13 @@ var STATIC_MIME = {
   ".pdf": "application/pdf"
 };
 function sendFileFromDisk(res, absPath) {
-  fs20.readFile(absPath, (err, data) => {
+  fs21.readFile(absPath, (err, data) => {
     if (err) {
       res.writeHead(404);
       res.end("Not found");
       return;
     }
-    const ext = path21.extname(absPath).toLowerCase();
+    const ext = path22.extname(absPath).toLowerCase();
     res.setHeader("Content-Type", STATIC_MIME[ext] ?? "application/octet-stream");
     res.setHeader("Access-Control-Allow-Origin", "*");
     res.end(data);
@@ -5256,9 +5364,9 @@ function getLanIp() {
   return "localhost";
 }
 function detectPackageManager(cwd) {
-  const dir = path21.resolve(cwd);
-  if (fs20.existsSync(path21.join(dir, "pnpm-lock.yaml"))) return { cmd: "pnpm", args: ["run", "build"] };
-  if (fs20.existsSync(path21.join(dir, "bun.lockb")) || fs20.existsSync(path21.join(dir, "bun.lock")))
+  const dir = path22.resolve(cwd);
+  if (fs21.existsSync(path22.join(dir, "pnpm-lock.yaml"))) return { cmd: "pnpm", args: ["run", "build"] };
+  if (fs21.existsSync(path22.join(dir, "bun.lockb")) || fs21.existsSync(path22.join(dir, "bun.lock")))
     return { cmd: "bun", args: ["run", "build"] };
   return { cmd: "npm", args: ["run", "build"] };
 }
@@ -5338,8 +5446,8 @@ function DevServerApp({ verbose }) {
       try {
         const resolved = resolveHostPaths();
         const { projectRoot, lynxProjectDir, lynxBundlePath, lynxBundleFile, config } = resolved;
-        const distDir = path21.dirname(lynxBundlePath);
-        const projectName = path21.basename(lynxProjectDir);
+        const distDir = path22.dirname(lynxBundlePath);
+        const projectName = path22.basename(lynxProjectDir);
         const basePath = `/${projectName}`;
         setUi((s) => ({ ...s, projectName, lynxBundleFile }));
         const preferredPort = config.devServer?.port ?? config.devServer?.httpPort ?? DEFAULT_PORT;
@@ -5349,18 +5457,18 @@ function DevServerApp({ verbose }) {
         }
         const iconPaths = resolveIconPaths(projectRoot, config);
         let iconFilePath = null;
-        if (iconPaths?.source && fs20.statSync(iconPaths.source).isFile()) {
+        if (iconPaths?.source && fs21.statSync(iconPaths.source).isFile()) {
           iconFilePath = iconPaths.source;
-        } else if (iconPaths?.androidAdaptiveForeground && fs20.statSync(iconPaths.androidAdaptiveForeground).isFile()) {
+        } else if (iconPaths?.androidAdaptiveForeground && fs21.statSync(iconPaths.androidAdaptiveForeground).isFile()) {
           iconFilePath = iconPaths.androidAdaptiveForeground;
         } else if (iconPaths?.android) {
-          const androidIcon = path21.join(iconPaths.android, "mipmap-xxxhdpi", "ic_launcher.png");
-          if (fs20.existsSync(androidIcon)) iconFilePath = androidIcon;
+          const androidIcon = path22.join(iconPaths.android, "mipmap-xxxhdpi", "ic_launcher.png");
+          if (fs21.existsSync(androidIcon)) iconFilePath = androidIcon;
         } else if (iconPaths?.ios) {
-          const iosIcon = path21.join(iconPaths.ios, "Icon-1024.png");
-          if (fs20.existsSync(iosIcon)) iconFilePath = iosIcon;
+          const iosIcon = path22.join(iconPaths.ios, "Icon-1024.png");
+          if (fs21.existsSync(iosIcon)) iconFilePath = iosIcon;
         }
-        const iconExt = iconFilePath ? path21.extname(iconFilePath) || ".png" : "";
+        const iconExt = iconFilePath ? path22.extname(iconFilePath) || ".png" : "";
         const runBuild = () => {
           return new Promise((resolve, reject) => {
             const { cmd, args } = detectPackageManager(lynxProjectDir);
@@ -5446,7 +5554,7 @@ function DevServerApp({ verbose }) {
             return;
           }
           if (iconFilePath && (reqPath === `${basePath}/icon` || reqPath === `${basePath}/icon${iconExt}`)) {
-            fs20.readFile(iconFilePath, (err, data) => {
+            fs21.readFile(iconFilePath, (err, data) => {
               if (err) {
                 res.writeHead(404);
                 res.end();
@@ -5472,20 +5580,20 @@ function DevServerApp({ verbose }) {
               res.end();
               return;
             }
-            const safe = path21.normalize(rel).replace(/^(\.\.(\/|\\|$))+/, "");
-            if (path21.isAbsolute(safe) || safe.startsWith("..")) {
+            const safe = path22.normalize(rel).replace(/^(\.\.(\/|\\|$))+/, "");
+            if (path22.isAbsolute(safe) || safe.startsWith("..")) {
               res.writeHead(403);
               res.end();
               return;
             }
-            const allowedRoot = path21.resolve(lynxProjectDir, rootSub);
-            const abs = path21.resolve(allowedRoot, safe);
-            if (!abs.startsWith(allowedRoot + path21.sep) && abs !== allowedRoot) {
+            const allowedRoot = path22.resolve(lynxProjectDir, rootSub);
+            const abs = path22.resolve(allowedRoot, safe);
+            if (!abs.startsWith(allowedRoot + path22.sep) && abs !== allowedRoot) {
               res.writeHead(403);
               res.end();
               return;
             }
-            if (!fs20.existsSync(abs) || !fs20.statSync(abs).isFile()) {
+            if (!fs21.existsSync(abs) || !fs21.statSync(abs).isFile()) {
               res.writeHead(404);
               res.end("Not found");
               return;
@@ -5499,14 +5607,14 @@ function DevServerApp({ verbose }) {
             reqPath = basePath + (reqPath.startsWith("/") ? reqPath : "/" + reqPath);
           }
           const relPath = reqPath.replace(basePath, "").replace(/^\//, "") || lynxBundleFile;
-          const filePath = path21.resolve(distDir, relPath);
-          const distResolved = path21.resolve(distDir);
-          if (!filePath.startsWith(distResolved + path21.sep) && filePath !== distResolved) {
+          const filePath = path22.resolve(distDir, relPath);
+          const distResolved = path22.resolve(distDir);
+          if (!filePath.startsWith(distResolved + path22.sep) && filePath !== distResolved) {
             res.writeHead(403);
             res.end();
             return;
           }
-          fs20.readFile(filePath, (err, data) => {
+          fs21.readFile(filePath, (err, data) => {
             if (err) {
               res.writeHead(404);
               res.end("Not found");
@@ -5567,10 +5675,10 @@ function DevServerApp({ verbose }) {
         }
         if (chokidar) {
           const watchPaths = [
-            path21.join(lynxProjectDir, "src"),
-            path21.join(lynxProjectDir, "lynx.config.ts"),
-            path21.join(lynxProjectDir, "lynx.config.js")
-          ].filter((p) => fs20.existsSync(p));
+            path22.join(lynxProjectDir, "src"),
+            path22.join(lynxProjectDir, "lynx.config.ts"),
+            path22.join(lynxProjectDir, "lynx.config.js")
+          ].filter((p) => fs21.existsSync(p));
           if (watchPaths.length > 0) {
             const w = chokidar.watch(watchPaths, { ignoreInitial: true });
             w.on("change", async () => {
@@ -5690,10 +5798,10 @@ async function start(opts) {
 var start_default = start;
 
 // src/common/injectHost.ts
-import fs21 from "fs";
-import path22 from "path";
+import fs22 from "fs";
+import path23 from "path";
 function readAndSubstitute(templatePath, vars) {
-  const raw = fs21.readFileSync(templatePath, "utf-8");
+  const raw = fs22.readFileSync(templatePath, "utf-8");
   return Object.entries(vars).reduce(
     (s, [k, v]) => s.replace(new RegExp(`\\{\\{${k}\\}\\}`, "g"), v),
     raw
@@ -5714,32 +5822,32 @@ async function injectHostAndroid(opts) {
     process.exit(1);
   }
   const androidDir = config.paths?.androidDir ?? "android";
-  const rootDir = path22.join(projectRoot, androidDir);
+  const rootDir = path23.join(projectRoot, androidDir);
   const packagePath = packageName.replace(/\./g, "/");
-  const javaDir = path22.join(rootDir, "app", "src", "main", "java", packagePath);
-  const kotlinDir = path22.join(rootDir, "app", "src", "main", "kotlin", packagePath);
-  if (!fs21.existsSync(javaDir) || !fs21.existsSync(kotlinDir)) {
+  const javaDir = path23.join(rootDir, "app", "src", "main", "java", packagePath);
+  const kotlinDir = path23.join(rootDir, "app", "src", "main", "kotlin", packagePath);
+  if (!fs22.existsSync(javaDir) || !fs22.existsSync(kotlinDir)) {
     console.error("\u274C Android project not found. Run `t4l android create` first or ensure android/ exists.");
     process.exit(1);
   }
-  const templateDir = path22.join(hostPkg, "android", "templates");
+  const templateDir = path23.join(hostPkg, "android", "templates");
   const vars = { PACKAGE_NAME: packageName, APP_NAME: appName };
   const files = [
-    { src: "App.java", dst: path22.join(javaDir, "App.java") },
-    { src: "TemplateProvider.java", dst: path22.join(javaDir, "TemplateProvider.java") },
-    { src: "MainActivity.kt", dst: path22.join(kotlinDir, "MainActivity.kt") }
+    { src: "App.java", dst: path23.join(javaDir, "App.java") },
+    { src: "TemplateProvider.java", dst: path23.join(javaDir, "TemplateProvider.java") },
+    { src: "MainActivity.kt", dst: path23.join(kotlinDir, "MainActivity.kt") }
   ];
   for (const { src, dst } of files) {
-    const srcPath = path22.join(templateDir, src);
-    if (!fs21.existsSync(srcPath)) continue;
-    if (fs21.existsSync(dst) && !opts?.force) {
-      console.log(`\u23ED\uFE0F  Skipping ${path22.basename(dst)} (use --force to overwrite)`);
+    const srcPath = path23.join(templateDir, src);
+    if (!fs22.existsSync(srcPath)) continue;
+    if (fs22.existsSync(dst) && !opts?.force) {
+      console.log(`\u23ED\uFE0F  Skipping ${path23.basename(dst)} (use --force to overwrite)`);
       continue;
     }
     const content = readAndSubstitute(srcPath, vars);
-    fs21.mkdirSync(path22.dirname(dst), { recursive: true });
-    fs21.writeFileSync(dst, content);
-    console.log(`\u2705 Injected ${path22.basename(dst)}`);
+    fs22.mkdirSync(path23.dirname(dst), { recursive: true });
+    fs22.writeFileSync(dst, content);
+    console.log(`\u2705 Injected ${path23.basename(dst)}`);
   }
 }
 async function injectHostIos(opts) {
@@ -5757,13 +5865,13 @@ async function injectHostIos(opts) {
     process.exit(1);
   }
   const iosDir = config.paths?.iosDir ?? "ios";
-  const rootDir = path22.join(projectRoot, iosDir);
-  const projectDir = path22.join(rootDir, appName);
-  if (!fs21.existsSync(projectDir)) {
+  const rootDir = path23.join(projectRoot, iosDir);
+  const projectDir = path23.join(rootDir, appName);
+  if (!fs22.existsSync(projectDir)) {
     console.error("\u274C iOS project not found. Run `t4l ios create` first or ensure ios/ exists.");
     process.exit(1);
   }
-  const templateDir = path22.join(hostPkg, "ios", "templates");
+  const templateDir = path23.join(hostPkg, "ios", "templates");
   const vars = { PACKAGE_NAME: bundleId, APP_NAME: appName, BUNDLE_ID: bundleId };
   const files = [
     "AppDelegate.swift",
@@ -5773,22 +5881,22 @@ async function injectHostIos(opts) {
     "LynxInitProcessor.swift"
   ];
   for (const f of files) {
-    const srcPath = path22.join(templateDir, f);
-    const dstPath = path22.join(projectDir, f);
-    if (!fs21.existsSync(srcPath)) continue;
-    if (fs21.existsSync(dstPath) && !opts?.force) {
+    const srcPath = path23.join(templateDir, f);
+    const dstPath = path23.join(projectDir, f);
+    if (!fs22.existsSync(srcPath)) continue;
+    if (fs22.existsSync(dstPath) && !opts?.force) {
       console.log(`\u23ED\uFE0F  Skipping ${f} (use --force to overwrite)`);
       continue;
     }
     const content = readAndSubstitute(srcPath, vars);
-    fs21.writeFileSync(dstPath, content);
+    fs22.writeFileSync(dstPath, content);
     console.log(`\u2705 Injected ${f}`);
   }
 }
 
 // src/common/buildEmbeddable.ts
-import fs22 from "fs";
-import path23 from "path";
+import fs23 from "fs";
+import path24 from "path";
 import { execSync as execSync9 } from "child_process";
 var EMBEDDABLE_DIR = "embeddable";
 var LIB_PACKAGE = "com.tamer.embeddable";
@@ -5865,14 +5973,14 @@ object LynxEmbeddable {
 }
 `;
 function generateAndroidLibrary(outDir, androidDir, projectRoot, lynxBundlePath, lynxBundleFile, modules, abiFilters) {
-  const libDir = path23.join(androidDir, "lib");
-  const libSrcMain = path23.join(libDir, "src", "main");
-  const assetsDir = path23.join(libSrcMain, "assets");
-  const kotlinDir = path23.join(libSrcMain, "kotlin", LIB_PACKAGE.replace(/\./g, "/"));
-  const generatedDir = path23.join(kotlinDir, "generated");
-  fs22.mkdirSync(path23.join(androidDir, "gradle"), { recursive: true });
-  fs22.mkdirSync(generatedDir, { recursive: true });
-  fs22.mkdirSync(assetsDir, { recursive: true });
+  const libDir = path24.join(androidDir, "lib");
+  const libSrcMain = path24.join(libDir, "src", "main");
+  const assetsDir = path24.join(libSrcMain, "assets");
+  const kotlinDir = path24.join(libSrcMain, "kotlin", LIB_PACKAGE.replace(/\./g, "/"));
+  const generatedDir = path24.join(kotlinDir, "generated");
+  fs23.mkdirSync(path24.join(androidDir, "gradle"), { recursive: true });
+  fs23.mkdirSync(generatedDir, { recursive: true });
+  fs23.mkdirSync(assetsDir, { recursive: true });
   const androidModules = modules.filter((m) => m.config.android);
   const abiList = abiFilters.map((a) => `"${a}"`).join(", ");
   const settingsContent = `pluginManagement {
@@ -5892,7 +6000,7 @@ include(":lib")
 ${androidModules.map((p) => {
     const gradleName = p.name.replace(/^@/, "").replace(/\//g, "_");
     const sourceDir = p.config.android?.sourceDir || "android";
-    const absPath = path23.join(p.packagePath, sourceDir).replace(/\\/g, "/");
+    const absPath = path24.join(p.packagePath, sourceDir).replace(/\\/g, "/");
     return `include(":${gradleName}")
 project(":${gradleName}").projectDir = file("${absPath}")`;
   }).join("\n")}
@@ -5941,10 +6049,10 @@ dependencies {
 ${libDeps}
 }
 `;
-  fs22.writeFileSync(path23.join(androidDir, "gradle", "libs.versions.toml"), LIBS_VERSIONS_TOML);
-  fs22.writeFileSync(path23.join(androidDir, "settings.gradle.kts"), settingsContent);
-  fs22.writeFileSync(
-    path23.join(androidDir, "build.gradle.kts"),
+  fs23.writeFileSync(path24.join(androidDir, "gradle", "libs.versions.toml"), LIBS_VERSIONS_TOML);
+  fs23.writeFileSync(path24.join(androidDir, "settings.gradle.kts"), settingsContent);
+  fs23.writeFileSync(
+    path24.join(androidDir, "build.gradle.kts"),
     `plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
@@ -5952,26 +6060,26 @@ ${libDeps}
 }
 `
   );
-  fs22.writeFileSync(
-    path23.join(androidDir, "gradle.properties"),
+  fs23.writeFileSync(
+    path24.join(androidDir, "gradle.properties"),
     `org.gradle.jvmargs=-Xmx2048m
 android.useAndroidX=true
 kotlin.code.style=official
 `
   );
-  fs22.writeFileSync(path23.join(libDir, "build.gradle.kts"), libBuildContent);
-  fs22.writeFileSync(
-    path23.join(libSrcMain, "AndroidManifest.xml"),
+  fs23.writeFileSync(path24.join(libDir, "build.gradle.kts"), libBuildContent);
+  fs23.writeFileSync(
+    path24.join(libSrcMain, "AndroidManifest.xml"),
     '<?xml version="1.0" encoding="utf-8"?>\n<manifest />'
   );
-  fs22.copyFileSync(lynxBundlePath, path23.join(assetsDir, lynxBundleFile));
-  fs22.writeFileSync(path23.join(kotlinDir, "LynxEmbeddable.kt"), LYNX_EMBEDDABLE_KT);
-  fs22.writeFileSync(
-    path23.join(generatedDir, "GeneratedLynxExtensions.kt"),
+  fs23.copyFileSync(lynxBundlePath, path24.join(assetsDir, lynxBundleFile));
+  fs23.writeFileSync(path24.join(kotlinDir, "LynxEmbeddable.kt"), LYNX_EMBEDDABLE_KT);
+  fs23.writeFileSync(
+    path24.join(generatedDir, "GeneratedLynxExtensions.kt"),
     generateLynxExtensionsKotlin(modules, LIB_PACKAGE)
   );
-  fs22.writeFileSync(
-    path23.join(generatedDir, "GeneratedActivityLifecycle.kt"),
+  fs23.writeFileSync(
+    path24.join(generatedDir, "GeneratedActivityLifecycle.kt"),
     generateActivityLifecycleKotlin(modules, LIB_PACKAGE)
   );
 }
@@ -5980,20 +6088,20 @@ async function buildEmbeddable(opts = {}) {
   const { lynxProjectDir, lynxBundlePath, lynxBundleFile, projectRoot, config } = resolved;
   console.log("\u{1F4E6} Building Lynx project (release)...");
   execSync9("npm run build", { stdio: "inherit", cwd: lynxProjectDir });
-  if (!fs22.existsSync(lynxBundlePath)) {
+  if (!fs23.existsSync(lynxBundlePath)) {
     console.error(`\u274C Bundle not found at ${lynxBundlePath}`);
     process.exit(1);
   }
-  const outDir = path23.join(projectRoot, EMBEDDABLE_DIR);
-  fs22.mkdirSync(outDir, { recursive: true });
-  const distDir = path23.dirname(lynxBundlePath);
+  const outDir = path24.join(projectRoot, EMBEDDABLE_DIR);
+  fs23.mkdirSync(outDir, { recursive: true });
+  const distDir = path24.dirname(lynxBundlePath);
   copyDistAssets(distDir, outDir, lynxBundleFile);
   const modules = discoverModules(projectRoot);
   const androidModules = modules.filter((m) => m.config.android);
   const abiFilters = resolveAbiFilters(config);
-  const androidDir = path23.join(outDir, "android");
-  if (fs22.existsSync(androidDir)) fs22.rmSync(androidDir, { recursive: true });
-  fs22.mkdirSync(androidDir, { recursive: true });
+  const androidDir = path24.join(outDir, "android");
+  if (fs23.existsSync(androidDir)) fs23.rmSync(androidDir, { recursive: true });
+  fs23.mkdirSync(androidDir, { recursive: true });
   generateAndroidLibrary(
     outDir,
     androidDir,
@@ -6003,23 +6111,23 @@ async function buildEmbeddable(opts = {}) {
     modules,
     abiFilters
   );
-  const gradlewPath = path23.join(androidDir, "gradlew");
+  const gradlewPath = path24.join(androidDir, "gradlew");
   const devAppDir = findDevAppPackage(projectRoot);
   const existingGradleDirs = [
-    path23.join(projectRoot, "android"),
-    devAppDir ? path23.join(devAppDir, "android") : null
+    path24.join(projectRoot, "android"),
+    devAppDir ? path24.join(devAppDir, "android") : null
   ].filter(Boolean);
   let hasWrapper = false;
   for (const d of existingGradleDirs) {
-    if (fs22.existsSync(path23.join(d, "gradlew"))) {
+    if (fs23.existsSync(path24.join(d, "gradlew"))) {
       for (const name of ["gradlew", "gradlew.bat", "gradle"]) {
-        const src = path23.join(d, name);
-        if (fs22.existsSync(src)) {
-          const dest = path23.join(androidDir, name);
-          if (fs22.statSync(src).isDirectory()) {
-            fs22.cpSync(src, dest, { recursive: true });
+        const src = path24.join(d, name);
+        if (fs23.existsSync(src)) {
+          const dest = path24.join(androidDir, name);
+          if (fs23.statSync(src).isDirectory()) {
+            fs23.cpSync(src, dest, { recursive: true });
           } else {
-            fs22.copyFileSync(src, dest);
+            fs23.copyFileSync(src, dest);
           }
         }
       }
@@ -6038,10 +6146,10 @@ async function buildEmbeddable(opts = {}) {
     console.error("\u274C Android AAR build failed. Run manually: cd embeddable/android && ./gradlew :lib:assembleRelease");
     throw e;
   }
-  const aarSrc = path23.join(androidDir, "lib", "build", "outputs", "aar", "lib-release.aar");
-  const aarDest = path23.join(outDir, "tamer-embeddable.aar");
-  if (fs22.existsSync(aarSrc)) {
-    fs22.copyFileSync(aarSrc, aarDest);
+  const aarSrc = path24.join(androidDir, "lib", "build", "outputs", "aar", "lib-release.aar");
+  const aarDest = path24.join(outDir, "tamer-embeddable.aar");
+  if (fs23.existsSync(aarSrc)) {
+    fs23.copyFileSync(aarSrc, aarDest);
     console.log(`   - tamer-embeddable.aar`);
   }
   const snippetAndroid = `// Add to your app's build.gradle:
@@ -6052,7 +6160,7 @@ async function buildEmbeddable(opts = {}) {
 // LynxEmbeddable.init(applicationContext)
 // val lynxView = LynxEmbeddable.buildLynxView(containerViewGroup)
 `;
-  fs22.writeFileSync(path23.join(outDir, "snippet-android.kt"), snippetAndroid);
+  fs23.writeFileSync(path24.join(outDir, "snippet-android.kt"), snippetAndroid);
   generateIosPod(outDir, projectRoot, lynxBundlePath, lynxBundleFile, modules);
   const readme = `# Embeddable Lynx Bundle
 
@@ -6083,7 +6191,7 @@ Add the \`Podfile.snippet\` entries to your Podfile (inside your app target), th
 
 - [Embedding LynxView](https://lynxjs.org/guide/embed-lynx-to-native)
 `;
-  fs22.writeFileSync(path23.join(outDir, "README.md"), readme);
+  fs23.writeFileSync(path24.join(outDir, "README.md"), readme);
   console.log(`
 \u2705 Embeddable output at ${outDir}/`);
   console.log("   - main.lynx.bundle");
@@ -6095,20 +6203,20 @@ Add the \`Podfile.snippet\` entries to your Podfile (inside your app target), th
   console.log("   - README.md");
 }
 function generateIosPod(outDir, projectRoot, lynxBundlePath, lynxBundleFile, modules) {
-  const iosDir = path23.join(outDir, "ios");
-  const podDir = path23.join(iosDir, "TamerEmbeddable");
-  const resourcesDir = path23.join(podDir, "Resources");
-  fs22.mkdirSync(resourcesDir, { recursive: true });
-  fs22.copyFileSync(lynxBundlePath, path23.join(resourcesDir, lynxBundleFile));
+  const iosDir = path24.join(outDir, "ios");
+  const podDir = path24.join(iosDir, "TamerEmbeddable");
+  const resourcesDir = path24.join(podDir, "Resources");
+  fs23.mkdirSync(resourcesDir, { recursive: true });
+  fs23.copyFileSync(lynxBundlePath, path24.join(resourcesDir, lynxBundleFile));
   const iosModules = modules.filter((m) => m.config.ios);
   const podDeps = iosModules.map((p) => {
     const podspecPath = p.config.ios?.podspecPath || ".";
-    const podspecDir = path23.join(p.packagePath, podspecPath);
-    if (!fs22.existsSync(podspecDir)) return null;
-    const files = fs22.readdirSync(podspecDir);
+    const podspecDir = path24.join(p.packagePath, podspecPath);
+    if (!fs23.existsSync(podspecDir)) return null;
+    const files = fs23.readdirSync(podspecDir);
     const podspecFile = files.find((f) => f.endsWith(".podspec"));
     const podName = podspecFile ? podspecFile.replace(".podspec", "") : p.name.split("/").pop().replace(/-/g, "");
-    const absPath = path23.resolve(podspecDir);
+    const absPath = path24.resolve(podspecDir);
     return { podName, absPath };
   }).filter(Boolean);
   const podDepLines = podDeps.map((d) => `  s.dependency '${d.podName}'`).join("\n");
@@ -6148,9 +6256,9 @@ end
   });
   const swiftImports = iosModules.map((p) => {
     const podspecPath = p.config.ios?.podspecPath || ".";
-    const podspecDir = path23.join(p.packagePath, podspecPath);
-    if (!fs22.existsSync(podspecDir)) return null;
-    const files = fs22.readdirSync(podspecDir);
+    const podspecDir = path24.join(p.packagePath, podspecPath);
+    if (!fs23.existsSync(podspecDir)) return null;
+    const files = fs23.readdirSync(podspecDir);
     const podspecFile = files.find((f) => f.endsWith(".podspec"));
     return podspecFile ? podspecFile.replace(".podspec", "") : null;
   }).filter(Boolean);
@@ -6169,17 +6277,17 @@ ${regBlock}
     }
 }
 `;
-  fs22.writeFileSync(path23.join(iosDir, "TamerEmbeddable.podspec"), podspecContent);
-  fs22.writeFileSync(path23.join(podDir, "LynxEmbeddable.swift"), lynxEmbeddableSwift);
-  const absIosDir = path23.resolve(iosDir);
+  fs23.writeFileSync(path24.join(iosDir, "TamerEmbeddable.podspec"), podspecContent);
+  fs23.writeFileSync(path24.join(podDir, "LynxEmbeddable.swift"), lynxEmbeddableSwift);
+  const absIosDir = path24.resolve(iosDir);
   const podfileSnippet = `# Paste into your app target in Podfile:
 
 pod 'TamerEmbeddable', :path => '${absIosDir}'
 ${podDeps.map((d) => `pod '${d.podName}', :path => '${d.absPath}'`).join("\n")}
 `;
-  fs22.writeFileSync(path23.join(iosDir, "Podfile.snippet"), podfileSnippet);
-  fs22.writeFileSync(
-    path23.join(outDir, "snippet-ios.swift"),
+  fs23.writeFileSync(path24.join(iosDir, "Podfile.snippet"), podfileSnippet);
+  fs23.writeFileSync(
+    path24.join(outDir, "snippet-ios.swift"),
     `// Add LynxEmbeddable.initEnvironment() in your AppDelegate/SceneDelegate before presenting LynxView.
 // Then create LynxView with your bundle URL (main.lynx.bundle is in the pod resources).
 `
@@ -6187,8 +6295,8 @@ ${podDeps.map((d) => `pod '${d.podName}', :path => '${d.absPath}'`).join("\n")}
 }
 
 // src/common/add.ts
-import fs23 from "fs";
-import path24 from "path";
+import fs24 from "fs";
+import path25 from "path";
 import { execFile, execSync as execSync10 } from "child_process";
 import { promisify } from "util";
 import semver from "semver";
@@ -6245,9 +6353,9 @@ async function normalizeTamerInstallSpec(pkg) {
   return `${pkg}@prerelease`;
 }
 function detectPackageManager2(cwd) {
-  const dir = path24.resolve(cwd);
-  if (fs23.existsSync(path24.join(dir, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs23.existsSync(path24.join(dir, "bun.lockb"))) return "bun";
+  const dir = path25.resolve(cwd);
+  if (fs24.existsSync(path25.join(dir, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs24.existsSync(path25.join(dir, "bun.lockb"))) return "bun";
   return "npm";
 }
 function runInstall(cwd, packages, pm) {
@@ -6299,13 +6407,13 @@ async function add(packages = []) {
 // src/common/signing.tsx
 import { useState as useState6, useEffect as useEffect4, useRef as useRef2 } from "react";
 import { render as render3, Text as Text10, Box as Box9 } from "ink";
-import fs26 from "fs";
-import path27 from "path";
+import fs27 from "fs";
+import path28 from "path";
 
 // src/common/androidKeystore.ts
 import { execFileSync } from "child_process";
-import fs24 from "fs";
-import path25 from "path";
+import fs25 from "fs";
+import path26 from "path";
 function normalizeJavaHome(raw) {
   if (!raw) return void 0;
   const t = raw.trim().replace(/^["']|["']$/g, "");
@@ -6318,7 +6426,7 @@ function discoverJavaHomeMacOs() {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"]
     }).trim().split("\n")[0]?.trim();
-    if (out && fs24.existsSync(path25.join(out, "bin", "keytool"))) return out;
+    if (out && fs25.existsSync(path26.join(out, "bin", "keytool"))) return out;
   } catch {
   }
   return void 0;
@@ -6328,13 +6436,13 @@ function resolveKeytoolPath() {
   const win = process.platform === "win32";
   const keytoolName = win ? "keytool.exe" : "keytool";
   if (jh) {
-    const p = path25.join(jh, "bin", keytoolName);
-    if (fs24.existsSync(p)) return p;
+    const p = path26.join(jh, "bin", keytoolName);
+    if (fs25.existsSync(p)) return p;
   }
   const mac = discoverJavaHomeMacOs();
   if (mac) {
-    const p = path25.join(mac, "bin", keytoolName);
-    if (fs24.existsSync(p)) return p;
+    const p = path26.join(mac, "bin", keytoolName);
+    if (fs25.existsSync(p)) return p;
   }
   return "keytool";
 }
@@ -6349,16 +6457,16 @@ function keytoolAvailable() {
   };
   if (tryRun("keytool")) return true;
   const fromJavaHome = resolveKeytoolPath();
-  if (fromJavaHome !== "keytool" && fs24.existsSync(fromJavaHome)) {
+  if (fromJavaHome !== "keytool" && fs25.existsSync(fromJavaHome)) {
     return tryRun(fromJavaHome);
   }
   return false;
 }
 function generateReleaseKeystore(opts) {
   const keytool = resolveKeytoolPath();
-  const dir = path25.dirname(opts.keystoreAbsPath);
-  fs24.mkdirSync(dir, { recursive: true });
-  if (fs24.existsSync(opts.keystoreAbsPath)) {
+  const dir = path26.dirname(opts.keystoreAbsPath);
+  fs25.mkdirSync(dir, { recursive: true });
+  if (fs25.existsSync(opts.keystoreAbsPath)) {
     throw new Error(`Keystore already exists: ${opts.keystoreAbsPath}`);
   }
   if (!opts.storePassword || !opts.keyPassword) {
@@ -6396,13 +6504,13 @@ function generateReleaseKeystore(opts) {
 }
 
 // src/common/appendEnvFile.ts
-import fs25 from "fs";
-import path26 from "path";
+import fs26 from "fs";
+import path27 from "path";
 import { parse } from "dotenv";
 function keysDefinedInFile(filePath) {
-  if (!fs25.existsSync(filePath)) return /* @__PURE__ */ new Set();
+  if (!fs26.existsSync(filePath)) return /* @__PURE__ */ new Set();
   try {
-    return new Set(Object.keys(parse(fs25.readFileSync(filePath, "utf8"))));
+    return new Set(Object.keys(parse(fs26.readFileSync(filePath, "utf8"))));
   } catch {
     return /* @__PURE__ */ new Set();
   }
@@ -6417,11 +6525,11 @@ function formatEnvLine(key, value) {
 function appendEnvVarsIfMissing(projectRoot, vars) {
   const entries = Object.entries(vars).filter(([, v]) => v !== void 0 && v !== "");
   if (entries.length === 0) return null;
-  const envLocal = path26.join(projectRoot, ".env.local");
-  const envDefault = path26.join(projectRoot, ".env");
+  const envLocal = path27.join(projectRoot, ".env.local");
+  const envDefault = path27.join(projectRoot, ".env");
   let target;
-  if (fs25.existsSync(envLocal)) target = envLocal;
-  else if (fs25.existsSync(envDefault)) target = envDefault;
+  if (fs26.existsSync(envLocal)) target = envLocal;
+  else if (fs26.existsSync(envDefault)) target = envDefault;
   else target = envLocal;
   const existing = keysDefinedInFile(target);
   const lines = [];
@@ -6433,20 +6541,20 @@ function appendEnvVarsIfMissing(projectRoot, vars) {
   }
   if (lines.length === 0) {
     return {
-      file: path26.basename(target),
+      file: path27.basename(target),
       keys: [],
       skippedAll: entries.length > 0
     };
   }
   let prefix = "";
-  if (fs25.existsSync(target)) {
-    const cur = fs25.readFileSync(target, "utf8");
+  if (fs26.existsSync(target)) {
+    const cur = fs26.readFileSync(target, "utf8");
     prefix = cur.length === 0 ? "" : cur.endsWith("\n") ? cur : `${cur}
 `;
   }
   const block = lines.join("\n") + "\n";
-  fs25.writeFileSync(target, prefix + block, "utf8");
-  return { file: path26.basename(target), keys: appendedKeys };
+  fs26.writeFileSync(target, prefix + block, "utf8");
+  return { file: path27.basename(target), keys: appendedKeys };
 }
 
 // src/common/signing.tsx
@@ -6552,7 +6660,7 @@ function SigningWizard({ platform: initialPlatform }) {
       try {
         const resolved = resolveHostPaths();
         const rel = state.android.genKeystorePath.trim() || "android/release.keystore";
-        abs = path27.isAbsolute(rel) ? rel : path27.join(resolved.projectRoot, rel);
+        abs = path28.isAbsolute(rel) ? rel : path28.join(resolved.projectRoot, rel);
         const alias = state.android.keyAlias.trim() || "release";
         const pw = state.android.genPassword;
         const pkg = resolved.config.android?.packageName ?? "com.example.app";
@@ -6579,7 +6687,7 @@ function SigningWizard({ platform: initialPlatform }) {
         }));
       } catch (e) {
         const msg = e.message;
-        if (abs && fs26.existsSync(abs) && (msg.includes("already exists") || msg.includes("Keystore already exists"))) {
+        if (abs && fs27.existsSync(abs) && (msg.includes("already exists") || msg.includes("Keystore already exists"))) {
           if (cancelled || runId !== generateRunId.current) return;
           const rel = state.android.genKeystorePath.trim() || "android/release.keystore";
           const alias = state.android.keyAlias.trim() || "release";
@@ -6619,11 +6727,11 @@ function SigningWizard({ platform: initialPlatform }) {
   const saveConfig = async () => {
     try {
       const resolved = resolveHostPaths();
-      const configPath = path27.join(resolved.projectRoot, "tamer.config.json");
+      const configPath = path28.join(resolved.projectRoot, "tamer.config.json");
       let config = {};
       let androidEnvAppend = null;
-      if (fs26.existsSync(configPath)) {
-        config = JSON.parse(fs26.readFileSync(configPath, "utf8"));
+      if (fs27.existsSync(configPath)) {
+        config = JSON.parse(fs27.readFileSync(configPath, "utf8"));
       }
       if (state.platform === "android" || state.platform === "both") {
         config.android = config.android || {};
@@ -6650,10 +6758,10 @@ function SigningWizard({ platform: initialPlatform }) {
           ...state.ios.provisioningProfileSpecifier && { provisioningProfileSpecifier: state.ios.provisioningProfileSpecifier }
         };
       }
-      fs26.writeFileSync(configPath, JSON.stringify(config, null, 2));
-      const gitignorePath = path27.join(resolved.projectRoot, ".gitignore");
-      if (fs26.existsSync(gitignorePath)) {
-        let gitignore = fs26.readFileSync(gitignorePath, "utf8");
+      fs27.writeFileSync(configPath, JSON.stringify(config, null, 2));
+      const gitignorePath = path28.join(resolved.projectRoot, ".gitignore");
+      if (fs27.existsSync(gitignorePath)) {
+        let gitignore = fs27.readFileSync(gitignorePath, "utf8");
         const additions = [
           ".env.local",
           "*.jks",
@@ -6666,7 +6774,7 @@ ${addition}
 `;
           }
         }
-        fs26.writeFileSync(gitignorePath, gitignore);
+        fs27.writeFileSync(gitignorePath, gitignore);
       }
       setState((s) => ({
         ...s,
@@ -6924,13 +7032,13 @@ async function signing(platform) {
 }
 
 // src/common/productionSigning.ts
-import fs27 from "fs";
-import path28 from "path";
+import fs28 from "fs";
+import path29 from "path";
 function isAndroidSigningConfigured(resolved) {
   const signing2 = resolved.config.android?.signing;
   const hasConfig = Boolean(signing2?.keystoreFile?.trim() && signing2?.keyAlias?.trim());
-  const signingProps = path28.join(resolved.androidDir, "signing.properties");
-  const hasProps = fs27.existsSync(signingProps);
+  const signingProps = path29.join(resolved.androidDir, "signing.properties");
+  const hasProps = fs28.existsSync(signingProps);
   return hasConfig || hasProps;
 }
 function isIosSigningConfigured(resolved) {
@@ -6961,11 +7069,11 @@ function assertProductionSigningReady(filter) {
 
 // index.ts
 function readCliVersion() {
-  const root = path29.dirname(fileURLToPath(import.meta.url));
-  const here = path29.join(root, "package.json");
-  const parent = path29.join(root, "..", "package.json");
-  const pkgPath = fs28.existsSync(here) ? here : parent;
-  return JSON.parse(fs28.readFileSync(pkgPath, "utf8")).version;
+  const root = path30.dirname(fileURLToPath(import.meta.url));
+  const here = path30.join(root, "package.json");
+  const parent = path30.join(root, "..", "package.json");
+  const pkgPath = fs29.existsSync(here) ? here : parent;
+  return JSON.parse(fs29.readFileSync(pkgPath, "utf8")).version;
 }
 var version = readCliVersion();
 function validateBuildMode(debug, release, production) {
@@ -7183,10 +7291,10 @@ program.command("ios <subcommand>").description("(Legacy) Use: t4l <command> ios
   process.exit(1);
 });
 program.command("autolink-toggle").alias("autolink").description("Toggle autolink on/off in tamer.config.json (controls postinstall linking)").action(async () => {
-  const configPath = path29.join(process.cwd(), "tamer.config.json");
+  const configPath = path30.join(process.cwd(), "tamer.config.json");
   let config = {};
-  if (fs28.existsSync(configPath)) {
-    config = JSON.parse(fs28.readFileSync(configPath, "utf8"));
+  if (fs29.existsSync(configPath)) {
+    config = JSON.parse(fs29.readFileSync(configPath, "utf8"));
   }
   if (config.autolink) {
     delete config.autolink;
@@ -7195,7 +7303,7 @@ program.command("autolink-toggle").alias("autolink").description("Toggle autolin
     config.autolink = true;
     console.log("Autolink enabled in tamer.config.json");
   }
-  fs28.writeFileSync(configPath, JSON.stringify(config, null, 2));
+  fs29.writeFileSync(configPath, JSON.stringify(config, null, 2));
   console.log(`Updated ${configPath}`);
 });
 if (process.argv.length <= 2 || process.argv.length === 3 && process.argv[2] === "init") {