@@ -274,3 +274,8 @@ infra/relay/migrations/**/snapshot.json
 # Ghostty build output vendored from upstream.
 apps/mobile/modules/t3-terminal/Vendor/**
 native/libghostty-vt/include/**
+
+# @pierre/highlights compiled to C by wasm2c, plus the wasm2c runtime and simde
+# it needs. Regenerated by apps/mobile/scripts/generate-highlights.mts; review
+# that script and cpp/t3_highlights.c instead.
+apps/mobile/modules/t3-highlights/Vendor/**
@@ -1,6 +1,7 @@
 included:
   - ios/T3Code
   - modules/t3-composer-editor/ios
+  - modules/t3-highlights/ios
   - modules/t3-native-controls/ios
   - modules/t3-terminal/ios
   - modules/t3-review-diff/ios
 
@@ -96,14 +96,6 @@ Build and run the local iOS preview app:
 vp run ios:preview
 ```
 
-Force the review diff highlighter engine:
-
-```bash
-EXPO_PUBLIC_REVIEW_HIGHLIGHTER_ENGINE=javascript vp run ios:dev
-```
-
-`javascript` is the default and recommended setting for the review diff screen. Set `EXPO_PUBLIC_REVIEW_HIGHLIGHTER_ENGINE=native` only when you explicitly want to test the native Shiki engine.
-
 Inspect the resolved Expo config for a variant:
 
 ```bash
 
@@ -454,7 +454,6 @@ const config: ExpoConfig = {
     ...(!isIosPersonalTeamBuild ? ["./plugins/withWidgetLogoAsset.cjs", widgetsPlugin] : []),
     "./plugins/withAndroidCleartextTraffic.cjs",
     "./plugins/withAndroidGradleHeap.cjs",
-    "./plugins/withAndroidFbjniVersion.cjs",
     "./plugins/withAndroidInputBackground.cjs",
     "./plugins/withAndroidModernPopupMenu.cjs",
     "./plugins/withAndroidModernAlertDialog.cjs",
 
@@ -16,23 +16,8 @@ const licenseGeneratorSource = path.join(
   "third-party-licenses.ts",
 );
 const escapedWorkspaceRoot = workspaceRoot.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-const mobileShikiRoot = path.dirname(require.resolve("shiki/package.json", { paths: [__dirname] }));
 const generatedDeviceStreamRoot = path.join(__dirname, ".generated", "device-stream");
 const generatedPreviewStreamRoot = path.join(__dirname, ".generated", "preview-stream");
-const resolveShikiDependencyRoot = (packageName) => {
-  const entryPath = require.resolve(packageName, { paths: [mobileShikiRoot] });
-  let currentDir = path.dirname(entryPath);
-
-  while (!fs.existsSync(path.join(currentDir, "package.json"))) {
-    const parentDir = path.dirname(currentDir);
-    if (parentDir === currentDir) {
-      throw new Error(`Could not resolve package root for ${packageName}`);
-    }
-    currentDir = parentDir;
-  }
-
-  return currentDir;
-};
 
 config.watchFolders = [...new Set([...(config.watchFolders ?? []), workspaceRoot])];
 config.resolver = {
@@ -50,14 +35,6 @@ config.resolver = {
     "@t3tools/mobile-third-party-licenses": generatedLicenseModuleRoot,
     "@t3tools/mobile-device-stream": generatedDeviceStreamRoot,
     "@t3tools/mobile-preview-stream": generatedPreviewStreamRoot,
-    shiki: mobileShikiRoot,
-    "@shikijs/core": resolveShikiDependencyRoot("@shikijs/core"),
-    "@shikijs/engine-javascript": resolveShikiDependencyRoot("@shikijs/engine-javascript"),
-    "@shikijs/engine-oniguruma": resolveShikiDependencyRoot("@shikijs/engine-oniguruma"),
-    "@shikijs/langs": resolveShikiDependencyRoot("@shikijs/langs"),
-    "@shikijs/themes": resolveShikiDependencyRoot("@shikijs/themes"),
-    "@shikijs/types": resolveShikiDependencyRoot("@shikijs/types"),
-    "@shikijs/vscode-textmate": resolveShikiDependencyRoot("@shikijs/vscode-textmate"),
   },
 };
 
 
@@ -0,0 +1,30 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+Pod::Spec.new do |s|
+  s.name = 'T3HighlightsNative'
+  s.version = package['version']
+  s.summary = 'Native @pierre/highlights syntax highlighter for T3 Code mobile.'
+  s.description = 'Runs the @pierre/highlights lexers, compiled from WebAssembly to C with wasm2c.'
+  s.homepage = 'https://t3tools.com'
+  s.license = { :type => 'UNLICENSED' }
+  s.author = { 'T3 Tools' => '[email protected]' }
+  s.platforms = { :ios => '16.1' }
+  s.source = { :path => '.' }
+  s.source_files = 'ios/**/*.swift', 'cpp/**/*.{c,h,inc}', 'Vendor/**/*.{c,h,inc}'
+  # Swift sees only the wrapper; the generated and runtime headers stay private.
+  s.public_header_files = 'cpp/t3_highlights.h'
+  # Debug builds compile at -O0 by default, which makes the lexers several times
+  # slower. They are generated code, so optimize them in every configuration.
+  s.compiler_flags = '-O2'
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    # Plain malloc memory with explicit bounds checks: no guard-page signal
+    # handlers competing with the app's crash reporting.
+    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) WASM_RT_USE_MMAP=0 WASM_RT_MEMCHECK_BOUNDS_CHECK=1 WASM_RT_SKIP_SIGNAL_RECOVERY=1',
+    'HEADER_SEARCH_PATHS' => '$(inherited) "${PODS_TARGET_SRCROOT}/Vendor" "${PODS_TARGET_SRCROOT}/Vendor/highlights" "${PODS_TARGET_SRCROOT}/Vendor/wasm2c"',
+  }
+  s.swift_version = '5.9'
+  s.dependency 'ExpoModulesCore'
+end