@ycodium-ai/plugin-devices 0.2.3230 → 0.2.3236

package/README.md

@@ -24,6 +24,16 @@ agent or a person actually uses a device (listing or opening one), the plugin:
 
 Turning the plugin off stops both processes.
 
+On Windows the hub and its ordinary children are owned by a kill-on-close Job.
+Android Emulators started through its `emulator.exe` shim belong to the user and
+continue running when the hub stops. This requires the shipped Windows launcher.
+The launcher uses managed mode when its executable stem is `ycodium-job-launcher`
+(case-insensitive). Any other name selects breakaway mode and looks for a same-named
+`.exe` on PATH outside its own directory; Devices copies it as `emulator.exe`.
+The shim depends on `agent-device` finding emulator through `PATH`; an absolute
+SDK path bypasses it and the emulator then stops with the hub. The plugin logs a
+warning when a launch cannot be matched to the shim's process record.
+
 ## Agent tools
 
 On MCP the tools are prefixed with the plugin id (`devices_device_list`, …).

package/dist/helper.mjs

@@ -11,7 +11,13 @@
 // 它不是插件进程里的代码，而是插件经 `ctx.process` 起的独立程序，跟插件自带的二进制同一类，
 // 所以放在 `bin/` 而不是 `src/`：插件源码边界（不许直接起子进程）管的是 `src/`。`run` 模式自己
 // 起 adb / emulator，并把 SIGTERM / SIGINT 转给它；Windows 上宿主直接结束本进程，收不到信号。
+//
+// emulator 脱离垫片绑在 agent-device「Windows 上只靠 PATH 找 emulator」上。若它改读
+// ANDROID_HOME 或绝对路径，垫片会被绕过，模拟器随 hub 的 Job 一起被收；不会留孤儿，
+// 但用户可能察觉不到。真实进程用例守脱离语义，下面的逐次启动记录核对守绝对路径绕过。
 import * as NodeChildProcess from "node:child_process";
+import * as NodeCrypto from "node:crypto";
+import * as NodeDiagnosticsChannel from "node:diagnostics_channel";
 import * as NodeFS from "node:fs";
 import * as NodePath from "node:path";
 import * as NodeURL from "node:url";
@@ -39,11 +45,104 @@ function parseArgs(argv) {
   return options;
 }
 
