Merge pull request #1825 from web-infra-dev/claude/fix-adb-parameters-llROO

fix(core): fix Launch and runAdbShell parameter types

Author: quanru

packages/android/src/agent.ts

@@ -35,16 +35,6 @@ type WrappedAction<T extends DeviceAction> = (
 ) => Promise<ActionReturn<T>>;
 
 export class AndroidAgent extends PageAgent<AndroidDevice> {
-  /**
-   * Launch an Android app or URL
-   */
-  launch!: WrappedAction<DeviceActionLaunch>;
-
-  /**
-   * Execute ADB shell command on Android device
-   */
-  runAdbShell!: WrappedAction<DeviceActionRunAdbShell>;
-
   /**
    * Trigger the system back operation on Android devices
    */
@@ -77,9 +67,6 @@ export class AndroidAgent extends PageAgent<AndroidDevice> {
     // Set the mapping on the device instance
     device.setAppNameMapping(this.appNameMapping);
 
-    this.launch = this.createActionWrapper<DeviceActionLaunch>('Launch');
-    this.runAdbShell =
-      this.createActionWrapper<DeviceActionRunAdbShell>('RunAdbShell');
     this.back =
       this.createActionWrapper<DeviceActionAndroidBackButton>(
         'AndroidBackButton',
@@ -94,6 +81,25 @@ export class AndroidAgent extends PageAgent<AndroidDevice> {
       );
   }
 
+  /**
+   * Launch an Android app or URL
+   * @param uri - App package name, URL, or app name to launch
+   */
+  async launch(uri: string): Promise<void> {
+    const action = this.wrapActionInActionSpace<DeviceActionLaunch>('Launch');
+    return action({ uri });
+  }
+
+  /**
+   * Execute ADB shell command on Android device
+   * @param command - ADB shell command to execute
+   */
+  async runAdbShell(command: string): Promise<string> {
+    const action =
+      this.wrapActionInActionSpace<DeviceActionRunAdbShell>('RunAdbShell');
+    return action({ command });
+  }
+
   private createActionWrapper<T extends DeviceAction>(
     name: string,
   ): WrappedAction<T> {

packages/android/src/device.ts

@@ -1621,13 +1621,13 @@ ${Object.keys(size)
  * Platform-specific action definitions for Android
  * Single source of truth for both runtime behavior and type definitions
  */
-const runAdbShellParamSchema = z
-  .string()
-  .describe('ADB shell command to execute');
+const runAdbShellParamSchema = z.object({
+  command: z.string().describe('ADB shell command to execute'),
+});
 
-const launchParamSchema = z
-  .string()
-  .describe('App package name or URL or app name to launch,');
+const launchParamSchema = z.object({
+  uri: z.string().describe('App package name or URL or app name to launch'),
+});
 
 type RunAdbShellParam = z.infer<typeof runAdbShellParamSchema>;
 type LaunchParam = z.infer<typeof launchParamSchema>;
@@ -1651,8 +1651,11 @@ const createPlatformActions = (
       interfaceAlias: 'runAdbShell',
       paramSchema: runAdbShellParamSchema,
       call: async (param) => {
+        if (!param.command || param.command.trim() === '') {
+          throw new Error('RunAdbShell requires a non-empty command parameter');
+        }
         const adb = await device.getAdb();
-        return await adb.shell(param);
+        return await adb.shell(param.command);
       },
     }),
     Launch: defineAction({
@@ -1661,7 +1664,10 @@ const createPlatformActions = (
       interfaceAlias: 'launch',
       paramSchema: launchParamSchema,
       call: async (param) => {
-        await device.launch(param);
+        if (!param.uri || param.uri.trim() === '') {
+          throw new Error('Launch requires a non-empty uri parameter');
+        }
+        await device.launch(param.uri);
       },
     }),
     AndroidBackButton: defineAction({

packages/android/tests/unit-test/agent.test.ts

@@ -107,7 +107,8 @@ describe('AndroidAgent', () => {
 
       await agent.launch(uri);
 
-      expect(launchSpy).toHaveBeenCalledWith(uri);
+      // agent.launch(uri) converts string to { uri } object before calling device action
+      expect(launchSpy).toHaveBeenCalledWith({ uri });
     });
   });
 

packages/core/src/yaml/player.ts

@@ -534,6 +534,40 @@ export class ScriptPlayer<T extends MidsceneYamlScriptEnv> {
           );
 
           // Store result if there's a name property in flowItem
+          const resultName = (flowItem as any).name;
+          if (result !== undefined) {
+            this.setResult(resultName, result);
+          }
+        } else if (
+          typeof actionParamForMatchedAction === 'string' &&
+          (matchedAction.name === 'Launch' ||
+            matchedAction.interfaceAlias === 'launch') &&
+          typeof (agent as any).launch === 'function'
+        ) {
+          // Call agent.launch directly for Launch action with string param
+          debug(`Calling agent.launch with: ${actionParamForMatchedAction}`);
+          const result = await (agent as any).launch(
+            actionParamForMatchedAction,
+          );
+
+          const resultName = (flowItem as any).name;
+          if (result !== undefined) {
+            this.setResult(resultName, result);
+          }
+        } else if (
+          typeof actionParamForMatchedAction === 'string' &&
+          (matchedAction.name === 'RunAdbShell' ||
+            matchedAction.interfaceAlias === 'runAdbShell') &&
+          typeof (agent as any).runAdbShell === 'function'
+        ) {
+          // Call agent.runAdbShell directly for RunAdbShell action with string param
+          debug(
+            `Calling agent.runAdbShell with: ${actionParamForMatchedAction}`,
+          );
+          const result = await (agent as any).runAdbShell(
+            actionParamForMatchedAction,
+          );
+
           const resultName = (flowItem as any).name;
           if (result !== undefined) {
             this.setResult(resultName, result);

packages/core/tests/unit-test/prompt/prompt.test.ts

@@ -113,6 +113,46 @@ describe('action space', () => {
           - option?: number // An optional option value"
     `);
   });
+
+  it('action with object param schema (Launch-like)', () => {
+    const action = descriptionForAction(
+      {
+        name: 'Launch',
+        description: 'Launch an app or URL',
+        paramSchema: z.object({
+          uri: z.string().describe('The URI to launch'),
+        }),
+        call: async () => {},
+      },
+      mockLocatorScheme,
+    );
+    expect(action).toMatchInlineSnapshot(`
+      "- Launch, Launch an app or URL
+        - type: "Launch"
+        - param:
+          - uri: string // The URI to launch"
+    `);
+  });
+
+  it('action with object param schema (RunAdbShell-like)', () => {
+    const action = descriptionForAction(
+      {
+        name: 'RunAdbShell',
+        description: 'Execute ADB shell command',
+        paramSchema: z.object({
+          command: z.string().describe('ADB shell command to execute'),
+        }),
+        call: async () => {},
+      },
+      mockLocatorScheme,
+    );
+    expect(action).toMatchInlineSnapshot(`
+      "- RunAdbShell, Execute ADB shell command
+        - type: "RunAdbShell"
+        - param:
+          - command: string // ADB shell command to execute"
+    `);
+  });
 });
 
 describe('system prompts', () => {