miaoda-expo-devkit 0.1.1-dev.development-build.1 → 0.1.1-dev.development-build.3

package/pnpm-patches/expo@55.0.6.patch

@@ -1,5 +1,5 @@
 diff --git a/bundledNativeModules.json b/bundledNativeModules.json
-index e2b8941923b274b1c5c9bda2269d28cf574aff7f..355deae878b654e1e1d9db114ee88c1e7e504276 100644
+index e2b8941..355deae 100644
 --- a/bundledNativeModules.json
 +++ b/bundledNativeModules.json
 @@ -19,7 +19,7 @@
@@ -21,9 +21,10 @@ index e2b8941923b274b1c5c9bda2269d28cf574aff7f..355deae878b654e1e1d9db114ee88c1e
    "jest-expo": "~55.0.9",
    "lottie-react-native": "~7.3.4",
 diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
+index c0ea71e..be9cb40 100644
 --- a/src/async-require/hmr.ts
 +++ b/src/async-require/hmr.ts
-@@ -17,6 +17,7 @@
+@@ -17,6 +17,7 @@ import {
    handleCompileError,
    hideLoading,
    resetErrorOverlay,
@@ -31,32 +32,52 @@ diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
    showLoading,
  } from './hmrUtils';
  
-@@ -29,6 +30,20 @@
+@@ -29,6 +30,38 @@ let hmrClient: MetroHMRClient | null = null;
  let hmrUnavailableReason: string | null = null;
  const buildErrorQueue = new Set<unknown>();
  let didConnect: boolean = false;
-+// Agent pause is separate from the user's native Fast Refresh preference.
++// ---- Miaoda HMR 批量编辑控制（客户端侧）----
++// miaodaPaused 是 Agent 的编辑闸门，与用户自己的 Fast Refresh 开关
++// （fastRefreshRequested）相互独立：放行后只有用户开着 Fast Refresh 才恢复更新。
 +let miaodaPaused = false;
 +let fastRefreshRequested = false;
++// 断线兜底轮询间隔。控制消息走 /hot WebSocket，轮询只用于 socket 断开期间的
++// 状态同步，不需要很频繁。
 +const MIAODA_HMR_POLL_INTERVAL_MS = 2000;
 +type MiaodaStatusProtocol = 'http' | 'https';
 +let miaodaStatusHost: string | null = null;
++// 首次探测使用的协议，取 bundle URL 的 scheme（设备怎么加载 bundle 就先试什么协议）。
 +let miaodaStatusInitialProtocol: MiaodaStatusProtocol = 'http';
++// 自适应成功后记住的协议；null 表示还没有成功过，每轮都先试初始协议。
 +let miaodaStatusProtocol: MiaodaStatusProtocol | null = null;
++// 收到明确 404（服务端未启用控制路由）后停止轮询；WebSocket 重连时重置，
++// 因为重连对面的 Metro 可能换了一个开启了控制的进程。
 +let miaodaStatusPollingStopped = false;
 +let miaodaPollTimer: ReturnType<typeof setTimeout> | null = null;
++// 轮询最近一次见到的服务端状态版本。
 +let miaodaStateVersion: number | null = null;
++// 已通过 WebSocket 控制消息同步到的版本。轮询发现比它新的版本，说明 socket
++// 断开期间错过了控制消息，增量 revision 的连续性无法证明，必须完整 reload。
 +let miaodaLastControlVersion: number | null = null;
++// 本次 JS 会话首次观察到的服务端版本（WebSocket 或轮询，谁先到用谁），此后
++// 不再更新。新会话的 bundle 刚从服务器取回，内容本身就对应该时刻的服务端
++// 状态，因此它是「当前运行代码已知完好」的锚点：之后版本号超过它且
++// lastMode 为 reload，才说明本会话错过了一次必须完整加载的迁移。
++let miaodaSessionBaseVersion: number | null = null;
++// 轮询曾观察到 paused=true：之后的版本变化即使 lastMode 不是 reload
++// 也要按 reload 处理（暂停期间错过的批量编辑不能靠增量补齐）。
 +let miaodaObservedPaused = false;
 +let miaodaWebSocketDisconnected = false;
  const pendingLogs: [LogLevel, any[]][] = [];
  
  type LogLevel =
