@xiuchang-midscene/android 1.6.0 → 2.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024-present Bytedance, Inc. and its affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/es/cli.mjs

@@ -131,7 +131,7 @@ var __webpack_modules__ = {
                 }
             }
             resolveServerBinPath() {
-                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(import.meta.url).resolve('@xiuchang-midscene/android/package.json');
                 return node_path__rspack_import_2["default"].join(node_path__rspack_import_2["default"].dirname(androidPkgJson), 'bin', 'scrcpy-server');
             }
             getFfmpegPath() {
@@ -1473,7 +1473,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async ensureYadb() {
         if (!this.yadbPushed) {
             const adb = await this.getAdb();
-            const androidPkgJson = (0, external_node_module_.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
+            const androidPkgJson = (0, external_node_module_.createRequire)(import.meta.url).resolve('@xiuchang-midscene/android/package.json');
             const yadbBin = external_node_path_["default"].join(external_node_path_["default"].dirname(androidPkgJson), 'bin', 'yadb');
             await adb.push(yadbBin, '/data/local/tmp');
             this.yadbPushed = true;
@@ -1521,25 +1521,31 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 IME_STRATEGY_ADB_KEYBOARD
             ];
         }
-        if (effectiveFallback?.length) for(let i = 0; i < effectiveFallback.length; i++){
-            const strategy = effectiveFallback[i];
-            const isLast = i === effectiveFallback.length - 1;
-            debugDevice(`[IME fallback] trying strategy: ${strategy} (${i + 1}/${effectiveFallback.length})`);
-            await this._typeWithStrategy(text, strategy, adb);
-            if (isLast) {
-                debugDevice('[IME fallback] all strategies tried');
-                break;
-            }
-            await sleep(300);
-            const success = await this.inputVerifyFn(text);
-            if (success) {
-                debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
-                break;
+        if (effectiveFallback?.length) {
+            const MAX_ROUNDS = 2;
+            const totalAttempts = effectiveFallback.length * MAX_ROUNDS;
+            let succeeded = false;
+            for(let i = 0; i < totalAttempts; i++){
+                const strategy = effectiveFallback[i % effectiveFallback.length];
+                const isLast = i === totalAttempts - 1;
+                debugDevice(`[IME fallback] trying strategy: ${strategy} (attempt ${i + 1}/${totalAttempts})`);
+                await this._typeWithStrategy(text, strategy, adb);
+                if (isLast) {
+                    debugDevice('[IME fallback] all attempts exhausted');
+                    break;
+                }
+                await sleep(800);
+                const success = await this.inputVerifyFn(text);
+                if (success) {
+                    debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
+                    succeeded = true;
+                    break;
+                }
+                debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
+                await adb.clearTextField(100);
             }
-            debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
-            await adb.clearTextField(100);
-        }
-        else {
+            debugDevice(`[IME fallback] done, succeeded=${succeeded}`);
+        } else {
             const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
             await this._typeWithStrategy(text, IME_STRATEGY, adb);
         }
@@ -1916,7 +1922,7 @@ class AndroidAgent extends Agent {
         device.setAppNameMapping(this.appNameMapping);
         device.inputVerifyFn = async (text)=>{
             try {
-                return await this.aiBoolean(`the currently focused input field contains the text "${text}"`);
+                return await this.aiBoolean(`the currently focused input field (text box) shows "${text}" as its actual typed value — ignore any IME candidate bar, autocomplete dropdown, or search suggestion list below the field; only check the input field itself`);
             } catch  {
                 return false;
             }
@@ -1994,7 +2000,7 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.6.0"
+    version: "2.0.0"
 }).catch((e)=>{
     if (!(e instanceof CLIError)) console.error(e);
     process.exit(e instanceof CLIError ? e.exitCode : 1);

package/dist/es/index.mjs

@@ -130,7 +130,7 @@ var __webpack_modules__ = {
                 }
             }
             resolveServerBinPath() {
-                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(import.meta.url).resolve('@xiuchang-midscene/android/package.json');
                 return node_path__rspack_import_2["default"].join(node_path__rspack_import_2["default"].dirname(androidPkgJson), 'bin', 'scrcpy-server');
             }
             getFfmpegPath() {
@@ -1376,7 +1376,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async ensureYadb() {
         if (!this.yadbPushed) {
             const adb = await this.getAdb();
-            const androidPkgJson = (0, external_node_module_.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
+            const androidPkgJson = (0, external_node_module_.createRequire)(import.meta.url).resolve('@xiuchang-midscene/android/package.json');
             const yadbBin = external_node_path_["default"].join(external_node_path_["default"].dirname(androidPkgJson), 'bin', 'yadb');
             await adb.push(yadbBin, '/data/local/tmp');
             this.yadbPushed = true;
@@ -1424,25 +1424,31 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 IME_STRATEGY_ADB_KEYBOARD
             ];
         }
-        if (effectiveFallback?.length) for(let i = 0; i < effectiveFallback.length; i++){
-            const strategy = effectiveFallback[i];
-            const isLast = i === effectiveFallback.length - 1;
-            debugDevice(`[IME fallback] trying strategy: ${strategy} (${i + 1}/${effectiveFallback.length})`);
-            await this._typeWithStrategy(text, strategy, adb);
-            if (isLast) {
-                debugDevice('[IME fallback] all strategies tried');
-                break;
-            }
-            await sleep(300);
-            const success = await this.inputVerifyFn(text);
-            if (success) {
-                debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
-                break;
+        if (effectiveFallback?.length) {
+            const MAX_ROUNDS = 2;
+            const totalAttempts = effectiveFallback.length * MAX_ROUNDS;
+            let succeeded = false;
+            for(let i = 0; i < totalAttempts; i++){
+                const strategy = effectiveFallback[i % effectiveFallback.length];
+                const isLast = i === totalAttempts - 1;
+                debugDevice(`[IME fallback] trying strategy: ${strategy} (attempt ${i + 1}/${totalAttempts})`);
+                await this._typeWithStrategy(text, strategy, adb);
+                if (isLast) {
+                    debugDevice('[IME fallback] all attempts exhausted');
+                    break;
+                }
+                await sleep(800);
+                const success = await this.inputVerifyFn(text);
+                if (success) {
+                    debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
+                    succeeded = true;
+                    break;
+                }
+                debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
+                await adb.clearTextField(100);
             }
-            debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
-            await adb.clearTextField(100);
-        }
-        else {
+            debugDevice(`[IME fallback] done, succeeded=${succeeded}`);
+        } else {
             const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
             await this._typeWithStrategy(text, IME_STRATEGY, adb);
         }
@@ -1982,7 +1988,7 @@ class AndroidAgent extends Agent {
         device.setAppNameMapping(this.appNameMapping);
         device.inputVerifyFn = async (text)=>{
             try {
-                return await this.aiBoolean(`the currently focused input field contains the text "${text}"`);
+                return await this.aiBoolean(`the currently focused input field (text box) shows "${text}" as its actual typed value — ignore any IME candidate bar, autocomplete dropdown, or search suggestion list below the field; only check the input field itself`);
             } catch  {
                 return false;
             }

package/dist/es/mcp-server.mjs

@@ -130,7 +130,7 @@ var __webpack_modules__ = {
                 }
             }
             resolveServerBinPath() {
-                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(import.meta.url).resolve('@xiuchang-midscene/android/package.json');
                 return node_path__rspack_import_2["default"].join(node_path__rspack_import_2["default"].dirname(androidPkgJson), 'bin', 'scrcpy-server');
             }
             getFfmpegPath() {
@@ -1472,7 +1472,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async ensureYadb() {
         if (!this.yadbPushed) {
             const adb = await this.getAdb();
-            const androidPkgJson = (0, external_node_module_.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
+            const androidPkgJson = (0, external_node_module_.createRequire)(import.meta.url).resolve('@xiuchang-midscene/android/package.json');
             const yadbBin = external_node_path_["default"].join(external_node_path_["default"].dirname(androidPkgJson), 'bin', 'yadb');
             await adb.push(yadbBin, '/data/local/tmp');
             this.yadbPushed = true;
@@ -1520,25 +1520,31 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 IME_STRATEGY_ADB_KEYBOARD
             ];
         }
-        if (effectiveFallback?.length) for(let i = 0; i < effectiveFallback.length; i++){
-            const strategy = effectiveFallback[i];
-            const isLast = i === effectiveFallback.length - 1;
-            debugDevice(`[IME fallback] trying strategy: ${strategy} (${i + 1}/${effectiveFallback.length})`);
-            await this._typeWithStrategy(text, strategy, adb);
-            if (isLast) {
-                debugDevice('[IME fallback] all strategies tried');
-                break;
-            }
-            await sleep(300);
-            const success = await this.inputVerifyFn(text);
-            if (success) {
-                debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
-                break;
+        if (effectiveFallback?.length) {
+            const MAX_ROUNDS = 2;
+            const totalAttempts = effectiveFallback.length * MAX_ROUNDS;
+            let succeeded = false;
+            for(let i = 0; i < totalAttempts; i++){
+                const strategy = effectiveFallback[i % effectiveFallback.length];
+                const isLast = i === totalAttempts - 1;
+                debugDevice(`[IME fallback] trying strategy: ${strategy} (attempt ${i + 1}/${totalAttempts})`);
+                await this._typeWithStrategy(text, strategy, adb);
+                if (isLast) {
+                    debugDevice('[IME fallback] all attempts exhausted');
+                    break;
+                }
+                await sleep(800);
+                const success = await this.inputVerifyFn(text);
+                if (success) {
+                    debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
+                    succeeded = true;
+                    break;
+                }
+                debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
+                await adb.clearTextField(100);
             }
-            debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
-            await adb.clearTextField(100);
-        }
-        else {
+            debugDevice(`[IME fallback] done, succeeded=${succeeded}`);
+        } else {
             const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
             await this._typeWithStrategy(text, IME_STRATEGY, adb);
         }
@@ -1915,7 +1921,7 @@ class AndroidAgent extends Agent {
         device.setAppNameMapping(this.appNameMapping);
         device.inputVerifyFn = async (text)=>{
             try {
-                return await this.aiBoolean(`the currently focused input field contains the text "${text}"`);
+                return await this.aiBoolean(`the currently focused input field (text box) shows "${text}" as its actual typed value — ignore any IME candidate bar, autocomplete dropdown, or search suggestion list below the field; only check the input field itself`);
             } catch  {
                 return false;
             }
@@ -1997,7 +2003,7 @@ class AndroidMCPServer extends BaseMCPServer {
     constructor(toolsManager){
         super({
             name: '@midscene/android-mcp',
-            version: "1.6.0",
+            version: "2.0.0",
             description: 'Control the Android device using natural language commands'
         }, toolsManager);
     }

package/dist/lib/cli.js

@@ -120,7 +120,7 @@ var __webpack_modules__ = {
                 }
             }
             resolveServerBinPath() {
-                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__).resolve('@xiuchang-midscene/android/package.json');
                 return node_path__rspack_import_2_default().join(node_path__rspack_import_2_default().dirname(androidPkgJson), 'bin', 'scrcpy-server');
             }
             getFfmpegPath() {
@@ -1488,7 +1488,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         async ensureYadb() {
             if (!this.yadbPushed) {
                 const adb = await this.getAdb();
-                const androidPkgJson = (0, external_node_module_.createRequire)(__rslib_import_meta_url__).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, external_node_module_.createRequire)(__rslib_import_meta_url__).resolve('@xiuchang-midscene/android/package.json');
                 const yadbBin = external_node_path_default().join(external_node_path_default().dirname(androidPkgJson), 'bin', 'yadb');
                 await adb.push(yadbBin, '/data/local/tmp');
                 this.yadbPushed = true;
@@ -1536,25 +1536,31 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     IME_STRATEGY_ADB_KEYBOARD
                 ];
             }
-            if (effectiveFallback?.length) for(let i = 0; i < effectiveFallback.length; i++){
-                const strategy = effectiveFallback[i];
-                const isLast = i === effectiveFallback.length - 1;
-                debugDevice(`[IME fallback] trying strategy: ${strategy} (${i + 1}/${effectiveFallback.length})`);
-                await this._typeWithStrategy(text, strategy, adb);
-                if (isLast) {
-                    debugDevice('[IME fallback] all strategies tried');
-                    break;
-                }
-                await (0, core_utils_namespaceObject.sleep)(300);
-                const success = await this.inputVerifyFn(text);
-                if (success) {
-                    debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
-                    break;
+            if (effectiveFallback?.length) {
+                const MAX_ROUNDS = 2;
+                const totalAttempts = effectiveFallback.length * MAX_ROUNDS;
+                let succeeded = false;
+                for(let i = 0; i < totalAttempts; i++){
+                    const strategy = effectiveFallback[i % effectiveFallback.length];
+                    const isLast = i === totalAttempts - 1;
+                    debugDevice(`[IME fallback] trying strategy: ${strategy} (attempt ${i + 1}/${totalAttempts})`);
+                    await this._typeWithStrategy(text, strategy, adb);
+                    if (isLast) {
+                        debugDevice('[IME fallback] all attempts exhausted');
+                        break;
+                    }
+                    await (0, core_utils_namespaceObject.sleep)(800);
+                    const success = await this.inputVerifyFn(text);
+                    if (success) {
+                        debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
+                        succeeded = true;
+                        break;
+                    }
+                    debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
+                    await adb.clearTextField(100);
                 }
-                debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
-                await adb.clearTextField(100);
-            }
-            else {
+                debugDevice(`[IME fallback] done, succeeded=${succeeded}`);
+            } else {
                 const IME_STRATEGY = (this.options?.imeStrategy || env_namespaceObject.globalConfigManager.getEnvConfigValue(env_namespaceObject.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
                 await this._typeWithStrategy(text, IME_STRATEGY, adb);
             }
@@ -1931,7 +1937,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             device.setAppNameMapping(this.appNameMapping);
             device.inputVerifyFn = async (text)=>{
                 try {
-                    return await this.aiBoolean(`the currently focused input field contains the text "${text}"`);
+                    return await this.aiBoolean(`the currently focused input field (text box) shows "${text}" as its actual typed value — ignore any IME candidate bar, autocomplete dropdown, or search suggestion list below the field; only check the input field itself`);
                 } catch  {
                     return false;
                 }
@@ -2009,7 +2015,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     const tools = new AndroidMidsceneTools();
     (0, cli_namespaceObject.runToolsCLI)(tools, 'midscene-android', {
         stripPrefix: 'android_',
-        version: "1.6.0"
+        version: "2.0.0"
     }).catch((e)=>{
         if (!(e instanceof cli_namespaceObject.CLIError)) console.error(e);
         process.exit(e instanceof cli_namespaceObject.CLIError ? e.exitCode : 1);

package/dist/lib/index.js

@@ -120,7 +120,7 @@ var __webpack_modules__ = {
                 }
             }
             resolveServerBinPath() {
-                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__).resolve('@xiuchang-midscene/android/package.json');
                 return node_path__rspack_import_2_default().join(node_path__rspack_import_2_default().dirname(androidPkgJson), 'bin', 'scrcpy-server');
             }
             getFfmpegPath() {
@@ -1410,7 +1410,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         async ensureYadb() {
             if (!this.yadbPushed) {
                 const adb = await this.getAdb();
-                const androidPkgJson = (0, external_node_module_.createRequire)(__rslib_import_meta_url__).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, external_node_module_.createRequire)(__rslib_import_meta_url__).resolve('@xiuchang-midscene/android/package.json');
                 const yadbBin = external_node_path_default().join(external_node_path_default().dirname(androidPkgJson), 'bin', 'yadb');
                 await adb.push(yadbBin, '/data/local/tmp');
                 this.yadbPushed = true;
@@ -1458,25 +1458,31 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     IME_STRATEGY_ADB_KEYBOARD
                 ];
             }
-            if (effectiveFallback?.length) for(let i = 0; i < effectiveFallback.length; i++){
-                const strategy = effectiveFallback[i];
-                const isLast = i === effectiveFallback.length - 1;
-                debugDevice(`[IME fallback] trying strategy: ${strategy} (${i + 1}/${effectiveFallback.length})`);
-                await this._typeWithStrategy(text, strategy, adb);
-                if (isLast) {
-                    debugDevice('[IME fallback] all strategies tried');
-                    break;
-                }
-                await (0, utils_namespaceObject.sleep)(300);
-                const success = await this.inputVerifyFn(text);
-                if (success) {
-                    debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
-                    break;
+            if (effectiveFallback?.length) {
+                const MAX_ROUNDS = 2;
+                const totalAttempts = effectiveFallback.length * MAX_ROUNDS;
+                let succeeded = false;
+                for(let i = 0; i < totalAttempts; i++){
+                    const strategy = effectiveFallback[i % effectiveFallback.length];
+                    const isLast = i === totalAttempts - 1;
+                    debugDevice(`[IME fallback] trying strategy: ${strategy} (attempt ${i + 1}/${totalAttempts})`);
+                    await this._typeWithStrategy(text, strategy, adb);
+                    if (isLast) {
+                        debugDevice('[IME fallback] all attempts exhausted');
+                        break;
+                    }
+                    await (0, utils_namespaceObject.sleep)(800);
+                    const success = await this.inputVerifyFn(text);
+                    if (success) {
+                        debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
+                        succeeded = true;
+                        break;
+                    }
+                    debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
+                    await adb.clearTextField(100);
                 }
-                debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
-                await adb.clearTextField(100);
-            }
-            else {
+                debugDevice(`[IME fallback] done, succeeded=${succeeded}`);
+            } else {
                 const IME_STRATEGY = (this.options?.imeStrategy || env_namespaceObject.globalConfigManager.getEnvConfigValue(env_namespaceObject.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
                 await this._typeWithStrategy(text, IME_STRATEGY, adb);
             }
@@ -2017,7 +2023,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             device.setAppNameMapping(this.appNameMapping);
             device.inputVerifyFn = async (text)=>{
                 try {
-                    return await this.aiBoolean(`the currently focused input field contains the text "${text}"`);
+                    return await this.aiBoolean(`the currently focused input field (text box) shows "${text}" as its actual typed value — ignore any IME candidate bar, autocomplete dropdown, or search suggestion list below the field; only check the input field itself`);
                 } catch  {
                     return false;
                 }

package/dist/lib/mcp-server.js

@@ -120,7 +120,7 @@ var __webpack_modules__ = {
                 }
             }
             resolveServerBinPath() {
-                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__).resolve('@xiuchang-midscene/android/package.json');
                 return node_path__rspack_import_2_default().join(node_path__rspack_import_2_default().dirname(androidPkgJson), 'bin', 'scrcpy-server');
             }
             getFfmpegPath() {
@@ -1503,7 +1503,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         async ensureYadb() {
             if (!this.yadbPushed) {
                 const adb = await this.getAdb();
-                const androidPkgJson = (0, external_node_module_.createRequire)(__rslib_import_meta_url__).resolve('@midscene/android/package.json');
+                const androidPkgJson = (0, external_node_module_.createRequire)(__rslib_import_meta_url__).resolve('@xiuchang-midscene/android/package.json');
                 const yadbBin = external_node_path_default().join(external_node_path_default().dirname(androidPkgJson), 'bin', 'yadb');
                 await adb.push(yadbBin, '/data/local/tmp');
                 this.yadbPushed = true;
@@ -1551,25 +1551,31 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     IME_STRATEGY_ADB_KEYBOARD
                 ];
             }
-            if (effectiveFallback?.length) for(let i = 0; i < effectiveFallback.length; i++){
-                const strategy = effectiveFallback[i];
-                const isLast = i === effectiveFallback.length - 1;
-                debugDevice(`[IME fallback] trying strategy: ${strategy} (${i + 1}/${effectiveFallback.length})`);
-                await this._typeWithStrategy(text, strategy, adb);
-                if (isLast) {
-                    debugDevice('[IME fallback] all strategies tried');
-                    break;
-                }
-                await (0, core_utils_namespaceObject.sleep)(300);
-                const success = await this.inputVerifyFn(text);
-                if (success) {
-                    debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
-                    break;
+            if (effectiveFallback?.length) {
+                const MAX_ROUNDS = 2;
+                const totalAttempts = effectiveFallback.length * MAX_ROUNDS;
+                let succeeded = false;
+                for(let i = 0; i < totalAttempts; i++){
+                    const strategy = effectiveFallback[i % effectiveFallback.length];
+                    const isLast = i === totalAttempts - 1;
+                    debugDevice(`[IME fallback] trying strategy: ${strategy} (attempt ${i + 1}/${totalAttempts})`);
+                    await this._typeWithStrategy(text, strategy, adb);
+                    if (isLast) {
+                        debugDevice('[IME fallback] all attempts exhausted');
+                        break;
+                    }
+                    await (0, core_utils_namespaceObject.sleep)(800);
+                    const success = await this.inputVerifyFn(text);
+                    if (success) {
+                        debugDevice(`[IME fallback] strategy '${strategy}' succeeded`);
+                        succeeded = true;
+                        break;
+                    }
+                    debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
+                    await adb.clearTextField(100);
                 }
-                debugDevice(`[IME fallback] strategy '${strategy}' failed, clearing field and trying next`);
-                await adb.clearTextField(100);
-            }
-            else {
+                debugDevice(`[IME fallback] done, succeeded=${succeeded}`);
+            } else {
                 const IME_STRATEGY = (this.options?.imeStrategy || env_namespaceObject.globalConfigManager.getEnvConfigValue(env_namespaceObject.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
                 await this._typeWithStrategy(text, IME_STRATEGY, adb);
             }
@@ -1946,7 +1952,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             device.setAppNameMapping(this.appNameMapping);
             device.inputVerifyFn = async (text)=>{
                 try {
-                    return await this.aiBoolean(`the currently focused input field contains the text "${text}"`);
+                    return await this.aiBoolean(`the currently focused input field (text box) shows "${text}" as its actual typed value — ignore any IME candidate bar, autocomplete dropdown, or search suggestion list below the field; only check the input field itself`);
                 } catch  {
                     return false;
                 }
@@ -2028,7 +2034,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         constructor(toolsManager){
             super({
                 name: '@midscene/android-mcp',
-                version: "1.6.0",
+                version: "2.0.0",
                 description: 'Control the Android device using natural language commands'
             }, toolsManager);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiuchang-midscene/android",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -15,7 +15,11 @@
   "bin": {
     "midscene-android": "./bin/midscene-android"
   },
-  "files": ["bin", "dist", "README.md"],
+  "files": [
+    "bin",
+    "dist",
+    "README.md"
+  ],
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
@@ -29,34 +33,21 @@
     },
     "./package.json": "./package.json"
   },
-  "scripts": {
-    "dev": "npm run build:watch",
-    "prebuild": "node scripts/download-scrcpy-server.mjs && node scripts/download-yadb.mjs",
-    "build": "rslib build",
-    "build:watch": "rslib build --watch --no-clean",
-    "prepack": "node scripts/download-scrcpy-server.mjs && node scripts/download-yadb.mjs",
-    "playground": "DEBUG=midscene:* tsx demo/playground.ts",
-    "test": "vitest --run",
-    "test:u": "vitest --run -u",
-    "test:ai": "AI_TEST_TYPE=android npm run test",
-    "test:ai:cache": "MIDSCENE_CACHE=true AI_TEST_TYPE=android npm run test"
-  },
   "dependencies": {
-    "@midscene/core": "workspace:*",
-    "@midscene/shared": "workspace:*",
     "@yume-chan/adb": "2.5.1",
     "@yume-chan/adb-scrcpy": "2.3.2",
     "@yume-chan/adb-server-node-tcp": "2.5.2",
     "@yume-chan/scrcpy": "2.3.0",
     "@yume-chan/stream-extra": "2.1.0",
     "appium-adb": "12.12.1",
-    "sharp": "^0.34.3"
+    "sharp": "^0.34.3",
+    "@midscene/core": "1.6.0",
+    "@midscene/shared": "1.6.0"
   },
   "optionalDependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0"
   },
   "devDependencies": {
-    "@midscene/playground": "workspace:*",
     "@rslib/core": "^0.18.3",
     "@types/node": "^18.0.0",
     "dotenv": "^16.4.5",
@@ -64,7 +55,19 @@
     "typescript": "^5.8.3",
     "tsx": "^4.19.2",
     "vitest": "3.0.5",
-    "zod": "3.24.3"
+    "zod": "3.24.3",
+    "@midscene/playground": "1.6.0"
   },
-  "license": "MIT"
-}
+  "license": "MIT",
+  "scripts": {
+    "dev": "npm run build:watch",
+    "prebuild": "node scripts/download-scrcpy-server.mjs && node scripts/download-yadb.mjs",
+    "build": "rslib build",
+    "build:watch": "rslib build --watch --no-clean",
+    "playground": "DEBUG=midscene:* tsx demo/playground.ts",
+    "test": "vitest --run",
+    "test:u": "vitest --run -u",
+    "test:ai": "AI_TEST_TYPE=android npm run test",
+    "test:ai:cache": "MIDSCENE_CACHE=true AI_TEST_TYPE=android npm run test"
+  }
+}