@oniroproject/core 0.8.0 → 0.10.0

package/dist/index.cjs

@@ -47,6 +47,7 @@ __export(index_exports, {
   VERSION: () => VERSION,
   applyChanges: () => applyChanges,
   attemptHdcConnection: () => attemptHdcConnection,
+  buildCmdWrapper: () => buildCmdWrapper,
   buildGestureCommands: () => buildGestureCommands,
   buildGestureUitestCommand: () => buildGestureUitestCommand,
   buildHap: () => buildHap,
@@ -83,6 +84,8 @@ __export(index_exports, {
   ensureOhModules: () => ensureOhModules,
   ensureOk: () => ensureOk,
   ensureRemoteOk: () => ensureRemoteOk,
+  escapeCmdArgument: () => escapeCmdArgument,
+  escapeCmdCommand: () => escapeCmdCommand,
   extractTarball: () => extractTarball,
   extractZipWithProgress: () => extractZipWithProgress,
   findAppProcessId: () => findAppProcessId,
@@ -121,12 +124,14 @@ __export(index_exports, {
   isRamBackedPath: () => isRamBackedPath,
   isValidBundleName: () => isValidBundleName,
   isValidProjectName: () => isValidProjectName,
+  killProcessTree: () => killProcessTree,
   launchApp: () => launchApp,
   listAbilities: () => listAbilities,
   listDevices: () => listDevices,
   listModules: () => listModules,
   listRunningProcesses: () => listRunningProcesses,
   listTemplates: () => listTemplates,
+  needsCmdWrapper: () => needsCmdWrapper,
   nonInteractivePrompter: () => nonInteractivePrompter,
   noopLogger: () => noopLogger,
   noopProgress: () => noopProgress,
@@ -163,11 +168,13 @@ __export(index_exports, {
   setHilogLevel: () => setHilogLevel,
   shell: () => shell,
   shellChecked: () => shellChecked,
+  spawnCompat: () => spawnCompat,
   startEmulator: () => startEmulator,
   staticConfig: () => staticConfig,
   stopEmulator: () => stopEmulator,
   streamHilog: () => streamHilog,
   takeScreenshot: () => takeScreenshot,
+  toLongPath: () => toLongPath,
   toSpaceError: () => toSpaceError,
   uninstallApp: () => uninstallApp,
   validateTemplateLayout: () => validateTemplateLayout,
@@ -402,6 +409,14 @@ function getCmdToolsPath(config) {
 function getEmulatorDir(config) {
   return config.get("emulatorDir", defaultPaths.emulatorDir());
 }
+function toLongPath(p, platform7 = os3.platform()) {
+  if (platform7 !== "win32") return p;
+  try {
+    return fs.realpathSync.native(p);
+  } catch {
+    return p;
+  }
+}
 function pickExisting(candidates) {
   for (const c of candidates) {
     if (fs.existsSync(c)) return c;
@@ -437,12 +452,11 @@ function getHdcPath(config) {
   }
   return path2.join(base, "hdc");
 }
-function getHvigorwPath(config, projectDir) {
-  const local = pickExisting([
-    path2.join(projectDir, "hvigorw"),
-    path2.join(projectDir, "hvigorw.bat"),
-    path2.join(projectDir, "hvigorw.cmd")
-  ]);
+function getHvigorwPath(config, projectDir, platform7 = os3.platform()) {
+  const posixFirst = ["hvigorw", "hvigorw.bat", "hvigorw.cmd"];
+  const windowsFirst = ["hvigorw.bat", "hvigorw.cmd", "hvigorw"];
+  const names = platform7 === "win32" ? windowsFirst : posixFirst;
+  const local = pickExisting(names.map((n) => path2.join(projectDir, n)));
   if (fs.existsSync(local) && isProjectLocalHvigorwWorking(projectDir)) {
     return local;
   }
@@ -522,7 +536,7 @@ function createInstallTempDir(opts) {
   } catch (err) {
     const fallback = os4.tmpdir();
     if (requested || isOutOfSpaceError(err) || path4.resolve(fallback) === path4.resolve(root)) throw err;
-    const reason = err instanceof Error ? err.message.split("\n")[0] : String(err);
+    const reason = err instanceof Error ? err.message.split(/\r?\n/)[0] : String(err);
     (opts.logger ?? noopLogger).warn(`${reason} Falling back to '${fallback}'.`);
     return { dir: createTempWorkDir(fallback, opts.prefix), root: fallback };
   }
@@ -974,8 +988,82 @@ async function downloadAndInstallSdk(opts) {
 // src/cmdTools/install.ts
 var fs10 = __toESM(require("fs"), 1);
 var os6 = __toESM(require("os"), 1);
+var path11 = __toESM(require("path"), 1);
+var import_node_child_process2 = require("child_process");
+
+// src/hdc/spawnCompat.ts
 var path10 = __toESM(require("path"), 1);
 var import_node_child_process = require("child_process");
+var WINDOWS_BATCH_RE = /\.(bat|cmd)$/i;
+var CMD_META_RE = /([()[\]%!^"`<>&|;, *?])/g;
+var CMD_SHIM_RE = /node_modules[\\/]\.bin[\\/][^\\/]+\.cmd$/i;
+var UNSAFE_CMD_CHARS_RE = /["\r\n\0]/;
+function needsCmdWrapper(command, platform7 = process.platform) {
+  return platform7 === "win32" && WINDOWS_BATCH_RE.test(command);
+}
+function escapeCmdArgument(arg, doubleEscapeMetaChars = false) {
+  let out = String(arg);
+  out = out.replace(/(\\*)"/g, '$1$1\\"');
+  out = out.replace(/(\\*)$/, "$1$1");
+  out = `"${out}"`;
+  out = out.replace(CMD_META_RE, "^$1");
+  if (doubleEscapeMetaChars) out = out.replace(CMD_META_RE, "^$1");
+  return out;
+}
+function escapeCmdCommand(command) {
+  return command.replace(CMD_META_RE, "^$1");
+}
+function buildCmdWrapper(command, args) {
+  assertCmdSafe(command, `command ${command}`);
+  args.forEach((a, i) => assertCmdSafe(a, `argument ${i} (${a})`));
+  const normalized = path10.normalize(command);
+  const double = CMD_SHIM_RE.test(normalized);
+  const line = [escapeCmdCommand(normalized), ...args.map((a) => escapeCmdArgument(a, double))].join(" ");
+  return {
+    command: process.env.ComSpec ?? process.env.COMSPEC ?? "cmd.exe",
+    args: ["/d", "/s", "/c", `"${line}"`]
+  };
+}
+function assertCmdSafe(value, label) {
+  if (UNSAFE_CMD_CHARS_RE.test(value)) {
+    throw new OniroError(
+      `Cannot run a Windows batch wrapper with a quote, newline or NUL in the ${label}: cmd.exe cannot pass it through unambiguously.`
+    );
+  }
+}
+function spawnCompat(command, args, options = {}) {
+  if (!needsCmdWrapper(command)) {
+    return (0, import_node_child_process.spawn)(command, [...args], { ...options, shell: false });
+  }
+  const wrapped = buildCmdWrapper(command, args);
+  return (0, import_node_child_process.spawn)(wrapped.command, wrapped.args, {
+    ...options,
+    shell: false,
+    // The line is already escaped; stop Node from re-quoting it.
+    windowsVerbatimArguments: true
+  });
+}
+function killProcessTree(child) {
+  if (process.platform === "win32" && typeof child.pid === "number") {
+    try {
+      const killer = (0, import_node_child_process.spawn)("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
+      killer.on("error", () => {
+        try {
+          child.kill("SIGKILL");
+        } catch {
+        }
+      });
+      return;
+    } catch {
+    }
+  }
+  try {
+    child.kill("SIGKILL");
+  } catch {
+  }
+}
+
+// src/cmdTools/install.ts
 function getCmdToolsDownloadUrl(config, platform7 = os6.platform()) {
   if (platform7 === "linux") {
     return config.get("cmdToolsUrlLinux", defaultPaths.cmdToolsUrlLinux);
@@ -1002,16 +1090,16 @@ function getCmdToolsDownloadUrl(config, platform7 = os6.platform()) {
 }
 function findCmdToolsSourceDir(extractPath) {
   const known = [
-    path10.join(extractPath, "command-line-tools"),
-    path10.join(extractPath, "oh-command-line-tools"),
-    path10.join(extractPath, "commandline-tools")
+    path11.join(extractPath, "command-line-tools"),
+    path11.join(extractPath, "oh-command-line-tools"),
+    path11.join(extractPath, "commandline-tools")
   ];
   for (const c of known) {
     if (fs10.existsSync(c)) return c;
   }
-  const entries = fs10.readdirSync(extractPath, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => path10.join(extractPath, e.name));
+  const entries = fs10.readdirSync(extractPath, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => path11.join(extractPath, e.name));
   for (const dir of entries) {
-    if (fs10.existsSync(path10.join(dir, "bin"))) return dir;
+    if (fs10.existsSync(path11.join(dir, "bin"))) return dir;
   }
   throw new OniroError("Could not locate command line tools folder in the extracted archive.");
 }
@@ -1023,12 +1111,12 @@ async function installCmdTools(opts) {
   const { dir: tmpDir, root: tmpRoot } = createInstallTempDir({
     config,
     override: opts.tmpDir,
-    installRoot: path10.dirname(CMD_PATH),
+    installRoot: path11.dirname(CMD_PATH),
     prefix: "oniro-cmdtools-",
     logger
   });
-  const zipPath = opts.localZipPath ?? path10.join(tmpDir, "oh-command-line-tools.zip");
-  const extractPath = path10.join(tmpDir, "oh-command-line-tools");
+  const zipPath = opts.localZipPath ?? path11.join(tmpDir, "oh-command-line-tools.zip");
+  const extractPath = path11.join(tmpDir, "oh-command-line-tools");
   try {
     if (!opts.localZipPath) {
       const url = getCmdToolsDownloadUrl(config);
@@ -1040,8 +1128,8 @@ async function installCmdTools(opts) {
     fs10.mkdirSync(CMD_PATH, { recursive: true });
     const srcDir = findCmdToolsSourceDir(extractPath);
     for (const entry of fs10.readdirSync(srcDir)) {
-      const src = path10.join(srcDir, entry);
-      const dest = path10.join(CMD_PATH, entry);
+      const src = path11.join(srcDir, entry);
+      const dest = path11.join(CMD_PATH, entry);
       if (fs10.statSync(src).isDirectory()) {
         if (fs10.existsSync(dest)) fs10.rmSync(dest, { recursive: true, force: true });
         movePath(src, dest);
@@ -1049,10 +1137,10 @@ async function installCmdTools(opts) {
         fs10.copyFileSync(src, dest);
       }
     }
-    const binDir = path10.join(CMD_PATH, "bin");
+    const binDir = path11.join(CMD_PATH, "bin");
     if (fs10.existsSync(binDir) && os6.platform() !== "win32") {
       for (const file of fs10.readdirSync(binDir)) {
-        fs10.chmodSync(path10.join(binDir, file), 493);
+        fs10.chmodSync(path11.join(binDir, file), 493);
       }
     }
     progress?.report({ message: "Finalizing installation...", increment: 5 });
@@ -1065,14 +1153,14 @@ async function installCmdTools(opts) {
 }
 function getCmdToolsStatus(config) {
   const cmdPath = getCmdToolsPath(config);
-  const binDir = path10.join(cmdPath, "bin");
+  const binDir = path11.join(cmdPath, "bin");
   const candidates = os6.platform() === "win32" ? ["ohpm.exe", "ohpm.cmd", "ohpm.bat", "ohpm"] : ["ohpm"];
-  const bin = candidates.map((c) => path10.join(binDir, c)).find((p) => fs10.existsSync(p));
+  const bin = candidates.map((c) => path11.join(binDir, c)).find((p) => fs10.existsSync(p));
   if (!bin) {
     return { installed: false, status: "Not installed" };
   }
   try {
-    const versionFile = path10.join(cmdPath, "version.txt");
+    const versionFile = path11.join(cmdPath, "version.txt");
     if (fs10.existsSync(versionFile)) {
       const content = fs10.readFileSync(versionFile, "utf8");
       for (const line of content.split(/\r?\n/)) {
@@ -1083,7 +1171,14 @@ function getCmdToolsStatus(config) {
   } catch {
   }
   try {
-    const version = (0, import_node_child_process.execFileSync)(bin, ["-v"], { encoding: "utf8" }).trim();
+    const wrapped = needsCmdWrapper(bin);
+    const probe = wrapped ? buildCmdWrapper(bin, ["-v"]) : { command: bin, args: ["-v"] };
+    const res = (0, import_node_child_process2.spawnSync)(probe.command, probe.args, {
+      encoding: "utf8",
+      windowsVerbatimArguments: wrapped
+    });
+    if (res.error || res.status !== 0) throw res.error ?? new Error(`exit ${String(res.status)}`);
+    const version = res.stdout.trim();
     return { installed: true, status: `Installed (${version})` };
   } catch {
     return { installed: true, status: "Installed (version unknown)" };
@@ -1101,7 +1196,7 @@ function removeCmdTools(config) {
 
 // src/sign/encryptKey.ts
 var fs11 = __toESM(require("fs"), 1);
-var path11 = __toESM(require("path"), 1);
+var path12 = __toESM(require("path"), 1);
 var crypto2 = __toESM(require("crypto"), 1);
 var DAEMON_ROOT_KEY_COMPONENT_LENGTH = 16;
 var DAEMON_SALT_KEY_LENGTH = 16;
@@ -1173,7 +1268,7 @@ function getRootKey(fdComponents, salt) {
 function createAndStoreKey(dir, keyLength) {
   const key = crypto2.randomBytes(keyLength);
   const hash = crypto2.createHash("sha256").update(key).digest("hex");
-  const filePath = path11.join(dir, hash);
+  const filePath = path12.join(dir, hash);
   fs11.writeFileSync(filePath, key);
   fs11.chmodSync(filePath, KEY_FILE_PERMISSIONS);
   return key;
@@ -1182,23 +1277,23 @@ function createAndStoreEnKey(rootKey, ceDir) {
   const workKey = crypto2.randomBytes(DAEMON_WORK_KEY_LENGTH);
   const encrypted = encrypt(rootKey, workKey);
   const hash = crypto2.createHash("sha256").update(encrypted).digest("hex");
-  const filePath = path11.join(ceDir, hash);
+  const filePath = path12.join(ceDir, hash);
   fs11.writeFileSync(filePath, encrypted);
   fs11.chmodSync(filePath, KEY_FILE_PERMISSIONS);
 }
 function createMaterial(materialPath) {
   fs11.mkdirSync(materialPath, { recursive: true });
   fs11.chmodSync(materialPath, KEY_FILE_DIRECTORY_PERMISSIONS);
-  const fdDir = path11.join(materialPath, "fd");
-  const acDir = path11.join(materialPath, "ac");
-  const ceDir = path11.join(materialPath, "ce");
+  const fdDir = path12.join(materialPath, "fd");
+  const acDir = path12.join(materialPath, "ac");
+  const ceDir = path12.join(materialPath, "ce");
   fs11.mkdirSync(fdDir, { recursive: true });
   fs11.mkdirSync(acDir, { recursive: true });
   fs11.mkdirSync(ceDir, { recursive: true });
   const fdSubDirs = ["0", "1", "2"];
   const fdComponents = [];
   for (const sub of fdSubDirs) {
-    const subDir = path11.join(fdDir, sub);
+    const subDir = path12.join(fdDir, sub);
     fs11.mkdirSync(subDir, { recursive: true });
     const comp = createAndStoreKey(subDir, DAEMON_ROOT_KEY_COMPONENT_LENGTH);
     fdComponents.push(comp);
@@ -1215,17 +1310,17 @@ function readSingleFile(dir) {
   if (files.length !== 1) {
     throw new Error(`Signing material in ${dir} is illegal (expected exactly one file).`);
   }
-  return fs11.readFileSync(path11.join(dir, files[0]));
+  return fs11.readFileSync(path12.join(dir, files[0]));
 }
 function getKey(materialPath) {
   if (!fs11.existsSync(materialPath) || !fs11.statSync(materialPath).isDirectory()) {
     throw new Error("Material directory does not exist.");
   }
-  const fdDir = path11.join(materialPath, "fd");
-  const fdComponents = ["0", "1", "2"].map((sub) => readSingleFile(path11.join(fdDir, sub)));
-  const salt = readSingleFile(path11.join(materialPath, "ac"));
+  const fdDir = path12.join(materialPath, "fd");
+  const fdComponents = ["0", "1", "2"].map((sub) => readSingleFile(path12.join(fdDir, sub)));
+  const salt = readSingleFile(path12.join(materialPath, "ac"));
   const rootKey = getRootKey(fdComponents, salt);
-  const workMaterial = readSingleFile(path11.join(materialPath, "ce"));
+  const workMaterial = readSingleFile(path12.join(materialPath, "ce"));
   return decrypt(rootKey, workMaterial);
 }
 function encryptPwd(password, materialPath) {
@@ -1241,8 +1336,8 @@ function decryptPwd(encryptedHex, materialPath) {
 
 // src/sign/generateSigningConfigs.ts
 var fs12 = __toESM(require("fs"), 1);
-var path12 = __toESM(require("path"), 1);
-var import_node_child_process2 = require("child_process");
+var path13 = __toESM(require("path"), 1);
+var import_node_child_process3 = require("child_process");
 var import_json52 = __toESM(require("json5"), 1);
 
 // src/sign/applicationCert.ts
@@ -1311,13 +1406,13 @@ var SIGNING_KIND_CONFIG = {
 };
 function copyFilesToProject(projectDir, paths, kind, logger, applicationCertPath) {
   logger.info("[sign] Copying signing material into project...");
-  const signaturesDir = path12.join(projectDir, "signatures");
+  const signaturesDir = path13.join(projectDir, "signatures");
   fs12.mkdirSync(signaturesDir, { recursive: true });
-  fs12.copyFileSync(paths.keystore, path12.join(signaturesDir, "OpenHarmony.p12"));
-  fs12.copyFileSync(paths.profileCert, path12.join(signaturesDir, "OpenHarmonyProfileRelease.pem"));
-  fs12.copyFileSync(paths.unsignedProfileTemplate, path12.join(signaturesDir, "UnsgnedReleasedProfileTemplate.json"));
+  fs12.copyFileSync(paths.keystore, path13.join(signaturesDir, "OpenHarmony.p12"));
+  fs12.copyFileSync(paths.profileCert, path13.join(signaturesDir, "OpenHarmonyProfileRelease.pem"));
+  fs12.copyFileSync(paths.unsignedProfileTemplate, path13.join(signaturesDir, "UnsgnedReleasedProfileTemplate.json"));
   if (kind === "application-release") {
-    const dest = path12.join(signaturesDir, "OpenHarmonyApplication.cer");
+    const dest = path13.join(signaturesDir, "OpenHarmonyApplication.cer");
     if (applicationCertPath) {
       fs12.copyFileSync(applicationCertPath, dest);
     } else {
@@ -1340,8 +1435,8 @@ function extractLeafCertificate(chainPath) {
 function modifyProfileTemplate(projectDir, apl, appFeature, logger, options = {}) {
   const kind = options.kind ?? pickSigningKind(apl);
   logger.info(`[sign] Modifying profile template (apl=${apl}, app-feature=${appFeature}, kind=${kind})...`);
-  const appJsonPath = path12.join(projectDir, "AppScope/app.json5");
-  const profileTemplatePath = path12.join(projectDir, "signatures/UnsgnedReleasedProfileTemplate.json");
+  const appJsonPath = path13.join(projectDir, "AppScope/app.json5");
+  const profileTemplatePath = path13.join(projectDir, "signatures/UnsgnedReleasedProfileTemplate.json");
   if (!fs12.existsSync(appJsonPath)) {
     throw new OniroError(`${appJsonPath} does not exist.`);
   }
@@ -1366,7 +1461,7 @@ function modifyProfileTemplate(projectDir, apl, appFeature, logger, options = {}
   profileTemplate["bundle-info"]["bundle-name"] = appJson.app.bundleName;
   profileTemplate["bundle-info"]["apl"] = apl;
   profileTemplate["bundle-info"]["app-feature"] = appFeature;
-  const distCertChainPath = path12.join(
+  const distCertChainPath = path13.join(
     projectDir,
     "signatures",
     SIGNING_KIND_CONFIG[kind].certBasename
@@ -1380,9 +1475,9 @@ function modifyProfileTemplate(projectDir, apl, appFeature, logger, options = {}
 }
 function generateP7bFile(projectDir, paths, logger, passwords) {
   logger.info("[sign] Generating P7b profile via hap-sign-tool...");
-  const signaturesDir = path12.join(projectDir, "signatures");
-  const profileTemplatePath = path12.join(signaturesDir, "UnsgnedReleasedProfileTemplate.json");
-  const outputProfilePath = path12.join(signaturesDir, "app1-profile.p7b");
+  const signaturesDir = path13.join(projectDir, "signatures");
+  const profileTemplatePath = path13.join(signaturesDir, "UnsgnedReleasedProfileTemplate.json");
+  const outputProfilePath = path13.join(signaturesDir, "app1-profile.p7b");
   const args = [
     "-jar",
     paths.signTool,
@@ -1407,7 +1502,7 @@ function generateP7bFile(projectDir, paths, logger, passwords) {
     passwords.store
   ];
   try {
-    (0, import_node_child_process2.execFileSync)("java", args, { stdio: "inherit" });
+    (0, import_node_child_process3.execFileSync)("java", args, { stdio: "inherit" });
   } catch (e) {
     throw new OniroError(
       `hap-sign-tool failed. Ensure a JDK (with keytool/java) is on PATH. Underlying error: ${e.message}`,
@@ -1416,7 +1511,7 @@ function generateP7bFile(projectDir, paths, logger, passwords) {
   }
 }
 function detectSigningConfigNames(projectDir) {
-  const buildProfilePath = path12.join(projectDir, "build-profile.json5");
+  const buildProfilePath = path13.join(projectDir, "build-profile.json5");
   if (!fs12.existsSync(buildProfilePath)) return ["default"];
   let parsed;
   try {
@@ -1437,8 +1532,8 @@ function detectSigningConfigNames(projectDir) {
 }
 function updateBuildProfile(projectDir, kind, logger, passwords) {
   logger.info("[sign] Writing signing configs into build-profile.json5...");
-  const materialDir = path12.join(projectDir, "signatures", "material");
-  const buildProfilePath = path12.join(projectDir, "build-profile.json5");
+  const materialDir = path13.join(projectDir, "signatures", "material");
+  const buildProfilePath = path13.join(projectDir, "build-profile.json5");
   const encryptedStorePassword = encryptPwd(passwords.store, materialDir);
   const encryptedKeyPassword = encryptPwd(passwords.key, materialDir);
   let buildProfile = { app: {} };
@@ -1469,7 +1564,7 @@ function updateBuildProfile(projectDir, kind, logger, passwords) {
 }
 function prepareMaterialDirectory(projectDir, logger) {
   logger.info("[sign] Generating fresh signing material...");
-  const materialDir = path12.join(projectDir, "signatures", "material");
+  const materialDir = path13.join(projectDir, "signatures", "material");
   if (fs12.existsSync(materialDir)) {
     fs12.rmSync(materialDir, { recursive: true, force: true });
   }
@@ -1494,15 +1589,15 @@ function generateSigningConfigs(options) {
       "Could not detect project SDK version (compileSdkVersion missing in build-profile.json5)."
     );
   }
-  const sdkPath = path12.join(sdkHome, String(sdkVersion));
+  const sdkPath = path13.join(sdkHome, String(sdkVersion));
   if (!fs12.existsSync(sdkPath)) {
     throw new OniroError(`SDK path does not exist: ${sdkPath}`);
   }
   const paths = {
-    signTool: path12.join(sdkPath, "toolchains/lib/hap-sign-tool.jar"),
-    keystore: path12.join(sdkPath, "toolchains/lib/OpenHarmony.p12"),
-    profileCert: path12.join(sdkPath, "toolchains/lib/OpenHarmonyProfileRelease.pem"),
-    unsignedProfileTemplate: path12.join(sdkPath, "toolchains/lib/UnsgnedReleasedProfileTemplate.json")
+    signTool: path13.join(sdkPath, "toolchains/lib/hap-sign-tool.jar"),
+    keystore: path13.join(sdkPath, "toolchains/lib/OpenHarmony.p12"),
+    profileCert: path13.join(sdkPath, "toolchains/lib/OpenHarmonyProfileRelease.pem"),
+    unsignedProfileTemplate: path13.join(sdkPath, "toolchains/lib/UnsgnedReleasedProfileTemplate.json")
   };
   const kind = pickSigningKind(apl);
   const passwords = options.passwords ?? DEFAULT_PASSWORDS;
@@ -1517,7 +1612,7 @@ function generateSigningConfigs(options) {
 
 // src/emulator/install.ts
 var fs13 = __toESM(require("fs"), 1);
-var path13 = __toESM(require("path"), 1);
+var path14 = __toESM(require("path"), 1);
 async function installEmulator(opts) {
   const { config, progress, abortSignal } = opts;
   const logger = opts.logger ?? noopLogger;
@@ -1527,18 +1622,18 @@ async function installEmulator(opts) {
   const { dir: tmpDir, root: tmpRoot } = createInstallTempDir({
     config,
     override: opts.tmpDir,
-    installRoot: path13.dirname(emulatorDir),
+    installRoot: path14.dirname(emulatorDir),
     prefix: "oniro-emulator-",
     logger
   });
-  const tmpZip = path13.join(tmpDir, "oniro_emulator.zip");
+  const tmpZip = path14.join(tmpDir, "oniro_emulator.zip");
   try {
     fs13.mkdirSync(emulatorDir, { recursive: true });
     progress?.report({ message: "Downloading emulator...", increment: 0 });
     await downloadFile({ url, dest: tmpZip, progress, abortSignal, start: 0, range: 50, what, tmpRoot });
     progress?.report({ message: "Extracting emulator...", increment: 0 });
     await extractZipWithProgress({ zipPath: tmpZip, dest: emulatorDir, progress, start: 50, range: 45, logger });
-    const runSh = path13.join(emulatorDir, "images", "run.sh");
+    const runSh = path14.join(emulatorDir, "images", "run.sh");
     if (fs13.existsSync(runSh)) {
       fs13.chmodSync(runSh, 493);
     }
@@ -1550,8 +1645,8 @@ async function installEmulator(opts) {
   }
 }
 function isEmulatorInstalled(config) {
-  const imagesDir = path13.join(getEmulatorDir(config), "images");
-  return fs13.existsSync(path13.join(imagesDir, "run.sh")) || fs13.existsSync(path13.join(imagesDir, "run.bat"));
+  const imagesDir = path14.join(getEmulatorDir(config), "images");
+  return fs13.existsSync(path14.join(imagesDir, "run.sh")) || fs13.existsSync(path14.join(imagesDir, "run.bat"));
 }
 function removeEmulator(config) {
   const emulatorDir = getEmulatorDir(config);
@@ -1561,13 +1656,16 @@ function removeEmulator(config) {
 }
 
 // src/emulator/lifecycle.ts
-var fs14 = __toESM(require("fs"), 1);
+var fs15 = __toESM(require("fs"), 1);
 var os7 = __toESM(require("os"), 1);
-var path14 = __toESM(require("path"), 1);
+var path15 = __toESM(require("path"), 1);
 var import_node_child_process4 = require("child_process");
 
 // src/hdc/exec.ts
-var import_node_child_process3 = require("child_process");
+var fs14 = __toESM(require("fs"), 1);
+function errorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
 function runProcess(opts) {
   const { command, args, cwd, env, onOutput } = opts;
   const timeoutMs = opts.timeoutMs ?? 6e4;
@@ -1577,7 +1675,17 @@ function runProcess(opts) {
       reject(new CancelledError(`Command aborted before start: ${command}`));
       return;
     }
-    const child = (0, import_node_child_process3.spawn)(command, [...args], { cwd, env, shell: false });
+    if (needsCmdWrapper(command) && !fs14.existsSync(command)) {
+      reject(new OniroError(`Failed to spawn ${command}: ENOENT (no such file)`));
+      return;
+    }
+    let child;
+    try {
+      child = spawnCompat(command, args, { cwd, env });
+    } catch (err) {
+      reject(new OniroError(`Failed to spawn ${command}: ${errorMessage(err)}`, err));
+      return;
+    }
     let stdout = "";
     let stderr = "";
     let settled = false;
@@ -1590,26 +1698,20 @@ function runProcess(opts) {
       if (settled) return;
       settled = true;
       cleanup();
-      try {
-        child.kill("SIGKILL");
-      } catch {
-      }
+      killProcessTree(child);
       reject(new CancelledError(`Command aborted: ${command} ${args.join(" ")}`));
     };
     const timer = setTimeout(() => {
       timedOut = true;
-      try {
-        child.kill("SIGKILL");
-      } catch {
-      }
+      killProcessTree(child);
     }, timeoutMs);
     abortSignal?.addEventListener("abort", onAbort, { once: true });
-    child.stdout.on("data", (d) => {
+    child.stdout?.on("data", (d) => {
       const s = d.toString();
       stdout += s;
       onOutput?.(s, "stdout");
     });
-    child.stderr.on("data", (d) => {
+    child.stderr?.on("data", (d) => {
       const s = d.toString();
       stderr += s;
       onOutput?.(s, "stderr");
@@ -1681,7 +1783,7 @@ function ensureRemoteOk(result, command) {
 }
 
 // src/emulator/lifecycle.ts
-var PID_FILE = path14.join(os7.tmpdir(), "oniro_emulator.pid");
+var PID_FILE = path15.join(os7.tmpdir(), "oniro_emulator.pid");
 async function attemptHdcConnection(config, address = "127.0.0.1:55555", logger = noopLogger) {
   try {
     await hdcExec({ config, args: ["start", "-r"], logger });
@@ -1694,24 +1796,24 @@ async function attemptHdcConnection(config, address = "127.0.0.1:55555", logger
   }
 }
 function resolveLauncher(imagesPath, headless, connect) {
-  const runSh = path14.join(imagesPath, "run.sh");
-  const runBat = path14.join(imagesPath, "run.bat");
+  const runSh = path15.join(imagesPath, "run.sh");
+  const runBat = path15.join(imagesPath, "run.bat");
   const extra = [];
   if (headless) extra.push("--headless");
   if (connect) extra.push("--connect", connect);
   if (os7.platform() === "win32") {
-    if (fs14.existsSync(runBat)) {
+    if (fs15.existsSync(runBat)) {
       return { command: "cmd.exe", args: ["/c", runBat, ...extra], cwd: imagesPath };
     }
-    if (fs14.existsSync(runSh)) {
+    if (fs15.existsSync(runSh)) {
       return { command: "bash", args: [runSh, ...extra], cwd: imagesPath };
     }
     throw new OniroError(`No emulator launcher (run.bat or run.sh) found in ${imagesPath}.`);
   }
-  if (fs14.existsSync(runSh)) {
+  if (fs15.existsSync(runSh)) {
     return { command: "bash", args: [runSh, ...extra], cwd: imagesPath };
   }
-  if (fs14.existsSync(runBat)) {
+  if (fs15.existsSync(runBat)) {
     return { command: "bash", args: [runBat, ...extra], cwd: imagesPath };
   }
   throw new OniroError(`No emulator launcher (run.sh or run.bat) found in ${imagesPath}.`);
@@ -1719,9 +1821,9 @@ function resolveLauncher(imagesPath, headless, connect) {
 async function startEmulator(opts) {
   const { config } = opts;
   const logger = opts.logger ?? noopLogger;
-  if (os7.platform() !== "win32" && fs14.existsSync(PID_FILE)) {
+  if (os7.platform() !== "win32" && fs15.existsSync(PID_FILE)) {
     try {
-      const pid = Number(fs14.readFileSync(PID_FILE, "utf8").trim());
+      const pid = Number(fs15.readFileSync(PID_FILE, "utf8").trim());
       if (Number.isFinite(pid) && pid > 0) {
         try {
           process.kill(pid, 0);
@@ -1737,13 +1839,13 @@ async function startEmulator(opts) {
       logger.warn(`Could not read PID file: ${err.message}`);
     }
   }
-  const imagesPath = path14.join(getEmulatorDir(config), "images");
-  if (!fs14.existsSync(imagesPath)) {
+  const imagesPath = path15.join(getEmulatorDir(config), "images");
+  if (!fs15.existsSync(imagesPath)) {
     throw new OniroError(`Emulator images directory not found at ${imagesPath}. Run \`oniro-app emulator install\` first.`);
   }
   const launcher = resolveLauncher(imagesPath, opts.headless === true, opts.connect);
   const logPath = opts.logFile ?? (os7.platform() === "win32" ? "NUL" : "/dev/null");
-  const logFd = fs14.openSync(logPath, "a");
+  const logFd = fs15.openSync(logPath, "a");
   let child;
   try {
     child = (0, import_node_child_process4.spawn)(launcher.command, [...launcher.args], {
@@ -1753,12 +1855,12 @@ async function startEmulator(opts) {
       windowsHide: true
     });
   } finally {
-    fs14.closeSync(logFd);
+    fs15.closeSync(logFd);
   }
   if (!child.pid) {
     throw new OniroError(`Failed to spawn launcher (${launcher.command} ${launcher.args.join(" ")}).`);
   }
-  fs14.writeFileSync(PID_FILE, String(child.pid));
+  fs15.writeFileSync(PID_FILE, String(child.pid));
   child.unref();
   logger.info(`Emulator launched (PID ${child.pid}). Logs: ${logPath}`);
   const earlyExit = new Promise((resolve4) => {
@@ -1805,24 +1907,24 @@ ${tail}` : ""}`);
 }
 function readTail(filePath, bytes) {
   try {
-    const stat = fs14.statSync(filePath);
+    const stat = fs15.statSync(filePath);
     const start = Math.max(0, stat.size - bytes);
-    const fd = fs14.openSync(filePath, "r");
+    const fd = fs15.openSync(filePath, "r");
     try {
       const buf = Buffer.alloc(stat.size - start);
-      fs14.readSync(fd, buf, 0, buf.length, start);
+      fs15.readSync(fd, buf, 0, buf.length, start);
       return buf.toString("utf8");
     } finally {
-      fs14.closeSync(fd);
+      fs15.closeSync(fd);
     }
   } catch {
     return "";
   }
 }
 async function stopEmulator(logger = noopLogger) {
-  if (fs14.existsSync(PID_FILE)) {
+  if (fs15.existsSync(PID_FILE)) {
     try {
-      const pid = Number(fs14.readFileSync(PID_FILE, "utf8").trim());
+      const pid = Number(fs15.readFileSync(PID_FILE, "utf8").trim());
       if (Number.isFinite(pid) && pid > 0) {
         try {
           process.kill(pid, "SIGTERM");
@@ -1841,7 +1943,7 @@ async function stopEmulator(logger = noopLogger) {
   } catch (err) {
     logger.warn(`[emulator] could not run ${killCmd}: ${err.message}`);
   }
-  fs14.rm(PID_FILE, { force: true }, (err) => {
+  fs15.rm(PID_FILE, { force: true }, (err) => {
     if (err) logger.warn(`Could not remove PID file: ${err.message}`);
   });
 }
@@ -2008,21 +2110,20 @@ async function waitForCondition(opts) {
 }
 
 // src/hdc/app.ts
-var fs16 = __toESM(require("fs"), 1);
-var path16 = __toESM(require("path"), 1);
-var import_node_child_process5 = require("child_process");
+var fs17 = __toESM(require("fs"), 1);
+var path17 = __toESM(require("path"), 1);
 
 // src/hdc/project.ts
-var fs15 = __toESM(require("fs"), 1);
-var path15 = __toESM(require("path"), 1);
+var fs16 = __toESM(require("fs"), 1);
+var path16 = __toESM(require("path"), 1);
 var import_json53 = __toESM(require("json5"), 1);
 function readJson5(filePath) {
-  const content = fs15.readFileSync(filePath, "utf-8");
+  const content = fs16.readFileSync(filePath, "utf-8");
   return import_json53.default.parse(content);
 }
 function getBundleName(projectDir) {
-  const appJsonPath = path15.join(projectDir, "AppScope", "app.json5");
-  if (!fs15.existsSync(appJsonPath)) {
+  const appJsonPath = path16.join(projectDir, "AppScope", "app.json5");
+  if (!fs16.existsSync(appJsonPath)) {
     throw new OniroError(`Could not find app.json5 at ${appJsonPath}`);
   }
   const appJson = readJson5(appJsonPath);
@@ -2032,8 +2133,8 @@ function getBundleName(projectDir) {
   return appJson.app.bundleName;
 }
 function getMainAbility(projectDir, moduleName = "entry", abilityName) {
-  const moduleJsonPath = path15.join(projectDir, moduleName, "src", "main", "module.json5");
-  if (!fs15.existsSync(moduleJsonPath)) {
+  const moduleJsonPath = path16.join(projectDir, moduleName, "src", "main", "module.json5");
+  if (!fs16.existsSync(moduleJsonPath)) {
     throw new OniroError(`Could not find module.json5 at ${moduleJsonPath}`);
   }
   const moduleJson = readJson5(moduleJsonPath);
@@ -2056,11 +2157,16 @@ function getMainAbility(projectDir, moduleName = "entry", abilityName) {
 async function installApp(opts) {
   const logger = scopedLogger(opts.logger ?? noopLogger, "hdc");
   const relativeHapPath = opts.hapPath ?? opts.config.get("hapPath", defaultPaths.hapPath);
-  const hapPath = path16.isAbsolute(relativeHapPath) ? relativeHapPath : path16.join(opts.projectDir, relativeHapPath);
-  if (!fs16.existsSync(hapPath)) {
+  const hapPath = path17.isAbsolute(relativeHapPath) ? relativeHapPath : path17.join(opts.projectDir, relativeHapPath);
+  if (!fs17.existsSync(hapPath)) {
     throw new OniroError(`HAP file not found at: ${hapPath}. Build and sign the app first.`);
   }
-  const result = await hdcExec({ config: opts.config, args: ["install", hapPath], timeoutMs: 3e5 });
+  const result = await hdcExec({
+    config: opts.config,
+    args: ["install", hapPath],
+    deviceSerial: opts.deviceSerial,
+    timeoutMs: 3e5
+  });
   if (result.stdout.trim()) logger.info(result.stdout.trim());
   if (result.stderr.trim()) logger.warn(result.stderr.trim());
   ensureOk(result, `hdc install ${hapPath}`);
@@ -2142,11 +2248,17 @@ function listRunningProcesses(config, options = {}) {
   const timeoutMs = options.timeoutMs ?? 1e3;
   const hdc = getHdcPath(config);
   return new Promise((resolve4, reject) => {
-    const proc = (0, import_node_child_process5.spawn)(hdc, ["track-jpid"]);
+    let proc;
+    try {
+      proc = spawnCompat(hdc, ["track-jpid"]);
+    } catch (err) {
+      reject(new OniroError(`Failed to spawn ${hdc}: ${err instanceof Error ? err.message : String(err)}`, err));
+      return;
+    }
     const processes = [];
     let resolved = false;
-    proc.stdout.on("data", (data) => {
-      for (const line of data.toString().split("\n").filter(Boolean)) {
+    proc.stdout?.on("data", (data) => {
+      for (const line of data.toString().split(/\r?\n/).filter(Boolean)) {
         const match = line.match(/^(\d+)\s+(.+)$/);
         if (!match) continue;
         const pid = match[1];
@@ -2154,13 +2266,13 @@ function listRunningProcesses(config, options = {}) {
         processes.push({ pid, name });
         if (options.targetProcessName && name === options.targetProcessName && !resolved) {
           resolved = true;
-          proc.kill();
+          killProcessTree(proc);
           resolve4(pid);
           return;
         }
       }
     });
-    proc.stderr.on("data", (data) => {
+    proc.stderr?.on("data", (data) => {
       logger.warn(`[hdc track-jpid] ${data.toString()}`);
     });
     proc.on("error", (err) => {
@@ -2172,7 +2284,7 @@ function listRunningProcesses(config, options = {}) {
     const timeout = setTimeout(() => {
       if (resolved) return;
       resolved = true;
-      proc.kill();
+      killProcessTree(proc);
       if (options.targetProcessName) {
         reject(new OniroError(`Could not find process for bundle: ${options.targetProcessName}`));
       } else {
@@ -2330,12 +2442,12 @@ async function reboot(opts) {
 }
 
 // src/hdc/screen.ts
-var fs17 = __toESM(require("fs"), 1);
+var fs18 = __toESM(require("fs"), 1);
 var os8 = __toESM(require("os"), 1);
-var path17 = __toESM(require("path"), 1);
+var path18 = __toESM(require("path"), 1);
 var import_node_crypto = require("crypto");
 function tmpName(ext) {
-  return path17.join(os8.tmpdir(), `oniro_screen_${(0, import_node_crypto.randomBytes)(6).toString("hex")}.${ext}`);
+  return path18.join(os8.tmpdir(), `oniro_screen_${(0, import_node_crypto.randomBytes)(6).toString("hex")}.${ext}`);
 }
 async function takeScreenshot(opts) {
   const remote = "/data/local/tmp/oniro_screenshot.jpeg";
@@ -2345,11 +2457,11 @@ async function takeScreenshot(opts) {
   const local = tmpName("jpeg");
   try {
     await recvFile({ config: opts.config, remote, local, deviceSerial: opts.deviceSerial, timeoutMs });
-    const pixels = await fs17.promises.readFile(local);
+    const pixels = await fs18.promises.readFile(local);
     const size = await getDisplaySize(opts.config, { deviceSerial: opts.deviceSerial }) ?? { width: 0, height: 0 };
     return { pixels, width: size.width, height: size.height };
   } finally {
-    fs17.promises.unlink(local).catch(() => {
+    fs18.promises.unlink(local).catch(() => {
     });
     void shell({ config: opts.config, command: `rm -f ${remote}`, deviceSerial: opts.deviceSerial }).catch(() => {
     });
@@ -2368,9 +2480,9 @@ async function captureBurst(opts) {
       const local = tmpName(`burst_${i}.jpeg`);
       try {
         await recvFile({ config: opts.config, remote: `${remoteDir}/f${i}.jpeg`, local, deviceSerial: opts.deviceSerial });
-        frames.push(await fs17.promises.readFile(local));
+        frames.push(await fs18.promises.readFile(local));
       } finally {
-        fs17.promises.unlink(local).catch(() => {
+        fs18.promises.unlink(local).catch(() => {
         });
       }
     }
@@ -2496,9 +2608,9 @@ async function sendRawTouch(opts) {
 }
 
 // src/hdc/dump.ts
-var fs18 = __toESM(require("fs"), 1);
+var fs19 = __toESM(require("fs"), 1);
 var os9 = __toESM(require("os"), 1);
-var path18 = __toESM(require("path"), 1);
+var path19 = __toESM(require("path"), 1);
 var import_node_crypto2 = require("crypto");
 function parseBounds(s) {
   const m = /^\[(-?\d+),(-?\d+)\]\[(-?\d+),(-?\d+)\]$/.exec(s ?? "");
@@ -2583,10 +2695,10 @@ async function dumpLayout(opts) {
   if (!m) throw new OniroError(`Could not parse dumpLayout output:
 ${dump.stdout}`);
   const remote = m[1];
-  const local = path18.join(os9.tmpdir(), `oniro_layout_${(0, import_node_crypto2.randomBytes)(6).toString("hex")}.json`);
+  const local = path19.join(os9.tmpdir(), `oniro_layout_${(0, import_node_crypto2.randomBytes)(6).toString("hex")}.json`);
   try {
     await recvFile({ config: opts.config, remote, local, deviceSerial: opts.deviceSerial, timeoutMs });
-    const parsed = JSON.parse(await fs18.promises.readFile(local, "utf8"));
+    const parsed = JSON.parse(await fs19.promises.readFile(local, "utf8"));
     const display = await getDisplaySize(opts.config, { deviceSerial: opts.deviceSerial });
     if (opts.prune === false) {
       return { display, tree: parsed };
@@ -2595,7 +2707,7 @@ ${dump.stdout}`);
     const tree = Array.isArray(prunedRaw) ? { children: prunedRaw } : prunedRaw ?? { children: [] };
     return { display, tree };
   } finally {
-    fs18.promises.unlink(local).catch(() => {
+    fs19.promises.unlink(local).catch(() => {
     });
     void shell({ config: opts.config, command: `rm -f ${remote}`, deviceSerial: opts.deviceSerial }).catch(() => {
     });
@@ -2603,14 +2715,21 @@ ${dump.stdout}`);
 }
 
 // src/hdc/hilog.ts
-var import_node_child_process6 = require("child_process");
 function setHilogLevel(opts) {
   const logger = opts.logger ?? noopLogger;
   const hdc = getHdcPath(opts.config);
   return new Promise((resolve4, reject) => {
-    const child = (0, import_node_child_process6.spawn)(hdc, ["shell", "hilog", "-b", opts.level]);
+    let child;
+    try {
+      child = spawnCompat(hdc, ["shell", "hilog", "-b", opts.level]);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      logger.error(`[hilog] failed to spawn hdc: ${msg}`);
+      reject(err instanceof Error ? err : new Error(msg));
+      return;
+    }
     let stderr = "";
-    child.stderr.on("data", (chunk) => {
+    child.stderr?.on("data", (chunk) => {
       stderr += chunk.toString();
     });
     child.once("error", (err) => {
@@ -2639,7 +2758,7 @@ function streamHilog(opts) {
   if (opts.domain !== void 0 && `${opts.domain}` !== "") {
     args.push("-D", `${opts.domain}`);
   }
-  return (0, import_node_child_process6.spawn)(hdc, args);
+  return spawnCompat(hdc, args);
 }
 var HILOG_LINE_RE = /^(\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3})\s+(\d+)\s+(\d+)\s+([DIWEF])\s+(\S+):\s+(.*)$/;
 function parseHilogLine(line) {
@@ -2685,10 +2804,7 @@ function waitForLog(opts) {
       if (reconnectTimer) clearTimeout(reconnectTimer);
       opts.abortSignal?.removeEventListener("abort", onAbort);
       if (child) {
-        try {
-          child.kill("SIGKILL");
-        } catch {
-        }
+        killProcessTree(child);
         child = null;
       }
     };
@@ -2704,6 +2820,7 @@ function waitForLog(opts) {
       cleanup();
       reject(err);
     };
+    const failWith = (err) => fail(err instanceof Error ? err : new Error(String(err)));
     const onAbort = () => fail(new CancelledError("waitForLog cancelled."));
     const timer = setTimeout(
       () => fail(new OniroError(`No log line matched ${String(opts.pattern)} within ${opts.timeoutMs}ms.`)),
@@ -2718,10 +2835,9 @@ function waitForLog(opts) {
       child = stream;
       stream.stdout.on("data", (d) => {
         buf += d.toString();
-        let idx;
-        while ((idx = buf.indexOf("\n")) >= 0) {
-          const line = buf.slice(0, idx);
-          buf = buf.slice(idx + 1);
+        const lines = buf.split(/\r?\n/);
+        buf = lines.pop() ?? "";
+        for (const line of lines) {
           const entry = parseHilogLine(line);
           if (entry && opts.pattern.test(entryText(entry))) {
             finish(entry);
@@ -2733,13 +2849,13 @@ function waitForLog(opts) {
         if (settled || child !== stream) return;
         child = null;
         if (Date.now() < deadline) {
-          reconnectTimer = setTimeout(() => void spawnStream(), 1e3);
+          reconnectTimer = setTimeout(() => void spawnStream().catch(failWith), 1e3);
         }
       };
       stream.once("close", onEnd);
       stream.once("error", onEnd);
     };
-    void spawnStream();
+    void spawnStream().catch(failWith);
   });
 }
 function watchLog(opts) {
@@ -2752,10 +2868,7 @@ function watchLog(opts) {
       clearTimeout(timer);
       opts.abortSignal?.removeEventListener("abort", onAbort);
       if (child) {
-        try {
-          child.kill("SIGKILL");
-        } catch {
-        }
+        killProcessTree(child);
         child = null;
       }
     };
@@ -2780,15 +2893,19 @@ function watchLog(opts) {
       child = stream;
       stream.stdout.on("data", (d) => {
         buf += d.toString();
-        let idx;
-        while ((idx = buf.indexOf("\n")) >= 0) {
-          const line = buf.slice(0, idx);
-          buf = buf.slice(idx + 1);
+        const lines = buf.split(/\r?\n/);
+        buf = lines.pop() ?? "";
+        for (const line of lines) {
           const entry = parseHilogLine(line);
           if (entry && opts.pattern.test(entryText(entry))) matches.push(entry);
         }
       });
-    })();
+    })().catch((err) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      reject(err instanceof Error ? err : new Error(String(err)));
+    });
   });
 }
 async function dumpLog(opts) {
@@ -2811,13 +2928,12 @@ async function dumpLog(opts) {
     timeoutMs: opts.timeoutMs ?? 3e4,
     logger: opts.logger
   });
-  return res.stdout.split("\n").map((line) => parseHilogLine(line)).filter((e) => e !== null);
+  return res.stdout.split(/\r?\n/).map((line) => parseHilogLine(line)).filter((e) => e !== null);
 }
 
 // src/build/runHvigorw.ts
-var fs19 = __toESM(require("fs"), 1);
-var path19 = __toESM(require("path"), 1);
-var import_node_child_process7 = require("child_process");
+var fs20 = __toESM(require("fs"), 1);
+var path20 = __toESM(require("path"), 1);
 function buildHvigorwArgs(opts) {
   const args = [opts.task ?? "assembleHap", "--mode", "module"];
   args.push("-p", `product=${opts.product ?? "default"}`);
@@ -2829,19 +2945,23 @@ function buildHvigorwArgs(opts) {
   return args;
 }
 function runHvigorw(opts) {
-  const { config, projectDir } = opts;
+  const { config } = opts;
+  const projectDir = toLongPath(opts.projectDir);
   const logger = opts.logger ?? noopLogger;
-  if (!fs19.existsSync(path19.join(projectDir, "build-profile.json5"))) {
+  if (!fs20.existsSync(path20.join(projectDir, "build-profile.json5"))) {
     throw new OniroError(`Not an OpenHarmony project: ${projectDir} (build-profile.json5 not found).`);
   }
-  if (!fs19.existsSync(getCmdToolsPath(config))) {
+  if (!fs20.existsSync(getCmdToolsPath(config))) {
     throw new CmdToolsNotInstalledError(getCmdToolsPath(config));
   }
   const hvigorw = getHvigorwPath(config, projectDir);
+  if (!fs20.existsSync(hvigorw)) {
+    throw new OniroError(`hvigorw wrapper not found at ${hvigorw}.`);
+  }
   const args = buildHvigorwArgs(opts);
   if (process.platform !== "win32") {
     try {
-      fs19.chmodSync(hvigorw, 493);
+      fs20.chmodSync(hvigorw, 493);
     } catch {
     }
   }
@@ -2855,26 +2975,29 @@ function runHvigorw(opts) {
       return;
     }
     logger.info(`[build] ${hvigorw} ${args.join(" ")}`);
-    const child = (0, import_node_child_process7.spawn)(hvigorw, args, { cwd: projectDir, env, shell: false });
+    let child;
+    try {
+      child = spawnCompat(hvigorw, args, { cwd: projectDir, env });
+    } catch (err) {
+      reject(new OniroError(`Failed to start hvigorw: ${err instanceof Error ? err.message : String(err)}`, err));
+      return;
+    }
     let settled = false;
     const cleanup = () => opts.abortSignal?.removeEventListener("abort", onAbort);
     const onAbort = () => {
       if (settled) return;
       settled = true;
       cleanup();
-      try {
-        child.kill("SIGKILL");
-      } catch {
-      }
+      killProcessTree(child);
       reject(new CancelledError("hvigorw build cancelled."));
     };
     opts.abortSignal?.addEventListener("abort", onAbort, { once: true });
-    child.stdout.on("data", (chunk) => {
+    child.stdout?.on("data", (chunk) => {
       const text = chunk.toString();
       opts.onOutput?.(text, "stdout");
       logger.info(text.trimEnd());
     });
-    child.stderr.on("data", (chunk) => {
+    child.stderr?.on("data", (chunk) => {
       const text = chunk.toString();
       opts.onOutput?.(text, "stderr");
       logger.warn(text.trimEnd());
@@ -2897,8 +3020,8 @@ function runHvigorw(opts) {
 }
 
 // src/build/discoverHaps.ts
-var fs20 = __toESM(require("fs"), 1);
-var path20 = __toESM(require("path"), 1);
+var fs21 = __toESM(require("fs"), 1);
+var path21 = __toESM(require("path"), 1);
 function moduleOfHap(hapFileName) {
   const dash = hapFileName.indexOf("-");
   return dash > 0 ? hapFileName.slice(0, dash) : hapFileName.replace(/\.hap$/i, "");
@@ -2909,9 +3032,9 @@ async function discoverHaps(opts) {
   const result = {};
   const walk = async (dir, depth) => {
     if (depth > maxDepth) return;
-    const entries = await fs20.promises.readdir(dir, { withFileTypes: true }).catch(() => []);
+    const entries = await fs21.promises.readdir(dir, { withFileTypes: true }).catch(() => []);
     for (const e of entries) {
-      const full = path20.join(dir, e.name);
+      const full = path21.join(dir, e.name);
       if (e.isDirectory()) {
         if (e.name === "node_modules" || e.name === "oh_modules" || e.name === ".git") continue;
         await walk(full, depth + 1);
@@ -2928,8 +3051,8 @@ async function discoverHaps(opts) {
 }
 
 // src/build/ohpm.ts
-var fs21 = __toESM(require("fs"), 1);
-var path21 = __toESM(require("path"), 1);
+var fs22 = __toESM(require("fs"), 1);
+var path22 = __toESM(require("path"), 1);
 function runOhpm(opts) {
   return runProcess({
     command: getOhpmPath(opts.config),
@@ -2942,7 +3065,7 @@ function runOhpm(opts) {
   });
 }
 async function ensureOhModules(opts) {
-  if (fs21.existsSync(path21.join(opts.projectDir, "oh_modules"))) {
+  if (fs22.existsSync(path22.join(opts.projectDir, "oh_modules"))) {
     return { installed: false };
   }
   const res = await runOhpm({
@@ -2994,10 +3117,11 @@ async function buildHap(opts) {
   const logger = scopedLogger(opts.logger ?? noopLogger, "build");
   const warnings = [];
   const start = Date.now();
+  const projectDir = toLongPath(opts.projectDir);
   if (opts.autoInstallDeps !== false) {
     const r = await ensureOhModules({
       config: opts.config,
-      projectDir: opts.projectDir,
+      projectDir,
       abortSignal: opts.abortSignal,
       onOutput: opts.onOutput,
       logger: opts.logger
@@ -3006,7 +3130,7 @@ async function buildHap(opts) {
   }
   const { exitCode } = await runHvigorw({
     config: opts.config,
-    projectDir: opts.projectDir,
+    projectDir,
     product: opts.product,
     module: opts.module,
     buildMode: opts.mode,
@@ -3016,7 +3140,7 @@ async function buildHap(opts) {
     onOutput: opts.onOutput,
     logger: opts.logger
   });
-  const discoveredHaps = await discoverHaps({ projectDir: opts.projectDir });
+  const discoveredHaps = await discoverHaps({ projectDir });
   const anySigned = Object.values(discoveredHaps).some((m) => m.signed.length > 0);
   if (!anySigned) {
     warnings.push(
@@ -3037,21 +3161,21 @@ function isValidBundleName(bundleName) {
 }
 
 // src/project/templates.ts
-var fs22 = __toESM(require("fs"), 1);
-var path22 = __toESM(require("path"), 1);
+var fs23 = __toESM(require("fs"), 1);
+var path23 = __toESM(require("path"), 1);
 function toHumanTemplateName(folderName) {
   return folderName.replace(/([a-z])([A-Z])/g, "$1 $2");
 }
 function listTemplates(templateRoot) {
-  if (!fs22.existsSync(templateRoot)) return [];
-  const entries = fs22.readdirSync(templateRoot, { withFileTypes: true });
+  if (!fs23.existsSync(templateRoot)) return [];
+  const entries = fs23.readdirSync(templateRoot, { withFileTypes: true });
   return entries.filter((e) => e.isDirectory()).map((e) => {
-    const dir = path22.join(templateRoot, e.name);
-    const metaPath = path22.join(dir, "template.json");
+    const dir = path23.join(templateRoot, e.name);
+    const metaPath = path23.join(dir, "template.json");
     let meta = {};
-    if (fs22.existsSync(metaPath)) {
+    if (fs23.existsSync(metaPath)) {
       try {
-        meta = JSON.parse(fs22.readFileSync(metaPath, "utf8"));
+        meta = JSON.parse(fs23.readFileSync(metaPath, "utf8"));
       } catch {
       }
     }
@@ -3066,57 +3190,57 @@ function listTemplates(templateRoot) {
 function validateTemplateLayout(templateDir, defaultModuleName) {
   const required = [
     "build-profile.json5",
-    path22.join("AppScope", "app.json5"),
-    path22.join(defaultModuleName, "src", "main", "module.json5"),
-    path22.join(defaultModuleName, "oh-package.json5"),
+    path23.join("AppScope", "app.json5"),
+    path23.join(defaultModuleName, "src", "main", "module.json5"),
+    path23.join(defaultModuleName, "oh-package.json5"),
     "hvigorfile.ts"
   ];
-  return required.filter((rel) => !fs22.existsSync(path22.join(templateDir, rel)));
+  return required.filter((rel) => !fs23.existsSync(path23.join(templateDir, rel)));
 }
 
 // src/project/createScaffold.ts
-var fs24 = __toESM(require("fs"), 1);
-var path23 = __toESM(require("path"), 1);
+var fs25 = __toESM(require("fs"), 1);
+var path24 = __toESM(require("path"), 1);
 
 // src/project/jsonHelpers.ts
-var fs23 = __toESM(require("fs"), 1);
+var fs24 = __toESM(require("fs"), 1);
 var import_json54 = __toESM(require("json5"), 1);
 function readJson5File(filePath) {
-  return import_json54.default.parse(fs23.readFileSync(filePath, "utf8"));
+  return import_json54.default.parse(fs24.readFileSync(filePath, "utf8"));
 }
 function writeJson5File(filePath, value) {
-  fs23.writeFileSync(filePath, JSON.stringify(value, null, 2) + "\n", "utf8");
+  fs24.writeFileSync(filePath, JSON.stringify(value, null, 2) + "\n", "utf8");
 }
 function readJsonFile(filePath) {
-  return JSON.parse(fs23.readFileSync(filePath, "utf8"));
+  return JSON.parse(fs24.readFileSync(filePath, "utf8"));
 }
 function writeJsonFile(filePath, value) {
-  fs23.writeFileSync(filePath, JSON.stringify(value, null, 2) + "\n", "utf8");
+  fs24.writeFileSync(filePath, JSON.stringify(value, null, 2) + "\n", "utf8");
 }
 
 // src/project/createScaffold.ts
 var IGNORED_DIRS = /* @__PURE__ */ new Set(["oh_modules", "node_modules", "build", ".hvigor"]);
 async function pathExists(p) {
   try {
-    await fs24.promises.access(p);
+    await fs25.promises.access(p);
     return true;
   } catch {
     return false;
   }
 }
 async function copyDirRecursive(srcDir, destDir) {
-  await fs24.promises.mkdir(destDir, { recursive: true });
-  const entries = await fs24.promises.readdir(srcDir, { withFileTypes: true });
+  await fs25.promises.mkdir(destDir, { recursive: true });
+  const entries = await fs25.promises.readdir(srcDir, { withFileTypes: true });
   for (const entry of entries) {
-    const src = path23.join(srcDir, entry.name);
-    const dest = path23.join(destDir, entry.name);
+    const src = path24.join(srcDir, entry.name);
+    const dest = path24.join(destDir, entry.name);
     if (entry.isDirectory()) {
       await copyDirRecursive(src, dest);
     } else if (entry.isSymbolicLink()) {
       continue;
     } else if (entry.isFile()) {
       if (entry.name === "template.json") continue;
-      await fs24.promises.copyFile(src, dest);
+      await fs25.promises.copyFile(src, dest);
     }
   }
 }
@@ -3124,9 +3248,9 @@ async function normalizeJson5ToJson(projectDir, logger) {
   const stack = [projectDir];
   while (stack.length > 0) {
     const currentDir = stack.pop();
-    const entries = await fs24.promises.readdir(currentDir, { withFileTypes: true });
+    const entries = await fs25.promises.readdir(currentDir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path23.join(currentDir, entry.name);
+      const fullPath = path24.join(currentDir, entry.name);
       if (entry.isDirectory()) {
         if (IGNORED_DIRS.has(entry.name)) continue;
         stack.push(fullPath);
@@ -3148,23 +3272,23 @@ function toJavaPropertiesPath(p) {
 function createOrUpdateLocalProperties(projectDir, sdkDir) {
   const content = `sdk.dir=${toJavaPropertiesPath(sdkDir)}
 `;
-  fs24.writeFileSync(path23.join(projectDir, "local.properties"), content, "utf8");
+  fs25.writeFileSync(path24.join(projectDir, "local.properties"), content, "utf8");
 }
 function renameIfExists(fromPath, toPath) {
-  if (fs24.existsSync(fromPath) && fromPath !== toPath) {
-    fs24.renameSync(fromPath, toPath);
+  if (fs25.existsSync(fromPath) && fromPath !== toPath) {
+    fs25.renameSync(fromPath, toPath);
   }
 }
 function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
-  const appJsonPath = path23.join(projectDir, "AppScope", "app.json5");
-  if (fs24.existsSync(appJsonPath)) {
+  const appJsonPath = path24.join(projectDir, "AppScope", "app.json5");
+  if (fs25.existsSync(appJsonPath)) {
     const appJson = readJson5File(appJsonPath);
     appJson.app = appJson.app ?? {};
     appJson.app.bundleName = args.bundleName;
     writeJson5File(appJsonPath, appJson);
   }
-  const stringsPath = path23.join(projectDir, "AppScope", "resources", "base", "element", "string.json");
-  if (fs24.existsSync(stringsPath)) {
+  const stringsPath = path24.join(projectDir, "AppScope", "resources", "base", "element", "string.json");
+  if (fs25.existsSync(stringsPath)) {
     const strings = readJsonFile(stringsPath);
     if (Array.isArray(strings.string)) {
       const appName = strings.string.find((s) => s.name === "app_name");
@@ -3172,8 +3296,8 @@ function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
     }
     writeJsonFile(stringsPath, strings);
   }
-  const buildProfilePath = path23.join(projectDir, "build-profile.json5");
-  if (fs24.existsSync(buildProfilePath)) {
+  const buildProfilePath = path24.join(projectDir, "build-profile.json5");
+  if (fs25.existsSync(buildProfilePath)) {
     const buildProfile = readJson5File(buildProfilePath);
     buildProfile.app = buildProfile.app ?? {};
     if (Array.isArray(buildProfile.app.products) && buildProfile.app.products.length > 0) {
@@ -3186,23 +3310,23 @@ function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
     }
     writeJson5File(buildProfilePath, buildProfile);
   }
-  const moduleJsonPath = path23.join(projectDir, args.moduleName, "src", "main", "module.json5");
-  if (fs24.existsSync(moduleJsonPath)) {
+  const moduleJsonPath = path24.join(projectDir, args.moduleName, "src", "main", "module.json5");
+  if (fs25.existsSync(moduleJsonPath)) {
     const moduleJson = readJson5File(moduleJsonPath);
     moduleJson.module = moduleJson.module ?? {};
     moduleJson.module.name = args.moduleName;
     writeJson5File(moduleJsonPath, moduleJson);
   }
-  const moduleOhPackagePath = path23.join(projectDir, args.moduleName, "oh-package.json5");
-  if (fs24.existsSync(moduleOhPackagePath)) {
+  const moduleOhPackagePath = path24.join(projectDir, args.moduleName, "oh-package.json5");
+  if (fs25.existsSync(moduleOhPackagePath)) {
     const pkg = readJson5File(moduleOhPackagePath);
     pkg.name = args.moduleName;
     writeJson5File(moduleOhPackagePath, pkg);
   }
-  const vscodeDir = path23.join(projectDir, ".vscode");
-  fs24.mkdirSync(vscodeDir, { recursive: true });
+  const vscodeDir = path24.join(projectDir, ".vscode");
+  fs25.mkdirSync(vscodeDir, { recursive: true });
   const hapPath = `${args.moduleName}/build/default/outputs/default/${args.moduleName}-default-signed.hap`;
-  writeJsonFile(path23.join(vscodeDir, "settings.json"), {
+  writeJsonFile(path24.join(vscodeDir, "settings.json"), {
     "oniro.hapPath": hapPath,
     "files.associations": { "*.json5": "jsonc" }
   });
@@ -3219,7 +3343,7 @@ async function createScaffold(opts) {
   if (!opts.location || !await pathExists(opts.location)) {
     throw new OniroError(`Location does not exist: ${opts.location}`);
   }
-  const templateDir = path23.join(opts.templateRoot, opts.templateId);
+  const templateDir = path24.join(opts.templateRoot, opts.templateId);
   if (!await pathExists(templateDir)) {
     throw new OniroError(`Template not found: ${templateDir}`);
   }
@@ -3232,17 +3356,17 @@ async function createScaffold(opts) {
     throw new OniroError(`Template '${opts.templateId}' is missing required files:
 - ${missing.join("\n- ")}`);
   }
-  const projectDir = path23.join(opts.location, opts.projectName);
+  const projectDir = path24.join(opts.location, opts.projectName);
   if (await pathExists(projectDir)) {
     if (!opts.overwrite) {
       throw new OniroError(`Destination already exists: ${projectDir}. Pass overwrite: true to replace it.`);
     }
-    await fs24.promises.rm(projectDir, { recursive: true, force: true });
+    await fs25.promises.rm(projectDir, { recursive: true, force: true });
   }
   logger.info(`[create] Scaffolding ${opts.templateId} at ${projectDir}`);
   await copyDirRecursive(templateDir, projectDir);
   if (moduleName !== defaultModuleName) {
-    renameIfExists(path23.join(projectDir, defaultModuleName), path23.join(projectDir, moduleName));
+    renameIfExists(path24.join(projectDir, defaultModuleName), path24.join(projectDir, moduleName));
   }
   updateTemplateConfigs(
     projectDir,
@@ -3259,11 +3383,11 @@ async function createScaffold(opts) {
 }
 
 // src/project/listModules.ts
-var fs25 = __toESM(require("fs"), 1);
-var path24 = __toESM(require("path"), 1);
+var fs26 = __toESM(require("fs"), 1);
+var path25 = __toESM(require("path"), 1);
 function listModules(opts) {
-  const buildProfile = path24.join(opts.projectDir, "build-profile.json5");
-  if (!fs25.existsSync(buildProfile)) {
+  const buildProfile = path25.join(opts.projectDir, "build-profile.json5");
+  if (!fs26.existsSync(buildProfile)) {
     throw new OniroError(`build-profile.json5 not found at ${buildProfile}`);
   }
   const parsed = readJson5File(buildProfile);
@@ -3275,12 +3399,12 @@ function listModules(opts) {
 }
 
 // src/project/abilities.ts
-var fs26 = __toESM(require("fs"), 1);
-var path25 = __toESM(require("path"), 1);
+var fs27 = __toESM(require("fs"), 1);
+var path26 = __toESM(require("path"), 1);
 function listAbilities(opts) {
   const moduleName = opts.moduleName ?? "entry";
-  const moduleJsonPath = path25.join(opts.projectDir, moduleName, "src", "main", "module.json5");
-  if (!fs26.existsSync(moduleJsonPath)) {
+  const moduleJsonPath = path26.join(opts.projectDir, moduleName, "src", "main", "module.json5");
+  if (!fs27.existsSync(moduleJsonPath)) {
     throw new OniroError(`Could not find module.json5 at ${moduleJsonPath}`);
   }
   const parsed = readJson5File(moduleJsonPath);
@@ -3288,12 +3412,12 @@ function listAbilities(opts) {
 }
 
 // src/project/prepareSigning.ts
-var fs27 = __toESM(require("fs"), 1);
-var path26 = __toESM(require("path"), 1);
+var fs28 = __toESM(require("fs"), 1);
+var path27 = __toESM(require("path"), 1);
 function hasSigningArtifacts(dir) {
-  if (!fs27.existsSync(path26.join(dir, "signatures"))) return false;
-  const buildProfile = path26.join(dir, "build-profile.json5");
-  if (!fs27.existsSync(buildProfile)) return false;
+  if (!fs28.existsSync(path27.join(dir, "signatures"))) return false;
+  const buildProfile = path27.join(dir, "build-profile.json5");
+  if (!fs28.existsSync(buildProfile)) return false;
   try {
     const parsed = readJson5File(buildProfile);
     return Array.isArray(parsed.app?.signingConfigs) && parsed.app.signingConfigs.length > 0;
@@ -3383,8 +3507,8 @@ async function diffHapAssets(opts) {
 }
 
 // src/install/apply.ts
-var fs28 = __toESM(require("fs"), 1);
-var path27 = __toESM(require("path"), 1);
+var fs29 = __toESM(require("fs"), 1);
+var path28 = __toESM(require("path"), 1);
 function decideInstallMethod(s) {
   if (!s.signInfoInconsistent) return "replace";
   if (s.isSystemBundle && !s.allowUninstall) return "refuse";
@@ -3405,7 +3529,7 @@ async function pidOf(config, bundle, deviceSerial) {
 async function resolveHapPath(opts) {
   let hapPath = opts.hapPath;
   if (hapPath) {
-    if (!path27.isAbsolute(hapPath) && opts.projectDir) hapPath = path27.join(opts.projectDir, hapPath);
+    if (!path28.isAbsolute(hapPath) && opts.projectDir) hapPath = path28.join(opts.projectDir, hapPath);
   } else {
     if (!opts.projectDir) throw new OniroError("applyChanges requires hapPath or projectDir.");
     const haps = await discoverHaps({ projectDir: opts.projectDir });
@@ -3424,7 +3548,7 @@ async function resolveHapPath(opts) {
       hapPath = withSigned[0][1].signed[0];
     }
   }
-  if (!fs28.existsSync(hapPath)) throw new OniroError(`HAP not found at ${hapPath}.`);
+  if (!fs29.existsSync(hapPath)) throw new OniroError(`HAP not found at ${hapPath}.`);
   return hapPath;
 }
 async function applyChanges(opts) {
@@ -3434,7 +3558,7 @@ async function applyChanges(opts) {
   const allowUninstall = opts.allowUninstall ?? false;
   const hapPath = await resolveHapPath(opts);
   let assetsChanged = false;
-  if (opts.installedHapPath && fs28.existsSync(opts.installedHapPath)) {
+  if (opts.installedHapPath && fs29.existsSync(opts.installedHapPath)) {
     try {
       const diff = await diffHapAssets({ installedHap: opts.installedHapPath, newHap: hapPath });
       assetsChanged = diff.addedAssetPaths.length > 0 || diff.removedAssetPaths.length > 0;
@@ -3476,7 +3600,7 @@ async function applyChanges(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.8.0";
+var VERSION = "0.10.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ALL_SDKS,
@@ -3496,6 +3620,7 @@ var VERSION = "0.8.0";
   VERSION,
   applyChanges,
   attemptHdcConnection,
+  buildCmdWrapper,
   buildGestureCommands,
   buildGestureUitestCommand,
   buildHap,
@@ -3532,6 +3657,8 @@ var VERSION = "0.8.0";
   ensureOhModules,
   ensureOk,
   ensureRemoteOk,
+  escapeCmdArgument,
+  escapeCmdCommand,
   extractTarball,
   extractZipWithProgress,
   findAppProcessId,
@@ -3570,12 +3697,14 @@ var VERSION = "0.8.0";
   isRamBackedPath,
   isValidBundleName,
   isValidProjectName,
+  killProcessTree,
   launchApp,
   listAbilities,
   listDevices,
   listModules,
   listRunningProcesses,
   listTemplates,
+  needsCmdWrapper,
   nonInteractivePrompter,
   noopLogger,
   noopProgress,
@@ -3612,11 +3741,13 @@ var VERSION = "0.8.0";
   setHilogLevel,
   shell,
   shellChecked,
+  spawnCompat,
   startEmulator,
   staticConfig,
   stopEmulator,
   streamHilog,
   takeScreenshot,
+  toLongPath,
   toSpaceError,
   uninstallApp,
   validateTemplateLayout,