@gpc-cli/core 0.9.58 → 0.9.60

package/dist/index.js

@@ -4,19 +4,25 @@ import {
   GpcError,
   NetworkError,
   applyReleaseNotes,
+  commitWithRescue,
   createTrack,
   diffReleases,
   fetchReleaseNotes,
   getReleasesStatus,
+  isVersionedNotesDir,
   listTracks,
   promoteRelease,
+  readReleaseNotesForVersion,
+  readReleaseNotesFromDir,
   updateRollout,
   updateTrackConfig,
   uploadExternallyHosted,
   uploadRelease,
+  validateAndCommit,
+  validateReleaseNotes,
   validateUploadFile,
   waitForBundleProcessing
-} from "./chunk-QIYAOW6R.js";
+} from "./chunk-3AUJEAXP.js";
 
 // src/output.ts
 import process2 from "process";
@@ -915,10 +921,7 @@ async function updateListing(client, packageName, language, data, commitOptions)
   const edit = await client.edits.insert(packageName);
   try {
     const listing = await client.listings.patch(packageName, edit.id, language, data);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return listing;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -931,10 +934,7 @@ async function deleteListing(client, packageName, language, commitOptions) {
   const edit = await client.edits.insert(packageName);
   try {
     await client.listings.delete(packageName, edit.id, language);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
     });
@@ -1057,10 +1057,7 @@ ${details}`,
       const { language, ...data } = listing;
       await client.listings.update(packageName, edit.id, language, data);
     }
-    if (!options?.commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, options?.commitOptions);
+    await validateAndCommit(client, packageName, edit.id, options?.commitOptions);
     return {
       updated: localListings.length,
       languages: localListings.map((l) => l.language)
@@ -1101,10 +1098,7 @@ async function uploadImage(client, packageName, language, imageType, filePath, c
   const edit = await client.edits.insert(packageName);
   try {
     const image = await client.images.upload(packageName, edit.id, language, imageType, filePath);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return image;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -1117,10 +1111,7 @@ async function deleteImage(client, packageName, language, imageType, imageId, co
   const edit = await client.edits.insert(packageName);
   try {
     await client.images.delete(packageName, edit.id, language, imageType, imageId);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
     });
@@ -1233,10 +1224,7 @@ async function updateAppDetails(client, packageName, details, commitOptions) {
   const edit = await client.edits.insert(packageName);
   try {
     const result = await client.details.patch(packageName, edit.id, details);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return result;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -1529,55 +1517,8 @@ function validateSku(sku) {
   }
 }
 
-// src/utils/release-notes.ts
-import { readdir as readdir3, readFile as readFile3, stat as stat3 } from "fs/promises";
-import { extname as extname2, basename, join as join3 } from "path";
-var MAX_NOTES_LENGTH = 500;
-async function readReleaseNotesFromDir(dir) {
-  let entries;
-  try {
-    entries = await readdir3(dir);
-  } catch {
-    throw new GpcError(
-      `Release notes directory not found: ${dir}`,
-      "RELEASE_NOTES_DIR_NOT_FOUND",
-      1,
-      `Create the directory and add .txt files named by language code (e.g., en-US.txt). Path: ${dir}`
-    );
-  }
-  const notes = [];
-  for (const entry of entries) {
-    if (extname2(entry) !== ".txt") continue;
-    const language = basename(entry, ".txt");
-    const filePath = join3(dir, entry);
-    const stats = await stat3(filePath);
-    if (!stats.isFile()) continue;
-    const text = (await readFile3(filePath, "utf-8")).trim();
-    if (text.length === 0) continue;
-    notes.push({ language, text });
-  }
-  return notes;
-}
-function validateReleaseNotes(notes) {
-  const errors = [];
-  const warnings = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const note of notes) {
-    if (seen.has(note.language)) {
-      errors.push(`Duplicate language code: ${note.language}`);
-    }
-    seen.add(note.language);
-    if (note.text.length > MAX_NOTES_LENGTH) {
-      warnings.push(
-        `Release notes for "${note.language}" are ${note.text.length} chars (max ${MAX_NOTES_LENGTH}) \u2014 Google Play will reject notes exceeding this limit`
-      );
-    }
-  }
-  return { valid: errors.length === 0, errors, warnings };
-}
-
 // src/commands/validate.ts
-import { stat as stat4 } from "fs/promises";
+import { stat as stat3 } from "fs/promises";
 var STANDARD_TRACKS = /* @__PURE__ */ new Set([
   "internal",
   "qa",
@@ -1621,7 +1562,7 @@ async function validatePreSubmission(options) {
   }
   if (options.mappingFile) {
     try {
-      const stats = await stat4(options.mappingFile);
+      const stats = await stat3(options.mappingFile);
       checks.push({
         name: "mapping",
         passed: stats.isFile(),
@@ -2420,12 +2361,28 @@ var METRIC_SET_METRICS = {
   ],
   errorCountMetricSet: ["errorReportCount", "distinctUsers"]
 };
-function buildQuery(metricSet, options) {
+async function getFreshnessEndDate(reporting, packageName, metricSet, aggregation = "DAILY") {
+  try {
+    const info = await reporting.getMetricSetFreshness(packageName, metricSet);
+    const match = info.freshnessInfo?.freshnesses?.find(
+      (f) => f.aggregationPeriod === aggregation
+    );
+    if (match) {
+      return new Date(
+        Date.UTC(match.latestEndTime.year, match.latestEndTime.month - 1, match.latestEndTime.day)
+      );
+    }
+  } catch {
+  }
+  return void 0;
+}
+function buildQuery(metricSet, options, freshnessEnd) {
   const metrics = METRIC_SET_METRICS[metricSet] ?? ["errorReportCount", "distinctUsers"];
   const days = options?.days ?? 30;
   const DAY_MS = 24 * 60 * 60 * 1e3;
-  const end = new Date(Date.now() - DAY_MS);
-  const start = new Date(Date.now() - DAY_MS - days * DAY_MS);
+  const yesterday = new Date(Date.now() - DAY_MS);
+  const end = freshnessEnd && freshnessEnd < yesterday ? freshnessEnd : yesterday;
+  const start = new Date(end.getTime() - days * DAY_MS);
   const query = {
     metrics,
     timelineSpec: {
@@ -2448,7 +2405,13 @@ function buildQuery(metricSet, options) {
   return query;
 }
 async function queryMetric(reporting, packageName, metricSet, options) {
-  const query = buildQuery(metricSet, options);
+  const freshnessEnd = await getFreshnessEndDate(
+    reporting,
+    packageName,
+    metricSet,
+    options?.aggregation
+  );
+  const query = buildQuery(metricSet, options, freshnessEnd);
   return reporting.queryMetricSet(packageName, metricSet, query);
 }
 async function getVitalsOverview(reporting, packageName) {
@@ -2460,8 +2423,15 @@ async function getVitalsOverview(reporting, packageName) {
     ["excessiveWakeupRateMetricSet", "excessiveWakeupRate"],
     ["stuckBackgroundWakelockRateMetricSet", "stuckWakelockRate"]
   ];
+  const freshnessResults = await Promise.allSettled(
+    metricSets.map(([metric]) => getFreshnessEndDate(reporting, packageName, metric))
+  );
   const results = await Promise.allSettled(
-    metricSets.map(([metric]) => reporting.queryMetricSet(packageName, metric, buildQuery(metric)))
+    metricSets.map(([metric], i) => {
+      const fr = freshnessResults[i];
+      const freshnessEnd = fr?.status === "fulfilled" ? fr.value : void 0;
+      return reporting.queryMetricSet(packageName, metric, buildQuery(metric, void 0, freshnessEnd));
+    })
   );
   const overview = {};
   for (let i = 0; i < metricSets.length; i++) {
@@ -2514,7 +2484,9 @@ async function searchVitalsErrors(reporting, packageName, options) {
 async function compareVitalsTrend(reporting, packageName, metricSet, days = 7) {
   const DAY_MS = 24 * 60 * 60 * 1e3;
   const nowMs = Date.now();
-  const baseMs = nowMs - 2 * DAY_MS;
+  const freshnessEnd = await getFreshnessEndDate(reporting, packageName, metricSet);
+  const fallback = nowMs - 2 * DAY_MS;
+  const baseMs = freshnessEnd ? Math.min(freshnessEnd.getTime(), fallback) : fallback;
   const currentEnd = new Date(baseMs);
   const currentStart = new Date(baseMs - days * DAY_MS);
   const previousEnd = new Date(baseMs - days * DAY_MS - DAY_MS);
@@ -2660,17 +2632,17 @@ function watchVitalsWithAutoHalt(reporting, packageName, options) {
 }
 
 // src/commands/status.ts
-import { mkdir as mkdir3, readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
+import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
 import { execFile } from "child_process";
-import { join as join4 } from "path";
+import { join as join3 } from "path";
 import { getCacheDir } from "@gpc-cli/config";
 var DEFAULT_TTL_SECONDS = 3600;
 function cacheFilePath(packageName) {
-  return join4(getCacheDir(), `status-${packageName}.json`);
+  return join3(getCacheDir(), `status-${packageName}.json`);
 }
 async function loadStatusCache(packageName, ttlSeconds = DEFAULT_TTL_SECONDS) {
   try {
-    const raw = await readFile4(cacheFilePath(packageName), "utf-8");
+    const raw = await readFile3(cacheFilePath(packageName), "utf-8");
     const entry = JSON.parse(raw);
     const age = (Date.now() - new Date(entry.fetchedAt).getTime()) / 1e3;
     if (age > (entry.ttl ?? ttlSeconds)) return null;
@@ -3079,13 +3051,13 @@ async function runWatchLoop(opts) {
   }
 }
 function breachStateFilePath(packageName) {
-  return join4(getCacheDir(), `breach-state-${packageName}.json`);
+  return join3(getCacheDir(), `breach-state-${packageName}.json`);
 }
 async function trackBreachState(packageName, isBreaching) {
   const filePath = breachStateFilePath(packageName);
   let prevBreaching = false;
   try {
-    const raw = await readFile4(filePath, "utf-8");
+    const raw = await readFile3(filePath, "utf-8");
     prevBreaching = JSON.parse(raw).breaching;
   } catch {
   }
@@ -3238,7 +3210,7 @@ async function handleBreach(event, config, client) {
       }
       case "halt": {
         try {
-          const { updateRollout: updateRollout2 } = await import("./releases-I5MYFNCV.js");
+          const { updateRollout: updateRollout2 } = await import("./releases-S54GLWH3.js");
           await updateRollout2(client, config.packageName, config.track, "halt");
           halted = true;
         } catch {
@@ -3354,8 +3326,8 @@ async function runWatch(client, reporting, config, callbacks) {
 }
 
 // src/commands/iap.ts
-import { readdir as readdir4, readFile as readFile5 } from "fs/promises";
-import { join as join5 } from "path";
+import { readdir as readdir3, readFile as readFile4 } from "fs/promises";
+import { join as join4 } from "path";
 import { paginateAll as paginateAll3 } from "@gpc-cli/api";
 async function listInAppProducts(client, packageName, options) {
   if (options?.limit || options?.nextPage) {
@@ -3440,11 +3412,11 @@ async function batchUpdateProducts(client, packageName, products) {
   return results;
 }
 async function readProductsFromDir(dir) {
-  const files = await readdir4(dir);
+  const files = await readdir3(dir);
   const jsonFiles = files.filter((f) => f.endsWith(".json"));
   const localProducts = [];
   for (const file of jsonFiles) {
-    const content = await readFile5(join5(dir, file), "utf-8");
+    const content = await readFile4(join4(dir, file), "utf-8");
     try {
       localProducts.push(JSON.parse(content));
     } catch {
@@ -3801,7 +3773,7 @@ async function deleteGrant(client, developerId, email, packageName) {
 }
 
 // src/commands/testers.ts
-import { readFile as readFile6 } from "fs/promises";
+import { readFile as readFile5 } from "fs/promises";
 async function listTesters(client, packageName, track) {
   const edit = await client.edits.insert(packageName);
   try {
@@ -3822,10 +3794,7 @@ async function addTesters(client, packageName, track, groupEmails, commitOptions
     const updated = await client.testers.update(packageName, edit.id, track, {
       googleGroups: [...existing]
     });
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return updated;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -3842,10 +3811,7 @@ async function removeTesters(client, packageName, track, groupEmails, commitOpti
     const updated = await client.testers.update(packageName, edit.id, track, {
       googleGroups: filtered
     });
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return updated;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -3854,7 +3820,7 @@ async function removeTesters(client, packageName, track, groupEmails, commitOpti
   }
 }
 async function importTestersFromCsv(client, packageName, track, csvPath, commitOptions) {
-  const content = await readFile6(csvPath, "utf-8");
+  const content = await readFile5(csvPath, "utf-8");
   const emails = content.split(/[,\n\r]+/).map((e) => e.trim()).filter((e) => e.length > 0 && e.includes("@"));
   if (emails.length === 0) {
     throw new GpcError(
@@ -3997,12 +3963,12 @@ async function addRecoveryTargeting(client, packageName, actionId, targeting) {
 }
 
 // src/commands/data-safety.ts
-import { readFile as readFile7 } from "fs/promises";
+import { readFile as readFile6 } from "fs/promises";
 async function updateDataSafety(client, packageName, data) {
   return client.dataSafety.update(packageName, data);
 }
 async function importDataSafety(client, packageName, filePath) {
-  const content = await readFile7(filePath, "utf-8");
+  const content = await readFile6(filePath, "utf-8");
   let data;
   try {
     data = JSON.parse(content);
@@ -4306,16 +4272,16 @@ function createSpinner(message) {
 }
 
 // src/utils/train-state.ts
-import { mkdir as mkdir4, readFile as readFile8, writeFile as writeFile4 } from "fs/promises";
-import { dirname, join as join6 } from "path";
+import { mkdir as mkdir4, readFile as readFile7, writeFile as writeFile4 } from "fs/promises";
+import { dirname, join as join5 } from "path";
 import { getCacheDir as getCacheDir2 } from "@gpc-cli/config";
 function stateFile(packageName) {
-  return join6(getCacheDir2(), `train-${packageName}.json`);
+  return join5(getCacheDir2(), `train-${packageName}.json`);
 }
 async function readTrainState(packageName) {
   const path = stateFile(packageName);
   try {
-    const raw = await readFile8(path, "utf-8");
+    const raw = await readFile7(path, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -4495,8 +4461,8 @@ async function publishEnterpriseApp(client, params) {
 }
 
 // src/audit.ts
-import { appendFile, chmod, mkdir as mkdir5, readFile as readFile9, writeFile as writeFile5 } from "fs/promises";
-import { join as join7 } from "path";
+import { appendFile, chmod, mkdir as mkdir5, readFile as readFile8, writeFile as writeFile5 } from "fs/promises";
+import { join as join6 } from "path";
 var auditDir = null;
 function initAudit(configDir) {
   auditDir = configDir;
@@ -4505,7 +4471,7 @@ async function writeAuditLog(entry) {
   if (!auditDir) return;
   try {
     await mkdir5(auditDir, { recursive: true, mode: 448 });
-    const logPath = join7(auditDir, "audit.log");
+    const logPath = join6(auditDir, "audit.log");
     const redactedEntry = redactAuditArgs(entry);
     const line = JSON.stringify(redactedEntry) + "\n";
     await appendFile(logPath, line, { encoding: "utf-8", mode: 384 });
@@ -4560,10 +4526,10 @@ function createAuditEntry(command, args, app) {
 }
 async function listAuditEvents(options) {
   if (!auditDir) return [];
-  const logPath = join7(auditDir, "audit.log");
+  const logPath = join6(auditDir, "audit.log");
   let content;
   try {
-    content = await readFile9(logPath, "utf-8");
+    content = await readFile8(logPath, "utf-8");
   } catch {
     return [];
   }
@@ -4598,10 +4564,10 @@ async function searchAuditEvents(query) {
 }
 async function clearAuditLog(options) {
   if (!auditDir) return { deleted: 0, remaining: 0 };
-  const logPath = join7(auditDir, "audit.log");
+  const logPath = join6(auditDir, "audit.log");
   let content;
   try {
-    content = await readFile9(logPath, "utf-8");
+    content = await readFile8(logPath, "utf-8");
   } catch {
     return { deleted: 0, remaining: 0 };
   }
@@ -4689,11 +4655,11 @@ function safePathWithin(userPath, baseDir) {
 }
 
 // src/commands/init.ts
-import { mkdir as mkdir6, writeFile as writeFile6, stat as stat5 } from "fs/promises";
-import { join as join8 } from "path";
+import { mkdir as mkdir6, writeFile as writeFile6, stat as stat4 } from "fs/promises";
+import { join as join7 } from "path";
 async function exists2(path) {
   try {
-    await stat5(path);
+    await stat4(path);
     return true;
   } catch {
     return false;
@@ -4725,7 +4691,7 @@ async function initProject(options) {
     null,
     2
   );
-  await safeWrite(join8(dir, ".gpcrc.json"), gpcrc + "\n", created, skipped, skipExisting);
+  await safeWrite(join7(dir, ".gpcrc.json"), gpcrc + "\n", created, skipped, skipExisting);
   const preflightrc = JSON.stringify(
     {
       failOn: "error",
@@ -4739,27 +4705,27 @@ async function initProject(options) {
     2
   );
   await safeWrite(
-    join8(dir, ".preflightrc.json"),
+    join7(dir, ".preflightrc.json"),
     preflightrc + "\n",
     created,
     skipped,
     skipExisting
   );
-  const metaDir = join8(dir, "metadata", "android", "en-US");
-  await safeWrite(join8(metaDir, "title.txt"), "", created, skipped, skipExisting);
-  await safeWrite(join8(metaDir, "short_description.txt"), "", created, skipped, skipExisting);
-  await safeWrite(join8(metaDir, "full_description.txt"), "", created, skipped, skipExisting);
-  await safeWrite(join8(metaDir, "video.txt"), "", created, skipped, skipExisting);
-  const ssDir = join8(metaDir, "images", "phoneScreenshots");
+  const metaDir = join7(dir, "metadata", "android", "en-US");
+  await safeWrite(join7(metaDir, "title.txt"), "", created, skipped, skipExisting);
+  await safeWrite(join7(metaDir, "short_description.txt"), "", created, skipped, skipExisting);
+  await safeWrite(join7(metaDir, "full_description.txt"), "", created, skipped, skipExisting);
+  await safeWrite(join7(metaDir, "video.txt"), "", created, skipped, skipExisting);
+  const ssDir = join7(metaDir, "images", "phoneScreenshots");
   await mkdir6(ssDir, { recursive: true });
-  await safeWrite(join8(ssDir, ".gitkeep"), "", created, skipped, skipExisting);
+  await safeWrite(join7(ssDir, ".gitkeep"), "", created, skipped, skipExisting);
   if (ci === "github") {
     const workflow = githubActionsTemplate(pkg);
-    const workflowDir = join8(dir, ".github", "workflows");
-    await safeWrite(join8(workflowDir, "gpc-release.yml"), workflow, created, skipped, skipExisting);
+    const workflowDir = join7(dir, ".github", "workflows");
+    await safeWrite(join7(workflowDir, "gpc-release.yml"), workflow, created, skipped, skipExisting);
   } else if (ci === "gitlab") {
     const pipeline = gitlabCiTemplate(pkg);
-    await safeWrite(join8(dir, ".gitlab-ci-gpc.yml"), pipeline, created, skipped, skipExisting);
+    await safeWrite(join7(dir, ".gitlab-ci-gpc.yml"), pipeline, created, skipped, skipExisting);
   }
   return { created, skipped };
 }
@@ -4854,13 +4820,13 @@ var DEFAULT_PREFLIGHT_CONFIG = {
 };
 
 // src/preflight/config.ts
-import { readFile as readFile10 } from "fs/promises";
+import { readFile as readFile9 } from "fs/promises";
 var VALID_SEVERITIES = /* @__PURE__ */ new Set(["critical", "error", "warning", "info"]);
 async function loadPreflightConfig(configPath) {
   const path = configPath || ".preflightrc.json";
   let raw;
   try {
-    raw = await readFile10(path, "utf-8");
+    raw = await readFile9(path, "utf-8");
   } catch {
     return { ...DEFAULT_PREFLIGHT_CONFIG };
   }
@@ -5777,8 +5743,8 @@ ${fileList}` + (hasPageSizeCompat ? "\nandroid:pageSizeCompat is set, so the app
 }
 
 // src/preflight/scanners/metadata-scanner.ts
-import { readdir as readdir5, stat as stat6, readFile as readFile11 } from "fs/promises";
-import { join as join9 } from "path";
+import { readdir as readdir4, stat as stat5, readFile as readFile10 } from "fs/promises";
+import { join as join8 } from "path";
 var SAFE_LANG = /^[a-zA-Z]{2,3}(-[a-zA-Z0-9]{2,8})*$/;
 var FILE_MAP2 = {
   "title.txt": "title",
@@ -5804,7 +5770,7 @@ var metadataScanner = {
     const findings = [];
     let entries;
     try {
-      entries = await readdir5(dir);
+      entries = await readdir4(dir);
     } catch {
       findings.push({
         scanner: "metadata",
@@ -5829,14 +5795,14 @@ var metadataScanner = {
       return findings;
     }
     for (const lang of locales) {
-      const langDir = join9(dir, lang);
-      const langStat = await stat6(langDir).catch(() => null);
+      const langDir = join8(dir, lang);
+      const langStat = await stat5(langDir).catch(() => null);
       if (!langStat?.isDirectory()) continue;
       const fields = {};
       for (const [fileName, field] of Object.entries(FILE_MAP2)) {
-        const filePath = join9(langDir, fileName);
+        const filePath = join8(langDir, fileName);
         try {
-          const content = await readFile11(filePath, "utf-8");
+          const content = await readFile10(filePath, "utf-8");
           fields[field] = content.trimEnd();
         } catch {
         }
@@ -5875,9 +5841,9 @@ var metadataScanner = {
       let totalScreenshots = 0;
       let phoneScreenshots = 0;
       for (const ssDir of SCREENSHOT_DIRS) {
-        const ssPath = join9(langDir, "images", ssDir);
+        const ssPath = join8(langDir, "images", ssDir);
         try {
-          const ssEntries = await readdir5(ssPath);
+          const ssEntries = await readdir4(ssPath);
           const imageFiles = ssEntries.filter((f) => /\.(png|jpe?g|webp)$/i.test(f));
           totalScreenshots += imageFiles.length;
           if (ssDir === "phoneScreenshots") {
@@ -5907,9 +5873,9 @@ var metadataScanner = {
       }
     }
     const defaultLang = locales.includes("en-US") ? "en-US" : locales[0];
-    const privacyPath = join9(dir, defaultLang, "privacy_policy_url.txt");
+    const privacyPath = join8(dir, defaultLang, "privacy_policy_url.txt");
     try {
-      const url = await readFile11(privacyPath, "utf-8");
+      const url = await readFile10(privacyPath, "utf-8");
       if (!url.trim()) throw new Error("empty");
     } catch {
       findings.push({
@@ -5934,11 +5900,11 @@ var metadataScanner = {
 };
 
 // src/preflight/scanners/secrets-scanner.ts
-import { readFile as readFile12 } from "fs/promises";
+import { readFile as readFile11 } from "fs/promises";
 
 // src/preflight/scan-files.ts
-import { readdir as readdir6, stat as stat7 } from "fs/promises";
-import { join as join10, extname as extname3 } from "path";
+import { readdir as readdir5, stat as stat6 } from "fs/promises";
+import { join as join9, extname as extname2 } from "path";
 var DEFAULT_SKIP_DIRS = /* @__PURE__ */ new Set([
   ".git",
   "node_modules",
@@ -5955,20 +5921,20 @@ async function collectSourceFiles(dir, extensions, skipDirs = DEFAULT_SKIP_DIRS,
   const files = [];
   let entries;
   try {
-    entries = await readdir6(dir);
+    entries = await readdir5(dir);
   } catch {
     return files;
   }
   for (const entry of entries) {
     if (skipDirs.has(entry)) continue;
-    const fullPath = join10(dir, entry);
-    const s = await stat7(fullPath).catch(() => null);
+    const fullPath = join9(dir, entry);
+    const s = await stat6(fullPath).catch(() => null);
     if (!s) continue;
     if (s.isDirectory()) {
       const sub = await collectSourceFiles(fullPath, extensions, skipDirs, maxDepth - 1);
       files.push(...sub);
     } else if (s.isFile()) {
-      const ext = extname3(entry).toLowerCase();
+      const ext = extname2(entry).toLowerCase();
       if (extensions.has(ext) || entry.endsWith(".gradle.kts")) {
         files.push(fullPath);
       }
@@ -6054,7 +6020,7 @@ var secretsScanner = {
     for (const filePath of files) {
       let content;
       try {
-        content = await readFile12(filePath, "utf-8");
+        content = await readFile11(filePath, "utf-8");
       } catch {
         continue;
       }
@@ -6082,7 +6048,7 @@ var secretsScanner = {
 };
 
 // src/preflight/scanners/billing-scanner.ts
-import { readFile as readFile13 } from "fs/promises";
+import { readFile as readFile12 } from "fs/promises";
 var BILLING_PATTERNS = [
   {
     ruleId: "billing-stripe-sdk",
@@ -6143,7 +6109,7 @@ var billingScanner = {
     for (const filePath of files) {
       let content;
       try {
-        content = await readFile13(filePath, "utf-8");
+        content = await readFile12(filePath, "utf-8");
       } catch {
         continue;
       }
@@ -6169,7 +6135,7 @@ var billingScanner = {
 };
 
 // src/preflight/scanners/privacy-scanner.ts
-import { readFile as readFile14 } from "fs/promises";
+import { readFile as readFile13 } from "fs/promises";
 var TRACKING_SDKS = [
   {
     name: "Facebook SDK",
@@ -6209,7 +6175,7 @@ var privacyScanner = {
     for (const filePath of files) {
       let content;
       try {
-        content = await readFile14(filePath, "utf-8");
+        content = await readFile13(filePath, "utf-8");
       } catch {
         continue;
       }
@@ -6582,13 +6548,13 @@ function sortResults(items, sortSpec) {
 
 // src/commands/plugin-scaffold.ts
 import { mkdir as mkdir7, writeFile as writeFile7 } from "fs/promises";
-import { join as join11 } from "path";
+import { join as join10 } from "path";
 async function scaffoldPlugin(options) {
   const { name, dir, description = `GPC plugin: ${name}` } = options;
   const pluginName = name.startsWith("gpc-plugin-") ? name : `gpc-plugin-${name}`;
   const shortName = pluginName.replace(/^gpc-plugin-/, "");
-  const srcDir = join11(dir, "src");
-  const testDir = join11(dir, "tests");
+  const srcDir = join10(dir, "src");
+  const testDir = join10(dir, "tests");
   await mkdir7(srcDir, { recursive: true });
   await mkdir7(testDir, { recursive: true });
   const files = [];
@@ -6624,7 +6590,7 @@ async function scaffoldPlugin(options) {
       vitest: "^3.0.0"
     }
   };
-  await writeFile7(join11(dir, "package.json"), JSON.stringify(pkg, null, 2) + "\n");
+  await writeFile7(join10(dir, "package.json"), JSON.stringify(pkg, null, 2) + "\n");
   files.push("package.json");
   const tsconfig = {
     compilerOptions: {
@@ -6640,7 +6606,7 @@ async function scaffoldPlugin(options) {
     },
     include: ["src"]
   };
-  await writeFile7(join11(dir, "tsconfig.json"), JSON.stringify(tsconfig, null, 2) + "\n");
+  await writeFile7(join10(dir, "tsconfig.json"), JSON.stringify(tsconfig, null, 2) + "\n");
   files.push("tsconfig.json");
   const srcContent = `import { definePlugin } from "@gpc-cli/plugin-sdk";
 import type { CommandEvent, CommandResult } from "@gpc-cli/plugin-sdk";
@@ -6673,7 +6639,7 @@ export const plugin = definePlugin({
   },
 });
 `;
-  await writeFile7(join11(srcDir, "index.ts"), srcContent);
+  await writeFile7(join10(srcDir, "index.ts"), srcContent);
   files.push("src/index.ts");
   const testContent = `import { describe, it, expect, vi } from "vitest";
 import { plugin } from "../src/index";
@@ -6698,7 +6664,7 @@ describe("${pluginName}", () => {
   });
 });
 `;
-  await writeFile7(join11(testDir, "plugin.test.ts"), testContent);
+  await writeFile7(join10(testDir, "plugin.test.ts"), testContent);
   files.push("tests/plugin.test.ts");
   return { dir, files };
 }
@@ -6809,7 +6775,7 @@ async function sendWebhook(config, payload, target) {
 }
 
 // src/commands/internal-sharing.ts
-import { extname as extname4 } from "path";
+import { extname as extname3 } from "path";
 async function uploadInternalSharing(client, packageName, filePath, fileType) {
   const resolvedType = fileType ?? detectFileType(filePath);
   const validation = await validateUploadFile(filePath);
@@ -6836,7 +6802,7 @@ ${validation.errors.join("\n")}`,
   };
 }
 function detectFileType(filePath) {
-  const ext = extname4(filePath).toLowerCase();
+  const ext = extname3(filePath).toLowerCase();
   if (ext === ".aab") return "bundle";
   if (ext === ".apk") return "apk";
   throw new GpcError(
@@ -6884,7 +6850,7 @@ async function downloadGeneratedApk(client, packageName, versionCode, apkId, out
 }
 
 // src/commands/bundle-analysis.ts
-import { readFile as readFile15, stat as stat8 } from "fs/promises";
+import { readFile as readFile14, stat as stat7 } from "fs/promises";
 var EOCD_SIGNATURE = 101010256;
 var CD_SIGNATURE = 33639248;
 var MODULE_SUBDIRS = /* @__PURE__ */ new Set(["dex", "manifest", "res", "assets", "lib", "resources.pb", "root"]);
@@ -6960,11 +6926,11 @@ function detectFileType2(filePath) {
   return "apk";
 }
 async function analyzeBundle(filePath) {
-  const fileInfo = await stat8(filePath).catch(() => null);
+  const fileInfo = await stat7(filePath).catch(() => null);
   if (!fileInfo || !fileInfo.isFile()) {
     throw new Error(`File not found: ${filePath}`);
   }
-  const buf = await readFile15(filePath);
+  const buf = await readFile14(filePath);
   const cdEntries = parseCentralDirectory(buf);
   const fileType = detectFileType2(filePath);
   const isAab = fileType === "aab";
@@ -7050,7 +7016,7 @@ function topFiles(analysis, n = 20) {
 async function checkBundleSize(analysis, configPath = ".bundlesize.json") {
   let config;
   try {
-    const raw = await readFile15(configPath, "utf-8");
+    const raw = await readFile14(configPath, "utf-8");
     config = JSON.parse(raw);
   } catch {
     return { passed: true, violations: [] };
@@ -8371,6 +8337,202 @@ function compareFingerprints(a, b) {
   return normalizeFingerprint(a) === normalizeFingerprint(b);
 }
 
+// src/utils/hash.ts
+import { createHash } from "crypto";
+import { stat as stat8 } from "fs/promises";
+async function sha256File(filePath) {
+  const hash = createHash("sha256");
+  const { size } = await stat8(filePath);
+  if (size === 0) return hash.digest("hex");
+  const { createReadStream } = await import("fs");
+  const stream = createReadStream(filePath);
+  await new Promise((resolve2, reject) => {
+    stream.on("data", (chunk) => hash.update(chunk));
+    stream.on("end", resolve2);
+    stream.on("error", reject);
+  });
+  return hash.digest("hex");
+}
+
+// src/commands/image-sync.ts
+import { readdir as readdir6 } from "fs/promises";
+import { join as join11, extname as extname4 } from "path";
+import { PlayApiError } from "@gpc-cli/api";
+var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg"]);
+var ALL_IMAGE_TYPES2 = [
+  "icon",
+  "featureGraphic",
+  "tvBanner",
+  "phoneScreenshots",
+  "sevenInchScreenshots",
+  "tenInchScreenshots",
+  "tvScreenshots",
+  "wearScreenshots"
+];
+async function scanLocalImages(dir) {
+  try {
+    const entries = await readdir6(dir, { withFileTypes: true });
+    return entries.filter((e) => e.isFile() && IMAGE_EXTENSIONS.has(extname4(e.name).toLowerCase())).map((e) => e.name).sort();
+  } catch {
+    return [];
+  }
+}
+async function scanLanguages(dir) {
+  try {
+    const entries = await readdir6(dir, { withFileTypes: true });
+    return entries.filter((e) => e.isDirectory()).map((e) => e.name).sort();
+  } catch {
+    return [];
+  }
+}
+async function syncImages(client, packageName, dir, options) {
+  const details = [];
+  let uploaded = 0;
+  let skipped = 0;
+  let deleted = 0;
+  const languages = options?.lang ? [options.lang] : await scanLanguages(dir);
+  if (languages.length === 0) {
+    throw new GpcError(
+      `No language directories found in "${dir}"`,
+      "IMAGE_SYNC_EMPTY",
+      1,
+      "The directory should contain subdirectories named by language code (e.g., en-US/) with image type subdirectories inside."
+    );
+  }
+  const imageTypes = options?.type ? [options.type] : ALL_IMAGE_TYPES2;
+  const edit = await client.edits.insert(packageName);
+  try {
+    for (const language of languages) {
+      for (const imageType of imageTypes) {
+        const localDir = join11(dir, language, imageType);
+        const localFiles = await scanLocalImages(localDir);
+        let remoteImages;
+        try {
+          remoteImages = await client.images.list(packageName, edit.id, language, imageType);
+        } catch (error) {
+          if (error instanceof PlayApiError && error.statusCode === 404) {
+            remoteImages = [];
+          } else {
+            throw error;
+          }
+        }
+        const remoteSha256Set = new Set(remoteImages.map((img) => img.sha256.toLowerCase()));
+        const localHashes = /* @__PURE__ */ new Map();
+        for (const file of localFiles) {
+          const hash = await sha256File(join11(localDir, file));
+          localHashes.set(file, hash);
+        }
+        const localSha256Set = new Set(localHashes.values());
+        if (options?.delete) {
+          for (const img of remoteImages) {
+            if (!localSha256Set.has(img.sha256.toLowerCase())) {
+              if (!options?.dryRun) {
+                await client.images.delete(packageName, edit.id, language, imageType, img.id);
+              }
+              deleted++;
+              details.push({
+                language,
+                imageType,
+                file: img.id,
+                action: "delete",
+                reason: "not in local"
+              });
+            }
+          }
+        }
+        for (const file of localFiles) {
+          const hash = localHashes.get(file);
+          if (remoteSha256Set.has(hash)) {
+            skipped++;
+            details.push({ language, imageType, file, action: "skip", reason: "sha256 match" });
+          } else {
+            if (!options?.dryRun) {
+              const filePath = join11(localDir, file);
+              const check = await validateImage(filePath, imageType);
+              if (!check.valid) {
+                throw new GpcError(
+                  `Image validation failed for ${language}/${imageType}/${file}: ${check.errors.join("; ")}`,
+                  "IMAGE_INVALID",
+                  2,
+                  "Check image dimensions, file size, and format."
+                );
+              }
+              await client.images.upload(packageName, edit.id, language, imageType, filePath);
+            }
+            uploaded++;
+            details.push({ language, imageType, file, action: "upload", reason: "new or changed" });
+          }
+        }
+      }
+    }
+    if (options?.dryRun || uploaded === 0 && deleted === 0) {
+      await client.edits.delete(packageName, edit.id).catch(() => {
+      });
+    } else {
+      await validateAndCommit(client, packageName, edit.id, options?.commitOptions);
+    }
+    return {
+      uploaded,
+      skipped,
+      deleted,
+      total: uploaded + skipped + deleted,
+      details
+    };
+  } catch (error) {
+    await client.edits.delete(packageName, edit.id).catch(() => {
+    });
+    throw error;
+  }
+}
+
+// src/commands/bundles.ts
+import { PlayApiError as PlayApiError2 } from "@gpc-cli/api";
+async function listBundles(client, packageName) {
+  const edit = await client.edits.insert(packageName);
+  try {
+    const bundles = await client.bundles.list(packageName, edit.id);
+    await client.edits.delete(packageName, edit.id).catch(() => {
+    });
+    return bundles;
+  } catch (error) {
+    await client.edits.delete(packageName, edit.id).catch(() => {
+    });
+    throw error;
+  }
+}
+async function findBundle(client, packageName, versionCode) {
+  const bundles = await listBundles(client, packageName);
+  return bundles.find((b) => b.versionCode === versionCode) ?? null;
+}
+function isRetryableError(error) {
+  if (!(error instanceof PlayApiError2)) return false;
+  const status = error.statusCode;
+  return status === 429 || status === 500 || status === 503 || status === 409;
+}
+async function waitForBundle(client, packageName, versionCode, options) {
+  const timeout = options?.timeout ?? 6e5;
+  const interval = options?.interval ?? 15e3;
+  const deadline = Date.now() + timeout;
+  while (Date.now() < deadline) {
+    try {
+      const bundles = await listBundles(client, packageName);
+      const match = bundles.find((b) => b.versionCode === versionCode);
+      if (match) return match;
+    } catch (error) {
+      if (!isRetryableError(error)) throw error;
+    }
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) break;
+    await new Promise((r) => setTimeout(r, Math.min(interval, remaining)));
+  }
+  throw new GpcError(
+    `Bundle version code ${versionCode} not found after ${Math.round(timeout / 1e3)}s`,
+    "BUNDLE_WAIT_TIMEOUT",
+    4,
+    "The bundle may still be processing. Try again with a longer --timeout, or check the Play Console."
+  );
+}
+
 // src/signing-consistency.ts
 async function checkSigningConsistency(accessToken, packageName, apiHost = "androidpublisher.googleapis.com") {
   const baseUrl = `https://${apiHost}/androidpublisher/v3/applications/${encodeURIComponent(packageName)}`;
@@ -8613,6 +8775,7 @@ export {
   checkThreshold,
   classifyError,
   clearAuditLog,
+  commitWithRescue,
   compareBundles,
   compareFingerprints,
   compareVersionVitals,
@@ -8667,6 +8830,7 @@ export {
   fetchAggregateCost,
   fetchChangelog,
   fetchReleaseNotes,
+  findBundle,
   formatChangelogEntry,
   formatCustomPayload,
   formatDiscordPayload,
@@ -8728,11 +8892,13 @@ export {
   isValidBcp47,
   isValidReportType,
   isValidStatsDimension,
+  isVersionedNotesDir,
   lintListing,
   lintListings,
   lintLocalListings,
   listAchievements,
   listAuditEvents,
+  listBundles,
   listDeviceTiers,
   listEvents,
   listGeneratedApks,
@@ -8770,6 +8936,7 @@ export {
   pullListings,
   pushListings,
   readListingsFromDir,
+  readReleaseNotesForVersion,
   readReleaseNotesFromDir,
   redactAuditArgs,
   redactSensitive,
@@ -8801,9 +8968,11 @@ export {
   searchVitalsErrors,
   sendNotification,
   sendWebhook,
+  sha256File,
   sortResults,
   startTrain,
   statusHasBreach,
+  syncImages,
   syncInAppProducts,
   topFiles,
   trackBreachState,
@@ -8824,6 +8993,7 @@ export {
   uploadImage,
   uploadInternalSharing,
   uploadRelease,
+  validateAndCommit,
   validateBundleForApply,
   validateImage,
   validateLanguageCode,
@@ -8834,6 +9004,7 @@ export {
   validateTrackName,
   validateUploadFile,
   validateVersionCode,
+  waitForBundle,
   waitForBundleProcessing,
   watchVitalsWithAutoHalt,
   wordDiff,