@oniroproject/core 0.7.0 → 0.9.0

package/dist/index.cjs

@@ -37,22 +37,29 @@ __export(index_exports, {
   ChecksumMismatchError: () => ChecksumMismatchError,
   CmdToolsNotInstalledError: () => CmdToolsNotInstalledError,
   CommandFailedError: () => CommandFailedError,
+  INSTALL_TMP_DIRNAME: () => INSTALL_TMP_DIRNAME,
+  InsufficientSpaceError: () => InsufficientSpaceError,
   OHOS_URL_BASE: () => OHOS_URL_BASE,
   OniroError: () => OniroError,
   SdkNotInstalledError: () => SdkNotInstalledError,
+  TMP_DIR_HINT: () => TMP_DIR_HINT,
   UnsupportedPlatformError: () => UnsupportedPlatformError,
   VERSION: () => VERSION,
   applyChanges: () => applyChanges,
   attemptHdcConnection: () => attemptHdcConnection,
+  buildCmdWrapper: () => buildCmdWrapper,
   buildGestureCommands: () => buildGestureCommands,
+  buildGestureUitestCommand: () => buildGestureUitestCommand,
   buildHap: () => buildHap,
   buildHvigorwArgs: () => buildHvigorwArgs,
   buildInputCommand: () => buildInputCommand,
   buildRawTouchCommand: () => buildRawTouchCommand,
   captureBurst: () => captureBurst,
   consoleLogger: () => consoleLogger,
+  createInstallTempDir: () => createInstallTempDir,
   createMaterial: () => createMaterial,
   createScaffold: () => createScaffold,
+  createTempWorkDir: () => createTempWorkDir,
   decideInstallMethod: () => decideInstallMethod,
   decideReboot: () => decideReboot,
   decryptPwd: () => decryptPwd,
@@ -73,14 +80,19 @@ __export(index_exports, {
   dumpScreen: () => dumpScreen,
   dumpWindow: () => dumpWindow,
   encryptPwd: () => encryptPwd,
+  ensureFreeSpace: () => ensureFreeSpace,
   ensureOhModules: () => ensureOhModules,
   ensureOk: () => ensureOk,
+  ensureRemoteOk: () => ensureRemoteOk,
+  escapeCmdArgument: () => escapeCmdArgument,
+  escapeCmdCommand: () => escapeCmdCommand,
   extractTarball: () => extractTarball,
   extractZipWithProgress: () => extractZipWithProgress,
   findAppProcessId: () => findAppProcessId,
   findCmdToolsSourceDir: () => findCmdToolsSourceDir,
   findRunningProcess: () => findRunningProcess,
   forceStop: () => forceStop,
+  formatBytes: () => formatBytes,
   generateSigningConfigs: () => generateSigningConfigs,
   getBundleName: () => getBundleName,
   getCmdToolsBin: () => getCmdToolsBin,
@@ -90,6 +102,7 @@ __export(index_exports, {
   getDeviceInfo: () => getDeviceInfo,
   getDisplaySize: () => getDisplaySize,
   getEmulatorDir: () => getEmulatorDir,
+  getFreeSpaceBytes: () => getFreeSpaceBytes,
   getHdcPath: () => getHdcPath,
   getHvigorwPath: () => getHvigorwPath,
   getInstalledSdks: () => getInstalledSdks,
@@ -107,14 +120,18 @@ __export(index_exports, {
   installEmulator: () => installEmulator,
   isCmdToolsInstalled: () => isCmdToolsInstalled,
   isEmulatorInstalled: () => isEmulatorInstalled,
+  isOutOfSpaceError: () => isOutOfSpaceError,
+  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,
@@ -124,6 +141,8 @@ __export(index_exports, {
   parseCodelinterFindings: () => parseCodelinterFindings,
   parseDeviceList: () => parseDeviceList,
   parseHilogLine: () => parseHilogLine,
+  parseMainAbilityFromBmDump: () => parseMainAbilityFromBmDump,
+  parseRemoteExit: () => parseRemoteExit,
   pickSigningKind: () => pickSigningKind,
   prepareSigning: () => prepareSigning,
   pruneLayout: () => pruneLayout,
@@ -134,6 +153,8 @@ __export(index_exports, {
   removeCmdTools: () => removeCmdTools,
   removeEmulator: () => removeEmulator,
   removeSdk: () => removeSdk,
+  removeTempWorkDir: () => removeTempWorkDir,
+  resolveTmpRoot: () => resolveTmpRoot,
   runCodelinter: () => runCodelinter,
   runHvigorw: () => runHvigorw,
   runOhpm: () => runOhpm,
@@ -146,11 +167,15 @@ __export(index_exports, {
   sendRawTouch: () => sendRawTouch,
   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,
   verifySha256: () => verifySha256,
@@ -159,6 +184,7 @@ __export(index_exports, {
   waitForCondition: () => waitForCondition,
   waitForLog: () => waitForLog,
   watchLog: () => watchLog,
+  waypointsToRawEvents: () => waypointsToRawEvents,
   writeJson5File: () => writeJson5File,
   writeJsonFile: () => writeJsonFile
 });
@@ -271,9 +297,9 @@ var CmdToolsNotInstalledError = class extends OniroError {
   expectedPath;
 };
 var UnsupportedPlatformError = class extends OniroError {
-  constructor(platform6) {
-    super(`Unsupported platform: ${platform6}.`);
-    this.platform = platform6;
+  constructor(platform7) {
+    super(`Unsupported platform: ${platform7}.`);
+    this.platform = platform7;
     this.name = "UnsupportedPlatformError";
   }
   platform;
@@ -288,6 +314,14 @@ var ChecksumMismatchError = class extends OniroError {
   expected;
   actual;
 };
+var InsufficientSpaceError = class extends OniroError {
+  constructor(message, dir, cause) {
+    super(message, cause);
+    this.dir = dir;
+    this.name = "InsufficientSpaceError";
+  }
+  dir;
+};
 var CancelledError = class extends OniroError {
   constructor(message = "Operation cancelled.") {
     super(message);
@@ -334,29 +368,29 @@ var OHOS_URL_BASE = "https://repo.huaweicloud.com/openharmony/os";
 // src/sdk/platform.ts
 var os2 = __toESM(require("os"), 1);
 function getOsFolder() {
-  const platform6 = os2.platform();
-  if (platform6 === "linux") return "linux";
-  if (platform6 === "darwin") return "darwin";
-  if (platform6 === "win32") return "windows";
-  throw new UnsupportedPlatformError(platform6);
+  const platform7 = os2.platform();
+  if (platform7 === "linux") return "linux";
+  if (platform7 === "darwin") return "darwin";
+  if (platform7 === "win32") return "windows";
+  throw new UnsupportedPlatformError(platform7);
 }
 function getSdkFilename(version) {
-  const platform6 = os2.platform();
+  const platform7 = os2.platform();
   const v = version ?? ALL_SDKS[ALL_SDKS.length - 1].version;
   const strips = ALL_SDKS.find((r) => r.version === v)?.tarballStrip ?? { linuxWindows: 1, darwin: 3 };
-  if (platform6 === "linux") {
+  if (platform7 === "linux") {
     return { filename: "ohos-sdk-windows_linux-public.tar.gz", osFolder: "linux", strip: strips.linuxWindows };
   }
-  if (platform6 === "darwin") {
+  if (platform7 === "darwin") {
     if (os2.arch() === "arm64") {
       return { filename: "L2-SDK-MAC-M1-PUBLIC.tar.gz", osFolder: "darwin", strip: strips.darwin };
     }
     return { filename: "ohos-sdk-mac-public.tar.gz", osFolder: "darwin", strip: strips.darwin };
   }
-  if (platform6 === "win32") {
+  if (platform7 === "win32") {
     return { filename: "ohos-sdk-windows_linux-public.tar.gz", osFolder: "windows", strip: strips.linuxWindows };
   }
-  throw new UnsupportedPlatformError(platform6);
+  throw new UnsupportedPlatformError(platform7);
 }
 
 // src/sdk/paths.ts
@@ -375,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;
@@ -397,6 +439,8 @@ function getOhpmPath(config) {
   return getCmdToolsBin(config, "ohpm");
 }
 function getHdcPath(config) {
+  const override = config.get("hdcPath", "");
+  if (override) return override;
   const base = path2.join(getCmdToolsPath(config), "sdk", "default", "openharmony", "toolchains");
   if (os3.platform() === "win32") {
     return pickExisting([
@@ -408,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;
   }
@@ -447,8 +490,164 @@ function detectProjectSdkVersion(projectRoot, logger = noopLogger) {
   }
 }
 
-// src/sdk/download.ts
+// src/sdk/tmp.ts
 var fs3 = __toESM(require("fs"), 1);
+var os4 = __toESM(require("os"), 1);
+var path4 = __toESM(require("path"), 1);
+var INSTALL_TMP_DIRNAME = ".oniro-tmp";
+var TMPFS_MAGIC = 16914836;
+var RAMFS_MAGIC = 2240043254;
+var HINT_EXAMPLE = os4.platform() === "win32" ? "D:\\oniro-tmp" : "~/.cache/oniro-tmp";
+var TMP_DIR_HINT = `Point the scratch directory at a filesystem with more room using --tmp-dir <path> (or the ONIRO_TMP_DIR environment variable), e.g. --tmp-dir ${HINT_EXAMPLE}.`;
+function resolveTmpRoot(config, override, installRoot) {
+  const explicit = (override ?? "").trim();
+  if (explicit) return path4.resolve(explicit);
+  const configured = config.get("tmpDir", "").trim();
+  if (configured) return path4.resolve(configured);
+  if (installRoot) return path4.join(path4.resolve(installRoot), INSTALL_TMP_DIRNAME);
+  return os4.tmpdir();
+}
+function createTempWorkDir(root, prefix) {
+  try {
+    fs3.mkdirSync(root, { recursive: true });
+    return fs3.mkdtempSync(path4.join(root, prefix));
+  } catch (err) {
+    if (isOutOfSpaceError(err)) throw toSpaceError(err, root, "a temporary directory");
+    throw new OniroError(
+      `Cannot create a temporary directory in '${root}': ${err instanceof Error ? err.message : String(err)}
+${TMP_DIR_HINT}`,
+      err
+    );
+  }
+}
+function removeTempWorkDir(dir, root) {
+  fs3.rmSync(dir, { recursive: true, force: true });
+  if (!root || path4.basename(root) !== INSTALL_TMP_DIRNAME) return;
+  try {
+    fs3.rmdirSync(root);
+  } catch {
+  }
+}
+function createInstallTempDir(opts) {
+  const requested = (opts.override ?? "").trim() || opts.config.get("tmpDir", "").trim();
+  const root = resolveTmpRoot(opts.config, opts.override, opts.installRoot);
+  try {
+    return { dir: createTempWorkDir(root, opts.prefix), root };
+  } 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);
+    (opts.logger ?? noopLogger).warn(`${reason} Falling back to '${fallback}'.`);
+    return { dir: createTempWorkDir(fallback, opts.prefix), root: fallback };
+  }
+}
+function nearestExisting(dir) {
+  let current = path4.resolve(dir);
+  for (; ; ) {
+    if (fs3.existsSync(current)) return current;
+    const parent = path4.dirname(current);
+    if (parent === current) return null;
+    current = parent;
+  }
+}
+function getFreeSpaceBytes(dir) {
+  const target = nearestExisting(dir);
+  if (!target) return null;
+  try {
+    const stats = fs3.statfsSync(target);
+    return Number(stats.bsize) * Number(stats.bavail);
+  } catch {
+    return null;
+  }
+}
+function isRamBackedPath(dir) {
+  const target = nearestExisting(dir);
+  if (!target) return false;
+  try {
+    const type = Number(fs3.statfsSync(target).type);
+    return type === TMPFS_MAGIC || type === RAMFS_MAGIC;
+  } catch {
+    return false;
+  }
+}
+function formatBytes(bytes) {
+  const units = ["B", "KiB", "MiB", "GiB", "TiB"];
+  let value = Math.max(0, bytes);
+  let unit = 0;
+  while (value >= 1024 && unit < units.length - 1) {
+    value /= 1024;
+    unit++;
+  }
+  return `${value >= 10 || unit === 0 ? Math.round(value) : value.toFixed(1)} ${units[unit]}`;
+}
+function isOutOfSpaceError(err) {
+  if (err instanceof InsufficientSpaceError) return true;
+  const seen = /* @__PURE__ */ new Set();
+  let current = err;
+  while (current && typeof current === "object" && !seen.has(current)) {
+    seen.add(current);
+    const e = current;
+    if (e.code === "ENOSPC" || e.code === "EDQUOT") return true;
+    if (typeof e.message === "string" && /ENOSPC|EDQUOT|no space left on device/i.test(e.message)) return true;
+    current = e.cause;
+  }
+  return false;
+}
+function spaceMessage(dir, what, opts) {
+  const need = typeof opts.requiredBytes === "number" ? `needs about ${formatBytes(opts.requiredBytes)}` : null;
+  const free = typeof opts.freeBytes === "number" ? `${formatBytes(opts.freeBytes)} available` : null;
+  const amounts = [need, free].filter(Boolean).join(", ");
+  const lines = [`Not enough free space in '${dir}' for ${what}${amounts ? ` (${amounts})` : ""}.`];
+  if (isRamBackedPath(dir)) {
+    lines.push(
+      `'${dir}' is on a RAM-backed filesystem (tmpfs), so its capacity is limited by free memory, not by free disk.`
+    );
+  }
+  if (opts.tmpDirHint) lines.push(TMP_DIR_HINT);
+  return lines.join("\n");
+}
+function ensureFreeSpace(dir, requiredBytes, what) {
+  if (!Number.isFinite(requiredBytes) || requiredBytes <= 0) return;
+  const freeBytes = getFreeSpaceBytes(dir);
+  if (freeBytes === null || freeBytes >= requiredBytes) return;
+  throw new InsufficientSpaceError(
+    spaceMessage(dir, what, { requiredBytes, freeBytes, tmpDirHint: true }),
+    dir
+  );
+}
+function errorPath(err) {
+  const seen = /* @__PURE__ */ new Set();
+  let current = err;
+  while (current && typeof current === "object" && !seen.has(current)) {
+    seen.add(current);
+    const e = current;
+    if (typeof e.path === "string" && e.path) return e.path;
+    if (typeof e.dest === "string" && e.dest) return e.dest;
+    current = e.cause;
+  }
+  return null;
+}
+function isInside(child, parent) {
+  const rel = path4.relative(path4.resolve(parent), path4.resolve(child));
+  return rel === "" || !rel.startsWith("..") && !path4.isAbsolute(rel);
+}
+function toSpaceError(err, tmpRoot, what) {
+  if (err instanceof InsufficientSpaceError) return err;
+  if (!isOutOfSpaceError(err)) return err;
+  const failed = errorPath(err);
+  const failedDir = failed ? path4.dirname(path4.resolve(failed)) : path4.resolve(tmpRoot);
+  const inTmp = isInside(failedDir, tmpRoot);
+  const dir = inTmp ? path4.resolve(tmpRoot) : failedDir;
+  return new InsufficientSpaceError(
+    spaceMessage(dir, what, { freeBytes: getFreeSpaceBytes(dir), tmpDirHint: inTmp }),
+    dir,
+    err
+  );
+}
+
+// src/sdk/download.ts
+var fs4 = __toESM(require("fs"), 1);
+var path5 = __toESM(require("path"), 1);
 var crypto = __toESM(require("crypto"), 1);
 var import_node_stream = require("stream");
 var import_node_util = require("util");
@@ -458,36 +657,57 @@ var pipelineAsync = (0, import_node_util.promisify)(import_node_stream.pipeline)
 async function downloadFile(opts) {
   const { url, dest, progress, abortSignal } = opts;
   const proto = url.startsWith("https") ? https : http;
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     const s = Math.max(0, Math.min(100, opts.start ?? 0));
     const r = Math.max(0, Math.min(100 - s, opts.range ?? 100));
     let settled = false;
     const done = (err) => {
       if (settled) return;
       settled = true;
-      err ? reject(err) : resolve2();
+      err ? reject(err) : resolve4();
     };
     if (abortSignal?.aborted) {
       done(new CancelledError("Download cancelled before start."));
       return;
     }
-    const file = fs3.createWriteStream(dest);
+    const destDir = path5.dirname(path5.resolve(dest));
+    const what = opts.what ?? `the download of '${url}'`;
+    const writeFailed = (err) => isOutOfSpaceError(err) ? toSpaceError(err, opts.tmpRoot ?? destDir, what) : new OniroError(`Error writing '${dest}': ${err instanceof Error ? err.message : String(err)}`, err);
+    const file = fs4.createWriteStream(dest);
+    let activeResponse;
+    const failWith = (err) => {
+      file.close(() => fs4.rm(dest, { force: true }, () => done(err)));
+    };
+    file.on("error", (err) => {
+      try {
+        activeResponse?.destroy?.();
+      } catch {
+      }
+      failWith(writeFailed(err));
+    });
     const req = proto.get(url, (response) => {
+      activeResponse = response;
       if (response.statusCode !== 200) {
         try {
           response.destroy();
         } catch {
         }
-        try {
-          file.close();
-        } catch {
-        }
-        fs3.unlink(dest, () => {
-        });
-        done(new OniroError(`Failed to download '${url}' (HTTP ${response.statusCode})`));
+        failWith(new OniroError(`Failed to download '${url}' (HTTP ${response.statusCode})`));
         return;
       }
       const total = parseInt(response.headers["content-length"] || "0", 10);
+      if (total > 0) {
+        try {
+          ensureFreeSpace(opts.tmpRoot ?? destDir, total, what);
+        } catch (err) {
+          try {
+            response.destroy();
+          } catch {
+          }
+          failWith(err);
+          return;
+        }
+      }
       let downloaded = 0;
       let lastOverall = Math.round(s);
       response.on("data", (chunk) => {
@@ -511,38 +731,26 @@ async function downloadFile(opts) {
           const inc = endOverall - lastOverall;
           if (inc > 0) progress.report({ message: "Downloading: 100%", increment: inc });
         }
-        file.close((err) => err ? done(err) : done());
+        file.close((err) => err ? done(writeFailed(err)) : done());
       });
       abortSignal?.addEventListener("abort", () => {
         response.destroy();
-        file.close();
-        fs3.unlink(dest, () => {
-        });
-        done(new CancelledError("Download cancelled."));
+        failWith(new CancelledError("Download cancelled."));
       });
     });
     req.on("error", (err) => {
-      try {
-        file.close();
-      } catch {
-      }
-      fs3.unlink(dest, () => {
-      });
-      done(new OniroError(`Error downloading '${url}': ${err.message}`, err));
+      failWith(new OniroError(`Error downloading '${url}': ${err.message}`, err));
     });
     abortSignal?.addEventListener("abort", () => {
       req.destroy();
-      file.close();
-      fs3.unlink(dest, () => {
-      });
-      done(new CancelledError("Download cancelled."));
+      failWith(new CancelledError("Download cancelled."));
     });
   });
 }
 async function verifySha256(filePath, sha256Path) {
-  const expected = fs3.readFileSync(sha256Path, "utf8").split(/\s+/)[0];
+  const expected = fs4.readFileSync(sha256Path, "utf8").split(/\s+/)[0];
   const hash = crypto.createHash("sha256");
-  await pipelineAsync(fs3.createReadStream(filePath), hash);
+  await pipelineAsync(fs4.createReadStream(filePath), hash);
   const actual = hash.digest("hex");
   if (actual !== expected) {
     throw new ChecksumMismatchError(expected, actual);
@@ -550,9 +758,9 @@ async function verifySha256(filePath, sha256Path) {
 }
 
 // src/sdk/extract.ts
-var fs4 = __toESM(require("fs"), 1);
-var os4 = __toESM(require("os"), 1);
-var path4 = __toESM(require("path"), 1);
+var fs5 = __toESM(require("fs"), 1);
+var os5 = __toESM(require("os"), 1);
+var path6 = __toESM(require("path"), 1);
 var import_node_stream2 = require("stream");
 var import_node_util2 = require("util");
 var tar = __toESM(require("tar"), 1);
@@ -569,12 +777,12 @@ async function extractZipWithProgress(opts) {
   const r = Math.max(0, Math.min(100 - s, opts.range ?? 100));
   let processed = 0;
   let lastOverall = Math.round(s);
-  await fs4.promises.mkdir(dest, { recursive: true });
-  const destRoot = path4.resolve(dest);
+  await fs5.promises.mkdir(dest, { recursive: true });
+  const destRoot = path6.resolve(dest);
   const safeResolveTarget = (entryName) => {
-    const resolved = path4.resolve(destRoot, entryName);
-    const rel = path4.relative(destRoot, resolved);
-    if (rel.startsWith("..") || path4.isAbsolute(rel)) {
+    const resolved = path6.resolve(destRoot, entryName);
+    const rel = path6.relative(destRoot, resolved);
+    if (rel.startsWith("..") || path6.isAbsolute(rel)) {
       throw new OniroError(`Blocked ZIP entry with illegal path: ${entryName}`);
     }
     return resolved;
@@ -586,25 +794,25 @@ async function extractZipWithProgress(opts) {
       const attr = file.attr ? file.attr >>> 16 : 0;
       const isSymlink = "isSymbolicLink" in file ? Boolean(file.isSymbolicLink) : (attr & 61440) === 40960;
       if (file.isDirectory) {
-        await fs4.promises.mkdir(targetPath, { recursive: true });
+        await fs5.promises.mkdir(targetPath, { recursive: true });
       } else if (isSymlink) {
-        await fs4.promises.mkdir(path4.dirname(targetPath), { recursive: true });
+        await fs5.promises.mkdir(path6.dirname(targetPath), { recursive: true });
         const linkTargetBuffer = await zip.entryData(file);
         const linkTarget = linkTargetBuffer.toString("utf8");
         try {
-          const isWin = os4.platform() === "win32";
-          await fs4.promises.symlink(linkTarget, targetPath, isWin ? "file" : void 0);
+          const isWin = os5.platform() === "win32";
+          await fs5.promises.symlink(linkTarget, targetPath, isWin ? "file" : void 0);
         } catch (e) {
           logger.warn(`Failed to create symlink at ${targetPath}: ${String(e)}`);
         }
       } else {
-        await fs4.promises.mkdir(path4.dirname(targetPath), { recursive: true });
+        await fs5.promises.mkdir(path6.dirname(targetPath), { recursive: true });
         const readStream = await zip.stream(file);
-        const writeStream = fs4.createWriteStream(targetPath);
+        const writeStream = fs5.createWriteStream(targetPath);
         await pipelineAsync2(readStream, writeStream);
         if (attr > 0) {
           try {
-            await fs4.promises.chmod(targetPath, attr & 511);
+            await fs5.promises.chmod(targetPath, attr & 511);
           } catch {
           }
         }
@@ -636,41 +844,41 @@ async function extractTarball(tarPath, dest, strip = 0) {
 }
 
 // src/sdk/list.ts
-var fs5 = __toESM(require("fs"), 1);
-var path5 = __toESM(require("path"), 1);
+var fs6 = __toESM(require("fs"), 1);
+var path7 = __toESM(require("path"), 1);
 function getSupportedSdksForUi(config) {
-  const base = path5.join(getSdkRootDir(config), getOsFolder());
+  const base = path7.join(getSdkRootDir(config), getOsFolder());
   return ALL_SDKS.map((sdk) => ({
     version: sdk.version,
     api: sdk.api,
-    installed: fs5.existsSync(path5.join(base, sdk.api))
+    installed: fs6.existsSync(path7.join(base, sdk.api))
   })).sort((a, b) => Number(b.api) - Number(a.api));
 }
 function getInstalledSdks(config) {
   const sdkRoot = getSdkRootDir(config);
   const versions = /* @__PURE__ */ new Set();
-  if (!fs5.existsSync(sdkRoot)) return [];
+  if (!fs6.existsSync(sdkRoot)) return [];
   for (const osFolder of ["linux", "darwin", "windows"]) {
-    const osPath = path5.join(sdkRoot, osFolder);
-    if (!fs5.existsSync(osPath) || !fs5.statSync(osPath).isDirectory()) continue;
-    for (const api of fs5.readdirSync(osPath)) {
-      const apiPath = path5.join(osPath, api);
-      if (fs5.statSync(apiPath).isDirectory()) versions.add(api);
+    const osPath = path7.join(sdkRoot, osFolder);
+    if (!fs6.existsSync(osPath) || !fs6.statSync(osPath).isDirectory()) continue;
+    for (const api of fs6.readdirSync(osPath)) {
+      const apiPath = path7.join(osPath, api);
+      if (fs6.statSync(apiPath).isDirectory()) versions.add(api);
     }
   }
   return ALL_SDKS.filter((sdk) => versions.has(sdk.api)).map((sdk) => sdk.version);
 }
 
 // src/sdk/remove.ts
-var fs6 = __toESM(require("fs"), 1);
-var path6 = __toESM(require("path"), 1);
+var fs7 = __toESM(require("fs"), 1);
+var path8 = __toESM(require("path"), 1);
 function removeSdk(config, api) {
   const sdkRoot = getSdkRootDir(config);
   let removed = false;
   for (const osFolder of ["linux", "darwin", "windows"]) {
-    const sdkPath = path6.join(sdkRoot, osFolder, api);
-    if (fs6.existsSync(sdkPath)) {
-      fs6.rmSync(sdkPath, { recursive: true, force: true });
+    const sdkPath = path8.join(sdkRoot, osFolder, api);
+    if (fs7.existsSync(sdkPath)) {
+      fs7.rmSync(sdkPath, { recursive: true, force: true });
       removed = true;
     }
   }
@@ -678,19 +886,18 @@ function removeSdk(config, api) {
 }
 
 // src/sdk/install.ts
-var fs8 = __toESM(require("fs"), 1);
-var os5 = __toESM(require("os"), 1);
-var path7 = __toESM(require("path"), 1);
+var fs9 = __toESM(require("fs"), 1);
+var path9 = __toESM(require("path"), 1);
 
 // src/sdk/move.ts
-var fs7 = __toESM(require("fs"), 1);
+var fs8 = __toESM(require("fs"), 1);
 function movePath(src, dest) {
   try {
-    fs7.renameSync(src, dest);
+    fs8.renameSync(src, dest);
   } catch (err) {
     if (err.code !== "EXDEV") throw err;
-    fs7.cpSync(src, dest, { recursive: true });
-    fs7.rmSync(src, { recursive: true, force: true });
+    fs8.cpSync(src, dest, { recursive: true });
+    fs8.rmSync(src, { recursive: true, force: true });
   }
 }
 
@@ -702,21 +909,29 @@ async function downloadAndInstallSdk(opts) {
   const urlBase = config.get("sdkUrlBase", OHOS_URL_BASE);
   const downloadUrl = `${urlBase}/${version}-Release/${filename}`;
   const sha256Url = `${downloadUrl}.sha256`;
-  const tmpDir = fs8.mkdtempSync(path7.join(os5.tmpdir(), "oniro-sdk-"));
-  const tarPath = path7.join(tmpDir, filename);
-  const sha256Path = path7.join(tmpDir, `${filename}.sha256`);
-  const extractDir = path7.join(tmpDir, "extract");
-  fs8.mkdirSync(extractDir);
-  const sdkInstallDir = path7.join(getSdkRootDir(config), osFolder, api);
-  fs8.mkdirSync(path7.dirname(sdkInstallDir), { recursive: true });
+  const what = `the SDK ${version} install`;
+  const sdkRoot = getSdkRootDir(config);
+  const { dir: tmpDir, root: tmpRoot } = createInstallTempDir({
+    config,
+    override: opts.tmpDir,
+    installRoot: sdkRoot,
+    prefix: "oniro-sdk-",
+    logger
+  });
+  const tarPath = path9.join(tmpDir, filename);
+  const sha256Path = path9.join(tmpDir, `${filename}.sha256`);
+  const extractDir = path9.join(tmpDir, "extract");
+  fs9.mkdirSync(extractDir);
+  const sdkInstallDir = path9.join(sdkRoot, osFolder, api);
+  fs9.mkdirSync(path9.dirname(sdkInstallDir), { recursive: true });
   const checkCancelled = () => {
     if (abortSignal?.aborted) throw new CancelledError();
   };
   try {
     progress?.report({ message: "Downloading SDK archive...", increment: 0 });
-    await downloadFile({ url: downloadUrl, dest: tarPath, progress, abortSignal, start: 0, range: 35 });
+    await downloadFile({ url: downloadUrl, dest: tarPath, progress, abortSignal, start: 0, range: 35, what, tmpRoot });
     progress?.report({ message: "Downloading checksum...", increment: 0 });
-    await downloadFile({ url: sha256Url, dest: sha256Path, progress, abortSignal, start: 35, range: 10 });
+    await downloadFile({ url: sha256Url, dest: sha256Path, progress, abortSignal, start: 35, range: 10, what, tmpRoot });
     progress?.report({ message: "Verifying checksum...", increment: 0 });
     await verifySha256(tarPath, sha256Path);
     progress?.report({ message: "Verifying checksum...", increment: 5 });
@@ -725,13 +940,13 @@ async function downloadAndInstallSdk(opts) {
     await extractTarball(tarPath, extractDir, strip);
     progress?.report({ message: "Extracting SDK (this may take a while)...", increment: 10 });
     checkCancelled();
-    const osContentPath = path7.join(extractDir, osFolder);
-    if (!fs8.existsSync(osContentPath)) {
+    const osContentPath = path9.join(extractDir, osFolder);
+    if (!fs9.existsSync(osContentPath)) {
       throw new OniroError(
         `Expected folder '${osFolder}' not found in extracted SDK. Tarball layout may have changed.`
       );
     }
-    const zipFiles = fs8.readdirSync(osContentPath).filter((n2) => n2.endsWith(".zip"));
+    const zipFiles = fs9.readdirSync(osContentPath).filter((n2) => n2.endsWith(".zip"));
     const componentsStart = 60;
     const componentsBudget = 35;
     const n = zipFiles.length;
@@ -746,39 +961,114 @@ async function downloadAndInstallSdk(opts) {
     for (const zipFile of zipFiles) {
       checkCancelled();
       logger.info(`Extracting component ${zipFile}`);
-      const zipPath = path7.join(osContentPath, zipFile);
+      const zipPath = path9.join(osContentPath, zipFile);
       const thisBudget = base + (rem > 0 ? 1 : 0);
       if (rem > 0) rem--;
       await extractZipWithProgress({ zipPath, dest: osContentPath, progress, start: cursor, range: thisBudget, logger });
       cursor += thisBudget;
-      fs8.unlinkSync(zipPath);
+      fs9.unlinkSync(zipPath);
     }
     progress?.report({ message: "Finalizing installation...", increment: 0 });
-    if (fs8.existsSync(sdkInstallDir)) {
-      fs8.rmSync(sdkInstallDir, { recursive: true, force: true });
+    if (fs9.existsSync(sdkInstallDir)) {
+      fs9.rmSync(sdkInstallDir, { recursive: true, force: true });
     }
     movePath(osContentPath, sdkInstallDir);
     progress?.report({ message: "Finalizing installation...", increment: 3 });
     progress?.report({ message: "Cleaning up...", increment: 0 });
-    fs8.rmSync(tmpDir, { recursive: true, force: true });
+    removeTempWorkDir(tmpDir, tmpRoot);
     progress?.report({ message: "Cleaning up...", increment: 2 });
   } catch (err) {
-    logger.error(`SDK install failed: ${err instanceof Error ? err.message : String(err)}`);
-    fs8.rmSync(tmpDir, { recursive: true, force: true });
-    throw err;
+    const wrapped = toSpaceError(err, tmpRoot, what);
+    logger.error(`SDK install failed: ${wrapped instanceof Error ? wrapped.message : String(wrapped)}`);
+    removeTempWorkDir(tmpDir, tmpRoot);
+    throw wrapped;
   }
 }
 
 // src/cmdTools/install.ts
-var fs9 = __toESM(require("fs"), 1);
+var fs10 = __toESM(require("fs"), 1);
 var os6 = __toESM(require("os"), 1);
-var path8 = __toESM(require("path"), 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");
-function getCmdToolsDownloadUrl(config, platform6 = os6.platform()) {
-  if (platform6 === "linux") {
+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);
   }
-  if (platform6 === "win32") {
+  if (platform7 === "win32") {
     const url = config.get("cmdToolsUrlWindows", "");
     if (!url) {
       throw new OniroError(
@@ -787,7 +1077,7 @@ function getCmdToolsDownloadUrl(config, platform6 = os6.platform()) {
     }
     return url;
   }
-  if (platform6 === "darwin") {
+  if (platform7 === "darwin") {
     const url = config.get("cmdToolsUrlMac", "");
     if (!url) {
       throw new OniroError(
@@ -796,20 +1086,20 @@ function getCmdToolsDownloadUrl(config, platform6 = os6.platform()) {
     }
     return url;
   }
-  throw new UnsupportedPlatformError(platform6);
+  throw new UnsupportedPlatformError(platform7);
 }
 function findCmdToolsSourceDir(extractPath) {
   const known = [
-    path8.join(extractPath, "command-line-tools"),
-    path8.join(extractPath, "oh-command-line-tools"),
-    path8.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 (fs9.existsSync(c)) return c;
+    if (fs10.existsSync(c)) return c;
   }
-  const entries = fs9.readdirSync(extractPath, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => path8.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 (fs9.existsSync(path8.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.");
 }
@@ -817,53 +1107,62 @@ async function installCmdTools(opts) {
   const { config, progress, abortSignal } = opts;
   const logger = opts.logger ?? noopLogger;
   const CMD_PATH = getCmdToolsPath(config);
-  const tmpDir = fs9.mkdtempSync(path8.join(os6.tmpdir(), "oniro-cmdtools-"));
-  const zipPath = opts.localZipPath ?? path8.join(tmpDir, "oh-command-line-tools.zip");
-  const extractPath = path8.join(tmpDir, "oh-command-line-tools");
+  const what = "the command-line tools install";
+  const { dir: tmpDir, root: tmpRoot } = createInstallTempDir({
+    config,
+    override: opts.tmpDir,
+    installRoot: path11.dirname(CMD_PATH),
+    prefix: "oniro-cmdtools-",
+    logger
+  });
+  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);
       progress?.report({ message: "Downloading command line tools...", increment: 0 });
-      await downloadFile({ url, dest: zipPath, progress, abortSignal, start: 0, range: 50 });
+      await downloadFile({ url, dest: zipPath, progress, abortSignal, start: 0, range: 50, what, tmpRoot });
     }
     progress?.report({ message: "Extracting tools...", increment: 0 });
     await extractZipWithProgress({ zipPath, dest: extractPath, progress, start: 50, range: 45, logger });
-    fs9.mkdirSync(CMD_PATH, { recursive: true });
+    fs10.mkdirSync(CMD_PATH, { recursive: true });
     const srcDir = findCmdToolsSourceDir(extractPath);
-    for (const entry of fs9.readdirSync(srcDir)) {
-      const src = path8.join(srcDir, entry);
-      const dest = path8.join(CMD_PATH, entry);
-      if (fs9.statSync(src).isDirectory()) {
-        if (fs9.existsSync(dest)) fs9.rmSync(dest, { recursive: true, force: true });
+    for (const entry of fs10.readdirSync(srcDir)) {
+      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);
       } else {
-        fs9.copyFileSync(src, dest);
+        fs10.copyFileSync(src, dest);
       }
     }
-    const binDir = path8.join(CMD_PATH, "bin");
-    if (fs9.existsSync(binDir) && os6.platform() !== "win32") {
-      for (const file of fs9.readdirSync(binDir)) {
-        fs9.chmodSync(path8.join(binDir, file), 493);
+    const binDir = path11.join(CMD_PATH, "bin");
+    if (fs10.existsSync(binDir) && os6.platform() !== "win32") {
+      for (const file of fs10.readdirSync(binDir)) {
+        fs10.chmodSync(path11.join(binDir, file), 493);
       }
     }
     progress?.report({ message: "Finalizing installation...", increment: 5 });
     progress?.report({ message: "Cleaning up...", increment: 0 });
+  } catch (err) {
+    throw toSpaceError(err, tmpRoot, what);
   } finally {
-    fs9.rmSync(tmpDir, { recursive: true, force: true });
+    removeTempWorkDir(tmpDir, tmpRoot);
   }
 }
 function getCmdToolsStatus(config) {
   const cmdPath = getCmdToolsPath(config);
-  const binDir = path8.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) => path8.join(binDir, c)).find((p) => fs9.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 = path8.join(cmdPath, "version.txt");
-    if (fs9.existsSync(versionFile)) {
-      const content = fs9.readFileSync(versionFile, "utf8");
+    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/)) {
         const m = line.match(/^\s*#\s*Version:\s*(.+)$/);
         if (m?.[1]) return { installed: true, status: `Installed (${m[1].trim()})` };
@@ -872,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)" };
@@ -883,14 +1189,14 @@ function isCmdToolsInstalled(config) {
 }
 function removeCmdTools(config) {
   const cmdPath = getCmdToolsPath(config);
-  if (fs9.existsSync(cmdPath)) {
-    fs9.rmSync(cmdPath, { recursive: true, force: true });
+  if (fs10.existsSync(cmdPath)) {
+    fs10.rmSync(cmdPath, { recursive: true, force: true });
   }
 }
 
 // src/sign/encryptKey.ts
-var fs10 = __toESM(require("fs"), 1);
-var path9 = __toESM(require("path"), 1);
+var fs11 = __toESM(require("fs"), 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;
@@ -962,33 +1268,33 @@ function getRootKey(fdComponents, salt) {
 function createAndStoreKey(dir, keyLength) {
   const key = crypto2.randomBytes(keyLength);
   const hash = crypto2.createHash("sha256").update(key).digest("hex");
-  const filePath = path9.join(dir, hash);
-  fs10.writeFileSync(filePath, key);
-  fs10.chmodSync(filePath, KEY_FILE_PERMISSIONS);
+  const filePath = path12.join(dir, hash);
+  fs11.writeFileSync(filePath, key);
+  fs11.chmodSync(filePath, KEY_FILE_PERMISSIONS);
   return key;
 }
 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 = path9.join(ceDir, hash);
-  fs10.writeFileSync(filePath, encrypted);
-  fs10.chmodSync(filePath, KEY_FILE_PERMISSIONS);
+  const filePath = path12.join(ceDir, hash);
+  fs11.writeFileSync(filePath, encrypted);
+  fs11.chmodSync(filePath, KEY_FILE_PERMISSIONS);
 }
 function createMaterial(materialPath) {
-  fs10.mkdirSync(materialPath, { recursive: true });
-  fs10.chmodSync(materialPath, KEY_FILE_DIRECTORY_PERMISSIONS);
-  const fdDir = path9.join(materialPath, "fd");
-  const acDir = path9.join(materialPath, "ac");
-  const ceDir = path9.join(materialPath, "ce");
-  fs10.mkdirSync(fdDir, { recursive: true });
-  fs10.mkdirSync(acDir, { recursive: true });
-  fs10.mkdirSync(ceDir, { recursive: true });
+  fs11.mkdirSync(materialPath, { recursive: true });
+  fs11.chmodSync(materialPath, KEY_FILE_DIRECTORY_PERMISSIONS);
+  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 = path9.join(fdDir, sub);
-    fs10.mkdirSync(subDir, { recursive: true });
+    const subDir = path12.join(fdDir, sub);
+    fs11.mkdirSync(subDir, { recursive: true });
     const comp = createAndStoreKey(subDir, DAEMON_ROOT_KEY_COMPONENT_LENGTH);
     fdComponents.push(comp);
   }
@@ -997,24 +1303,24 @@ function createMaterial(materialPath) {
   createAndStoreEnKey(rootKey, ceDir);
 }
 function readSingleFile(dir) {
-  if (!fs10.existsSync(dir) || !fs10.statSync(dir).isDirectory()) {
+  if (!fs11.existsSync(dir) || !fs11.statSync(dir).isDirectory()) {
     throw new Error(`Missing signing material directory: ${dir}`);
   }
-  const files = fs10.readdirSync(dir).filter((f) => f !== ".DS_Store");
+  const files = fs11.readdirSync(dir).filter((f) => f !== ".DS_Store");
   if (files.length !== 1) {
     throw new Error(`Signing material in ${dir} is illegal (expected exactly one file).`);
   }
-  return fs10.readFileSync(path9.join(dir, files[0]));
+  return fs11.readFileSync(path12.join(dir, files[0]));
 }
 function getKey(materialPath) {
-  if (!fs10.existsSync(materialPath) || !fs10.statSync(materialPath).isDirectory()) {
+  if (!fs11.existsSync(materialPath) || !fs11.statSync(materialPath).isDirectory()) {
     throw new Error("Material directory does not exist.");
   }
-  const fdDir = path9.join(materialPath, "fd");
-  const fdComponents = ["0", "1", "2"].map((sub) => readSingleFile(path9.join(fdDir, sub)));
-  const salt = readSingleFile(path9.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(path9.join(materialPath, "ce"));
+  const workMaterial = readSingleFile(path12.join(materialPath, "ce"));
   return decrypt(rootKey, workMaterial);
 }
 function encryptPwd(password, materialPath) {
@@ -1029,9 +1335,9 @@ function decryptPwd(encryptedHex, materialPath) {
 }
 
 // src/sign/generateSigningConfigs.ts
-var fs11 = __toESM(require("fs"), 1);
-var path10 = __toESM(require("path"), 1);
-var import_node_child_process2 = require("child_process");
+var fs12 = __toESM(require("fs"), 1);
+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
@@ -1100,17 +1406,17 @@ var SIGNING_KIND_CONFIG = {
 };
 function copyFilesToProject(projectDir, paths, kind, logger, applicationCertPath) {
   logger.info("[sign] Copying signing material into project...");
-  const signaturesDir = path10.join(projectDir, "signatures");
-  fs11.mkdirSync(signaturesDir, { recursive: true });
-  fs11.copyFileSync(paths.keystore, path10.join(signaturesDir, "OpenHarmony.p12"));
-  fs11.copyFileSync(paths.profileCert, path10.join(signaturesDir, "OpenHarmonyProfileRelease.pem"));
-  fs11.copyFileSync(paths.unsignedProfileTemplate, path10.join(signaturesDir, "UnsgnedReleasedProfileTemplate.json"));
+  const signaturesDir = path13.join(projectDir, "signatures");
+  fs12.mkdirSync(signaturesDir, { recursive: true });
+  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 = path10.join(signaturesDir, "OpenHarmonyApplication.cer");
+    const dest = path13.join(signaturesDir, "OpenHarmonyApplication.cer");
     if (applicationCertPath) {
-      fs11.copyFileSync(applicationCertPath, dest);
+      fs12.copyFileSync(applicationCertPath, dest);
     } else {
-      fs11.writeFileSync(dest, OPEN_HARMONY_APPLICATION_CERT);
+      fs12.writeFileSync(dest, OPEN_HARMONY_APPLICATION_CERT);
     }
   }
 }
@@ -1119,7 +1425,7 @@ function resolveAppFeature(apl, override) {
   return apl === "normal" ? "hos_normal_app" : "hos_system_app";
 }
 function extractLeafCertificate(chainPath) {
-  const certContent = fs11.readFileSync(chainPath, "utf-8");
+  const certContent = fs12.readFileSync(chainPath, "utf-8");
   const parts = certContent.split("-----END CERTIFICATE-----");
   if (parts.length < 3) {
     throw new OniroError(`${chainPath} does not contain enough certificates.`);
@@ -1129,20 +1435,20 @@ 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 = path10.join(projectDir, "AppScope/app.json5");
-  const profileTemplatePath = path10.join(projectDir, "signatures/UnsgnedReleasedProfileTemplate.json");
-  if (!fs11.existsSync(appJsonPath)) {
+  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.`);
   }
   let appJson;
   try {
-    appJson = import_json52.default.parse(fs11.readFileSync(appJsonPath, "utf-8"));
+    appJson = import_json52.default.parse(fs12.readFileSync(appJsonPath, "utf-8"));
   } catch (e) {
     throw new OniroError(`Error parsing ${appJsonPath}: ${e.message}`, e);
   }
   let profileTemplate;
   try {
-    profileTemplate = JSON.parse(fs11.readFileSync(profileTemplatePath, "utf-8"));
+    profileTemplate = JSON.parse(fs12.readFileSync(profileTemplatePath, "utf-8"));
   } catch (e) {
     throw new OniroError(`Error parsing ${profileTemplatePath}: ${e.message}`, e);
   }
@@ -1155,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 = path10.join(
+  const distCertChainPath = path13.join(
     projectDir,
     "signatures",
     SIGNING_KIND_CONFIG[kind].certBasename
@@ -1165,13 +1471,13 @@ function modifyProfileTemplate(projectDir, apl, appFeature, logger, options = {}
     profileTemplate.acls = profileTemplate.acls ?? {};
     profileTemplate.acls["allowed-acls"] = options.acls;
   }
-  fs11.writeFileSync(profileTemplatePath, JSON.stringify(profileTemplate, null, 2));
+  fs12.writeFileSync(profileTemplatePath, JSON.stringify(profileTemplate, null, 2));
 }
 function generateP7bFile(projectDir, paths, logger, passwords) {
   logger.info("[sign] Generating P7b profile via hap-sign-tool...");
-  const signaturesDir = path10.join(projectDir, "signatures");
-  const profileTemplatePath = path10.join(signaturesDir, "UnsgnedReleasedProfileTemplate.json");
-  const outputProfilePath = path10.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,
@@ -1196,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}`,
@@ -1205,11 +1511,11 @@ function generateP7bFile(projectDir, paths, logger, passwords) {
   }
 }
 function detectSigningConfigNames(projectDir) {
-  const buildProfilePath = path10.join(projectDir, "build-profile.json5");
-  if (!fs11.existsSync(buildProfilePath)) return ["default"];
+  const buildProfilePath = path13.join(projectDir, "build-profile.json5");
+  if (!fs12.existsSync(buildProfilePath)) return ["default"];
   let parsed;
   try {
-    parsed = import_json52.default.parse(fs11.readFileSync(buildProfilePath, "utf-8"));
+    parsed = import_json52.default.parse(fs12.readFileSync(buildProfilePath, "utf-8"));
   } catch {
     return ["default"];
   }
@@ -1226,14 +1532,14 @@ function detectSigningConfigNames(projectDir) {
 }
 function updateBuildProfile(projectDir, kind, logger, passwords) {
   logger.info("[sign] Writing signing configs into build-profile.json5...");
-  const materialDir = path10.join(projectDir, "signatures", "material");
-  const buildProfilePath = path10.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: {} };
-  if (fs11.existsSync(buildProfilePath)) {
+  if (fs12.existsSync(buildProfilePath)) {
     try {
-      buildProfile = import_json52.default.parse(fs11.readFileSync(buildProfilePath, "utf-8"));
+      buildProfile = import_json52.default.parse(fs12.readFileSync(buildProfilePath, "utf-8"));
     } catch (e) {
       throw new OniroError(`Error parsing ${buildProfilePath}: ${e.message}`, e);
     }
@@ -1254,13 +1560,13 @@ function updateBuildProfile(projectDir, kind, logger, passwords) {
       storeFile: "./signatures/OpenHarmony.p12"
     }
   }));
-  fs11.writeFileSync(buildProfilePath, JSON.stringify(buildProfile, null, 2));
+  fs12.writeFileSync(buildProfilePath, JSON.stringify(buildProfile, null, 2));
 }
 function prepareMaterialDirectory(projectDir, logger) {
   logger.info("[sign] Generating fresh signing material...");
-  const materialDir = path10.join(projectDir, "signatures", "material");
-  if (fs11.existsSync(materialDir)) {
-    fs11.rmSync(materialDir, { recursive: true, force: true });
+  const materialDir = path13.join(projectDir, "signatures", "material");
+  if (fs12.existsSync(materialDir)) {
+    fs12.rmSync(materialDir, { recursive: true, force: true });
   }
   createMaterial(materialDir);
 }
@@ -1283,15 +1589,15 @@ function generateSigningConfigs(options) {
       "Could not detect project SDK version (compileSdkVersion missing in build-profile.json5)."
     );
   }
-  const sdkPath = path10.join(sdkHome, String(sdkVersion));
-  if (!fs11.existsSync(sdkPath)) {
+  const sdkPath = path13.join(sdkHome, String(sdkVersion));
+  if (!fs12.existsSync(sdkPath)) {
     throw new OniroError(`SDK path does not exist: ${sdkPath}`);
   }
   const paths = {
-    signTool: path10.join(sdkPath, "toolchains/lib/hap-sign-tool.jar"),
-    keystore: path10.join(sdkPath, "toolchains/lib/OpenHarmony.p12"),
-    profileCert: path10.join(sdkPath, "toolchains/lib/OpenHarmonyProfileRelease.pem"),
-    unsignedProfileTemplate: path10.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;
@@ -1305,60 +1611,81 @@ function generateSigningConfigs(options) {
 }
 
 // src/emulator/install.ts
-var fs12 = __toESM(require("fs"), 1);
-var os7 = __toESM(require("os"), 1);
-var path11 = __toESM(require("path"), 1);
+var fs13 = __toESM(require("fs"), 1);
+var path14 = __toESM(require("path"), 1);
 async function installEmulator(opts) {
   const { config, progress, abortSignal } = opts;
   const logger = opts.logger ?? noopLogger;
   const url = config.get("emulatorUrl", defaultPaths.emulatorUrl);
   const emulatorDir = getEmulatorDir(config);
-  const tmpDir = fs12.mkdtempSync(path11.join(os7.tmpdir(), "oniro-emulator-"));
-  const tmpZip = path11.join(tmpDir, "oniro_emulator.zip");
+  const what = "the emulator install";
+  const { dir: tmpDir, root: tmpRoot } = createInstallTempDir({
+    config,
+    override: opts.tmpDir,
+    installRoot: path14.dirname(emulatorDir),
+    prefix: "oniro-emulator-",
+    logger
+  });
+  const tmpZip = path14.join(tmpDir, "oniro_emulator.zip");
   try {
-    fs12.mkdirSync(emulatorDir, { recursive: true });
+    fs13.mkdirSync(emulatorDir, { recursive: true });
     progress?.report({ message: "Downloading emulator...", increment: 0 });
-    await downloadFile({ url, dest: tmpZip, progress, abortSignal, start: 0, range: 50 });
+    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 = path11.join(emulatorDir, "images", "run.sh");
-    if (fs12.existsSync(runSh)) {
-      fs12.chmodSync(runSh, 493);
+    const runSh = path14.join(emulatorDir, "images", "run.sh");
+    if (fs13.existsSync(runSh)) {
+      fs13.chmodSync(runSh, 493);
     }
     progress?.report({ message: "Finalizing installation...", increment: 5 });
+  } catch (err) {
+    throw toSpaceError(err, tmpRoot, what);
   } finally {
-    fs12.rmSync(tmpDir, { recursive: true, force: true });
+    removeTempWorkDir(tmpDir, tmpRoot);
   }
 }
 function isEmulatorInstalled(config) {
-  const imagesDir = path11.join(getEmulatorDir(config), "images");
-  return fs12.existsSync(path11.join(imagesDir, "run.sh")) || fs12.existsSync(path11.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);
-  if (fs12.existsSync(emulatorDir)) {
-    fs12.rmSync(emulatorDir, { recursive: true, force: true });
+  if (fs13.existsSync(emulatorDir)) {
+    fs13.rmSync(emulatorDir, { recursive: true, force: true });
   }
 }
 
 // src/emulator/lifecycle.ts
-var fs13 = __toESM(require("fs"), 1);
-var os8 = __toESM(require("os"), 1);
-var path12 = __toESM(require("path"), 1);
+var fs15 = __toESM(require("fs"), 1);
+var os7 = __toESM(require("os"), 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;
   const { abortSignal } = opts;
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     if (abortSignal?.aborted) {
       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;
@@ -1371,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");
@@ -1414,7 +1735,7 @@ ${stderr.trim()}` : "")
         );
         return;
       }
-      resolve2({ code: code ?? -1, stdout, stderr });
+      resolve4({ code: code ?? -1, stdout, stderr });
     });
   });
 }
@@ -1440,9 +1761,29 @@ function ensureOk(result, command) {
   }
   return result;
 }
+var REMOTE_RC_RE = /__ONIRO_RC=(-?\d+)__/g;
+function parseRemoteExit(stdout) {
+  let code = null;
+  for (const m of stdout.matchAll(REMOTE_RC_RE)) code = Number(m[1]);
+  if (code === null) return null;
+  return { code, stdout: stdout.replace(REMOTE_RC_RE, "").replace(/[ \t\r\n]+$/, "") };
+}
+async function shellChecked(opts) {
+  const { command, ...rest } = opts;
+  const res = await hdcExec({ ...rest, args: ["shell", `${command}; echo "__ONIRO_RC=$?__"`] });
+  const parsed = parseRemoteExit(res.stdout);
+  if (!parsed) return res;
+  return { code: parsed.code, stdout: parsed.stdout, stderr: res.stderr };
+}
+function ensureRemoteOk(result, command) {
+  if (result.code !== 0) {
+    throw new CommandFailedError(command, result.code, result.stderr.trim() || result.stdout.trim());
+  }
+  return result;
+}
 
 // src/emulator/lifecycle.ts
-var PID_FILE = path12.join(os8.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 });
@@ -1455,24 +1796,24 @@ async function attemptHdcConnection(config, address = "127.0.0.1:55555", logger
   }
 }
 function resolveLauncher(imagesPath, headless, connect) {
-  const runSh = path12.join(imagesPath, "run.sh");
-  const runBat = path12.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 (os8.platform() === "win32") {
-    if (fs13.existsSync(runBat)) {
+  if (os7.platform() === "win32") {
+    if (fs15.existsSync(runBat)) {
       return { command: "cmd.exe", args: ["/c", runBat, ...extra], cwd: imagesPath };
     }
-    if (fs13.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 (fs13.existsSync(runSh)) {
+  if (fs15.existsSync(runSh)) {
     return { command: "bash", args: [runSh, ...extra], cwd: imagesPath };
   }
-  if (fs13.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}.`);
@@ -1480,9 +1821,9 @@ function resolveLauncher(imagesPath, headless, connect) {
 async function startEmulator(opts) {
   const { config } = opts;
   const logger = opts.logger ?? noopLogger;
-  if (os8.platform() !== "win32" && fs13.existsSync(PID_FILE)) {
+  if (os7.platform() !== "win32" && fs15.existsSync(PID_FILE)) {
     try {
-      const pid = Number(fs13.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);
@@ -1498,13 +1839,13 @@ async function startEmulator(opts) {
       logger.warn(`Could not read PID file: ${err.message}`);
     }
   }
-  const imagesPath = path12.join(getEmulatorDir(config), "images");
-  if (!fs13.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 ?? (os8.platform() === "win32" ? "NUL" : "/dev/null");
-  const logFd = fs13.openSync(logPath, "a");
+  const logPath = opts.logFile ?? (os7.platform() === "win32" ? "NUL" : "/dev/null");
+  const logFd = fs15.openSync(logPath, "a");
   let child;
   try {
     child = (0, import_node_child_process4.spawn)(launcher.command, [...launcher.args], {
@@ -1514,19 +1855,19 @@ async function startEmulator(opts) {
       windowsHide: true
     });
   } finally {
-    fs13.closeSync(logFd);
+    fs15.closeSync(logFd);
   }
   if (!child.pid) {
     throw new OniroError(`Failed to spawn launcher (${launcher.command} ${launcher.args.join(" ")}).`);
   }
-  fs13.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((resolve2) => {
-    child.once("exit", (code) => resolve2(code));
-    child.once("error", () => resolve2(-1));
+  const earlyExit = new Promise((resolve4) => {
+    child.once("exit", (code) => resolve4(code));
+    child.once("error", () => resolve4(-1));
   });
-  const liveness = new Promise((resolve2) => setTimeout(() => resolve2("alive"), 2e3));
+  const liveness = new Promise((resolve4) => setTimeout(() => resolve4("alive"), 2e3));
   const outcome = await Promise.race([earlyExit, liveness]);
   if (outcome !== "alive") {
     const tail = readTail(logPath, 4e3);
@@ -1566,24 +1907,24 @@ ${tail}` : ""}`);
 }
 function readTail(filePath, bytes) {
   try {
-    const stat = fs13.statSync(filePath);
+    const stat = fs15.statSync(filePath);
     const start = Math.max(0, stat.size - bytes);
-    const fd = fs13.openSync(filePath, "r");
+    const fd = fs15.openSync(filePath, "r");
     try {
       const buf = Buffer.alloc(stat.size - start);
-      fs13.readSync(fd, buf, 0, buf.length, start);
+      fs15.readSync(fd, buf, 0, buf.length, start);
       return buf.toString("utf8");
     } finally {
-      fs13.closeSync(fd);
+      fs15.closeSync(fd);
     }
   } catch {
     return "";
   }
 }
 async function stopEmulator(logger = noopLogger) {
-  if (fs13.existsSync(PID_FILE)) {
+  if (fs15.existsSync(PID_FILE)) {
     try {
-      const pid = Number(fs13.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");
@@ -1596,13 +1937,13 @@ async function stopEmulator(logger = noopLogger) {
       logger.warn(`Could not read PID file: ${err.message}`);
     }
   }
-  const [killCmd, ...killArgs] = os8.platform() === "win32" ? ["taskkill", "/IM", "qemu-system-x86_64.exe", "/F"] : ["pkill", "-f", "qemu-system-x86_64"];
+  const [killCmd, ...killArgs] = os7.platform() === "win32" ? ["taskkill", "/IM", "qemu-system-x86_64.exe", "/F"] : ["pkill", "-f", "qemu-system-x86_64"];
   try {
     await runProcess({ command: killCmd, args: killArgs, logger });
   } catch (err) {
     logger.warn(`[emulator] could not run ${killCmd}: ${err.message}`);
   }
-  fs13.rm(PID_FILE, { force: true }, (err) => {
+  fs15.rm(PID_FILE, { force: true }, (err) => {
     if (err) logger.warn(`Could not remove PID file: ${err.message}`);
   });
 }
@@ -1725,7 +2066,7 @@ async function getDisplaySize(config, opts = {}) {
 
 // src/hdc/wait.ts
 function delay(ms, signal) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     if (signal?.aborted) {
       reject(new CancelledError("Wait cancelled."));
       return;
@@ -1740,7 +2081,7 @@ function delay(ms, signal) {
     };
     const timer = setTimeout(() => {
       cleanup();
-      resolve2();
+      resolve4();
     }, ms);
     signal?.addEventListener("abort", onAbort, { once: true });
   });
@@ -1769,21 +2110,20 @@ async function waitForCondition(opts) {
 }
 
 // src/hdc/app.ts
-var fs15 = __toESM(require("fs"), 1);
-var path14 = __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 fs14 = __toESM(require("fs"), 1);
-var path13 = __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 = fs14.readFileSync(filePath, "utf-8");
+  const content = fs16.readFileSync(filePath, "utf-8");
   return import_json53.default.parse(content);
 }
 function getBundleName(projectDir) {
-  const appJsonPath = path13.join(projectDir, "AppScope", "app.json5");
-  if (!fs14.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);
@@ -1793,8 +2133,8 @@ function getBundleName(projectDir) {
   return appJson.app.bundleName;
 }
 function getMainAbility(projectDir, moduleName = "entry", abilityName) {
-  const moduleJsonPath = path13.join(projectDir, moduleName, "src", "main", "module.json5");
-  if (!fs14.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);
@@ -1817,8 +2157,8 @@ 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 = path14.isAbsolute(relativeHapPath) ? relativeHapPath : path14.join(opts.projectDir, relativeHapPath);
-  if (!fs15.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 });
@@ -1835,13 +2175,59 @@ async function installApp(opts) {
 function detectAaStartFailure(output) {
   return /failed to start ability|Error Code:\s*\d|Error Message:/i.test(output) ? output.trim() : null;
 }
+function parseMainAbilityFromBmDump(stdout) {
+  const start = stdout.indexOf("{");
+  if (start < 0) return null;
+  let info;
+  try {
+    info = JSON.parse(stdout.slice(start));
+  } catch {
+    return null;
+  }
+  const mods = Array.isArray(info?.hapModuleInfos) ? info.hapModuleInfos : [];
+  const abilityOf = (m) => m?.mainElementName || m?.mainAbility || void 0;
+  const isEntry = (m) => m?.moduleType === 1 || m?.moduleType === "1" || m?.moduleType === "entry";
+  const entry = mods.find((m) => isEntry(m) && abilityOf(m));
+  const any = mods.find((m) => abilityOf(m));
+  return entry && abilityOf(entry) || any && abilityOf(any) || null;
+}
+async function resolveInstalledMainAbility(opts) {
+  const res = await shell({
+    config: opts.config,
+    command: `bm dump -n ${opts.bundle}`,
+    deviceSerial: opts.deviceSerial,
+    timeoutMs: 15e3,
+    logger: opts.logger
+  });
+  const ability = parseMainAbilityFromBmDump(res.stdout);
+  if (!ability) {
+    throw new OniroError(
+      `Could not determine the main ability for installed bundle ${opts.bundle} (is it installed?). Pass an explicit ability instead.`
+    );
+  }
+  return ability;
+}
 async function launchApp(opts) {
   const logger = scopedLogger(opts.logger ?? noopLogger, "hdc");
-  const bundleName = getBundleName(opts.projectDir);
-  const mainAbility = getMainAbility(opts.projectDir, opts.moduleName, opts.abilityName);
+  let bundleName;
+  let mainAbility;
+  if (opts.bundleName) {
+    bundleName = opts.bundleName;
+    mainAbility = opts.abilityName ?? await resolveInstalledMainAbility({
+      config: opts.config,
+      bundle: bundleName,
+      deviceSerial: opts.deviceSerial,
+      logger: opts.logger
+    });
+  } else {
+    if (!opts.projectDir) throw new OniroError("launchApp requires either bundleName or projectDir.");
+    bundleName = getBundleName(opts.projectDir);
+    mainAbility = getMainAbility(opts.projectDir, opts.moduleName, opts.abilityName);
+  }
   const result = await hdcExec({
     config: opts.config,
-    args: ["shell", "aa", "start", "-a", mainAbility, "-b", bundleName]
+    args: ["shell", "aa", "start", "-a", mainAbility, "-b", bundleName],
+    deviceSerial: opts.deviceSerial
   });
   if (result.stdout.trim()) logger.info(result.stdout.trim());
   if (result.stderr.trim()) logger.warn(result.stderr.trim());
@@ -1856,11 +2242,17 @@ function listRunningProcesses(config, options = {}) {
   const logger = options.logger ?? noopLogger;
   const timeoutMs = options.timeoutMs ?? 1e3;
   const hdc = getHdcPath(config);
-  return new Promise((resolve2, reject) => {
-    const proc = (0, import_node_child_process5.spawn)(hdc, ["track-jpid"]);
+  return new Promise((resolve4, reject) => {
+    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) => {
+    proc.stdout?.on("data", (data) => {
       for (const line of data.toString().split("\n").filter(Boolean)) {
         const match = line.match(/^(\d+)\s+(.+)$/);
         if (!match) continue;
@@ -1869,13 +2261,13 @@ function listRunningProcesses(config, options = {}) {
         processes.push({ pid, name });
         if (options.targetProcessName && name === options.targetProcessName && !resolved) {
           resolved = true;
-          proc.kill();
-          resolve2(pid);
+          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) => {
@@ -1887,11 +2279,11 @@ 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 {
-        resolve2(processes);
+        resolve4(processes);
       }
     }, timeoutMs);
     proc.on("close", () => {
@@ -1901,7 +2293,7 @@ function listRunningProcesses(config, options = {}) {
       if (options.targetProcessName) {
         reject(new OniroError(`Could not find process for bundle: ${options.targetProcessName}`));
       } else {
-        resolve2(processes);
+        resolve4(processes);
       }
     });
   });
@@ -1921,8 +2313,17 @@ async function findRunningProcess(opts) {
     logger: opts.logger
   });
   const pid = res.stdout.trim().split(/\s+/).filter(Boolean)[0];
-  if (res.code !== 0 || !pid || !/^\d+$/.test(pid)) return null;
-  return { pid, name: opts.bundle };
+  if (res.code === 0 && pid && /^\d+$/.test(pid)) return { pid, name: opts.bundle };
+  try {
+    const list = await listRunningProcesses(opts.config, { timeoutMs: 1200, logger: opts.logger });
+    if (Array.isArray(list)) {
+      const mine = (name) => name === opts.bundle || name.startsWith(`${opts.bundle}/`) || name.startsWith(`${opts.bundle}:`);
+      const match = list.find((p) => p.name === opts.bundle) ?? list.find((p) => mine(p.name));
+      if (match) return match;
+    }
+  } catch {
+  }
+  return null;
 }
 async function uninstallApp(opts) {
   const logger = scopedLogger(opts.logger ?? noopLogger, "hdc");
@@ -2036,12 +2437,12 @@ async function reboot(opts) {
 }
 
 // src/hdc/screen.ts
-var fs16 = __toESM(require("fs"), 1);
-var os9 = __toESM(require("os"), 1);
-var path15 = __toESM(require("path"), 1);
+var fs18 = __toESM(require("fs"), 1);
+var os8 = __toESM(require("os"), 1);
+var path18 = __toESM(require("path"), 1);
 var import_node_crypto = require("crypto");
 function tmpName(ext) {
-  return path15.join(os9.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";
@@ -2051,11 +2452,11 @@ async function takeScreenshot(opts) {
   const local = tmpName("jpeg");
   try {
     await recvFile({ config: opts.config, remote, local, deviceSerial: opts.deviceSerial, timeoutMs });
-    const pixels = await fs16.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 {
-    fs16.promises.unlink(local).catch(() => {
+    fs18.promises.unlink(local).catch(() => {
     });
     void shell({ config: opts.config, command: `rm -f ${remote}`, deviceSerial: opts.deviceSerial }).catch(() => {
     });
@@ -2074,9 +2475,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 fs16.promises.readFile(local));
+        frames.push(await fs18.promises.readFile(local));
       } finally {
-        fs16.promises.unlink(local).catch(() => {
+        fs18.promises.unlink(local).catch(() => {
         });
       }
     }
@@ -2120,8 +2521,8 @@ function buildInputCommand(opts) {
 }
 async function sendInput(opts) {
   const cmd = buildInputCommand(opts);
-  const res = await shell({ config: opts.config, command: cmd, deviceSerial: opts.deviceSerial, timeoutMs: 3e4, logger: opts.logger });
-  ensureOk(res, `hdc shell ${cmd}`);
+  const res = await shellChecked({ config: opts.config, command: cmd, deviceSerial: opts.deviceSerial, timeoutMs: 3e4, logger: opts.logger });
+  ensureRemoteOk(res, `hdc shell ${cmd}`);
 }
 function buildGestureCommands(waypoints) {
   if (waypoints.length < 2) {
@@ -2164,32 +2565,47 @@ function waypointsToRawEvents(waypoints, holdStartMs = 0, holdEndMs = 0) {
   events.push({ type: "up", x: last.x, y: last.y, t: last.t + holdStartMs + holdEndMs });
   return events;
 }
+var UITEST_VELOCITY_MIN = 200;
+var UITEST_VELOCITY_MAX = 4e4;
+function buildGestureUitestCommand(waypoints, opts = {}) {
+  if (waypoints.length < 2) throw new OniroError("sendGesture requires at least two waypoints.");
+  const a = waypoints[0];
+  const b = waypoints[waypoints.length - 1];
+  const dist = Math.hypot(b.x - a.x, b.y - a.y);
+  const dtMs = b.t - a.t;
+  const op = (opts.holdStartMs ?? 0) > 0 ? "drag" : "swipe";
+  let cmd = `uitest uiInput ${op} ${a.x} ${a.y} ${b.x} ${b.y}`;
+  if (dtMs > 0 && dist > 0) {
+    const v = Math.round(dist / (dtMs / 1e3));
+    cmd += ` ${Math.max(UITEST_VELOCITY_MIN, Math.min(UITEST_VELOCITY_MAX, v))}`;
+  }
+  return cmd;
+}
 async function sendGesture(opts) {
-  const wantsHold = (opts.holdStartMs ?? 0) > 0 || (opts.holdEndMs ?? 0) > 0;
-  if (wantsHold) {
-    await sendRawTouch({
-      config: opts.config,
-      events: waypointsToRawEvents(opts.waypoints, opts.holdStartMs, opts.holdEndMs),
-      deviceSerial: opts.deviceSerial,
-      logger: opts.logger
-    });
-    return;
+  if ((opts.holdEndMs ?? 0) > 0) {
+    opts.logger?.warn(
+      "sendGesture: hold-end has no uitest equivalent and is ignored; use sendRawTouch for a trailing hold."
+    );
   }
-  for (const cmd of buildGestureCommands(opts.waypoints)) {
-    const res = await shell({ config: opts.config, command: cmd, deviceSerial: opts.deviceSerial, timeoutMs: 3e4, logger: opts.logger });
-    ensureOk(res, `hdc shell ${cmd}`);
+  if (opts.waypoints.length > 2) {
+    opts.logger?.debug(
+      `sendGesture: ${opts.waypoints.length} waypoints collapsed to first\u2192last (uitest has no polyline path).`
+    );
   }
+  const cmd = buildGestureUitestCommand(opts.waypoints, { holdStartMs: opts.holdStartMs });
+  const res = await shellChecked({ config: opts.config, command: cmd, deviceSerial: opts.deviceSerial, timeoutMs: 3e4, logger: opts.logger });
+  ensureRemoteOk(res, `hdc shell ${cmd}`);
 }
 async function sendRawTouch(opts) {
   const cmd = buildRawTouchCommand(opts.events);
-  const res = await shell({ config: opts.config, command: cmd, deviceSerial: opts.deviceSerial, timeoutMs: 3e4, logger: opts.logger });
-  ensureOk(res, `hdc shell ${cmd}`);
+  const res = await shellChecked({ config: opts.config, command: cmd, deviceSerial: opts.deviceSerial, timeoutMs: 3e4, logger: opts.logger });
+  ensureRemoteOk(res, `hdc shell ${cmd}`);
 }
 
 // src/hdc/dump.ts
-var fs17 = __toESM(require("fs"), 1);
-var os10 = __toESM(require("os"), 1);
-var path16 = __toESM(require("path"), 1);
+var fs19 = __toESM(require("fs"), 1);
+var os9 = __toESM(require("os"), 1);
+var path19 = __toESM(require("path"), 1);
 var import_node_crypto2 = require("crypto");
 function parseBounds(s) {
   const m = /^\[(-?\d+),(-?\d+)\]\[(-?\d+),(-?\d+)\]$/.exec(s ?? "");
@@ -2274,10 +2690,10 @@ async function dumpLayout(opts) {
   if (!m) throw new OniroError(`Could not parse dumpLayout output:
 ${dump.stdout}`);
   const remote = m[1];
-  const local = path16.join(os10.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 fs17.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 };
@@ -2286,7 +2702,7 @@ ${dump.stdout}`);
     const tree = Array.isArray(prunedRaw) ? { children: prunedRaw } : prunedRaw ?? { children: [] };
     return { display, tree };
   } finally {
-    fs17.promises.unlink(local).catch(() => {
+    fs19.promises.unlink(local).catch(() => {
     });
     void shell({ config: opts.config, command: `rm -f ${remote}`, deviceSerial: opts.deviceSerial }).catch(() => {
     });
@@ -2294,14 +2710,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((resolve2, reject) => {
-    const child = (0, import_node_child_process6.spawn)(hdc, ["shell", "hilog", "-b", opts.level]);
+  return new Promise((resolve4, reject) => {
+    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) => {
@@ -2310,7 +2733,7 @@ function setHilogLevel(opts) {
     });
     child.once("close", (code) => {
       if (code === 0) {
-        resolve2();
+        resolve4();
       } else {
         const msg = stderr.trim() || `hdc shell hilog -b ${opts.level} exited with code ${code}`;
         logger.error(`[hilog] ${msg}`);
@@ -2330,7 +2753,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) {
@@ -2365,7 +2788,7 @@ async function resolveProcessId(config, bundle, deviceSerial) {
   return proc?.pid;
 }
 function waitForLog(opts) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     const deadline = Date.now() + opts.timeoutMs;
     let settled = false;
     let child = null;
@@ -2376,10 +2799,7 @@ function waitForLog(opts) {
       if (reconnectTimer) clearTimeout(reconnectTimer);
       opts.abortSignal?.removeEventListener("abort", onAbort);
       if (child) {
-        try {
-          child.kill("SIGKILL");
-        } catch {
-        }
+        killProcessTree(child);
         child = null;
       }
     };
@@ -2387,7 +2807,7 @@ function waitForLog(opts) {
       if (settled) return;
       settled = true;
       cleanup();
-      resolve2(entry);
+      resolve4(entry);
     };
     const fail = (err) => {
       if (settled) return;
@@ -2395,6 +2815,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.`)),
@@ -2424,17 +2845,17 @@ 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) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     const matches = [];
     let settled = false;
     let child = null;
@@ -2443,10 +2864,7 @@ function watchLog(opts) {
       clearTimeout(timer);
       opts.abortSignal?.removeEventListener("abort", onAbort);
       if (child) {
-        try {
-          child.kill("SIGKILL");
-        } catch {
-        }
+        killProcessTree(child);
         child = null;
       }
     };
@@ -2454,7 +2872,7 @@ function watchLog(opts) {
       if (settled) return;
       settled = true;
       cleanup();
-      resolve2(opts.dedup === false ? matches : dedupEntries(matches));
+      resolve4(opts.dedup === false ? matches : dedupEntries(matches));
     };
     const onAbort = () => {
       if (settled) return;
@@ -2479,7 +2897,12 @@ function watchLog(opts) {
           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) {
@@ -2506,9 +2929,8 @@ async function dumpLog(opts) {
 }
 
 // src/build/runHvigorw.ts
-var fs18 = __toESM(require("fs"), 1);
-var path17 = __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"}`);
@@ -2520,19 +2942,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 (!fs18.existsSync(path17.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 (!fs18.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 {
-      fs18.chmodSync(hvigorw, 493);
+      fs20.chmodSync(hvigorw, 493);
     } catch {
     }
   }
@@ -2540,32 +2966,35 @@ function runHvigorw(opts) {
     ...process.env,
     OHOS_BASE_SDK_HOME: getOhosBaseSdkHome(config)
   };
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     if (opts.abortSignal?.aborted) {
       reject(new CancelledError("hvigorw build cancelled."));
       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());
@@ -2581,19 +3010,18 @@ function runHvigorw(opts) {
       settled = true;
       cleanup();
       const exitCode = code ?? 1;
-      if (exitCode === 0) resolve2({ exitCode });
+      if (exitCode === 0) resolve4({ exitCode });
       else reject(new OniroError(`hvigorw exited with code ${exitCode}`));
     });
   });
 }
 
 // src/build/discoverHaps.ts
-var fs19 = __toESM(require("fs"), 1);
-var path18 = __toESM(require("path"), 1);
-function moduleOf(projectDir, hapPath) {
-  const rel = path18.relative(projectDir, hapPath);
-  const first = rel.split(path18.sep)[0];
-  return first && first !== ".." ? first : "(root)";
+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, "");
 }
 async function discoverHaps(opts) {
   const { projectDir } = opts;
@@ -2601,14 +3029,14 @@ async function discoverHaps(opts) {
   const result = {};
   const walk = async (dir, depth) => {
     if (depth > maxDepth) return;
-    const entries = await fs19.promises.readdir(dir, { withFileTypes: true }).catch(() => []);
+    const entries = await fs21.promises.readdir(dir, { withFileTypes: true }).catch(() => []);
     for (const e of entries) {
-      const full = path18.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);
       } else if (e.isFile() && e.name.endsWith(".hap")) {
-        const moduleName = moduleOf(projectDir, full);
+        const moduleName = moduleOfHap(e.name);
         const bucket = result[moduleName] ??= { signed: [], unsigned: [] };
         if (e.name.includes("unsigned")) bucket.unsigned.push(full);
         else if (e.name.includes("signed")) bucket.signed.push(full);
@@ -2620,8 +3048,8 @@ async function discoverHaps(opts) {
 }
 
 // src/build/ohpm.ts
-var fs20 = __toESM(require("fs"), 1);
-var path19 = __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),
@@ -2634,7 +3062,7 @@ function runOhpm(opts) {
   });
 }
 async function ensureOhModules(opts) {
-  if (fs20.existsSync(path19.join(opts.projectDir, "oh_modules"))) {
+  if (fs22.existsSync(path22.join(opts.projectDir, "oh_modules"))) {
     return { installed: false };
   }
   const res = await runOhpm({
@@ -2686,10 +3114,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
@@ -2698,7 +3127,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,
@@ -2708,7 +3137,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(
@@ -2729,21 +3158,21 @@ function isValidBundleName(bundleName) {
 }
 
 // src/project/templates.ts
-var fs21 = __toESM(require("fs"), 1);
-var path20 = __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 (!fs21.existsSync(templateRoot)) return [];
-  const entries = fs21.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 = path20.join(templateRoot, e.name);
-    const metaPath = path20.join(dir, "template.json");
+    const dir = path23.join(templateRoot, e.name);
+    const metaPath = path23.join(dir, "template.json");
     let meta = {};
-    if (fs21.existsSync(metaPath)) {
+    if (fs23.existsSync(metaPath)) {
       try {
-        meta = JSON.parse(fs21.readFileSync(metaPath, "utf8"));
+        meta = JSON.parse(fs23.readFileSync(metaPath, "utf8"));
       } catch {
       }
     }
@@ -2758,57 +3187,57 @@ function listTemplates(templateRoot) {
 function validateTemplateLayout(templateDir, defaultModuleName) {
   const required = [
     "build-profile.json5",
-    path20.join("AppScope", "app.json5"),
-    path20.join(defaultModuleName, "src", "main", "module.json5"),
-    path20.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) => !fs21.existsSync(path20.join(templateDir, rel)));
+  return required.filter((rel) => !fs23.existsSync(path23.join(templateDir, rel)));
 }
 
 // src/project/createScaffold.ts
-var fs23 = __toESM(require("fs"), 1);
-var path21 = __toESM(require("path"), 1);
+var fs25 = __toESM(require("fs"), 1);
+var path24 = __toESM(require("path"), 1);
 
 // src/project/jsonHelpers.ts
-var fs22 = __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(fs22.readFileSync(filePath, "utf8"));
+  return import_json54.default.parse(fs24.readFileSync(filePath, "utf8"));
 }
 function writeJson5File(filePath, value) {
-  fs22.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(fs22.readFileSync(filePath, "utf8"));
+  return JSON.parse(fs24.readFileSync(filePath, "utf8"));
 }
 function writeJsonFile(filePath, value) {
-  fs22.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 fs23.promises.access(p);
+    await fs25.promises.access(p);
     return true;
   } catch {
     return false;
   }
 }
 async function copyDirRecursive(srcDir, destDir) {
-  await fs23.promises.mkdir(destDir, { recursive: true });
-  const entries = await fs23.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 = path21.join(srcDir, entry.name);
-    const dest = path21.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 fs23.promises.copyFile(src, dest);
+      await fs25.promises.copyFile(src, dest);
     }
   }
 }
@@ -2816,9 +3245,9 @@ async function normalizeJson5ToJson(projectDir, logger) {
   const stack = [projectDir];
   while (stack.length > 0) {
     const currentDir = stack.pop();
-    const entries = await fs23.promises.readdir(currentDir, { withFileTypes: true });
+    const entries = await fs25.promises.readdir(currentDir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path21.join(currentDir, entry.name);
+      const fullPath = path24.join(currentDir, entry.name);
       if (entry.isDirectory()) {
         if (IGNORED_DIRS.has(entry.name)) continue;
         stack.push(fullPath);
@@ -2840,23 +3269,23 @@ function toJavaPropertiesPath(p) {
 function createOrUpdateLocalProperties(projectDir, sdkDir) {
   const content = `sdk.dir=${toJavaPropertiesPath(sdkDir)}
 `;
-  fs23.writeFileSync(path21.join(projectDir, "local.properties"), content, "utf8");
+  fs25.writeFileSync(path24.join(projectDir, "local.properties"), content, "utf8");
 }
 function renameIfExists(fromPath, toPath) {
-  if (fs23.existsSync(fromPath) && fromPath !== toPath) {
-    fs23.renameSync(fromPath, toPath);
+  if (fs25.existsSync(fromPath) && fromPath !== toPath) {
+    fs25.renameSync(fromPath, toPath);
   }
 }
 function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
-  const appJsonPath = path21.join(projectDir, "AppScope", "app.json5");
-  if (fs23.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 = path21.join(projectDir, "AppScope", "resources", "base", "element", "string.json");
-  if (fs23.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");
@@ -2864,8 +3293,8 @@ function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
     }
     writeJsonFile(stringsPath, strings);
   }
-  const buildProfilePath = path21.join(projectDir, "build-profile.json5");
-  if (fs23.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) {
@@ -2878,23 +3307,23 @@ function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
     }
     writeJson5File(buildProfilePath, buildProfile);
   }
-  const moduleJsonPath = path21.join(projectDir, args.moduleName, "src", "main", "module.json5");
-  if (fs23.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 = path21.join(projectDir, args.moduleName, "oh-package.json5");
-  if (fs23.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 = path21.join(projectDir, ".vscode");
-  fs23.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(path21.join(vscodeDir, "settings.json"), {
+  writeJsonFile(path24.join(vscodeDir, "settings.json"), {
     "oniro.hapPath": hapPath,
     "files.associations": { "*.json5": "jsonc" }
   });
@@ -2911,7 +3340,7 @@ async function createScaffold(opts) {
   if (!opts.location || !await pathExists(opts.location)) {
     throw new OniroError(`Location does not exist: ${opts.location}`);
   }
-  const templateDir = path21.join(opts.templateRoot, opts.templateId);
+  const templateDir = path24.join(opts.templateRoot, opts.templateId);
   if (!await pathExists(templateDir)) {
     throw new OniroError(`Template not found: ${templateDir}`);
   }
@@ -2924,17 +3353,17 @@ async function createScaffold(opts) {
     throw new OniroError(`Template '${opts.templateId}' is missing required files:
 - ${missing.join("\n- ")}`);
   }
-  const projectDir = path21.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 fs23.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(path21.join(projectDir, defaultModuleName), path21.join(projectDir, moduleName));
+    renameIfExists(path24.join(projectDir, defaultModuleName), path24.join(projectDir, moduleName));
   }
   updateTemplateConfigs(
     projectDir,
@@ -2951,11 +3380,11 @@ async function createScaffold(opts) {
 }
 
 // src/project/listModules.ts
-var fs24 = __toESM(require("fs"), 1);
-var path22 = __toESM(require("path"), 1);
+var fs26 = __toESM(require("fs"), 1);
+var path25 = __toESM(require("path"), 1);
 function listModules(opts) {
-  const buildProfile = path22.join(opts.projectDir, "build-profile.json5");
-  if (!fs24.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);
@@ -2967,12 +3396,12 @@ function listModules(opts) {
 }
 
 // src/project/abilities.ts
-var fs25 = __toESM(require("fs"), 1);
-var path23 = __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 = path23.join(opts.projectDir, moduleName, "src", "main", "module.json5");
-  if (!fs25.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);
@@ -2980,12 +3409,12 @@ function listAbilities(opts) {
 }
 
 // src/project/prepareSigning.ts
-var fs26 = __toESM(require("fs"), 1);
-var path24 = __toESM(require("path"), 1);
+var fs28 = __toESM(require("fs"), 1);
+var path27 = __toESM(require("path"), 1);
 function hasSigningArtifacts(dir) {
-  if (!fs26.existsSync(path24.join(dir, "signatures"))) return false;
-  const buildProfile = path24.join(dir, "build-profile.json5");
-  if (!fs26.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;
@@ -3075,8 +3504,8 @@ async function diffHapAssets(opts) {
 }
 
 // src/install/apply.ts
-var fs27 = __toESM(require("fs"), 1);
-var path25 = __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";
@@ -3097,7 +3526,7 @@ async function pidOf(config, bundle, deviceSerial) {
 async function resolveHapPath(opts) {
   let hapPath = opts.hapPath;
   if (hapPath) {
-    if (!path25.isAbsolute(hapPath) && opts.projectDir) hapPath = path25.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 });
@@ -3116,7 +3545,7 @@ async function resolveHapPath(opts) {
       hapPath = withSigned[0][1].signed[0];
     }
   }
-  if (!fs27.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) {
@@ -3126,7 +3555,7 @@ async function applyChanges(opts) {
   const allowUninstall = opts.allowUninstall ?? false;
   const hapPath = await resolveHapPath(opts);
   let assetsChanged = false;
-  if (opts.installedHapPath && fs27.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;
@@ -3168,7 +3597,7 @@ async function applyChanges(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.7.0";
+var VERSION = "0.9.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ALL_SDKS,
@@ -3178,22 +3607,29 @@ var VERSION = "0.7.0";
   ChecksumMismatchError,
   CmdToolsNotInstalledError,
   CommandFailedError,
+  INSTALL_TMP_DIRNAME,
+  InsufficientSpaceError,
   OHOS_URL_BASE,
   OniroError,
   SdkNotInstalledError,
+  TMP_DIR_HINT,
   UnsupportedPlatformError,
   VERSION,
   applyChanges,
   attemptHdcConnection,
+  buildCmdWrapper,
   buildGestureCommands,
+  buildGestureUitestCommand,
   buildHap,
   buildHvigorwArgs,
   buildInputCommand,
   buildRawTouchCommand,
   captureBurst,
   consoleLogger,
+  createInstallTempDir,
   createMaterial,
   createScaffold,
+  createTempWorkDir,
   decideInstallMethod,
   decideReboot,
   decryptPwd,
@@ -3214,14 +3650,19 @@ var VERSION = "0.7.0";
   dumpScreen,
   dumpWindow,
   encryptPwd,
+  ensureFreeSpace,
   ensureOhModules,
   ensureOk,
+  ensureRemoteOk,
+  escapeCmdArgument,
+  escapeCmdCommand,
   extractTarball,
   extractZipWithProgress,
   findAppProcessId,
   findCmdToolsSourceDir,
   findRunningProcess,
   forceStop,
+  formatBytes,
   generateSigningConfigs,
   getBundleName,
   getCmdToolsBin,
@@ -3231,6 +3672,7 @@ var VERSION = "0.7.0";
   getDeviceInfo,
   getDisplaySize,
   getEmulatorDir,
+  getFreeSpaceBytes,
   getHdcPath,
   getHvigorwPath,
   getInstalledSdks,
@@ -3248,14 +3690,18 @@ var VERSION = "0.7.0";
   installEmulator,
   isCmdToolsInstalled,
   isEmulatorInstalled,
+  isOutOfSpaceError,
+  isRamBackedPath,
   isValidBundleName,
   isValidProjectName,
+  killProcessTree,
   launchApp,
   listAbilities,
   listDevices,
   listModules,
   listRunningProcesses,
   listTemplates,
+  needsCmdWrapper,
   nonInteractivePrompter,
   noopLogger,
   noopProgress,
@@ -3265,6 +3711,8 @@ var VERSION = "0.7.0";
   parseCodelinterFindings,
   parseDeviceList,
   parseHilogLine,
+  parseMainAbilityFromBmDump,
+  parseRemoteExit,
   pickSigningKind,
   prepareSigning,
   pruneLayout,
@@ -3275,6 +3723,8 @@ var VERSION = "0.7.0";
   removeCmdTools,
   removeEmulator,
   removeSdk,
+  removeTempWorkDir,
+  resolveTmpRoot,
   runCodelinter,
   runHvigorw,
   runOhpm,
@@ -3287,11 +3737,15 @@ var VERSION = "0.7.0";
   sendRawTouch,
   setHilogLevel,
   shell,
+  shellChecked,
+  spawnCompat,
   startEmulator,
   staticConfig,
   stopEmulator,
   streamHilog,
   takeScreenshot,
+  toLongPath,
+  toSpaceError,
   uninstallApp,
   validateTemplateLayout,
   verifySha256,
@@ -3300,6 +3754,7 @@ var VERSION = "0.7.0";
   waitForCondition,
   waitForLog,
   watchLog,
+  waypointsToRawEvents,
   writeJson5File,
   writeJsonFile
 });