@mobileaidev/ai-app-bridge 0.2.2 → 0.2.3

package/bin/ai-app-bridge.js

@@ -782,25 +782,41 @@ async function ensureForward(ctx) {
   };
 }
 
-async function resolveDevicePort(ctx) {
-  if (ctx.explicitPort) return { port: ctx.port, source: 'explicit-port' };
-  try {
-    const result = await adb(ctx, ['shell', 'run-as', ctx.packageName, 'cat', 'files/ai_app_bridge_port.json']);
-    const state = JSON.parse(result.stdout.trim());
-    const discoveredPort = Number(state.port);
-    if (state.ok === true && Number.isInteger(discoveredPort) && discoveredPort > 0) {
-      return { port: discoveredPort, source: 'package-port-file', state };
-    }
-  } catch (error) {
-    // Fall back to the historical default port for older bridge versions.
-    return {
-      port: ctx.port,
-      source: 'default-port',
-      error: firstErrorLine(error),
-    };
-  }
-  return { port: ctx.port, source: 'default-port' };
-}
+async function resolveDevicePort(ctx) {
+  if (ctx.explicitPort) return { port: ctx.port, source: 'explicit-port' };
+  try {
+    const result = await adb(ctx, ['shell', 'run-as', ctx.packageName, 'cat', 'files/ai_app_bridge_port.json']);
+    const state = JSON.parse(result.stdout.trim());
+    const discoveredPort = Number(state.port);
+    if (state.ok === true && Number.isInteger(discoveredPort) && discoveredPort > 0) {
+      return { port: discoveredPort, source: 'package-port-file', state };
+    }
+  } catch (error) {
+    if (!shouldUseDefaultPortFallback(ctx)) {
+      ctx.devicePortSource = 'package-port-file';
+      ctx.devicePortError = firstErrorLine(error);
+      error.aiAppBridgePortDiscovery = true;
+      throw error;
+    }
+    return {
+      port: ctx.port,
+      source: 'default-port',
+      error: firstErrorLine(error),
+    };
+  }
+  if (!shouldUseDefaultPortFallback(ctx)) {
+    const error = new Error(`bridge port discovery failed for explicit package: ${ctx.packageName}`);
+    error.aiAppBridgePortDiscovery = true;
+    ctx.devicePortSource = 'package-port-file';
+    ctx.devicePortError = firstErrorLine(error);
+    throw error;
+  }
+  return { port: ctx.port, source: 'default-port' };
+}
+
+function shouldUseDefaultPortFallback(ctx) {
+  return !ctx.explicitPackageName;
+}
 
 async function bridgeStatus(ctx, options = {}) {
   try {
@@ -953,17 +969,17 @@ function normalizeBridgeError(error) {
       suggestion: 'Confirm the target app is running and that the resolved bridge port belongs to this package.',
     };
   }
-  if (lower.includes('adb timed out')) {
-    return {
-      code: 'adb_timeout',
-      message,
-      suggestion: 'Check the device state and retry; if the bridge port is known, pass --port to skip package port discovery.',
-    };
-  }
-  if (lower.includes('run-as') || lower.includes('package not found')) {
-    return {
-      code: 'bridge_port_discovery_failed',
-      message,
+  if (lower.includes('adb timed out')) {
+    return {
+      code: 'adb_timeout',
+      message,
+      suggestion: 'Check the device state and retry; if the bridge port is known, pass --port to skip package port discovery.',
+    };
+  }
+  if (error?.aiAppBridgePortDiscovery || lower.includes('bridge port discovery failed') || lower.includes('run-as') || lower.includes('package not found')) {
+    return {
+      code: 'bridge_port_discovery_failed',
+      message,
       suggestion: 'Install a debuggable build for the requested package or pass --port explicitly.',
     };
   }
@@ -4299,8 +4315,9 @@ module.exports = {
   compactNetworkRecord,
   pruneGeneratedArtifacts,
   shouldSkipInstallerTapForInstalledPackage,
-  shouldDismissKeyboardForPoint,
-  screenshotOutputPath,
+  shouldDismissKeyboardForPoint,
+  shouldUseDefaultPortFallback,
+  screenshotOutputPath,
   statusSearchText,
   uiautomatorLockPath,
   waitTextConditionsMet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobileaidev/ai-app-bridge",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Desktop CLI and MCP server for AI App Bridge.",
   "repository": {
     "type": "git",