-function prependPath(directories) {
-  const key = Object.keys(process.env).find((name) => name.toUpperCase() === "PATH") ?? "PATH";
-  process.env[key] = [...directories, process.env[key] ?? ""]
-    .filter(Boolean)
-    .join(NodePath.delimiter);
+function prependPath(directories, env = process.env, delimiter = NodePath.delimiter) {
+  const key = Object.keys(env).find((name) => name.toUpperCase() === "PATH") ?? "PATH";
+  env[key] = [...directories, env[key] ?? ""].filter(Boolean).join(delimiter);
+}
+
+// 允许脱离 hub 的 Job 的那一个程序：垫片文件名与启动核对都从它来。
+const BREAKAWAY_TARGET = "emulator";
+
+/** 只在宿主提供 launcher 时布置；每次 hub 启动换 nonce，旧 pid 文件不能冒充本次脱离。 */
+export function prepareBreakawayShim({ platform, directory, env }) {
+  const source = env.YCODIUM_BREAKAWAY_SHIM_SOURCE;
+  if (platform !== "win32" || !source || !directory) return null;
+  NodeFS.mkdirSync(directory, { recursive: true });
+  const target = NodePath.join(directory, `${BREAKAWAY_TARGET}.exe`);
+  // 复制到新文件再换名，不能覆写仍在执行或硬链接到安装目录的可执行文件。
+  const temporary = NodePath.join(directory, `${NodeCrypto.randomUUID()}.tmp`);
+  try {
+    NodeFS.copyFileSync(source, temporary);
+    NodeFS.renameSync(temporary, target);
+  } finally {
+    NodeFS.rmSync(temporary, { force: true });
+  }
+  for (const name of NodeFS.readdirSync(directory)) {
+    if (/^\d+\.json$/.test(name)) NodeFS.rmSync(NodePath.join(directory, name), { force: true });
+  }
+  const nonce = NodeCrypto.randomUUID();
+  env.YCODIUM_BREAKAWAY_SHIM_NONCE = nonce;
+  prependPath([directory], env, ";");
+  return { directory, nonce };
+}
+
+/** 记录在 CreateProcess 后、ResumeThread 前原子落盘，targetPid 的父进程因此就是 shimPid。 */
+export function verifyBreakawayLaunch(child, shim, report, timeoutMs = 5_000) {
+  const pid = child.pid;
+  if (!pid) return;
+  const recordPath = NodePath.join(shim.directory, `${pid}.json`);
+  let done = false;
+  let watcher;
+  let timer;
+  const finish = (record) => {
+    if (done) return;
+    done = true;
+    watcher?.close();
+    clearTimeout(timer);
+    report({
+      event: "ycodium-emulator-breakaway",
+      shimPid: pid,
+      targetPid: record?.targetPid ?? null,
+      verified: record !== null,
+    });
+  };
+  const check = () => {
+    if (done) return;
+    try {
+      const record = JSON.parse(NodeFS.readFileSync(recordPath, "utf8"));
+      if (
+        record.shimPid !== pid ||
+        record.nonce !== shim.nonce ||
+        !Number.isSafeInteger(record.targetPid) ||
+        record.targetPid <= 0 ||
+        record.targetPid === pid
+      )
+        return;
+      finish(record);
+      NodeFS.rmSync(recordPath, { force: true });
+    } catch {
+      // 记录尚未落盘；由目录事件再次检查，到期仍不匹配才警告。
+    }
+  };
+  // Windows 目录事件可能合并或丢失；到期再读一次，不能把通知缺失当成垫片缺失。
+  timer = setTimeout(() => {
+    check();
+    if (!done) finish(null);
+  }, timeoutMs);
+  timer.unref();
+  try {
+    watcher = NodeFS.watch(shim.directory, { persistent: false }, check);
+    watcher.on("error", () => watcher.close());
+  } catch {
+    // 目录监听不可用时仍保留到期读取，不能把监听错误当成脱离失败。
+  }
+  check();
+}
+
+function observeEmulatorLaunches(shim) {
+  // Node 的公开诊断通道在 ChildProcess 构造时通知；spawn 事件后才读 pid / spawnfile。
+  NodeDiagnosticsChannel.subscribe("child_process", ({ process: child }) => {
+    child.once("spawn", () => {
+      const name = NodePath.win32
+        .basename(child.spawnfile)
+        .toLowerCase()
+        .replace(/\.exe$/u, "");
+      if (name !== BREAKAWAY_TARGET) return;
+      verifyBreakawayLaunch(child, shim, (record) =>
+        process.stderr.write(`${JSON.stringify(record)}\n`),
+      );
+    });
+  });
 }
 
 /**
@@ -237,6 +336,12 @@ async function main() {
     const [entry, ...args] = options.rest;
     if (!entry) throw new Error("helper node: missing entry script");
     applySdkEnvironment(options.sdk);
+    const shim = prepareBreakawayShim({
+      platform: hostPlatform,
+      directory: options.shim,
+      env: process.env,
+    });
+    if (shim) observeEmulatorLaunches(shim);
     await loadEntry(entry, args);
     return;
   }
@@ -280,7 +385,8 @@ async function main() {
   throw new Error(`helper: unknown mode ${String(mode)}`);
 }
 
-main().catch((error) => {
-  process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
-  process.exitCode = 1;
-});
+if (process.argv[1] && NodePath.resolve(process.argv[1]) === NodeURL.fileURLToPath(import.meta.url))
+  main().catch((error) => {
+    process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+    process.exitCode = 1;
+  });

package/dist/index.js

@@ -901,7 +901,17 @@ var nodeProcessProbe = {
   }
 };
 var defaultSleep2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var drainOutput = (handle) => {
+var parseBreakawayWarning = (line) => {
+  try {
+    const record = JSON.parse(line);
+    if (typeof record === "object" && record !== null && "event" in record && record.event === "ycodium-emulator-breakaway" && "verified" in record && record.verified === false) {
+      return record;
+    }
+  } catch {
+  }
+  return null;
+};
+var drainOutput = (handle, log) => {
   const tail = [];
   const decoder = new TextDecoder();
   const drain = async (stream) => {
@@ -912,6 +922,13 @@ var drainOutput = (handle) => {
       pending = lines.pop() ?? "";
       for (const line of lines) {
         if (line.trim().length === 0) continue;
+        const warning = parseBreakawayWarning(line);
+        if (warning !== null) {
+          log.warn(
+            "Emulator breakaway shim was bypassed or could not be verified; the emulator may stop with the device hub",
+            warning
+          );
+        }
         tail.push(line.trim());
         if (tail.length > OUTPUT_TAIL_LINES) tail.shift();
       }
@@ -981,7 +998,12 @@ var HubProcess = class {
     await NodeFSP2.mkdir(this.options.stateDir, { recursive: true });
     const port = await (this.options.reservePort ?? (() => reserveFetchSafePort()))();
     const origin = `http://127.0.0.1:${String(port)}`;
-    const args = [this.options.helperPath, "node"];
+    const args = [
+      this.options.helperPath,
+      "node",
+      "--shim",
+      NodePath2.join(this.options.stateDir, "emulator-shim")
+    ];
     if (launch.sdkRoot !== null) args.push("--sdk", launch.sdkRoot);
     args.push(
       "--",
@@ -997,7 +1019,7 @@ var HubProcess = class {
     try {
       handle = await this.options.process.spawn({
         program: "host:node",
-        jobPolicy: "none",
+        jobPolicy: "allowExplicitBreakaway",
         args,
         cwd: this.options.stateDir,
         env: { FORCE_COLOR: "0", NO_COLOR: "1" }
@@ -1011,7 +1033,7 @@ var HubProcess = class {
         }
       );
     }
-    const output = drainOutput(handle);
+    const output = drainOutput(handle, this.options.log);
     let exited = false;
     void handle.exited.then(() => {
       exited = true;
@@ -2835,7 +2857,7 @@ var deviceToolkit = (service) => ({
 var HUB_SERVICE = "hub";
 var index_default = definePlugin({
   id: "devices",
-  apiVersion: 23,
+  apiVersion: 25,
   activate: async (ctx) => {
     const direct = (input, init) => ctx.proxies.fetch(PLUGIN_PROXY_DIRECT).then((fetchDirect) => fetchDirect(input, init));
     const host = new LocalDeviceHost({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/plugin-devices",
-  "version": "0.2.3230",
+  "version": "0.2.3236",
   "description": "Lets agents drive iOS Simulators and Android Emulators on this machine.",
   "keywords": [
     "android",
@@ -33,7 +33,7 @@
     "tailwindcss": "^4.0.0",
     "typescript": "~6.0.3",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3230",
+    "@ycodium-ai/plugin-api": "0.2.3236",
     "ycodium-fetch-ports": "0.0.0",
     "ycodium-sse-stream": "0.0.0"
   },