@farmslot/adapter-rn 0.19.4 → 0.19.6

package/CHANGELOG.md

@@ -6,6 +6,15 @@ All notable changes to `@farmslot/adapter-rn` (published as `@farmslot/expo-reci
 
 - Active-development baseline; add user-facing changes here before release or package publication.
 
+## 0.19.6 - 2026-10-09
+
+- `hasMatchingRoute` and `matchesBridgeTarget` accept the manufacturer-prefixed name a physical Android device reports in its bridge snapshot ("Google Pixel 6a" for the pin "Pixel 6a"). They accepted only the Metro form ("Pixel 6a - 17 - API 37"), so wait-for-bridge never saw the Pixel 6a as ready and launch failed after its full timeout. The model must be whole trailing words ("Pixel 6" does not match "Google Pixel 6a"), the serial must not be an `emulator-` serial, and two manufacturer-prefixed entries on one Metro (counting one that has not reported a platform yet) count as no match. `manufacturerNameMatches(deviceName, androidName, adbSerial)` is exported so mm-harness applies the same rule.
+- Publish with protocol 0.35.1 and recipe-runner 0.28.2.
+
+## 0.19.5 - 2026-10-09
+
+- Publish with protocol 0.35.1 and recipe-runner 0.28.2 so consumers share one protocol and one recipe-runner copy. No code change.
+
 ## 0.19.4 - 2026-10-09
 
 - Publish with protocol 0.35.0 and recipe-runner 0.28.1 so consumers share one recipe-runner copy. No code change.

package/bridge-runtime/lib/match-bridge-target.cjs

@@ -11,6 +11,16 @@
 // the matcher would fall back to that ambient identity and confirm against the wrong
 // platform's target. Binding the platform up front closes that corner.
 
+// Metro names a physical device by its model ("Pixel 6a - 17 - API 37"), but the
+// in-app bridge snapshot can prefix the manufacturer ("Google Pixel 6a"). Accept that
+// form only for a physical device (not an emulator- serial) and only with the model as
+// whole trailing words, so "Pixel 6" never matches "Google Pixel 6a".
+function manufacturerNameMatches(deviceName, androidName, adbSerial) {
+  if (!adbSerial || adbSerial.startsWith('emulator-')) return false;
+  if (deviceName === androidName || deviceName.startsWith(`${androidName} -`)) return false;
+  return deviceName.endsWith(` ${androidName}`) || deviceName.includes(` ${androidName} -`);
+}
+
 function matchesBridgeTarget(target, env) {
   const e = env || process.env;
   if (!target || typeof target !== 'object') return false;
@@ -33,7 +43,8 @@ function matchesBridgeTarget(target, env) {
     if (target.platform !== 'android') return false;
     if (!androidName) return true;
     const deviceName = String(target.deviceName || '');
-    return deviceName === androidName || deviceName.startsWith(`${androidName} -`);
+    if (deviceName === androidName || deviceName.startsWith(`${androidName} -`)) return true;
+    return manufacturerNameMatches(deviceName, androidName, adbSerial);
   }
 
   // iOS simulator pin applies only when iOS is requested (or nothing constrains the
@@ -48,10 +59,28 @@ function matchesBridgeTarget(target, env) {
 
 // True when at least one answering target matches the request AND carries a route
 // (an in-app agentic bridge is live), not merely a registered debug target.
+// Two phones of the same model on one Metro both report "Google Pixel 6a"; the
+// snapshot cannot tell which one is pinned, so a manufacturer-form match counts only
+// when it is the sole one. The count includes entries that have not reported a
+// platform yet: the pinned phone may still be starting while the other one answers.
 function hasMatchingRoute(value, env) {
-  const targets = Array.isArray(value) ? value : [value];
-  return targets.some(
-    (t) => matchesBridgeTarget(t, env) && t && t.agenticPresent === true && Boolean(t.route),
+  const e = env || process.env;
+  const entries = (Array.isArray(value) ? value : [value]).filter(
+    (t) => t && typeof t === 'object',
+  );
+  const androidName = e.ANDROID_TARGET_DEVICE_NAME || e.ANDROID_DEVICE || '';
+  const adbSerial = e.ADB_SERIAL || e.ANDROID_SERIAL || '';
+  const manufacturerForm = (t) =>
+    Boolean(androidName) &&
+    (!t.platform || t.platform === 'android') &&
+    manufacturerNameMatches(String(t.deviceName || ''), androidName, adbSerial);
+  const ambiguous = entries.filter(manufacturerForm).length > 1;
+  return entries.some(
+    (t) =>
+      matchesBridgeTarget(t, e) &&
+      !(ambiguous && manufacturerForm(t)) &&
+      t.agenticPresent === true &&
+      Boolean(t.route),
   );
 }
 
@@ -86,4 +115,10 @@ function describeRequested(env) {
   return 'any platform';
 }
 
-module.exports = { matchesBridgeTarget, hasMatchingRoute, describeTargets, describeRequested };
+module.exports = {
+  matchesBridgeTarget,
+  manufacturerNameMatches,
+  hasMatchingRoute,
+  describeTargets,
+  describeRequested,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farmslot/adapter-rn",
-  "version": "0.19.4",
+  "version": "0.19.6",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -42,8 +42,8 @@
     "prepublishOnly": "node ../../scripts/quality/check-farmslot-package-readiness.mjs --publish --packages @farmslot/adapter-rn"
   },
   "dependencies": {
-    "@farmslot/protocol": "0.35.0",
-    "@farmslot/recipe-runner": "0.28.1",
+    "@farmslot/protocol": "0.35.1",
+    "@farmslot/recipe-runner": "0.28.2",
     "pngjs": "^7.0.0",
     "ws": "^8.18.0"
   },