@mobileaidev/ai-app-bridge 0.2.2 → 0.2.4

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/bin/mcp-server.js

@@ -17,13 +17,15 @@ const serverInstructions = [
 ].join(' ');
 
 let buffer = Buffer.alloc(0);
-
-process.stdin.on('data', (chunk) => {
-  buffer = Buffer.concat([buffer, chunk]);
-  drainMessages();
-});
-
-process.stdin.on('error', () => {});
+
+function startServer() {
+  process.stdin.on('data', (chunk) => {
+    buffer = Buffer.concat([buffer, chunk]);
+    drainMessages();
+  });
+
+  process.stdin.on('error', () => {});
+}
 
 function drainMessages() {
   while (true) {
@@ -565,9 +567,13 @@ function runBridgeChecked(command, args = {}) {
   return runBridge(command, args);
 }
 
-async function runBridge(command, args) {
-  const cliArgs = [cliScript, command];
-  addCommonArgs(cliArgs, args);
+async function runBridge(command, args) {
+  return runProcess(buildBridgeCliArgs(command, args));
+}
+
+function buildBridgeCliArgs(command, args = {}) {
+  const cliArgs = [cliScript, command];
+  addCommonArgs(cliArgs, args);
   addArg(cliArgs, 'initial-route', args.initialRoute);
   addArg(cliArgs, 'activity', args.activity);
   addArg(cliArgs, 'component', args.component);
@@ -601,33 +607,45 @@ async function runBridge(command, args) {
   addArg(cliArgs, 'page-url-filter', args.pageUrlFilter);
   addArg(cliArgs, 'url-filter', args.urlFilter);
   addArg(cliArgs, 'method', args.method);
-  addArg(cliArgs, 'status-code', args.statusCode);
-  addArg(cliArgs, 'compact', args.compact);
-  addArg(cliArgs, 'full', args.full);
-  addArg(cliArgs, 'no-bodies', args.noBodies);
-  addArg(cliArgs, 'duration-ms', args.durationMs);
-  addArg(cliArgs, 'include-response-body', args.includeResponseBody);
-  addArg(cliArgs, 'body-max-bytes', args.bodyMaxBytes);
-  addArg(cliArgs, 'max-events', args.maxEvents);
-  addArg(cliArgs, 'keep-forward', args.keepForward);
-  addArg(cliArgs, 'key-code', args.keyCode);
-  addArg(cliArgs, 'permission', args.permission);
-  addArg(cliArgs, 'op', args.op);
-  addArg(cliArgs, 'mode', args.mode);
-  addArg(cliArgs, 'script', args.script);
-  addArg(cliArgs, 'selector', args.selector);
+  addArg(cliArgs, 'status-code', args.statusCode);
+  addArg(cliArgs, 'compact', args.compact);
+  addArg(cliArgs, 'full', args.full);
+  addArg(cliArgs, 'text-filter', args.textFilter);
+  addArg(cliArgs, 'resource-id-filter', args.resourceIdFilter);
+  addArg(cliArgs, 'class-filter', args.classFilter);
+  addArg(cliArgs, 'visible-only', args.visibleOnly);
+  addArg(cliArgs, 'max-nodes', args.maxNodes);
+  addArg(cliArgs, 'max-depth', args.maxDepth);
+  addArg(cliArgs, 'no-bodies', args.noBodies);
+  addArg(cliArgs, 'duration-ms', args.durationMs);
+  addArg(cliArgs, 'include-response-body', args.includeResponseBody);
+  addArg(cliArgs, 'body-max-bytes', args.bodyMaxBytes);
+  addArg(cliArgs, 'max-events', args.maxEvents);
+  addArg(cliArgs, 'keep-forward', args.keepForward);
+  addArg(cliArgs, 'key-code', args.keyCode);
+  addArg(cliArgs, 'payload', args.payload);
+  addArg(cliArgs, 'delta', args.delta);
+  addArg(cliArgs, 'max-swipes', args.maxSwipes);
+  addArg(cliArgs, 'permission', args.permission);
+  addArg(cliArgs, 'op', args.op);
+  addArg(cliArgs, 'mode', args.mode);
+  addArg(cliArgs, 'script', args.script);
+  addArg(cliArgs, 'selector', args.selector);
   addArg(cliArgs, 'target-text', args.targetText);
   addArg(cliArgs, 'value', args.value);
   addArg(cliArgs, 'exact', args.exact);
   addArg(cliArgs, 'button-text', args.buttonText);
   addArg(cliArgs, 'resource-id', args.resourceId);
-  addArg(cliArgs, 'attempts', args.attempts);
-  addArg(cliArgs, 'interval-ms', args.intervalMs);
-  addArg(cliArgs, 'delta-x', args.deltaX);
-  addArg(cliArgs, 'delta-y', args.deltaY);
-  addArg(cliArgs, 'since-id', args.sinceId);
-  addArg(cliArgs, 'since-ms', args.sinceMs);
-  addArg(cliArgs, 'limit', args.limit);
+  addArg(cliArgs, 'attempts', args.attempts);
+  addArg(cliArgs, 'interval-ms', args.intervalMs);
+  addArg(cliArgs, 'delta-x', args.deltaX);
+  addArg(cliArgs, 'delta-y', args.deltaY);
+  addArg(cliArgs, 'require-text', args.requireText);
+  addArg(cliArgs, 'absent-text', args.absentText);
+  addArg(cliArgs, 'require-activity', args.requireActivity);
+  addArg(cliArgs, 'since-id', args.sinceId);
+  addArg(cliArgs, 'since-ms', args.sinceMs);
+  addArg(cliArgs, 'limit', args.limit);
   addArg(cliArgs, 'pid', args.pid);
   addArg(cliArgs, 'app-pid', args.appPid);
   addArg(cliArgs, 'tag', args.tag);
@@ -635,19 +653,21 @@ async function runBridge(command, args) {
   addArg(cliArgs, 'grep', args.grep);
   addArg(cliArgs, 'lines', args.lines);
   addArg(cliArgs, 'since', args.since);
-  addArg(cliArgs, 'follow', args.follow);
-  addArg(cliArgs, 'duration-sec', args.durationSec);
-  addArg(cliArgs, 'clear', args.clear);
-  return runProcess(cliArgs);
-}
+  addArg(cliArgs, 'follow', args.follow);
+  addArg(cliArgs, 'duration-sec', args.durationSec);
+  addArg(cliArgs, 'clear', args.clear);
+  addArg(cliArgs, 'skip-flutter-launch', args.skipFlutterLaunch);
+  return cliArgs;
+}
 
 async function runSmoke(args) {
   const cliArgs = [cliScript, 'smoke'];
-  addCommonArgs(cliArgs, args);
-  addArg(cliArgs, 'out-file', args.outFile);
-  addArg(cliArgs, 'artifact-dir', args.artifactDir || defaultArtifactDirFor('smoke', args));
-  return runProcess(cliArgs);
-}
+  addCommonArgs(cliArgs, args);
+  addArg(cliArgs, 'out-file', args.outFile);
+  addArg(cliArgs, 'artifact-dir', args.artifactDir || defaultArtifactDirFor('smoke', args));
+  addArg(cliArgs, 'skip-flutter-launch', args.skipFlutterLaunch);
+  return runProcess(cliArgs);
+}
 
 function defaultArtifactDirFor(command, args) {
   if (args.outFile) return '';
@@ -776,7 +796,15 @@ function send(message) {
   process.stdout.write(body);
 }
 
-function writeLog(text) {
-  process.stderr.write(`${text}\n`);
-}
-
+function writeLog(text) {
+  process.stderr.write(`${text}\n`);
+}
+
+if (require.main === module) {
+  startServer();
+}
+
+module.exports = {
+  buildBridgeCliArgs,
+  startServer,
+};

package/package.json

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