@hmharness/domain-harmony 0.11.0 → 0.13.2

package/dist/emulator.js

@@ -26,7 +26,21 @@ export function imageRoot() {
     return join(localAppData(), 'Huawei', 'Sdk');
 }
 function emulatorExe() {
-    return join(process.env.HM_DEVECO_HOME ?? 'C:\\DevEco-Studio', 'tools', 'emulator', 'Emulator.exe');
+    // same discoverability contract as findHdc: honor HM_DEVECO_HOME, then
+    // probe the standard install locations. The bare-drive default missed the
+    // common "Program Files" install and broke every emulator tool on stock
+    // DevEco setups (day-18 SELFFEED: the agent had to fake a junction).
+    if (process.env.HM_DEVECO_HOME)
+        return join(process.env.HM_DEVECO_HOME, 'tools', 'emulator', 'Emulator.exe');
+    for (const home of ['C:\\Program Files\\Huawei\\DevEco Studio', 'D:\\Program Files\\Huawei\\DevEco Studio', 'C:\\DevEco-Studio']) {
+        const cand = join(home, 'tools', 'emulator', 'Emulator.exe');
+        try {
+            accessSync(cand);
+            return cand;
+        }
+        catch { /* next */ }
+    }
+    return join('C:\\DevEco-Studio', 'tools', 'emulator', 'Emulator.exe');
 }
 async function readLists() {
     try {
@@ -178,7 +192,26 @@ export const harmonyEmulatorStop = {
                 /* already gone */
             }
         }
-        return { output: `stopped: ${targets.map((t) => `${t.hvd} (pid ${t.pid})`).join(', ')}` };
+        // verify, never trust the kill report (day-19 SELFFEED: taskkill returned
+        // success while Emulator.exe was still alive for seconds) - poll until the
+        // CIM query no longer sees the target pids, bounded at ~15s
+        const wantGone = new Set(targets.map((t) => t.pid));
+        let stillAlive = [];
+        for (let waited = 0; waited <= 15_000; waited += 2000) {
+            await new Promise((res) => setTimeout(res, waited === 0 ? 1000 : 2000));
+            const now = await runningEmulators();
+            stillAlive = now.map((r) => r.pid).filter((pid) => wantGone.has(pid));
+            if (stillAlive.length === 0)
+                break;
+        }
+        const stopped = targets.filter((t) => !stillAlive.includes(t.pid));
+        const stuck = targets.filter((t) => stillAlive.includes(t.pid));
+        const lines = [];
+        if (stopped.length > 0)
+            lines.push(`stopped: ${stopped.map((t) => `${t.hvd} (pid ${t.pid})`).join(', ')} (verified gone)`);
+        if (stuck.length > 0)
+            lines.push(`NOT stopped (process still alive after taskkill - kill it manually or retry): ${stuck.map((t) => `${t.hvd} (pid ${t.pid})`).join(', ')}`);
+        return { output: lines.join('\n'), ...(stuck.length > 0 ? { isError: true } : {}) };
     },
 };
 export const harmonyEmulatorCatalog = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmharness/domain-harmony",
-  "version": "0.11.0",
+  "version": "0.13.2",
   "description": "hmharness HarmonyOS domain core: device, toolchain, build, and project lifecycle capabilities. HarmonyOS is the framework's native domain, not an add-on.",
   "type": "module",
   "main": "dist/index.js",