@ycodium-ai/plugin-devices 0.2.3817 → 0.2.3904

package/dist/index.js

@@ -135,6 +135,7 @@ var parseDeviceAction = (platform2, input) => {
       "setPermission",
       "openUrl",
       "launchApp",
+      "relaunchApp",
       "terminateApp",
       "shake",
       "sendPush"
@@ -178,6 +179,7 @@ var parseDeviceAction = (platform2, input) => {
     case "openUrl":
       return { type, url: url(input["url"]) };
     case "launchApp":
+    case "relaunchApp":
     case "terminateApp":
       return { type, appId: appId(platform2, input["appId"]) };
     case "sendPush":
@@ -199,6 +201,7 @@ var IOS_ACTIONS = /* @__PURE__ */ new Set([
   "setPermission",
   "openUrl",
   "launchApp",
+  "relaunchApp",
   "terminateApp",
   "sendPush"
 ]);
@@ -208,10 +211,10 @@ var ANDROID_ACTIONS = /* @__PURE__ */ new Set([
   "setToggle",
   "setOrientation",
   "setLocation",
-  "clearLocation",
   "setPermission",
   "openUrl",
   "launchApp",
+  "relaunchApp",
   "terminateApp"
 ]);
 var IOS_TOGGLES = /* @__PURE__ */ new Set([
@@ -279,6 +282,7 @@ var actionPayload = {
     ),
     branch("openUrl", { url: { type: "string", minLength: 1, maxLength: 2048 } }, ["url"]),
     branch("launchApp", { appId: appId2 }, ["appId"]),
+    branch("relaunchApp", { appId: appId2 }, ["appId"]),
     branch("terminateApp", { appId: appId2 }, ["appId"]),
     branch("shake"),
     branch("sendPush", { appId: appId2, payload: { type: ["string", "object"] } }, ["appId", "payload"])
@@ -559,9 +563,16 @@ var registerCommands = (ctx, service) => {
 import * as NodeFSP3 from "node:fs/promises";
 import * as NodePath3 from "node:path";
 
+// src/environmentTypes.ts
+var ANDROID_VERSIONS = [
+  { api: "35", name: "Android 15" },
+  { api: "30", name: "Android 11" }
+];
+var BASE_ANDROID_API = ANDROID_VERSIONS[0].api;
+
 // src/androidPackages.ts
 var repo = "https://dl.google.com/android/repository/";
-var archive = (name, file, sha1, bytes, destination = "sdk") => ({ name, url: `${repo}${file}`, sha1, bytes, destination });
+var archive = (name, file, sha1, bytes, destination = "") => ({ name, url: `${repo}${file}`, sha1, bytes, destination });
 var platformTools = {
   linux: archive(
     "Platform-Tools 37.0.1",
@@ -608,19 +619,38 @@ var emulators = {
     455342868
   )
 };
-var androidArchives = (platform2, arch2) => {
+var images = {
+  "35": {
+    name: "Android 15 (API 35), AOSP",
+    x64: ["x86_64-35_r02.zip", "2d857d170c0d1b827149565da34b3383e5306f7f", 782404023],
+    arm64: ["arm64-v8a-35_r02.zip", "2026a06409db630b56711afdbffb457c1dbaed49", 769099654]
+  },
+  "30": {
+    name: "Android 11 (API 30), AOSP",
+    x64: ["x86_64-30_r11.zip", "5e4de3946d46f88856c35efcc4d797b381456347", 676379777],
+    arm64: ["arm64-v8a-30_r02.zip", "e96298145a5e0bfd6da4816f51b06c520d8dba72", 548363615]
+  }
+};
+var image = (api, arch2) => {
+  const [file, sha1, bytes] = images[api][arch2];
+  return archive(
+    images[api].name,
+    `sys-img/android/${file}`,
+    sha1,
+    bytes,
+    `system-images/android-${api}/default`
+  );
+};
+var androidArchives = (platform2, arch2, api = BASE_ANDROID_API) => {
   const emulator = emulators[`${platform2}-${arch2}`];
   const tools = platformTools[platform2];
   if (!emulator || !tools) return null;
-  const arm = arch2 === "arm64";
-  const image = archive(
-    "Android 15 (API 35), AOSP revision 2",
-    `sys-img/android/${arm ? "arm64-v8a" : "x86_64"}-35_r02.zip`,
-    arm ? "2026a06409db630b56711afdbffb457c1dbaed49" : "2d857d170c0d1b827149565da34b3383e5306f7f",
-    arm ? 769099654 : 782404023,
-    "image"
-  );
-  return [tools, emulator, image];
+  const imageArch = arch2 === "arm64" ? "arm64" : "x64";
+  return [
+    tools,
+    emulator,
+    ...[.../* @__PURE__ */ new Set([BASE_ANDROID_API, api])].map((item) => image(item, imageArch))
+  ];
 };
 
 // src/environmentArchive.ts
@@ -826,7 +856,9 @@ var throttledEnvironmentProgress = (publish, now = Date.now) => {
 import * as NodeFSP2 from "node:fs/promises";
 import * as NodePath2 from "node:path";
 var ENVIRONMENT_MARKER = ".ycodium-devices-environment.json";
-var ANDROID_ENVIRONMENT_VERSION = "Android 15 / API 35 \xB7 Emulator 37.2.12";
+var androidVersionLabel = (api) => `${ANDROID_VERSIONS.find((item) => item.api === api)?.name} / API ${api} \xB7 Emulator 37.2.12`;
+var ANDROID_ENVIRONMENT_VERSION = androidVersionLabel(BASE_ANDROID_API);
+var androidAvdName = (api) => `Ycodium_API_${api}`;
 var environmentPaths = (root) => ({
   root,
   sdk: NodePath2.join(root, "sdk"),
@@ -939,27 +971,28 @@ var selectedPrivateSdk = async (dataDir) => {
   if (!root) return null;
   return await privateEnvironmentReady(root) ? NodePath2.join(root, "sdk") : null;
 };
-var privateEnvironmentReady = async (root) => {
+var privateEnvironmentReady = async (root, api = BASE_ANDROID_API) => {
   try {
     await assertPrivateEnvironmentPaths(root);
     const paths = environmentPaths(root);
     if (await NodeFSP2.readFile(NodePath2.join(root, ".prepared"), "utf8") !== ANDROID_ENVIRONMENT_VERSION || await NodeFSP2.readFile(NodePath2.join(paths.sdk, ".ycodium-components"), "utf8") !== ANDROID_ENVIRONMENT_VERSION)
       return false;
-    const avd = NodePath2.join(paths.avd, "Ycodium_API_35.avd");
-    await assertPrivatePath(root, NodePath2.join(avd, "config.ini"));
-    await assertPrivatePath(root, NodePath2.join(paths.avd, "Ycodium_API_35.ini"));
-    const config = await NodeFSP2.readFile(NodePath2.join(avd, "config.ini"), "utf8");
-    const image = /^image\.sysdir\.1\s*=\s*(system-images\/android-35\/default\/(?:x86_64|arm64-v8a)\/)\s*$/m.exec(
-      config
-    )?.[1];
-    if (!image) return false;
-    await assertPrivatePath(root, NodePath2.join(paths.sdk, image, "system.img"));
-    await NodeFSP2.access(NodePath2.join(paths.sdk, image, "system.img"));
-    if (!(await NodeFSP2.readFile(NodePath2.join(paths.avd, "Ycodium_API_35.ini"), "utf8")).includes(
-      `path=${avd}
-`
-    ))
-      return false;
+    for (const item of /* @__PURE__ */ new Set([BASE_ANDROID_API, api])) {
+      const avd = NodePath2.join(paths.avd, `${androidAvdName(item)}.avd`);
+      const ini = NodePath2.join(paths.avd, `${androidAvdName(item)}.ini`);
+      await assertPrivatePath(root, NodePath2.join(avd, "config.ini"));
+      await assertPrivatePath(root, ini);
+      const config = await NodeFSP2.readFile(NodePath2.join(avd, "config.ini"), "utf8");
+      const image2 = new RegExp(
+        `^image\\.sysdir\\.1\\s*=\\s*(system-images/android-${item}/default/(?:x86_64|arm64-v8a)/)\\s*$`,
+        "m"
+      ).exec(config)?.[1];
+      if (!image2) return false;
+      await assertPrivatePath(root, NodePath2.join(paths.sdk, image2, "system.img"));
+      await NodeFSP2.access(NodePath2.join(paths.sdk, image2, "system.img"));
+      if (!(await NodeFSP2.readFile(ini, "utf8")).includes(`path=${avd}
+`)) return false;
+    }
     for (const suffix of ["", ".exe"]) {
       try {
         await NodeFSP2.access(NodePath2.join(paths.sdk, "platform-tools", `adb${suffix}`));
@@ -1003,6 +1036,18 @@ var cleanEnvironment = async (root, category) => {
 var GIB = 1024 ** 3;
 var androidGuide = "https://developer.android.com/studio/run/emulator-acceleration";
 var appleGuide = "https://developer.apple.com/documentation/xcode/downloading-and-installing-additional-xcode-components";
+var androidApi = (version) => {
+  const requested = version?.trim() || BASE_ANDROID_API;
+  const selected = ANDROID_VERSIONS.find((item) => item.api === requested);
+  if (!selected) throw new DeviceError("invalid-input", `Unsupported Android API: ${requested}`);
+  return selected.api;
+};
+var pendingArchives = async (archives, sdk) => {
+  const present = await Promise.all(
+    archives.map((item) => NodeFSP3.lstat(NodePath3.join(sdk, item.destination)).catch(() => null))
+  );
+  return archives.filter((_item, index) => present[index] === null);
+};
 var DeviceEnvironments = class {
   busy = false;
   abort = new AbortController();
@@ -1115,12 +1160,12 @@ var DeviceEnvironments = class {
         deviceDataBytes
       };
     }
-    const archives = androidArchives(probe.platform, probe.arch);
+    const api = androidApi(input.version);
+    const archives = androidArchives(probe.platform, probe.arch, api);
     const sdk = await this.options.externalSdk();
-    const prepared = await privateEnvironmentReady(root);
-    const installed = await NodeFSP3.lstat(paths.sdk).catch(() => null) !== null;
-    const missing = installed ? [] : await Promise.all(
-      (archives ?? []).map(async (item) => {
+    const prepared = await privateEnvironmentReady(root, api);
+    const missing = await Promise.all(
+      (await pendingArchives(archives ?? [], paths.sdk)).map(async (item) => {
         const cached = await NodeFSP3.lstat(archivePath(item, paths.cache)).catch(() => null);
         return cached?.size === item.bytes ? 0 : item.bytes;
       })
@@ -1131,7 +1176,7 @@ var DeviceEnvironments = class {
       source: sdk.available && sdk.root !== paths.sdk ? "external" : "private",
       ...sdk.available && sdk.root ? { existingSdkRoot: sdk.root } : {},
       root,
-      version: ANDROID_ENVIRONMENT_VERSION,
+      version: androidVersionLabel(api),
       downloadBytes: archives ? missing.reduce((sum, bytes) => sum + bytes, 0) : null,
       requiredFreeBytes: 12 * GIB,
       freeBytes: free,
@@ -1199,7 +1244,7 @@ var DeviceEnvironments = class {
         ])
           await NodeFSP3.mkdir(directory, { recursive: true });
         if (input.platform === "ios") await this.prepareIos(plan, progress, signal);
-        else await this.prepareAndroid(plan, progress, signal);
+        else await this.prepareAndroid(plan, androidApi(input.version), progress, signal);
       } finally {
         await release?.();
       }
@@ -1207,57 +1252,68 @@ var DeviceEnvironments = class {
       return this.plan(input);
     });
   }
-  async prepareAndroid(plan, progress, signal) {
+  async prepareAndroid(plan, api, progress, signal) {
     const probe = await this.probe();
-    const archives = androidArchives(probe.platform, probe.arch);
+    const archives = androidArchives(probe.platform, probe.arch, api);
     if (!archives) throw new Error("Android host target is unsupported");
     const paths = environmentPaths(plan.root);
     const staging = await NodeFSP3.mkdtemp(NodePath3.join(paths.temp, "prepare-"));
     try {
       const existing2 = await NodeFSP3.lstat(paths.sdk).catch(() => null);
+      if (existing2 && (existing2.isSymbolicLink() || !existing2.isDirectory() || await NodeFSP3.readFile(NodePath3.join(paths.sdk, ".ycodium-components"), "utf8").catch(
+        () => ""
+      ) !== ANDROID_ENVIRONMENT_VERSION))
+        throw new Error(
+          "An unrecognized private SDK already exists; its installation will not be overwritten"
+        );
+      const pending = await pendingArchives(archives, paths.sdk);
+      const totalBytes = pending.reduce((sum, item) => sum + item.bytes, 0);
+      let finished = 0;
+      for (const item of pending) {
+        const received = (bytes) => progress({
+          phase: "download",
+          component: item.name,
+          receivedBytes: finished + bytes,
+          totalBytes
+        });
+        received(0);
+        signal.throwIfAborted();
+        const file = await downloadArchive(
+          item,
+          paths.cache,
+          (url2, init) => this.options.fetch(url2, { ...init, signal }),
+          received
+        );
+        finished += item.bytes;
+        progress({
+          phase: "extract",
+          component: item.name,
+          receivedBytes: finished,
+          totalBytes
+        });
+        await extractEnvironmentZip(file, NodePath3.join(staging, item.destination), signal);
+      }
       if (existing2) {
-        if (existing2.isSymbolicLink() || !existing2.isDirectory() || await NodeFSP3.readFile(NodePath3.join(paths.sdk, ".ycodium-components"), "utf8").catch(
-          () => ""
-        ) !== plan.version)
-          throw new Error(
-            "An unrecognized private SDK already exists; its installation will not be overwritten"
-          );
-      } else {
-        const totalBytes = archives.reduce((sum, item) => sum + item.bytes, 0);
-        let finished = 0;
-        for (const item of archives) {
-          const received = (bytes) => progress({
-            phase: "download",
-            component: item.name,
-            receivedBytes: finished + bytes,
-            totalBytes
-          });
-          received(0);
-          signal.throwIfAborted();
-          const file = await downloadArchive(
-            item,
-            paths.cache,
-            (url2, init) => this.options.fetch(url2, { ...init, signal }),
-            received
-          );
-          finished += item.bytes;
-          progress({
-            phase: "extract",
-            component: item.name,
-            receivedBytes: finished,
-            totalBytes
-          });
-          await extractEnvironmentZip(
-            file,
-            item.destination === "sdk" ? staging : NodePath3.join(staging, "system-images", "android-35", "default"),
-            signal
-          );
+        for (const item of pending) {
+          const target2 = NodePath3.join(paths.sdk, item.destination);
+          await assertPrivatePath(paths.root, target2);
+          await NodeFSP3.mkdir(NodePath3.dirname(target2), { recursive: true });
+          await NodeFSP3.rename(NodePath3.join(staging, item.destination), target2);
         }
-        await NodeFSP3.writeFile(NodePath3.join(staging, ".ycodium-components"), plan.version);
+      } else {
+        await NodeFSP3.writeFile(
+          NodePath3.join(staging, ".ycodium-components"),
+          ANDROID_ENVIRONMENT_VERSION
+        );
         await NodeFSP3.rename(staging, paths.sdk);
       }
       progress({ phase: "device" });
-      await this.createPrivateAvd(paths.root, probe.arch === "arm64" ? "arm64-v8a" : "x86_64");
+      for (const item of /* @__PURE__ */ new Set([BASE_ANDROID_API, api]))
+        await this.createPrivateAvd(
+          paths.root,
+          probe.arch === "arm64" ? "arm64-v8a" : "x86_64",
+          item
+        );
       signal.throwIfAborted();
       progress({ phase: "validate" });
       const validated = await this.options.process.run({
@@ -1268,7 +1324,7 @@ var DeviceEnvironments = class {
       });
       if (validated.exitCode !== 0)
         throw new Error(`The private SDK could not be validated. ${validated.stderr.trim()}`);
-      await NodeFSP3.writeFile(NodePath3.join(plan.root, ".prepared"), plan.version);
+      await NodeFSP3.writeFile(NodePath3.join(plan.root, ".prepared"), ANDROID_ENVIRONMENT_VERSION);
       await NodeFSP3.writeFile(
         NodePath3.join(this.options.dataDir, "android-environment.json"),
         JSON.stringify({ root: plan.root })
@@ -1277,9 +1333,9 @@ var DeviceEnvironments = class {
       await NodeFSP3.rm(staging, { recursive: true, force: true });
     }
   }
-  async createPrivateAvd(root, abi) {
+  async createPrivateAvd(root, abi, api) {
     const paths = environmentPaths(root);
-    const name = "Ycodium_API_35";
+    const name = androidAvdName(api);
     const avd = NodePath3.join(paths.avd, `${name}.avd`);
     await assertPrivatePath(root, avd);
     await assertPrivatePath(root, NodePath3.join(paths.avd, `${name}.ini`));
@@ -1294,7 +1350,7 @@ var DeviceEnvironments = class {
     await NodeFSP3.mkdir(avd, { recursive: true });
     const config = {
       AvdId: name,
-      "avd.ini.displayname": "Ycodium Android 15",
+      "avd.ini.displayname": `Ycodium ${ANDROID_VERSIONS.find((item) => item.api === api)?.name}`,
       "abi.type": abi,
       "hw.cpu.arch": abi === "arm64-v8a" ? "arm64" : "x86_64",
       "hw.cpu.ncore": "2",
@@ -1305,8 +1361,10 @@ var DeviceEnvironments = class {
       "hw.gpu.enabled": "yes",
       "hw.gpu.mode": "auto",
       "hw.keyboard": "yes",
+      // 不写时 API 30 按实体按键处理，屏幕上没有导航栏。
+      "hw.mainKeys": "no",
       "disk.dataPartition.size": "4G",
-      "image.sysdir.1": `system-images/android-35/default/${abi}/`,
+      "image.sysdir.1": `system-images/android-${api}/default/${abi}/`,
       "tag.id": "default",
       "tag.display": "Default Android System Image",
       "PlayStore.enabled": "false"
@@ -1320,7 +1378,7 @@ var DeviceEnvironments = class {
       NodePath3.join(paths.avd, `${name}.ini`),
       `avd.ini.encoding=UTF-8
 path=${avd}
-target=android-35
+target=android-${api}
 `,
       { flag: "wx" }
     );
@@ -2189,7 +2247,7 @@ import * as NodePath7 from "node:path";
 import * as NodeFSP6 from "node:fs/promises";
 import * as NodePath6 from "node:path";
 import * as NodeOS from "node:os";
-var DEVICE_HUB_VERSION = "0.12.0";
+var DEVICE_HUB_VERSION = "0.19.1";
 var AGENT_DEVICE_VERSION = "0.21.12";
 var runtimeTarget = `${NodeOS.platform()}-${NodeOS.arch()}`;
 var HUB_SPEC = {
@@ -2696,6 +2754,10 @@ var runIos = async (tools, udid, action) => {
     case "launchApp":
       await simctl(tools, udid, ["launch", action.appId], "launch");
       return;
+    case "relaunchApp":
+      await simctl(tools, udid, ["terminate", action.appId], "terminate").catch(() => void 0);
+      await simctl(tools, udid, ["launch", action.appId], "launch");
+      return;
     case "terminateApp":
       await simctl(tools, udid, ["terminate", action.appId], "terminate");
       return;
@@ -2712,6 +2774,7 @@ var runIos = async (tools, udid, action) => {
 var adb = (tools, serial, args, operation) => checked(tools.run("adb", ["-s", serial, ...args]), operation);
 var runAndroid = async (tools, serial, action) => {
   const shell = (args, operation) => adb(tools, serial, ["shell", ...args], operation);
+  const launch = (appId3) => shell(["monkey", "-p", appId3, "-c", "android.intent.category.LAUNCHER", "1"], "launch");
   switch (action.type) {
     case "setAppearance":
       await shell(["cmd", "uimode", "night", action.value === "dark" ? "yes" : "no"], "appearance");
@@ -2768,13 +2831,21 @@ var runAndroid = async (tools, serial, action) => {
         "location"
       );
       return;
-    case "clearLocation":
-      return;
     case "setPermission": {
       const permissions = ANDROID_PERMISSIONS[action.permission];
       if (permissions === void 0) throw unsupported("permission", "android");
       const verb = action.decision === "grant" ? "grant" : "revoke";
-      for (const permission of permissions) {
+      const declared = new Set(
+        (await shell(["dumpsys", "package", action.appId], "permission")).split(/[\s:,]+/u)
+      );
+      const requested = permissions.filter((permission) => declared.has(permission));
+      if (requested.length === 0) {
+        throw new DeviceError(
+          "command-failed",
+          `${action.appId} does not declare this permission, so Android cannot change it.`
+        );
+      }
+      for (const permission of requested) {
         await shell(["pm", verb, action.appId, permission], "permission").catch(() => void 0);
       }
       return;
@@ -2786,14 +2857,16 @@ var runAndroid = async (tools, serial, action) => {
       );
       return;
     case "launchApp":
-      await shell(
-        ["monkey", "-p", action.appId, "-c", "android.intent.category.LAUNCHER", "1"],
-        "launch"
-      );
+      await launch(action.appId);
+      return;
+    case "relaunchApp":
+      await shell(["am", "force-stop", action.appId], "terminate");
+      await launch(action.appId);
       return;
     case "terminateApp":
       await shell(["am", "force-stop", action.appId], "terminate");
       return;
+    case "clearLocation":
     case "setLiquidGlass":
     case "setColorFilter":
     case "shake":
@@ -2859,22 +2932,32 @@ var readIos = async (tools, udid) => {
   };
   return { settings, foregroundApp: null };
 };
+var ANDROID_DETAIL_SEPARATOR = "--ycodium-detail--";
+var ANDROID_DETAIL_READS = [
+  "cmd uimode night",
+  "settings get system font_scale",
+  "settings get global animator_duration_scale",
+  "settings get global wifi_on",
+  // `dumpsys window windows` 在 API 36 起不再打印焦点；不带过滤的整份 dump 还打。
+  "dumpsys window"
+];
 var readAndroid = async (tools, serial) => {
-  const shell = (args) => quiet(async () => (await adb(tools, serial, ["shell", ...args], args[0] ?? "shell")).trim());
-  const [night, fontScale, animator, wifi, focus] = await Promise.all([
-    shell(["cmd", "uimode", "night"]),
-    shell(["settings", "get", "system", "font_scale"]),
-    shell(["settings", "get", "global", "animator_duration_scale"]),
-    shell(["settings", "get", "global", "wifi_on"]),
-    // `dumpsys window windows` 在 API 36 起不再打印焦点；不带过滤的整份 dump 还打。
-    shell(["dumpsys", "window"])
-  ]);
+  const output = await quiet(
+    () => adb(
+      tools,
+      serial,
+      ["shell", ANDROID_DETAIL_READS.join(` ; echo ${ANDROID_DETAIL_SEPARATOR} ; `)],
+      "detail"
+    )
+  );
+  const [night, fontScale, animator, wifi, focus] = (output ?? "").split(ANDROID_DETAIL_SEPARATOR).map((part) => part.trim() || void 0);
   const scale = fontScale && fontScale !== "null" ? Number(fontScale) : Number.NaN;
   const focused = focus?.match(/m(?:CurrentFocus|FocusedApp)=\w+\{[^ ]+ u\d+ ([^/ ]+)\//);
   const settings = {
     ...night?.includes("yes") ? { appearance: "dark" } : night?.includes("no") ? { appearance: "light" } : {},
     ...Number.isFinite(scale) ? { textSize: textSizeFromAndroid(scale) } : {},
-    ...animator !== void 0 && animator !== "null" ? { reduceMotion: Number(animator) === 0 } : {},
+    // 没动过这项设置时系统读出 "null"，含义是默认动画，不是未知。
+    ...animator === void 0 ? {} : { reduceMotion: animator !== "null" && Number(animator) === 0 },
     ...wifi === "1" || wifi === "0" ? { networkEnabled: wifi === "1" } : {}
   };
   const foregroundApp = focused?.[1] === void 0 ? null : { id: focused[1] };
@@ -3048,6 +3131,8 @@ var classifyBootFailure = (error) => {
 };
 
 // src/service.ts
+var ANDROID_BOOT_POLL_MS = 2e3;
+var ANDROID_BOOT_POLLS = 60;
 var sameDevice = (a, hostId, deviceId) => a.hostId === hostId && a.id === deviceId;
 var DeviceService = class {
   environmentMutating = false;
@@ -3161,7 +3246,9 @@ var DeviceService = class {
         }
       }
     }
-    return list.errors.length > 0 ? { devices, detail: list.errors.join("\n") } : { devices };
+    const iosAvailable = (await this.host.platformAvailability("ios")).available;
+    const errors = iosAvailable ? list.errors : list.errors.filter((error) => !error.startsWith("[apple-utils]"));
+    return errors.length > 0 ? { devices, detail: errors.join("\n") } : { devices };
   }
   async refresh(ready) {
     const generation = this.environmentGeneration;
@@ -3213,6 +3300,22 @@ var DeviceService = class {
       this.pendingOpens--;
     }
   }
+  /** hub 在模拟器连上 adb 时就返回，这时系统还没开机完，画面出不来；等不到也照常打开。 */
+  async waitForAndroidBoot(serial) {
+    for (let poll = 0; poll < ANDROID_BOOT_POLLS; poll += 1) {
+      const result = await this.host.runSdkCommand("adb", [
+        "-s",
+        serial,
+        "shell",
+        "getprop",
+        "sys.boot_completed"
+      ]);
+      if (result.code === 0 && result.stdout.trim() === "1") return;
+      await new Promise(
+        (resolve3) => setTimeout(resolve3, this.options.androidBootPollMs ?? ANDROID_BOOT_POLL_MS)
+      );
+    }
+  }
   async openDevice(input) {
     this.resolveHost(input.hostId);
     const availability = await this.host.platformAvailability(input.platform);
@@ -3254,6 +3357,7 @@ var DeviceService = class {
         }
         if (device.platform === "ios") await hub.attachIosStream(device.id);
         bootedId = result.serial ?? result.id ?? device.id;
+        if (device.platform === "android") await this.waitForAndroidBoot(bootedId);
       } finally {
         this.publish((state) => ({
           ...state,
@@ -3652,7 +3756,7 @@ var deviceToolkit = (service) => ({
 var HUB_SERVICE = "hub";
 var index_default = definePlugin({
   id: "devices",
-  apiVersion: 60,
+  apiVersion: 66,
   activate: async (ctx) => {
     const direct = (input, init) => ctx.proxies.fetch(PLUGIN_PROXY_DIRECT).then((fetchDirect) => fetchDirect(input, init));
     const host = new LocalDeviceHost({

package/locales/en.json

@@ -9,6 +9,8 @@
     "directory": "Storage directory on this machine",
     "defaultDirectory": "Ycodium private data directory",
     "directoryHint": "Choose an absolute folder on the desired disk. A dedicated ycodium-devices folder is created inside it. This path belongs to the connected machine.",
+    "androidVersion": "Android version",
+    "androidVersionOption": "{{name}} (API {{api}})",
     "iosVersion": "iOS runtime version",
     "iosVersionPlaceholder": "For example, 18.0",
     "inspect": "Check prerequisites and storage",
@@ -29,7 +31,7 @@
     "external": "Existing SDKs are reused by default. Preparing a private environment selects it unless an SDK location is explicitly set in Settings. Normal use of existing virtual devices writes to their data. Private preparation does not modify the external SDK.",
     "guide": "Official setup guidance",
     "appleOwnership": "Apple installs this runtime in its shared simulator environment. Only its download archive is stored privately. No existing runtime is upgraded or removed. Xcode may require you to complete permissions or initialization yourself.",
-    "privateOwnership": "Android 15 AOSP, Platform-Tools and Emulator are downloaded from Google at pinned revisions. SDK files, virtual device data, configuration and temporary files stay in private storage. Applications installed in a virtual device are user data.",
+    "privateOwnership": "The chosen Android AOSP image, Platform-Tools and Emulator are downloaded from Google at pinned revisions. SDK files, virtual device data, configuration and temporary files stay in private storage. Applications installed in a virtual device are user data.",
     "appleLicense": "Apple software license agreements",
     "androidLicense": "Android SDK License Agreement",
     "acceptLicense": "I accept the applicable component licenses",
@@ -244,6 +246,7 @@
       "presetPlaceholder": "Preset…",
       "set": "Set",
       "clear": "Clear",
+      "current": "Set to {{latitude}}, {{longitude}}",
       "sanFrancisco": "San Francisco",
       "newYork": "New York",
       "london": "London",
@@ -294,6 +297,7 @@
     "updateTo": "Verify bundled {{version}}",
     "pendingPolicy": "Device helpers are included with Ycodium. Missing or incomplete components require repairing or updating Ycodium on this machine.",
     "checkHint": "Checking reads the installed tools without installing or starting anything.",
+    "checked": "Checked. The versions above are current.",
     "check": "Check versions",
     "checkFailed": "Could not read the tool versions. Try again.",
     "updateFailed": "Bundled components are missing or incomplete. Repair or update Ycodium on this machine."

package/locales/zh-CN.json

@@ -9,6 +9,8 @@
     "directory": "这台机器上的存储目录",
     "defaultDirectory": "Ycodium 私有数据目录",
     "directoryHint": "填写目标磁盘上的绝对路径，组件将放进其中专用的 ycodium-devices 文件夹。路径属于当前连接的机器。",
+    "androidVersion": "Android 版本",
+    "androidVersionOption": "{{name}}（API {{api}}）",
     "iosVersion": "iOS 运行时版本",
     "iosVersionPlaceholder": "例如 18.0",
     "inspect": "检查条件与存储空间",
@@ -29,7 +31,7 @@
     "external": "默认复用已有 SDK。准备私有环境后会接入它，但设置中明确指定的 SDK 位置优先。正常使用已有虚拟设备会写入其数据；私有准备不会修改外部 SDK。",
     "guide": "官方设置指引",
     "appleOwnership": "Apple 会将运行时安装到共享模拟器环境，只有下载归档存放在私有目录。不会升级或删除已有运行时。Xcode 如需权限或首次初始化，须由你自行完成。",
-    "privateOwnership": "从 Google 下载固定版本的 Android 15 AOSP、Platform-Tools 和 Emulator。SDK、虚拟设备数据、配置和临时文件保存在私有目录。虚拟设备中安装的应用属于用户数据。",
+    "privateOwnership": "从 Google 下载固定版本的所选 Android AOSP 镜像、Platform-Tools 和 Emulator。SDK、虚拟设备数据、配置和临时文件保存在私有目录。虚拟设备中安装的应用属于用户数据。",
     "appleLicense": "Apple 软件许可协议",
     "androidLicense": "Android SDK 许可协议",
     "acceptLicense": "我接受适用的组件许可协议",
@@ -244,6 +246,7 @@
       "presetPlaceholder": "预设…",
       "set": "设置",
       "clear": "清除",
+      "current": "已设为 {{latitude}}, {{longitude}}",
       "sanFrancisco": "旧金山",
       "newYork": "纽约",
       "london": "伦敦",
@@ -294,6 +297,7 @@
     "updateTo": "校验随包版本 {{version}}",
     "pendingPolicy": "设备辅助工具随 Ycodium 提供。组件缺失或不完整时，请修复或更新这台机器上的 Ycodium。",
     "checkHint": "检查只读取已装的工具，不安装也不启动任何东西。",
+    "checked": "检查完成，上面的版本是最新读取的结果。",
     "check": "检查版本",
     "checkFailed": "读不到工具版本，请重试。",
     "updateFailed": "随包组件缺失或不完整，请修复或更新这台机器上的 Ycodium。"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/plugin-devices",
-  "version": "0.2.3817",
+  "version": "0.2.3904",
   "description": "Lets agents drive iOS Simulators and Android Emulators on this machine.",
   "keywords": [
     "android",
@@ -16,6 +16,7 @@
     "dist",
     "locales",
     "assets",
+    "skills",
     "README.md"
   ],
   "type": "module",
@@ -33,7 +34,7 @@
     "tailwindcss": "^4.0.0",
     "typescript": "~6.0.3",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3817",
+    "@ycodium-ai/plugin-api": "0.2.3904",
     "ycodium-fetch-ports": "0.0.0",
     "ycodium-sse-stream": "0.0.0"
   },
@@ -44,6 +45,11 @@
     "description": "Lets agents drive iOS Simulators and Android Emulators on this machine.",
     "descriptionKey": "presentation.description",
     "icon": "./assets/icon.svg",
+    "skills": [
+      {
+        "dir": "./skills/mobile-devices"
+      }
+    ],
     "ui": {
       "assets": "./assets",
       "entry": "ui.js",