@oniroproject/core 0.14.0 → 0.15.0

package/dist/index.cjs

@@ -42,6 +42,7 @@ __export(index_exports, {
   HUAWEI_SITES: () => HUAWEI_SITES,
   INSTALL_TMP_DIRNAME: () => INSTALL_TMP_DIRNAME,
   InsufficientSpaceError: () => InsufficientSpaceError,
+  OHOS_DAILY_BUILDS_URL: () => OHOS_DAILY_BUILDS_URL,
   OHOS_URL_BASE: () => OHOS_URL_BASE,
   OniroError: () => OniroError,
   SIGNING_ERRORS: () => SIGNING_ERRORS,
@@ -62,6 +63,7 @@ __export(index_exports, {
   buildHvigorwArgs: () => buildHvigorwArgs,
   buildInputCommand: () => buildInputCommand,
   buildRawTouchCommand: () => buildRawTouchCommand,
+  bundleNameFromHapConfig: () => bundleNameFromHapConfig,
   captureBurst: () => captureBurst,
   captureLog: () => captureLog,
   cleanCodelinterOutput: () => cleanCodelinterOutput,
@@ -115,6 +117,7 @@ __export(index_exports, {
   findLayoutNodes: () => findLayoutNodes,
   findMissingProjectSdk: () => findMissingProjectSdk,
   findRunningProcess: () => findRunningProcess,
+  findSdkOsDir: () => findSdkOsDir,
   flattenLayout: () => flattenLayout,
   forceStop: () => forceStop,
   formatBytes: () => formatBytes,
@@ -148,10 +151,12 @@ __export(index_exports, {
   hdcTargetArgs: () => hdcTargetArgs,
   hdcTargetArgsFor: () => hdcTargetArgsFor,
   hideKeyboard: () => hideKeyboard,
+  hilogTimeMs: () => hilogTimeMs,
   installApp: () => installApp,
   installCmdTools: () => installCmdTools,
   installEmulator: () => installEmulator,
   installFailureReason: () => installFailureReason,
+  installSdkFromArchive: () => installSdkFromArchive,
   isBundleInstalled: () => isBundleInstalled,
   isCmdToolsInstalled: () => isCmdToolsInstalled,
   isEmulatorInstalled: () => isEmulatorInstalled,
@@ -168,6 +173,7 @@ __export(index_exports, {
   listRunningProcesses: () => listRunningProcesses,
   listTemplates: () => listTemplates,
   locateTarget: () => locateTarget,
+  missingProjectRootFiles: () => missingProjectRootFiles,
   needsCmdWrapper: () => needsCmdWrapper,
   nonInteractivePrompter: () => nonInteractivePrompter,
   noopLogger: () => noopLogger,
@@ -191,9 +197,11 @@ __export(index_exports, {
   pickTarget: () => pickTarget,
   prepareSigning: () => prepareSigning,
   pruneLayout: () => pruneLayout,
+  readHapBundleName: () => readHapBundleName,
   readJson5File: () => readJson5File,
   readJsonFile: () => readJsonFile,
   readProvisionProfile: () => readProvisionProfile,
+  readZipEntry: () => readZipEntry,
   reboot: () => reboot,
   recvFile: () => recvFile,
   removeCmdTools: () => removeCmdTools,
@@ -424,6 +432,7 @@ var ALL_SDKS = [
   { version: "7.0", api: "26", tarballStrip: { linuxWindows: 1, darwin: 3 }, archiveSuffix: "_20260829" }
 ];
 var OHOS_URL_BASE = "https://repo.huaweicloud.com/openharmony/os";
+var OHOS_DAILY_BUILDS_URL = "https://dcp.openharmony.cn/workbench/cicd/dailybuild/dailylist";
 
 // src/sdk/platform.ts
 var os2 = __toESM(require("os"), 1);
@@ -1006,8 +1015,17 @@ async function extractZipWithProgress(opts) {
     if (inc > 0) progress.report({ message: "Extracting: 100%", increment: inc });
   }
 }
-async function extractTarball(tarPath, dest, strip = 0) {
-  await tar.x({ file: tarPath, cwd: dest, strip });
+async function extractTarball(tarPath, dest, strip = 0, filter) {
+  await tar.x({ file: tarPath, cwd: dest, strip, ...filter ? { filter: (p) => filter(p) } : {} });
+}
+async function readZipEntry(zipPath, match) {
+  const zip = new import_node_stream_zip.default.async({ file: zipPath });
+  try {
+    const entry = Object.values(await zip.entries()).find((e) => !e.isDirectory && match(e.name));
+    return entry ? await zip.entryData(entry) : void 0;
+  } finally {
+    await zip.close();
+  }
 }
 
 // src/sdk/list.ts
@@ -1113,34 +1131,7 @@ async function downloadAndInstallSdk(opts) {
         `Expected folder '${osFolder}' not found in extracted SDK. Tarball layout may have changed.`
       );
     }
-    const zipFiles = fs10.readdirSync(osContentPath).filter((n2) => n2.endsWith(".zip"));
-    const componentsStart = 60;
-    const componentsBudget = 35;
-    const n = zipFiles.length;
-    if (n === 0) {
-      progress?.report({ message: "No SDK component ZIPs found.", increment: componentsBudget });
-    } else {
-      progress?.report({ message: "Extracting SDK components...", increment: 0 });
-    }
-    const base = n > 0 ? Math.floor(componentsBudget / n) : 0;
-    let rem = n > 0 ? componentsBudget % n : 0;
-    let cursor = componentsStart;
-    for (const zipFile of zipFiles) {
-      checkCancelled();
-      logger.info(`Extracting component ${zipFile}`);
-      const zipPath = path10.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;
-      fs10.unlinkSync(zipPath);
-    }
-    progress?.report({ message: "Finalizing installation...", increment: 0 });
-    if (fs10.existsSync(sdkInstallDir)) {
-      fs10.rmSync(sdkInstallDir, { recursive: true, force: true });
-    }
-    movePath(osContentPath, sdkInstallDir);
-    progress?.report({ message: "Finalizing installation...", increment: 3 });
+    await installComponents({ osContentPath, sdkInstallDir, progress, logger, start: 60, range: 35, checkCancelled });
     progress?.report({ message: "Cleaning up...", increment: 0 });
     removeTempWorkDir(tmpDir, tmpRoot);
     progress?.report({ message: "Cleaning up...", increment: 2 });
@@ -1151,6 +1142,115 @@ async function downloadAndInstallSdk(opts) {
     throw wrapped;
   }
 }
+async function installComponents(opts) {
+  const { osContentPath, sdkInstallDir, progress, logger, checkCancelled } = opts;
+  const zipFiles = fs10.readdirSync(osContentPath).filter((n2) => n2.endsWith(".zip"));
+  const n = zipFiles.length;
+  if (n === 0) {
+    progress?.report({ message: "No SDK component ZIPs found.", increment: opts.range });
+  } else {
+    progress?.report({ message: "Extracting SDK components...", increment: 0 });
+  }
+  const base = n > 0 ? Math.floor(opts.range / n) : 0;
+  let rem = n > 0 ? opts.range % n : 0;
+  let cursor = opts.start;
+  for (const zipFile of zipFiles) {
+    checkCancelled();
+    logger.info(`Extracting component ${zipFile}`);
+    const zipPath = path10.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;
+    fs10.unlinkSync(zipPath);
+  }
+  progress?.report({ message: "Finalizing installation...", increment: 0 });
+  if (fs10.existsSync(sdkInstallDir)) {
+    fs10.rmSync(sdkInstallDir, { recursive: true, force: true });
+  }
+  movePath(osContentPath, sdkInstallDir);
+  progress?.report({ message: "Finalizing installation...", increment: 3 });
+}
+async function installSdkFromArchive(opts) {
+  const { config, archivePath, progress, abortSignal } = opts;
+  const logger = opts.logger ?? noopLogger;
+  if (!fs10.statSync(archivePath, { throwIfNoEntry: false })?.isFile()) {
+    throw new OniroError(`SDK archive not found: ${archivePath}`);
+  }
+  const osFolder = getOsFolder();
+  const what = `the SDK install from '${path10.basename(archivePath)}'`;
+  const sdkRoot = getSdkRootDir(config);
+  const { dir: tmpDir, root: tmpRoot } = createInstallTempDir({
+    config,
+    override: opts.tmpDir,
+    installRoot: sdkRoot,
+    prefix: "oniro-sdk-",
+    logger
+  });
+  const extractDir = path10.join(tmpDir, "extract");
+  fs10.mkdirSync(extractDir);
+  const checkCancelled = () => {
+    if (abortSignal?.aborted) throw new CancelledError();
+  };
+  try {
+    progress?.report({ message: "Extracting SDK archive (this may take a while)...", increment: 0 });
+    await extractTarball(archivePath, extractDir, 0, (p) => p.split("/").includes(osFolder));
+    progress?.report({ message: "Extracting SDK archive (this may take a while)...", increment: 40 });
+    checkCancelled();
+    const osContentPath = findSdkOsDir(extractDir, osFolder);
+    if (!osContentPath) {
+      throw new OniroError(
+        `No '${osFolder}' SDK components (a '${osFolder}' folder of ZIPs) found in ${archivePath}. Is it an OpenHarmony SDK archive for this OS?`
+      );
+    }
+    const { api, version } = await readSdkComponentsMeta(osContentPath);
+    const sdkInstallDir = path10.join(sdkRoot, osFolder, api);
+    if (fs10.existsSync(sdkInstallDir) && !opts.force) {
+      throw new OniroError(
+        `An SDK for api ${api} is already installed at ${sdkInstallDir}; pass --force to replace it with this archive, or set ONIRO_SDK_ROOT_DIR to install it in a separate SDK root.`
+      );
+    }
+    fs10.mkdirSync(path10.dirname(sdkInstallDir), { recursive: true });
+    await installComponents({ osContentPath, sdkInstallDir, progress, logger, start: 40, range: 55, checkCancelled });
+    progress?.report({ message: "Cleaning up...", increment: 0 });
+    removeTempWorkDir(tmpDir, tmpRoot);
+    progress?.report({ message: "Cleaning up...", increment: 2 });
+    return { api, version, dir: sdkInstallDir };
+  } catch (err) {
+    removeTempWorkDir(tmpDir, tmpRoot);
+    throw toSpaceError(err, tmpRoot, what);
+  }
+}
+function findSdkOsDir(root, osFolder, maxDepth = 4) {
+  let level = [root];
+  for (let depth = 0; depth < maxDepth && level.length > 0; depth++) {
+    const next = [];
+    for (const dir of level) {
+      for (const entry of fs10.readdirSync(dir, { withFileTypes: true })) {
+        if (!entry.isDirectory()) continue;
+        const p = path10.join(dir, entry.name);
+        if (entry.name === osFolder && fs10.readdirSync(p).some((n) => n.endsWith(".zip"))) return p;
+        next.push(p);
+      }
+    }
+    level = next;
+  }
+  return void 0;
+}
+async function readSdkComponentsMeta(dir) {
+  const zips = fs10.readdirSync(dir).filter((n) => n.endsWith(".zip")).sort((a, b) => Number(b.startsWith("ets-")) - Number(a.startsWith("ets-")));
+  for (const name of zips) {
+    const data = await readZipEntry(path10.join(dir, name), (e) => /^[^/]+\/oh-uni-package\.json$/.test(e));
+    if (!data) continue;
+    try {
+      const pkg = JSON.parse(data.toString("utf8"));
+      const api = String(pkg.apiVersion ?? "");
+      if (/^\d+$/.test(api)) return { api, version: String(pkg.version ?? "") };
+    } catch {
+    }
+  }
+  throw new OniroError("No SDK component in the archive declares a numeric apiVersion (oh-uni-package.json).");
+}
 
 // src/cmdTools/install.ts
 var fs11 = __toESM(require("fs"), 1);
@@ -1849,6 +1949,7 @@ var import_node_child_process4 = require("child_process");
 
 // src/hdc/exec.ts
 var fs15 = __toESM(require("fs"), 1);
+var import_node_string_decoder = require("string_decoder");
 function errorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -1876,6 +1977,8 @@ function runProcess(opts) {
     let stderr = "";
     let settled = false;
     let timedOut = false;
+    const stdoutDecoder = new import_node_string_decoder.StringDecoder("utf8");
+    const stderrDecoder = new import_node_string_decoder.StringDecoder("utf8");
     const cleanup = () => {
       clearTimeout(timer);
       abortSignal?.removeEventListener("abort", onAbort);
@@ -1893,14 +1996,14 @@ function runProcess(opts) {
     }, timeoutMs);
     abortSignal?.addEventListener("abort", onAbort, { once: true });
     child.stdout?.on("data", (d) => {
-      const s = d.toString();
+      const s = stdoutDecoder.write(d);
       stdout += s;
-      onOutput?.(s, "stdout");
+      if (s) onOutput?.(s, "stdout");
     });
     child.stderr?.on("data", (d) => {
-      const s = d.toString();
+      const s = stderrDecoder.write(d);
       stderr += s;
-      onOutput?.(s, "stderr");
+      if (s) onOutput?.(s, "stderr");
     });
     child.on("error", (err) => {
       if (settled) return;
@@ -1912,6 +2015,12 @@ function runProcess(opts) {
       if (settled) return;
       settled = true;
       cleanup();
+      const stdoutTail = stdoutDecoder.end();
+      const stderrTail = stderrDecoder.end();
+      stdout += stdoutTail;
+      stderr += stderrTail;
+      if (stdoutTail) onOutput?.(stdoutTail, "stdout");
+      if (stderrTail) onOutput?.(stderrTail, "stderr");
       if (timedOut) {
         reject(
           new OniroError(
@@ -2199,6 +2308,7 @@ async function getEmulatorStatus(config, opts = {}) {
 // src/hdc/devices.ts
 var STATUS_TOKENS = /* @__PURE__ */ new Set([
   "Connected",
+  "Ready",
   "Offline",
   "Unauthorized",
   "Authorizing",
@@ -2428,9 +2538,13 @@ function moduleOfHap(hapFileName) {
   const dash = hapFileName.indexOf("-");
   return dash > 0 ? hapFileName.slice(0, dash) : hapFileName.replace(/\.hap$/i, "");
 }
+function isAppProjectRoot(dir) {
+  return fs17.existsSync(path18.join(dir, "AppScope", "app.json5"));
+}
 async function discoverHaps(opts) {
   const { projectDir } = opts;
   const maxDepth = opts.maxDepth ?? 8;
+  const skipNestedProjects = isAppProjectRoot(projectDir);
   const result = {};
   const walk = async (dir, depth) => {
     if (depth > maxDepth) return;
@@ -2439,6 +2553,7 @@ async function discoverHaps(opts) {
       const full = path18.join(dir, e.name);
       if (e.isDirectory()) {
         if (e.name === "node_modules" || e.name === "oh_modules" || e.name === ".git") continue;
+        if (skipNestedProjects && isAppProjectRoot(full)) continue;
         await walk(full, depth + 1);
       } else if (e.isFile() && e.name.endsWith(".hap")) {
         const moduleName = moduleOfHap(e.name);
@@ -3630,6 +3745,54 @@ async function resolveProcessId(config, bundle, deviceSerial) {
   const proc = await findRunningProcess({ config, bundle, deviceSerial });
   return proc?.pid;
 }
+async function readDeviceClock(config, deviceSerial) {
+  try {
+    const res = await shell({ config, command: "date +%Y-%m-%dT%H:%M:%S", deviceSerial, timeoutMs: 1e4 });
+    const m = res.code === 0 ? /(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})/.exec(res.stdout) : null;
+    if (!m) return null;
+    const [year, month, day, hour, minute, second] = m.slice(1).map(Number);
+    return Date.UTC(year, month - 1, day, hour, minute, second);
+  } catch {
+    return null;
+  }
+}
+function hilogTimeMs(time, referenceMs) {
+  const m = /^(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})\.(\d{3})$/.exec(time);
+  if (!m) return null;
+  const [month, day, hour, minute, second, ms] = m.slice(1).map(Number);
+  const year = new Date(referenceMs).getUTCFullYear();
+  let best = null;
+  for (const y of [year - 1, year, year + 1]) {
+    const t = Date.UTC(y, month - 1, day, hour, minute, second, ms);
+    if (best === null || Math.abs(t - referenceMs) < Math.abs(best - referenceMs)) best = t;
+  }
+  return best;
+}
+async function recentEntryFilter(opts) {
+  const passAll = { test: () => true, afterReconnect: async () => {
+  } };
+  const lookbackMs = opts.lookbackMs ?? 0;
+  if (lookbackMs === Infinity) return passAll;
+  const startedAt = Date.now();
+  const now = await readDeviceClock(opts.config, opts.deviceSerial);
+  if (now === null) {
+    opts.logger.warn("Could not read the device clock, so lines already in the log buffer can match too.");
+    return passAll;
+  }
+  let since = now - (Date.now() - startedAt) - lookbackMs;
+  return {
+    test: (entry) => {
+      if (since === null) return true;
+      const t = hilogTimeMs(entry.time, now);
+      return t === null || t >= since;
+    },
+    afterReconnect: async () => {
+      if (since === null) return;
+      const later = await readDeviceClock(opts.config, opts.deviceSerial);
+      if (later !== null && later < since) since = null;
+    }
+  };
+}
 function waitForLog(opts) {
   return new Promise((resolve7, reject) => {
     const deadline = Date.now() + opts.timeoutMs;
@@ -3637,6 +3800,8 @@ function waitForLog(opts) {
     let child = null;
     let reconnectTimer;
     let buf = "";
+    let recent = { test: () => true, afterReconnect: async () => {
+    } };
     const cleanup = () => {
       clearTimeout(timer);
       if (reconnectTimer) clearTimeout(reconnectTimer);
@@ -3677,7 +3842,7 @@ function waitForLog(opts) {
         buf = lines.pop() ?? "";
         for (const line of lines) {
           const entry = parseHilogLine(line);
-          if (entry && opts.pattern.test(entryText(entry))) {
+          if (entry && recent.test(entry) && opts.pattern.test(entryText(entry))) {
             finish(entry);
             return;
           }
@@ -3687,13 +3852,21 @@ function waitForLog(opts) {
         if (settled || child !== stream) return;
         child = null;
         if (Date.now() < deadline) {
-          reconnectTimer = setTimeout(() => void spawnStream().catch(failWith), 1e3);
+          reconnectTimer = setTimeout(() => void recent.afterReconnect().then(spawnStream).catch(failWith), 1e3);
         }
       };
       stream.once("close", onEnd);
       stream.once("error", onEnd);
     };
-    void spawnStream().catch(failWith);
+    void (async () => {
+      recent = await recentEntryFilter({
+        config: opts.config,
+        deviceSerial: opts.deviceSerial,
+        lookbackMs: opts.lookbackMs,
+        logger: opts.logger ?? noopLogger
+      });
+      await spawnStream();
+    })().catch(failWith);
   });
 }
 function watchLog(opts) {
@@ -3702,6 +3875,8 @@ function watchLog(opts) {
     let settled = false;
     let child = null;
     let buf = "";
+    let recent = { test: () => true, afterReconnect: async () => {
+    } };
     const cleanup = () => {
       clearTimeout(timer);
       opts.abortSignal?.removeEventListener("abort", onAbort);
@@ -3725,6 +3900,13 @@ function watchLog(opts) {
     const timer = setTimeout(done, opts.durationMs);
     opts.abortSignal?.addEventListener("abort", onAbort, { once: true });
     void (async () => {
+      recent = await recentEntryFilter({
+        config: opts.config,
+        deviceSerial: opts.deviceSerial,
+        lookbackMs: opts.lookbackMs,
+        logger: opts.logger ?? noopLogger
+      });
+      if (settled) return;
       const processId = await resolveProcessId(opts.config, opts.bundle, opts.deviceSerial);
       if (settled) return;
       const stream = streamHilog({ config: opts.config, processId, domain: opts.domain, deviceSerial: opts.deviceSerial });
@@ -3735,7 +3917,7 @@ function watchLog(opts) {
         buf = lines.pop() ?? "";
         for (const line of lines) {
           const entry = parseHilogLine(line);
-          if (entry && opts.pattern.test(entryText(entry))) matches.push(entry);
+          if (entry && recent.test(entry) && opts.pattern.test(entryText(entry))) matches.push(entry);
         }
       });
     })().catch((err) => {
@@ -4020,6 +4202,8 @@ async function ensureOhModules(opts) {
 }
 
 // src/build/codelinter.ts
+var fs26 = __toESM(require("fs"), 1);
+var path26 = __toESM(require("path"), 1);
 var FINDING_RE = /^(.*?):(\d+):(?:(\d+):)?\s*(error|warning|warn|suggestion|info)\b[:\s-]*(.*)$/i;
 var TRAILING_CODE_RE = /[([]([\w@/.\-]+)[)\]]\s*$/;
 var FILE_HEADER_RE = /^(.+\.\w+)\((\d+)\)$/;
@@ -4106,6 +4290,16 @@ function parseCodelinterReport(output) {
 function parseCodelinterFindings(output) {
   return parseCodelinterReport(output).findings;
 }
+var PROJECT_ROOT_FILES = [
+  ["build-profile.json5"],
+  ["hvigorfile.ts", "hvigorfile.js"],
+  [path26.join("hvigor", "hvigor-config.json5")]
+];
+function missingProjectRootFiles(projectDir) {
+  return PROJECT_ROOT_FILES.filter((names) => !names.some((f) => fs26.existsSync(path26.join(projectDir, f)))).map(
+    (names) => names[0]
+  );
+}
 async function runCodelinter(opts) {
   const res = await runProcess({
     command: getCmdToolsBin(opts.config, "codelinter"),
@@ -4123,7 +4317,7 @@ async function runCodelinter(opts) {
 var DIAGNOSIS_OUTPUT_LIMIT = 2e6;
 function diagnoseBuildFailure(output) {
   if (/is not exported from Kit|has no exported member .*@systemapi/i.test(output)) {
-    return "The project calls system APIs (`@systemapi`), which the public SDK leaves out. Build against the full OpenHarmony SDK: unpack its components into <root>/<os>/<api> of a separate SDK root and set ONIRO_SDK_ROOT_DIR to that root. Installing such an app also needs privileged signing (`oniro-app sign --apl system_core --acls \u2026 --app-privilege-capabilities \u2026`).";
+    return `The project calls system APIs (\`@systemapi\`), which the public SDK leaves out. Build against the full OpenHarmony SDK: download an \`ohos-sdk-full\` archive from ${OHOS_DAILY_BUILDS_URL} and install it with \`oniro-app sdk install --from-archive <archive> --force\` (this replaces the public SDK of that API level; set ONIRO_SDK_ROOT_DIR to keep the two apart). Installing such an app also needs privileged signing (\`oniro-app sign --apl system_core --acls \u2026 --app-privilege-capabilities \u2026\`).`;
   }
   if (/00308018|SDK path does not exist|SDK license agreement is not accepted/i.test(output)) {
     return "hvigor cannot find the SDK the project compiles against: check `oniro-app sdk list` against compileSdkVersion.";
@@ -4195,21 +4389,21 @@ function isValidBundleName(bundleName) {
 }
 
 // src/project/templates.ts
-var fs26 = __toESM(require("fs"), 1);
-var path26 = __toESM(require("path"), 1);
+var fs27 = __toESM(require("fs"), 1);
+var path27 = __toESM(require("path"), 1);
 function toHumanTemplateName(folderName) {
   return folderName.replace(/([a-z])([A-Z])/g, "$1 $2");
 }
 function listTemplates(templateRoot) {
-  if (!fs26.existsSync(templateRoot)) return [];
-  const entries = fs26.readdirSync(templateRoot, { withFileTypes: true });
+  if (!fs27.existsSync(templateRoot)) return [];
+  const entries = fs27.readdirSync(templateRoot, { withFileTypes: true });
   return entries.filter((e) => e.isDirectory()).map((e) => {
-    const dir = path26.join(templateRoot, e.name);
-    const metaPath = path26.join(dir, "template.json");
+    const dir = path27.join(templateRoot, e.name);
+    const metaPath = path27.join(dir, "template.json");
     let meta = {};
-    if (fs26.existsSync(metaPath)) {
+    if (fs27.existsSync(metaPath)) {
       try {
-        meta = JSON.parse(fs26.readFileSync(metaPath, "utf8"));
+        meta = JSON.parse(fs27.readFileSync(metaPath, "utf8"));
       } catch {
       }
     }
@@ -4224,57 +4418,57 @@ function listTemplates(templateRoot) {
 function validateTemplateLayout(templateDir, defaultModuleName) {
   const required = [
     "build-profile.json5",
-    path26.join("AppScope", "app.json5"),
-    path26.join(defaultModuleName, "src", "main", "module.json5"),
-    path26.join(defaultModuleName, "oh-package.json5"),
+    path27.join("AppScope", "app.json5"),
+    path27.join(defaultModuleName, "src", "main", "module.json5"),
+    path27.join(defaultModuleName, "oh-package.json5"),
     "hvigorfile.ts"
   ];
-  return required.filter((rel) => !fs26.existsSync(path26.join(templateDir, rel)));
+  return required.filter((rel) => !fs27.existsSync(path27.join(templateDir, rel)));
 }
 
 // src/project/createScaffold.ts
-var fs28 = __toESM(require("fs"), 1);
-var path27 = __toESM(require("path"), 1);
+var fs29 = __toESM(require("fs"), 1);
+var path28 = __toESM(require("path"), 1);
 
 // src/project/jsonHelpers.ts
-var fs27 = __toESM(require("fs"), 1);
+var fs28 = __toESM(require("fs"), 1);
 var import_json55 = __toESM(require("json5"), 1);
 function readJson5File(filePath) {
-  return import_json55.default.parse(fs27.readFileSync(filePath, "utf8"));
+  return import_json55.default.parse(fs28.readFileSync(filePath, "utf8"));
 }
 function writeJson5File(filePath, value) {
-  fs27.writeFileSync(filePath, JSON.stringify(value, null, 2) + "\n", "utf8");
+  fs28.writeFileSync(filePath, JSON.stringify(value, null, 2) + "\n", "utf8");
 }
 function readJsonFile(filePath) {
-  return JSON.parse(fs27.readFileSync(filePath, "utf8"));
+  return JSON.parse(fs28.readFileSync(filePath, "utf8"));
 }
 function writeJsonFile(filePath, value) {
-  fs27.writeFileSync(filePath, JSON.stringify(value, null, 2) + "\n", "utf8");
+  fs28.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 fs28.promises.access(p);
+    await fs29.promises.access(p);
     return true;
   } catch {
     return false;
   }
 }
 async function copyDirRecursive(srcDir, destDir) {
-  await fs28.promises.mkdir(destDir, { recursive: true });
-  const entries = await fs28.promises.readdir(srcDir, { withFileTypes: true });
+  await fs29.promises.mkdir(destDir, { recursive: true });
+  const entries = await fs29.promises.readdir(srcDir, { withFileTypes: true });
   for (const entry of entries) {
-    const src = path27.join(srcDir, entry.name);
-    const dest = path27.join(destDir, entry.name);
+    const src = path28.join(srcDir, entry.name);
+    const dest = path28.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 fs28.promises.copyFile(src, dest);
+      await fs29.promises.copyFile(src, dest);
     }
   }
 }
@@ -4282,9 +4476,9 @@ async function normalizeJson5ToJson(projectDir, logger) {
   const stack = [projectDir];
   while (stack.length > 0) {
     const currentDir = stack.pop();
-    const entries = await fs28.promises.readdir(currentDir, { withFileTypes: true });
+    const entries = await fs29.promises.readdir(currentDir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path27.join(currentDir, entry.name);
+      const fullPath = path28.join(currentDir, entry.name);
       if (entry.isDirectory()) {
         if (IGNORED_DIRS.has(entry.name)) continue;
         stack.push(fullPath);
@@ -4306,23 +4500,23 @@ function toJavaPropertiesPath(p) {
 function createOrUpdateLocalProperties(projectDir, sdkDir) {
   const content = `sdk.dir=${toJavaPropertiesPath(sdkDir)}
 `;
-  fs28.writeFileSync(path27.join(projectDir, "local.properties"), content, "utf8");
+  fs29.writeFileSync(path28.join(projectDir, "local.properties"), content, "utf8");
 }
 function renameIfExists(fromPath, toPath) {
-  if (fs28.existsSync(fromPath) && fromPath !== toPath) {
-    fs28.renameSync(fromPath, toPath);
+  if (fs29.existsSync(fromPath) && fromPath !== toPath) {
+    fs29.renameSync(fromPath, toPath);
   }
 }
 function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
-  const appJsonPath = path27.join(projectDir, "AppScope", "app.json5");
-  if (fs28.existsSync(appJsonPath)) {
+  const appJsonPath = path28.join(projectDir, "AppScope", "app.json5");
+  if (fs29.existsSync(appJsonPath)) {
     const appJson = readJson5File(appJsonPath);
     appJson.app = appJson.app ?? {};
     appJson.app.bundleName = args.bundleName;
     writeJson5File(appJsonPath, appJson);
   }
-  const stringsPath = path27.join(projectDir, "AppScope", "resources", "base", "element", "string.json");
-  if (fs28.existsSync(stringsPath)) {
+  const stringsPath = path28.join(projectDir, "AppScope", "resources", "base", "element", "string.json");
+  if (fs29.existsSync(stringsPath)) {
     const strings = readJsonFile(stringsPath);
     if (Array.isArray(strings.string)) {
       const appName = strings.string.find((s) => s.name === "app_name");
@@ -4330,8 +4524,8 @@ function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
     }
     writeJsonFile(stringsPath, strings);
   }
-  const buildProfilePath = path27.join(projectDir, "build-profile.json5");
-  if (fs28.existsSync(buildProfilePath)) {
+  const buildProfilePath = path28.join(projectDir, "build-profile.json5");
+  if (fs29.existsSync(buildProfilePath)) {
     const buildProfile = readJson5File(buildProfilePath);
     buildProfile.app = buildProfile.app ?? {};
     if (Array.isArray(buildProfile.app.products) && buildProfile.app.products.length > 0) {
@@ -4344,23 +4538,23 @@ function updateTemplateConfigs(projectDir, args, sdkBaseDir) {
     }
     writeJson5File(buildProfilePath, buildProfile);
   }
-  const moduleJsonPath = path27.join(projectDir, args.moduleName, "src", "main", "module.json5");
-  if (fs28.existsSync(moduleJsonPath)) {
+  const moduleJsonPath = path28.join(projectDir, args.moduleName, "src", "main", "module.json5");
+  if (fs29.existsSync(moduleJsonPath)) {
     const moduleJson = readJson5File(moduleJsonPath);
     moduleJson.module = moduleJson.module ?? {};
     moduleJson.module.name = args.moduleName;
     writeJson5File(moduleJsonPath, moduleJson);
   }
-  const moduleOhPackagePath = path27.join(projectDir, args.moduleName, "oh-package.json5");
-  if (fs28.existsSync(moduleOhPackagePath)) {
+  const moduleOhPackagePath = path28.join(projectDir, args.moduleName, "oh-package.json5");
+  if (fs29.existsSync(moduleOhPackagePath)) {
     const pkg = readJson5File(moduleOhPackagePath);
     pkg.name = args.moduleName;
     writeJson5File(moduleOhPackagePath, pkg);
   }
-  const vscodeDir = path27.join(projectDir, ".vscode");
-  fs28.mkdirSync(vscodeDir, { recursive: true });
+  const vscodeDir = path28.join(projectDir, ".vscode");
+  fs29.mkdirSync(vscodeDir, { recursive: true });
   const hapPath = `${args.moduleName}/build/default/outputs/default/${args.moduleName}-default-signed.hap`;
-  writeJsonFile(path27.join(vscodeDir, "settings.json"), {
+  writeJsonFile(path28.join(vscodeDir, "settings.json"), {
     "oniro.hapPath": hapPath,
     "files.associations": { "*.json5": "jsonc" }
   });
@@ -4377,7 +4571,7 @@ async function createScaffold(opts) {
   if (!opts.location || !await pathExists(opts.location)) {
     throw new OniroError(`Location does not exist: ${opts.location}`);
   }
-  const templateDir = path27.join(opts.templateRoot, opts.templateId);
+  const templateDir = path28.join(opts.templateRoot, opts.templateId);
   if (!await pathExists(templateDir)) {
     throw new OniroError(`Template not found: ${templateDir}`);
   }
@@ -4412,17 +4606,17 @@ async function createScaffold(opts) {
       }
     }
   }
-  const projectDir = path27.join(opts.location, opts.projectName);
+  const projectDir = path28.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 fs28.promises.rm(projectDir, { recursive: true, force: true });
+    await fs29.promises.rm(projectDir, { recursive: true, force: true });
   }
   logger.info(`[create] Scaffolding ${opts.templateId} at ${projectDir}`);
   await copyDirRecursive(templateDir, projectDir);
   if (moduleName !== defaultModuleName) {
-    renameIfExists(path27.join(projectDir, defaultModuleName), path27.join(projectDir, moduleName));
+    renameIfExists(path28.join(projectDir, defaultModuleName), path28.join(projectDir, moduleName));
   }
   updateTemplateConfigs(
     projectDir,
@@ -4439,11 +4633,11 @@ async function createScaffold(opts) {
 }
 
 // src/project/listModules.ts
-var fs29 = __toESM(require("fs"), 1);
-var path28 = __toESM(require("path"), 1);
+var fs30 = __toESM(require("fs"), 1);
+var path29 = __toESM(require("path"), 1);
 function listModules(opts) {
-  const buildProfile = path28.join(opts.projectDir, "build-profile.json5");
-  if (!fs29.existsSync(buildProfile)) {
+  const buildProfile = path29.join(opts.projectDir, "build-profile.json5");
+  if (!fs30.existsSync(buildProfile)) {
     throw new OniroError(`build-profile.json5 not found at ${buildProfile}`);
   }
   const parsed = readJson5File(buildProfile);
@@ -4455,12 +4649,12 @@ function listModules(opts) {
 }
 
 // src/project/abilities.ts
-var fs30 = __toESM(require("fs"), 1);
-var path29 = __toESM(require("path"), 1);
+var fs31 = __toESM(require("fs"), 1);
+var path30 = __toESM(require("path"), 1);
 function listAbilities(opts) {
   const moduleName = opts.moduleName ?? "entry";
-  const moduleJsonPath = path29.join(opts.projectDir, moduleName, "src", "main", "module.json5");
-  if (!fs30.existsSync(moduleJsonPath)) {
+  const moduleJsonPath = path30.join(opts.projectDir, moduleName, "src", "main", "module.json5");
+  if (!fs31.existsSync(moduleJsonPath)) {
     throw new OniroError(`Could not find module.json5 at ${moduleJsonPath}`);
   }
   const parsed = readJson5File(moduleJsonPath);
@@ -4468,12 +4662,12 @@ function listAbilities(opts) {
 }
 
 // src/project/prepareSigning.ts
-var fs31 = __toESM(require("fs"), 1);
-var path30 = __toESM(require("path"), 1);
+var fs32 = __toESM(require("fs"), 1);
+var path31 = __toESM(require("path"), 1);
 function hasSigningArtifacts(dir) {
-  if (!fs31.existsSync(path30.join(dir, "signatures"))) return false;
-  const buildProfile = path30.join(dir, "build-profile.json5");
-  if (!fs31.existsSync(buildProfile)) return false;
+  if (!fs32.existsSync(path31.join(dir, "signatures"))) return false;
+  const buildProfile = path31.join(dir, "build-profile.json5");
+  if (!fs32.existsSync(buildProfile)) return false;
   try {
     const parsed = readJson5File(buildProfile);
     return Array.isArray(parsed.app?.signingConfigs) && parsed.app.signingConfigs.length > 0;
@@ -4576,8 +4770,25 @@ async function diffHapAssets(opts) {
 }
 
 // src/install/apply.ts
-var fs32 = __toESM(require("fs"), 1);
-var path31 = __toESM(require("path"), 1);
+var fs33 = __toESM(require("fs"), 1);
+var path32 = __toESM(require("path"), 1);
+
+// src/install/hapBundleName.ts
+function bundleNameFromHapConfig(text) {
+  try {
+    const parsed = JSON.parse(text.replace(/^/, ""));
+    const name = parsed.app?.bundleName;
+    return typeof name === "string" && name ? name : null;
+  } catch {
+    return null;
+  }
+}
+async function readHapBundleName(hapPath) {
+  const config = await readZipEntry(hapPath, (n) => n === "module.json") ?? await readZipEntry(hapPath, (n) => n === "config.json");
+  return config ? bundleNameFromHapConfig(config.toString("utf8")) : null;
+}
+
+// src/install/apply.ts
 function decideInstallMethod(s) {
   if (!s.signInfoInconsistent) return "replace";
   if (s.isSystemBundle && !s.allowUninstall) return "refuse";
@@ -4598,7 +4809,7 @@ async function pidOf(config, bundle, deviceSerial) {
 async function resolveHap(opts, logger) {
   let hap;
   if (opts.hapPath) {
-    const hapPath = !path31.isAbsolute(opts.hapPath) && opts.projectDir ? path31.join(opts.projectDir, opts.hapPath) : opts.hapPath;
+    const hapPath = !path32.isAbsolute(opts.hapPath) && opts.projectDir ? path32.join(opts.projectDir, opts.hapPath) : opts.hapPath;
     hap = existingHapOrUnsigned(hapPath);
     if (!hap) throw new OniroError(`HAP not found at ${hapPath}.`);
   } else {
@@ -4607,7 +4818,7 @@ async function resolveHap(opts, logger) {
     if (!picked) throw new OniroError(`No HAP found${opts.module ? ` for module ${opts.module}` : ""}. Build first.`);
     hap = { path: picked.path, fallback: !picked.signed };
   }
-  if (hap.fallback) logger.warn(`No signed HAP found; installing the unsigned ${path31.basename(hap.path)}.`);
+  if (hap.fallback) logger.warn(`No signed HAP found; installing the unsigned ${path32.basename(hap.path)}.`);
   return hap;
 }
 async function applyChanges(opts) {
@@ -4617,9 +4828,18 @@ async function applyChanges(opts) {
   const allowUninstall = opts.allowUninstall ?? false;
   const hap = await resolveHap(opts, logger);
   const hapPath = hap.path;
+  const hapBundle = await readHapBundleName(hapPath).catch((err) => {
+    logger.debug(`bundle name check skipped: ${err.message}`);
+    return null;
+  });
+  if (hapBundle && hapBundle !== bundle) {
+    throw new OniroError(
+      `${path32.basename(hapPath)} (${hapPath}) is bundle ${hapBundle}, not ${bundle}, so installing it would not update ${bundle}. Choose the HAP explicitly, or name ${hapBundle} as the bundle if it is the app to update.`
+    );
+  }
   logger.info(`installing ${hapPath}`);
   let assetsChanged = false;
-  if (opts.installedHapPath && fs32.existsSync(opts.installedHapPath)) {
+  if (opts.installedHapPath && fs33.existsSync(opts.installedHapPath)) {
     try {
       const diff = await diffHapAssets({ installedHap: opts.installedHapPath, newHap: hapPath });
       assetsChanged = diff.addedAssetPaths.length > 0 || diff.removedAssetPaths.length > 0;
@@ -4652,7 +4872,7 @@ async function applyChanges(opts) {
   }
   if (!await isBundleInstalled({ config, bundle, deviceSerial })) {
     throw new OniroError(
-      `hdc reported ${path31.basename(hapPath)} as installed, but bm dump does not list ${bundle}. Check that the HAP was built from this project (its bundleName must match).`
+      `hdc reported ${path32.basename(hapPath)} as installed, but bm dump does not list ${bundle}. Check that the HAP was built from this project (its bundleName must match).`
     );
   }
   let postInstallPid = await pidOf(config, bundle, deviceSerial);
@@ -4729,9 +4949,9 @@ var AUTH_PATHS = {
 };
 
 // src/harmonyos/auth/tokenStore.ts
-var fs33 = __toESM(require("fs"), 1);
+var fs34 = __toESM(require("fs"), 1);
 var os11 = __toESM(require("os"), 1);
-var path32 = __toESM(require("path"), 1);
+var path33 = __toESM(require("path"), 1);
 var crypto3 = __toESM(require("crypto"), 1);
 var ALGORITHM = "aes-256-gcm";
 var KEY_LENGTH = 32;
@@ -4767,7 +4987,7 @@ function permissionHint(dir) {
 }
 function ensureDir(dir) {
   try {
-    fs33.mkdirSync(dir, { recursive: true, mode: DIR_MODE });
+    fs34.mkdirSync(dir, { recursive: true, mode: DIR_MODE });
   } catch (err) {
     if (err.code === "EACCES") {
       throw new OniroError(permissionHint(dir), err);
@@ -4778,17 +4998,17 @@ function ensureDir(dir) {
 function createTokenStore(opts) {
   const logger = opts.logger ?? noopLogger;
   const authDir = opts.config.get("harmonyosAuthDir", defaultPaths.harmonyosAuthDir());
-  const tokenPath = path32.join(authDir, TOKEN_FILE);
-  const keyPath = path32.join(os11.homedir(), ".local", "share", "oniro-app", "keys", KEY_FILE);
+  const tokenPath = path33.join(authDir, TOKEN_FILE);
+  const keyPath = path33.join(os11.homedir(), ".local", "share", "oniro-app", "keys", KEY_FILE);
   function loadOrCreateKey() {
-    if (fs33.existsSync(keyPath)) {
-      const existing = fs33.readFileSync(keyPath);
+    if (fs34.existsSync(keyPath)) {
+      const existing = fs34.readFileSync(keyPath);
       if (existing.length === KEY_LENGTH) return existing;
       logger.warn("[harmonyos] The token key file was malformed; regenerating (you will need to log in again).");
     }
-    ensureDir(path32.dirname(keyPath));
+    ensureDir(path33.dirname(keyPath));
     const key = crypto3.randomBytes(KEY_LENGTH);
-    fs33.writeFileSync(keyPath, key, { mode: FILE_MODE });
+    fs34.writeFileSync(keyPath, key, { mode: FILE_MODE });
     return key;
   }
   return {
@@ -4798,12 +5018,12 @@ function createTokenStore(opts) {
       const payload = Buffer.from(JSON.stringify(session), "utf8");
       const blob = encrypt2(loadOrCreateKey(), payload);
       ensureDir(authDir);
-      fs33.writeFileSync(tokenPath, JSON.stringify(blob, null, 2), { mode: FILE_MODE });
+      fs34.writeFileSync(tokenPath, JSON.stringify(blob, null, 2), { mode: FILE_MODE });
     },
     load() {
-      if (!fs33.existsSync(tokenPath)) return null;
+      if (!fs34.existsSync(tokenPath)) return null;
       try {
-        const blob = JSON.parse(fs33.readFileSync(tokenPath, "utf8"));
+        const blob = JSON.parse(fs34.readFileSync(tokenPath, "utf8"));
         if (!isEncryptedBlob(blob)) return null;
         const { jwtToken, siteId } = JSON.parse(decrypt2(loadOrCreateKey(), blob).toString("utf8"));
         return typeof jwtToken === "string" && jwtToken && typeof siteId === "string" ? { jwtToken, siteId } : null;
@@ -4815,7 +5035,7 @@ function createTokenStore(opts) {
         }
         logger.debug(`[harmonyos] Discarding unreadable token at ${tokenPath}.`);
         try {
-          fs33.rmSync(tokenPath, { force: true });
+          fs34.rmSync(tokenPath, { force: true });
         } catch {
         }
         return null;
@@ -4823,7 +5043,7 @@ function createTokenStore(opts) {
     },
     clear() {
       try {
-        fs33.rmSync(tokenPath, { force: true });
+        fs34.rmSync(tokenPath, { force: true });
       } catch (err) {
         throw new OniroError(`Failed to remove ${tokenPath}.`, err);
       }
@@ -5304,7 +5524,7 @@ function mapAgcError(operation, statusCode, reasonPhrase, body) {
 }
 
 // src/harmonyos/signing/profile.ts
-var fs34 = __toESM(require("fs"), 1);
+var fs35 = __toESM(require("fs"), 1);
 var import_node_crypto3 = require("crypto");
 var import_node_forge = __toESM(require("node-forge"), 1);
 function extractProfileJson(buffer) {
@@ -5336,7 +5556,7 @@ function extractProfileJson(buffer) {
 function readProvisionProfile(profilePath) {
   let raw;
   try {
-    const json = extractProfileJson(fs34.readFileSync(profilePath));
+    const json = extractProfileJson(fs35.readFileSync(profilePath));
     if (!json) return null;
     raw = JSON.parse(json);
   } catch {
@@ -5365,7 +5585,7 @@ function parseCertificate(pem) {
 }
 function keystoreHoldsKey(p12Path, keyAlias, keyPwd, certificate) {
   try {
-    const der = import_node_forge.default.util.createBuffer(fs34.readFileSync(p12Path).toString("binary"));
+    const der = import_node_forge.default.util.createBuffer(fs35.readFileSync(p12Path).toString("binary"));
     const p12 = import_node_forge.default.pkcs12.pkcs12FromAsn1(import_node_forge.default.asn1.fromDer(der), keyPwd);
     const certBag = import_node_forge.default.pki.oids.certBag ?? "1.2.840.113549.1.12.10.1.3";
     const wanted = certificate.publicKey.export({ type: "spki", format: "der" });
@@ -5381,7 +5601,7 @@ function keystoreHoldsKey(p12Path, keyAlias, keyPwd, certificate) {
   }
 }
 function verifySigningMaterial(opts) {
-  const pems = fs34.readFileSync(opts.cerPath, "utf8").match(/-----BEGIN CERTIFICATE-----[\s\S]*?-----END CERTIFICATE-----/g);
+  const pems = fs35.readFileSync(opts.cerPath, "utf8").match(/-----BEGIN CERTIFICATE-----[\s\S]*?-----END CERTIFICATE-----/g);
   const chain = (pems ?? []).map(parseCertificate);
   const leaf = chain.find((c) => !c.ca) ?? chain.at(-1);
   if (!leaf) throw new AgcError(SIGNING_ERRORS.CERT_INVALID);
@@ -5400,14 +5620,14 @@ function verifySigningMaterial(opts) {
 
 // src/harmonyos/signing/autoSign.ts
 var crypto9 = __toESM(require("crypto"), 1);
-var fs39 = __toESM(require("fs"), 1);
-var path38 = __toESM(require("path"), 1);
+var fs40 = __toESM(require("fs"), 1);
+var path39 = __toESM(require("path"), 1);
 var import_json57 = __toESM(require("json5"), 1);
 
 // src/harmonyos/signing/agc.ts
 var crypto6 = __toESM(require("crypto"), 1);
-var fs35 = __toESM(require("fs"), 1);
-var path33 = __toESM(require("path"), 1);
+var fs36 = __toESM(require("fs"), 1);
+var path34 = __toESM(require("path"), 1);
 var ENDPOINTS = {
   CERT_LIST: "/api/cps/harmony-cert-manage/v1/cert/list",
   CERT_ADD: "/api/cps/harmony-cert-manage/v1/cert/add",
@@ -5493,8 +5713,8 @@ function createAgcClient(http3, auth) {
       if (target.sha256 && actual !== target.sha256.toLowerCase()) {
         throw new ChecksumMismatchError(target.sha256, actual);
       }
-      fs35.mkdirSync(path33.dirname(dest), { recursive: true, mode: 448 });
-      fs35.writeFileSync(dest, buffer, { mode: 384 });
+      fs36.mkdirSync(path34.dirname(dest), { recursive: true, mode: 448 });
+      fs36.writeFileSync(dest, buffer, { mode: 384 });
     }
   };
 }
@@ -5545,22 +5765,22 @@ async function registerDevices(agc, connected, logger) {
 
 // src/harmonyos/signing/keystore.ts
 var crypto7 = __toESM(require("crypto"), 1);
-var fs37 = __toESM(require("fs"), 1);
-var path35 = __toESM(require("path"), 1);
+var fs38 = __toESM(require("fs"), 1);
+var path36 = __toESM(require("path"), 1);
 
 // src/harmonyos/java.ts
-var fs36 = __toESM(require("fs"), 1);
-var path34 = __toESM(require("path"), 1);
+var fs37 = __toESM(require("fs"), 1);
+var path35 = __toESM(require("path"), 1);
 var JAVA_BIN = process.platform === "win32" ? "java.exe" : "java";
 function findJava(sdk, env = process.env) {
   const candidates = [
-    env.JAVA_HOME && path34.join(env.JAVA_HOME, "bin", JAVA_BIN),
-    sdk && path34.join(sdk.installRoot, "jbr", "bin", JAVA_BIN),
+    env.JAVA_HOME && path35.join(env.JAVA_HOME, "bin", JAVA_BIN),
+    sdk && path35.join(sdk.installRoot, "jbr", "bin", JAVA_BIN),
     // macOS: the JBR is itself a bundle inside Studio's Contents.
-    sdk && path34.join(sdk.installRoot, "jbr", "Contents", "Home", "bin", JAVA_BIN),
-    ...(env.PATH ?? "").split(path34.delimiter).map((dir) => dir && path34.join(dir, JAVA_BIN))
+    sdk && path35.join(sdk.installRoot, "jbr", "Contents", "Home", "bin", JAVA_BIN),
+    ...(env.PATH ?? "").split(path35.delimiter).map((dir) => dir && path35.join(dir, JAVA_BIN))
   ];
-  const found = candidates.find((c) => !!c && fs36.existsSync(c));
+  const found = candidates.find((c) => !!c && fs37.existsSync(c));
   if (found) return found;
   throw new OniroError(
     "No Java runtime found. HarmonyOS signing runs the SDK's hap-sign-tool.jar, which needs one: install a JDK and set JAVA_HOME, or install DevEco Studio, whose bundled runtime is used automatically."
@@ -5574,13 +5794,13 @@ function redactArgs(args) {
   return args.map((arg, i) => args[i - 1] === "-keyPwd" || args[i - 1] === "-keystorePwd" ? "******" : arg);
 }
 async function generateKeystoreAndCsr(opts) {
-  const jar = path35.join(opts.sdk.sdkPath, "default", "openharmony", "toolchains", "lib", "hap-sign-tool.jar");
-  if (!fs37.existsSync(jar)) {
+  const jar = path36.join(opts.sdk.sdkPath, "default", "openharmony", "toolchains", "lib", "hap-sign-tool.jar");
+  if (!fs38.existsSync(jar)) {
     throw new OniroError(`hap-sign-tool.jar not found at ${jar}; the HarmonyOS SDK looks incomplete.`);
   }
   const java = findJava(opts.sdk);
   const keyPwd = crypto7.randomBytes(12).toString("base64url").replaceAll(/[-_]/g, "");
-  fs37.mkdirSync(path35.dirname(opts.p12Path), { recursive: true, mode: 448 });
+  fs38.mkdirSync(path36.dirname(opts.p12Path), { recursive: true, mode: 448 });
   const run = async (what, args) => {
     const argv = ["-jar", jar, ...args, "-keyAlias", KEY_ALIAS, "-keystoreFile", opts.p12Path, "-keystorePwd", keyPwd, "-keyPwd", keyPwd];
     opts.logger.debug(`[harmonyos] ${java} ${redactArgs(argv).join(" ")}`);
@@ -5594,28 +5814,28 @@ ${detail}` : ""}`);
   opts.logger.info("[harmonyos] Generating the local keystore and certificate signing request...");
   await run("generate the key pair", ["generate-keypair", "-keyAlg", "ECC", "-keySize", "NIST-P-256"]);
   await run("generate the CSR", ["generate-csr", "-subject", "CN=DebugKey", "-signAlg", SIGN_ALG, "-outFile", opts.csrPath]);
-  return { keyPwd, csr: fs37.readFileSync(opts.csrPath, "utf8") };
+  return { keyPwd, csr: fs38.readFileSync(opts.csrPath, "utf8") };
 }
 
 // src/harmonyos/signing/paths.ts
 var crypto8 = __toESM(require("crypto"), 1);
-var path36 = __toESM(require("path"), 1);
+var path37 = __toESM(require("path"), 1);
 function sanitizeNamePart(raw) {
   const safe = (raw?.trim() ?? "").replace(/[\\/:*?"<>|=.-]+/g, "_");
   return safe.slice(0, 64) || "default";
 }
 function resolveSigningMaterialPaths(config, productName, projectRoot) {
   const hash = crypto8.createHash("sha256").update(projectRoot, "utf8").digest("base64url").replaceAll(/[-_]/g, "");
-  const base = path36.join(
+  const base = path37.join(
     config.get("harmonyosSigningDir", defaultPaths.harmonyosSigningDir()),
-    `${sanitizeNamePart(productName)}_${path36.basename(projectRoot)}_${hash}=`
+    `${sanitizeNamePart(productName)}_${path37.basename(projectRoot)}_${hash}=`
   );
   return { p12Path: `${base}.p12`, csrPath: `${base}.csr`, cerPath: `${base}.cer`, profilePath: `${base}.p7b` };
 }
 
 // src/harmonyos/signing/project.ts
-var fs38 = __toESM(require("fs"), 1);
-var path37 = __toESM(require("path"), 1);
+var fs39 = __toESM(require("fs"), 1);
+var path38 = __toESM(require("path"), 1);
 var import_json56 = __toESM(require("json5"), 1);
 
 // src/harmonyos/signing/aclPermissionList.ts
@@ -5683,9 +5903,9 @@ var ACL_PERMISSIONS = /* @__PURE__ */ new Set([
 
 // src/harmonyos/signing/project.ts
 function readRequestedPermissions(moduleConfigPath) {
-  if (!fs38.existsSync(moduleConfigPath)) return [];
+  if (!fs39.existsSync(moduleConfigPath)) return [];
   try {
-    const parsed = import_json56.default.parse(fs38.readFileSync(moduleConfigPath, "utf-8"));
+    const parsed = import_json56.default.parse(fs39.readFileSync(moduleConfigPath, "utf-8"));
     return (parsed.module?.requestPermissions ?? []).map((p) => p?.name).filter((n) => typeof n === "string" && n.length > 0);
   } catch {
     return [];
@@ -5694,10 +5914,10 @@ function readRequestedPermissions(moduleConfigPath) {
 function collectAclPermissions(projectDir, logger = noopLogger) {
   const requested = /* @__PURE__ */ new Set();
   for (const module2 of listModules({ projectDir })) {
-    const moduleRoot = path37.resolve(projectDir, module2.srcPath);
+    const moduleRoot = path38.resolve(projectDir, module2.srcPath);
     for (const sourceSet of ["main", "ohosTest"]) {
       for (const name of readRequestedPermissions(
-        path37.join(moduleRoot, "src", sourceSet, "module.json5")
+        path38.join(moduleRoot, "src", sourceSet, "module.json5")
       )) {
         requested.add(name);
       }
@@ -5713,7 +5933,7 @@ function collectAclPermissions(projectDir, logger = noopLogger) {
 // src/harmonyos/signing/autoSign.ts
 function shouldRegenerate(input) {
   if (input.force) return "--force was passed";
-  const missing = Object.values(input.paths).find((file) => !fs39.existsSync(file));
+  const missing = Object.values(input.paths).find((file) => !fs40.existsSync(file));
   if (missing) return `${missing} is missing`;
   const config = input.buildProfile.app?.signingConfigs?.find((c) => c.name === input.productName);
   if (config?.type !== "HarmonyOS" || config.material?.profile !== input.paths.profilePath) {
@@ -5752,16 +5972,16 @@ function writeSigningConfig(opts) {
   for (const product of app.products ?? []) {
     if (product.name === opts.productName) product.signingConfig = opts.productName;
   }
-  fs39.writeFileSync(opts.buildProfilePath, JSON.stringify(opts.buildProfile, null, 2));
+  fs40.writeFileSync(opts.buildProfilePath, JSON.stringify(opts.buildProfile, null, 2));
 }
 async function harmonyOsAutoSign(opts) {
   const logger = opts.logger ?? noopLogger;
   const productName = opts.productName ?? "default";
-  const projectDir = path38.resolve(opts.projectDir);
-  const buildProfilePath = path38.join(projectDir, "build-profile.json5");
+  const projectDir = path39.resolve(opts.projectDir);
+  const buildProfilePath = path39.join(projectDir, "build-profile.json5");
   let buildProfile;
   try {
-    buildProfile = import_json57.default.parse(fs39.readFileSync(buildProfilePath, "utf-8"));
+    buildProfile = import_json57.default.parse(fs40.readFileSync(buildProfilePath, "utf-8"));
   } catch (err) {
     throw new OniroError(`Could not read ${buildProfilePath}: ${err.message}`, err);
   }
@@ -5801,7 +6021,7 @@ async function harmonyOsAutoSign(opts) {
   logger.info(`[harmonyos] Regenerating signing material: ${reason}.`);
   const agc = createAgcClient(opts.http ?? createHttpClient({ logger }), auth);
   const deviceIds = await registerDevices(agc, connected, logger);
-  for (const file of Object.values(paths)) fs39.rmSync(file, { force: true });
+  for (const file of Object.values(paths)) fs40.rmSync(file, { force: true });
   const certName = `oniro_debug_${auth.teamId.replace(/[\\/.:]/g, "")}.cer`;
   const stale = (await agc.listCertificates()).find((c) => c.certName === certName);
   if (stale) {
@@ -5832,10 +6052,10 @@ async function harmonyOsAutoSign(opts) {
   try {
     verifySigningMaterial({ ...paths, keyAlias: KEY_ALIAS, keyPwd });
   } catch (err) {
-    fs39.rmSync(paths.profilePath, { force: true });
+    fs40.rmSync(paths.profilePath, { force: true });
     throw err;
   }
-  const materialDir = path38.join(path38.dirname(paths.p12Path), "material");
+  const materialDir = path39.join(path39.dirname(paths.p12Path), "material");
   try {
     getKey(materialDir);
   } catch {
@@ -5847,7 +6067,7 @@ async function harmonyOsAutoSign(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.14.0";
+var VERSION = "0.15.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ALL_SDKS,
@@ -5862,6 +6082,7 @@ var VERSION = "0.14.0";
   HUAWEI_SITES,
   INSTALL_TMP_DIRNAME,
   InsufficientSpaceError,
+  OHOS_DAILY_BUILDS_URL,
   OHOS_URL_BASE,
   OniroError,
   SIGNING_ERRORS,
@@ -5882,6 +6103,7 @@ var VERSION = "0.14.0";
   buildHvigorwArgs,
   buildInputCommand,
   buildRawTouchCommand,
+  bundleNameFromHapConfig,
   captureBurst,
   captureLog,
   cleanCodelinterOutput,
@@ -5935,6 +6157,7 @@ var VERSION = "0.14.0";
   findLayoutNodes,
   findMissingProjectSdk,
   findRunningProcess,
+  findSdkOsDir,
   flattenLayout,
   forceStop,
   formatBytes,
@@ -5968,10 +6191,12 @@ var VERSION = "0.14.0";
   hdcTargetArgs,
   hdcTargetArgsFor,
   hideKeyboard,
+  hilogTimeMs,
   installApp,
   installCmdTools,
   installEmulator,
   installFailureReason,
+  installSdkFromArchive,
   isBundleInstalled,
   isCmdToolsInstalled,
   isEmulatorInstalled,
@@ -5988,6 +6213,7 @@ var VERSION = "0.14.0";
   listRunningProcesses,
   listTemplates,
   locateTarget,
+  missingProjectRootFiles,
   needsCmdWrapper,
   nonInteractivePrompter,
   noopLogger,
@@ -6011,9 +6237,11 @@ var VERSION = "0.14.0";
   pickTarget,
   prepareSigning,
   pruneLayout,
+  readHapBundleName,
   readJson5File,
   readJsonFile,
   readProvisionProfile,
+  readZipEntry,
   reboot,
   recvFile,
   removeCmdTools,