-@@ -42,6 +57,86 @@
+@@ -42,6 +75,102 @@ type LogLevel =
    | 'groupEnd'
    | 'debug';
  
 +function scheduleMiaodaStatusPoll() {
++  // Web 端不轮询（跨域响应会被浏览器拦截，且没有必要）；无 host、已 404 停止、
++  // 或已有定时器在跑时都直接跳过。unref 避免定时器阻止进程退出（如 Jest 环境）。
 +  if (process.env.EXPO_OS === 'web' || !miaodaStatusHost || miaodaStatusPollingStopped || miaodaPollTimer != null) return;
 +  miaodaPollTimer = setTimeout(() => {
 +    miaodaPollTimer = null;
@@ -66,7 +87,9 @@ diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
 +}
 +
 +function miaodaStatusUrl(protocol: MiaodaStatusProtocol) {
-+  return `${protocol}://${miaodaStatusHost}/innerapi/v1/sourcecode/__hmr_status`;
++  // 控制接口直接挂在 Metro 根路径（/_hmr/*）：端侧裸轮询请求不携带平台凭证，
++  // 带内部 API 前缀的路径可能被路由层权限拦截。
++  return `${protocol}://${miaodaStatusHost}/_hmr/status`;
 +}
 +
 +function alternateMiaodaStatusProtocol(protocol: MiaodaStatusProtocol): MiaodaStatusProtocol {
@@ -81,15 +104,17 @@ diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
 +    try {
 +      response = await fetch(miaodaStatusUrl(protocol), {headers: {'Cache-Control': 'no-cache'}});
 +    } catch {
-+      // Devices may reject development certificates and need HTTP, while other
-+      // environments expose HTTPS only. Switch only after a network/SSL failure.
++      // 协议自适应：部分开发环境的 HTTPS 证书无效、设备会拒绝，需要降级 HTTP；
++      // 也有环境只暴露 HTTPS。只有网络/证书类失败（fetch reject）才换协议重试，
++      // HTTP 状态码不算——那是服务器给出的确定答复。
 +      protocol = alternateMiaodaStatusProtocol(protocol);
 +      response = await fetch(miaodaStatusUrl(protocol), {headers: {'Cache-Control': 'no-cache'}});
 +    }
 +
 +    if (response.status === 404) {
-+      // A 404 is a definitive signal that this Metro instance has no control route.
-+      // Stop probing until the WebSocket reconnects, which may point at a new server.
++      // 404 是确定性信号：这个 Metro 实例没有挂载控制路由（未开启
++      // EXPO_MIAODA_HMR_CONTROL）。停止探测直到 WebSocket 重连，
++      // 避免对普通开发服务器永久空轮询。注意不要在 404 时换协议重试。
 +      miaodaStatusPollingStopped = true;
 +      if (miaodaPollTimer != null) {
 +        clearTimeout(miaodaPollTimer);
@@ -98,28 +123,37 @@ diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
 +      return;
 +    }
 +    if (!response.ok) {
-+      // 5xx and other temporary HTTP failures are retried on the next interval.
++      // 5xx 等暂时性 HTTP 失败不停止轮询，下一轮继续重试。
 +      return;
 +    }
 +
-+    // Remember the protocol that reached the server for subsequent polls.
++    // 记住本次到达服务器的协议，后续轮询固定使用它。
 +    miaodaStatusProtocol = protocol;
 +    const state = (await response.json()) as {
 +      paused?: boolean; reloadPending?: boolean; stateVersion?: number; lastMode?: string | null;
 +    };
-+    const version = Number.isInteger(state.stateVersion) ? state.stateVersion : null;
++    // Number.isInteger 不是 TS 类型守卫，先收窄 number 再判整数，
++    // 使 version 的类型收敛为 number | null。
++    const version = typeof state.stateVersion === 'number' && Number.isInteger(state.stateVersion) ? state.stateVersion : null;
 +    const firstObservation = miaodaStateVersion === null;
 +    miaodaStateVersion = version;
++    if (miaodaSessionBaseVersion === null && version !== null) miaodaSessionBaseVersion = version;
 +    if (state.paused) {
 +      miaodaObservedPaused = true;
 +      miaodaPaused = true;
 +      hmrClient?.disable();
-+      // The observed pause is now our local baseline. A later version without a
-+      // matching WebSocket message requires a full Bundle reload.
++      // 把观察到的这次暂停作为本地基线版本。之后若出现没有对应 WebSocket
++      // 控制消息的新版本，说明错过了状态迁移，必须完整 Bundle reload。
 +      miaodaLastControlVersion = version;
 +    } else {
++      // 错过控制消息且（曾处于暂停或 socket 断连中）→ 增量连续性无法证明，
++      // 只能 reload。lastMode === 'reload' 则必须再满足「版本号相对本次会话
++      // 基线前进过」才视为未执行的 reload 指令：服务端会把 lastMode 持久化并
++      // 一直原样返回，若不做版本门控，已经执行过 reload 的客户端重连后会反复
++      // 执行同一条指令，陷入无限重载循环。
 +      const missedControl = !firstObservation && version !== null && version !== miaodaLastControlVersion;
-+      const shouldReload = !firstObservation && (state.lastMode === 'reload' || (missedControl && (miaodaObservedPaused || miaodaWebSocketDisconnected)));
++      const missedReload = version !== null && miaodaSessionBaseVersion !== null && version > miaodaSessionBaseVersion && state.lastMode === 'reload';
++      const shouldReload = missedReload || (missedControl && (miaodaObservedPaused || miaodaWebSocketDisconnected));
 +      miaodaObservedPaused = false;
 +      miaodaPaused = false;
 +      miaodaLastControlVersion = version;
@@ -130,7 +164,8 @@ diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
 +      if (fastRefreshRequested) HMRClient.enable();
 +    }
 +  } catch {
-+    // Network, timeout and invalid-response failures must not release the edit gate.
++    // 网络错误、超时、响应解析失败都属于暂时故障：不解除编辑闸门，
++    // 也不停止轮询，下一轮继续。
 +  } finally {
 +    scheduleMiaodaStatusPoll();
 +  }
@@ -139,16 +174,17 @@ diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
  function assert(foo: any, msg: string): asserts foo {
    if (!foo) throw new Error(msg);
  }
-@@ -52,6 +147,8 @@
+@@ -52,6 +181,9 @@ function assert(foo: any, msg: string): asserts foo {
   */
  const HMRClient = {
    enable() {
 +    fastRefreshRequested = true;
++    // Agent 编辑闸门优先于用户操作：暂停期间只记录意图，等 resume 再恢复。
 +    if (miaodaPaused) return;
      if (hmrUnavailableReason !== null) {
        // If HMR became unavailable while you weren't using it,
        // explain why when you try to turn it on.
-@@ -87,6 +184,7 @@
+@@ -87,6 +219,7 @@ const HMRClient = {
    },
  
    disable() {
@@ -156,79 +192,93 @@ diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
      assert(hmrClient, 'Expected HMRClient.setup() call at startup.');
      hmrClient.disable();
    },
-@@ -180,6 +278,13 @@
+@@ -180,6 +313,13 @@ const HMRClient = {
      const origin = `${serverScheme}://${serverHost}`;
      const client = new MetroHMRClient(`${origin}/hot`);
      hmrClient = client;
 +    if (process.env.EXPO_OS !== 'web') {
-+      // Native clients may receive HTTPS bundle URLs with invalid development certificates,
-+      // while some deployments expose only HTTPS. Probe the bundle protocol first, then
-+      // remember the protocol that succeeds for subsequent polls.
++      // 仅 native 客户端启用状态轮询。初始协议跟随 bundle URL 的 scheme：
++      // 设备可能拿到证书无效的 HTTPS 开发地址，也有环境只暴露 HTTPS，
++      // 因此先按 bundle 协议探测，成功后记住可用的那个协议。
 +      miaodaStatusHost = serverHost;
 +      miaodaStatusInitialProtocol = serverScheme === 'https' || serverScheme === 'wss' ? 'https' : 'http';
 +    }
  
      pendingEntryPoints.push(
        // HMRServer understands regular bundle URLs, so prefer that in case
-@@ -192,6 +297,45 @@
-         platform: typeof platformOrOptions === 'string' ? platformOrOptions : undefined,
+@@ -193,6 +333,55 @@ const HMRClient = {
        })
      );
-+
+ 
 +    client.on('open', () => {
 +      miaodaWebSocketDisconnected = false;
-+      // A reconnect may target a Metro process with HMR control enabled.
++      // 重连对面的 Metro 可能是另一个进程（例如这次开启了 HMR 控制），
++      // 重置 404 停止标志，重新探测一次。
 +      miaodaStatusPollingStopped = false;
 +      scheduleMiaodaStatusPoll();
 +    });
 +
++    // 服务端编辑闸门控制消息（协议 v1）。stateVersion 随每条消息捎带，
++    // 收到即同步本地版本基线，轮询兜底据此判断有没有丢消息。
 +    client.on('miaoda-hmr-control', (message: {
 +      version: number; action: string; id?: number; error?: any; stateVersion?: number;
 +    }) => {
 +      if (message.version !== 1) return;
 +      if (Number.isInteger(message.stateVersion)) {
++        if (miaodaSessionBaseVersion === null) miaodaSessionBaseVersion = message.stateVersion!;
 +        miaodaStateVersion = message.stateVersion!;
 +        miaodaLastControlVersion = message.stateVersion!;
 +      }
 +      switch (message.action) {
 +        case 'pause':
++          // 立即闸住 HMR 并隐藏刷新提示，然后回 ack——服务端要等所有客户端
++          // ack 后才认为暂停完成，ack 之前 Agent 不会开始写文件。
 +          miaodaPaused = true;
 +          client.disable();
 +          hideLoading();
 +          client.send(JSON.stringify({type: 'miaoda-hmr-ack', version: 1, id: message.id}));
 +          break;
 +        case 'resume':
++          // 解除 Agent 闸门；用户自己的 Fast Refresh 开关保持独立，
++          // 只有它开着才真正恢复更新。
 +          miaodaPaused = false;
 +          if (fastRefreshRequested) HMRClient.enable();
 +          break;
 +        case 'reload':
++          // 完整加载前也保持闸门，避免 reload 完成前又有增量进来。
 +          miaodaPaused = true;
 +          client.disable();
 +          reload();
 +          break;
 +        case 'error':
-+          // Final compilation failure is actionable even while the edit gate stays closed.
++          // 批次最终编译失败：闸门仍然关着（服务端等 Agent 修好重试），
++          // 但错误本身要展示出来，因为它在设备端是可行动的。
 +          hideLoading();
 +          handleCompileError(message.error);
 +          break;
 +      }
 +    });
- 
++
      client.on('connection-error', (e: Error) => {
        setHMRUnavailableReason(getConnectionError(serverHost, e));
-@@ -234,6 +378,8 @@
+     });
+@@ -234,6 +423,10 @@ const HMRClient = {
      client.on('error', (data) => this._onMetroError(data));
  
      client.on('close', (closeEvent?: { code: number; reason: string }) => {
++      // 控制通道断开：之后的版本变化都无法通过 socket 同步，
++      // 启动轮询兜底直到重连。
 +      miaodaWebSocketDisconnected = true;
 +      scheduleMiaodaStatusPoll();
        hideLoading();
        const reason = closeEvent?.reason;
        const code = closeEvent?.code || 1000;
-@@ -326,6 +472,7 @@
+@@ -326,6 +519,9 @@ function registerBundleEntryPoints(client: MetroHMRClient | null) {
      client?.send(
        JSON.stringify({
          type: 'register-entrypoints',
++        // Miaoda 控制协议 v1 的协商标记：带此标记的客户端才会收到
++        // miaoda-hmr-control 消息；不带标记的老客户端会触发服务端 409。
 +        miaodaHmr: 1,
          entryPoints: pendingEntryPoints,
        })

package/pnpm-patches/metro-file-map@0.83.3.patch

@@ -1,12 +1,16 @@
 diff --git a/src/index.js b/src/index.js
+index ec21a55..b8a8f68 100644
 --- a/src/index.js
 +++ b/src/index.js
-@@ -670,6 +670,20 @@
+@@ -670,6 +670,23 @@ class FileMap extends _events.default {
            );
          });
      };
-+    // Miaoda edit-batch barrier. The cookie fences watcher delivery; drain file
-+    // processing before emitting the changes used by DeltaCalculator.
++    // Miaoda 批量编辑栅栏：resume 时用来证明「watcher 已经看到了 Agent 的
++    // 最后一次写入」。checkHealth 的 cookie 沿 watcher 通道走一遍，返回即代表
++    // 此前所有文件事件都已投递到本进程；再把 changeQueue 排空（处理中的事件
++    // 可能继续入队新任务，所以循环到队列不再变化）；最后 emitChange() 立即
++    // 发出累积的变更，让 DeltaCalculator 不等 CHANGE_INTERVAL 就能看到它们。
 +    this.miaodaFlushChanges = async (timeout = 5000) => {
 +      const result = await this._watcher.checkHealth(timeout);
 +      if (result.type !== "success") {

package/pnpm-patches/metro-runtime@0.83.3.patch

@@ -1,10 +1,14 @@
 diff --git a/src/modules/HMRClient.js b/src/modules/HMRClient.js
+index 3e2652d..8225714 100644
 --- a/src/modules/HMRClient.js
 +++ b/src/modules/HMRClient.js
-@@ -35,6 +35,9 @@
+@@ -35,6 +35,12 @@ class HMRClient extends EventEmitter {
      this._ws.onmessage = (message) => {
        const data = JSON.parse(String(message.data));
        switch (data.type) {
++        // Miaoda HMR 批量编辑控制：服务端复用这条 /hot socket 下发
++        // 控制消息。HMRClient 只做透传转发，具体处理在 expo 包的
++        // async-require/hmr.ts（该补丁同时加了版本协商，version !== 1 直接忽略）。
 +        case "miaoda-hmr-control":
 +          if (data.version === 1) this.emit("miaoda-hmr-control", data);
 +          break;

package/pnpm-patches/react-native-worklets@0.7.4.patch

@@ -0,0 +1,91 @@
+diff --git a/plugin/index.js b/plugin/index.js
+--- a/plugin/index.js
++++ b/plugin/index.js
+@@ -752,6 +752,31 @@ var require_workletStringCode = __commonJS({
+     var types_2 = require_types();
+     var utils_1 = require_utils();
+     var MOCK_SOURCE_MAP = "mock source map";
++    function normalizeTypeScriptFunctionTypes(node) {
++      if (node == null || typeof node !== "object") {
++        return;
++      }
++      if (node.type === "TSFunctionType" || node.type === "TSConstructorType") {
++        const parameters = Array.isArray(node.parameters) ? node.parameters : Array.isArray(node.params) ? node.params : [];
++        node.parameters = parameters;
++        node.params = parameters;
++        const returnType = node.typeAnnotation != null ? node.typeAnnotation : node.returnType != null ? node.returnType : null;
++        node.typeAnnotation = returnType;
++        node.returnType = returnType;
++      }
++      if (node.type === "TSTypeReference") {
++        const typeArguments = node.typeParameters != null ? node.typeParameters : node.typeArguments != null ? node.typeArguments : null;
++        node.typeParameters = typeArguments;
++        node.typeArguments = typeArguments;
++      }
++      for (const value of Object.values(node)) {
++        if (Array.isArray(value)) {
++          value.forEach(normalizeTypeScriptFunctionTypes);
++        } else {
++          normalizeTypeScriptFunctionTypes(value);
++        }
++      }
++    }
+     function buildWorkletString(fun, state, closureVariables, workletName, inputMap) {
+       var _a;
+       restoreRecursiveCalls(fun, workletName);
+@@ -784,6 +809,7 @@ var require_workletStringCode = __commonJS({
+         });
+       }
+       const workletFunction = (0, types_12.functionExpression)((0, types_12.identifier)(workletName), expression.params, expression.body, expression.generator, expression.async);
++      normalizeTypeScriptFunctionTypes(workletFunction);
+       const code = (0, generator_1.default)(workletFunction).code;
+       (0, assert_1.strict)(inputMap, "[Reanimated] `inputMap` is undefined.");
+       const includeSourceMap = !((0, utils_1.isRelease)() || state.opts.disableSourceMaps);
+@@ -892,10 +918,36 @@ var require_workletFactory = __commonJS({
+     var workletStringCode_1 = require_workletStringCode();
+     var REAL_VERSION = require("../package.json").version;
+     var MOCK_VERSION = "x.y.z";
++    function normalizeTypeScriptFunctionTypes(node) {
++      if (node == null || typeof node !== "object") {
++        return;
++      }
++      if (node.type === "TSFunctionType" || node.type === "TSConstructorType") {
++        const parameters = Array.isArray(node.parameters) ? node.parameters : Array.isArray(node.params) ? node.params : [];
++        node.parameters = parameters;
++        node.params = parameters;
++        const returnType = node.typeAnnotation != null ? node.typeAnnotation : node.returnType != null ? node.returnType : null;
++        node.typeAnnotation = returnType;
++        node.returnType = returnType;
++      }
++      if (node.type === "TSTypeReference") {
++        const typeArguments = node.typeParameters != null ? node.typeParameters : node.typeArguments != null ? node.typeArguments : null;
++        node.typeParameters = typeArguments;
++        node.typeArguments = typeArguments;
++      }
++      for (const value of Object.values(node)) {
++        if (Array.isArray(value)) {
++          value.forEach(normalizeTypeScriptFunctionTypes);
++        } else {
++          normalizeTypeScriptFunctionTypes(value);
++        }
++      }
++    }
+     function makeWorkletFactory(fun, state) {
+       var _a;
+       removeWorkletDirective(fun);
+       (0, assert_1.strict)(state.file.opts.filename, "[Reanimated] `state.file.opts.filename` is undefined.");
++      normalizeTypeScriptFunctionTypes(fun.node);
+       const codeObject = (0, generator_1.default)(fun.node, {
+         sourceMaps: true,
+         sourceFileName: state.file.opts.filename
+@@ -977,8 +1029,8 @@ var require_workletFactory = __commonJS({
+         statements.unshift((0, types_12.variableDeclaration)("const", [
+           (0, types_12.variableDeclarator)((0, types_12.identifier)("_e"), (0, types_12.arrayExpression)([
+             (0, types_12.newExpression)((0, types_12.memberExpression)((0, types_12.identifier)("global"), (0, types_12.identifier)("Error")), []),
+-            (0, types_12.numericLiteral)(lineOffset),
+-            (0, types_12.numericLiteral)(-27)
++            lineOffset < 0 ? (0, types_12.unaryExpression)("-", (0, types_12.numericLiteral)(-lineOffset)) : (0, types_12.numericLiteral)(lineOffset),
++            (0, types_12.unaryExpression)("-", (0, types_12.numericLiteral)(27))
+           ]))
+         ]));
+         statements.push((0, types_12.expressionStatement)((0, types_12.assignmentExpression)("=", (0, types_12.memberExpression)((0, types_12.identifier)(reactName), (0, types_12.identifier)("__stackDetails"), false), (0, types_12.identifier)("_e"))));

package/pnpmfile.cjs

@@ -18,16 +18,22 @@ const managedPatches = {
   [EXPO_CLI_PATCH_SELECTOR]: {
     filename: '@expo__cli@55.0.16-55.0.22.patch',
     legacyHashes: new Set([
+      '29f03d7d2633dad8e8ff99815c38a4f4059e46a235a5e66c508125975d920385',
+      '98c96a6bae56f47c0a47efe9a68e7a6751022d812b569b68d03b93753635c32c',
       '9a0d662675fba8088396c6cdbab7d36d81fbe9acb3727144a50826ff3500b093',
     ]),
   },
   'metro-runtime@0.83.3': {
     filename: 'metro-runtime@0.83.3.patch',
-    legacyHashes: new Set(),
+    legacyHashes: new Set([
+      'bd14ae6037bcf49028607c01caf67d4bd03e543460609a62e72647664c27b242',
+    ]),
   },
   'metro-file-map@0.83.3': {
     filename: 'metro-file-map@0.83.3.patch',
-    legacyHashes: new Set(),
+    legacyHashes: new Set([
+      '41bc590f22f0e8ba73f090394db218bbb9c808a1eafdc70bfb746abbd3017b3b',
+    ]),
   },
   '@shopify/react-native-skia@2.4.18': {
     filename: '@shopify__react-native-skia@2.4.18.patch',
@@ -44,6 +50,9 @@ const managedPatches = {
   'expo@55.0.6': {
     filename: 'expo@55.0.6.patch',
     legacyHashes: new Set([
+      '1df9b522728e93daf64f9e2298ab835ce52d55b4aa2de92a68b947e7ed08f40a',
+      '8ac63998a9852ddafda7af96deb4d7ac4c3a5da5e65e865af32be9d4fd966e02',
+      '12efbb4c64bc67744a838cc5d9d88604ad2a99cdd578a5cfab31b8d1c2be1144',
       'd2507f55976f6c5da8f35d26906f4bd46415e042570afc3bd7c543c86abc5a61',
       '5dda484d5acb6475495587d96c8cbae5bc7514a5781159c92faa9637e6e257ec',
     ]),
@@ -60,14 +69,32 @@ const managedPatches = {
       'b2c55038b2fa525ad5e84bd4940ddd2b7298b559de2d0d1709f32ced57e929e9',
     ]),
   },
+  'react-native@0.83.2': {
+    filename: 'react-native@0.83.2.patch',
+    legacyHashes: new Set(),
+  },
+  'react-native-worklets@0.7.4': {
+    filename: 'react-native-worklets@0.7.4.patch',
+    legacyHashes: new Set([
+      '8fee2c39a582a0ec150a3fd5af632fba6736dc03565763d21376b54820fe6668',
+      'd9e02591e77a9f510e215ce273330381f81c68659c5736374f33e231d0bc9611',
+    ]),
+  },
   'react-native-worklets@0.7.2': {
     filename: 'react-native-worklets@0.7.2.patch',
     legacyHashes: new Set([
       '8fee2c39a582a0ec150a3fd5af632fba6736dc03565763d21376b54820fe6668',
+      'd9e02591e77a9f510e215ce273330381f81c68659c5736374f33e231d0bc9611',
     ]),
   },
 };
 
+const legacyPatchSelectors = new Set([
+  '@shopify/react-native-skia@2.4.18',
+  'react-native-css-interop@0.2.6',
+  'react-native-worklets@0.7.2',
+]);
+
 function getPatchHash(patchPath) {
   return crypto.createHash('sha256').update(fs.readFileSync(patchPath)).digest('hex');
 }
@@ -96,6 +123,51 @@ function getBundledPatchPath(config, filename) {
   return path.join(__dirname, 'pnpm-patches', filename);
 }
 
+function projectRequestsLegacySelector(config, selector) {
+  const at = selector.lastIndexOf('@');
+  if (at <= 0) return false;
+  const name = selector.slice(0, at);
+  const version = selector.slice(at + 1);
+  const projectRoot = getProjectRoot(config);
+  const manifests = [path.join(projectRoot, 'package.json')];
+  for (const directory of ['template', 'packages']) {
+    const candidate = path.join(projectRoot, directory);
+    if (!fs.existsSync(candidate)) continue;
+    for (const entry of fs.readdirSync(candidate, { withFileTypes: true })) {
+      if (entry.isDirectory()) manifests.push(path.join(candidate, entry.name, 'package.json'));
+    }
+  }
+  for (const manifest of manifests) {
+    try {
+      const packageJson = JSON.parse(fs.readFileSync(manifest, 'utf8'));
+      for (const section of ['dependencies', 'devDependencies', 'optionalDependencies', 'peerDependencies']) {
+        for (const [dependency, spec] of Object.entries(packageJson[section] ?? {})) {
+          if (typeof spec !== 'string') continue;
+          if (
+            (dependency === name || spec.includes(name)) &&
+            (spec === version || spec === `${name}@${version}` || spec.endsWith(`@${version}`))
+          ) return true;
+          if (spec === 'catalog:' || spec === 'catalog') {
+            const workspace = fs.existsSync(path.join(projectRoot, 'pnpm-workspace.yaml'))
+              ? fs.readFileSync(path.join(projectRoot, 'pnpm-workspace.yaml'), 'utf8')
+              : '';
+            const match = new RegExp(`^\\s{2}${name.replace(/[.*+?^${}()|[\\]\\]/g, '\\\\$&')}:\\s*([^#\\n]+)`, 'm').exec(workspace);
+            if (match?.[1].trim() === version) return true;
+          }
+        }
+      }
+    } catch {
+      // Defer malformed manifest errors to pnpm.
+    }
+  }
+  try {
+    const lockfile = fs.readFileSync(path.join(projectRoot, 'pnpm-lock.yaml'), 'utf8');
+    return new RegExp(`(?:^|\\n)\\s{2}${selector.replace(/[.*+?^${}()|[\\]\\]/g, '\\\\$&')}:`).test(lockfile);
+  } catch {
+    return false;
+  }
+}
+
 function applyManagedPatches(config) {
   const patchedDependencies = { ...config.patchedDependencies };
 
@@ -103,6 +175,19 @@ function applyManagedPatches(config) {
     const bundledPatchPath = getBundledPatchPath(config, managedPatch.filename);
     const projectPatch = patchedDependencies[selector];
 
+    if (legacyPatchSelectors.has(selector) && !projectRequestsLegacySelector(config, selector)) {
+      if (projectPatch != null) {
+        try {
+          if (managedPatch.legacyHashes.has(getPatchHash(resolveProjectPatchPath(config, projectPatch)))) {
+            delete patchedDependencies[selector];
+          }
+        } catch {
+          // Keep unreadable or custom project patches for pnpm's normal diagnostics.
+        }
+      }
+      continue;
+    }
+
     if (projectPatch == null) {
       patchedDependencies[selector] = bundledPatchPath;
       continue;