dsh-plugin-update 0.2.0 → 0.3.0

package/dist/host.js

@@ -10,13 +10,126 @@ import {
   resolveUpdateConfig
 } from "./config.js";
 import { manualCommand } from "./commands.js";
-import { validVersion } from "./service.js";
-import { createUpdateDiskPorts, createUpdateExecutor } from "./store.js";
+import { buildDiag } from "./diag.js";
+import { isVersionAllowedInChannel, validRequestId } from "./service.js";
+import { createUpdateDiskPorts, createUpdateExecutor, createUpdateQueuePorts } from "./store.js";
 import { createUpdateReader, defaultHomeDir, resolveProfileName, resolveTargetPackage } from "./reader.js";
+import {
+  QUEUE_INTENT_TTL_MS,
+  cancelEnqueuedInQueue,
+  emptyQueueState,
+  enqueueInQueue,
+  isHeadOfQueue,
+  normalizeQueueState,
+  pruneExpiredIntents,
+  queuePositionOf,
+  releaseOwnerInQueue,
+  setOwnerIfFree,
+  visibleQueueFor
+} from "./queue.js";
 import { buildPhoneName, buildPhoneNames as buildPhoneNames2, resolveUpdateConfig as resolveUpdateConfig2 } from "./config.js";
 import { parseEventListManifest, checkEventFields, checkEventCounts } from "./gate.js";
 import { containingPackage, defaultHomeDir as defaultHomeDir2, profileNameValid, registrySpec, resolveTargetPackage as resolveTargetPackage2 } from "./reader.js";
+import {
+  COPY_BUDGET_CHARS,
+  DETAIL_MAX_CHARS,
+  DIAG_DROP_ORDER,
+  DIAG_INLINE_BUDGET_BYTES,
+  DIAG_NEVER_DROP_KEYS,
+  ENDORSED_REGISTRY_HOSTS,
+  KNOWN_GAP_FILE_URL_PREFIX,
+  REDACTED_PATH,
+  REDACTED_SECRET,
+  REDACTION_RULE_NAMES,
+  diagByteLength,
+  enforceDiagBudget,
+  resolveRegistryHost,
+  sanitizeDetail,
+  sanitizeForCopy,
+  truncateToWordBoundary
+} from "./redaction.js";
+import {
+  DIAG_ACTIONS,
+  DIAG_KEYS,
+  DIAG_KNOWN_TYPES,
+  DIAG_STAGE_EXPECT,
+  DIAG_STAGES,
+  DIAG_VERSION,
+  buildDiag as buildDiag2,
+  deriveAction,
+  deriveRouteMethod,
+  deriveStage,
+  enforceBudget
+} from "./diag.js";
+import {
+  CHANGELOG_ALL_CATEGORIES,
+  CHANGELOG_FILENAME,
+  CHANGELOG_FOLDED,
+  CHANGELOG_MAX_BULLETS_PER_SECTION,
+  CHANGELOG_MAX_BULLET_CHARS,
+  CHANGELOG_MAX_CHARS,
+  CHANGELOG_MAX_ENTRIES,
+  CHANGELOG_MUST_SHOW,
+  CHANGELOG_NEUTRAL_HINT,
+  CHANGELOG_NEUTRAL_LINE,
+  changelogForUpdate,
+  hasVisibleSections,
+  isUnreleasedVersion,
+  parseChangelog,
+  renderChangelogHTML,
+  renderChangelogNeutral,
+  renderChangelogSection,
+  selectChangelogEntries
+} from "./changelog.js";
+import {
+  CHANGELOG_DEFAULT_REGISTRY,
+  CHANGELOG_FETCH_MAX_BYTES,
+  CHANGELOG_TAR_MAX_BYTES,
+  CHANGELOG_TARBALL_MAX_BYTES,
+  extractChangelogFromTar,
+  fetchReleaseChangelogText,
+  readInstalledChangelogText
+} from "./changelog-io.js";
 import { createUpdateDiskPorts as createUpdateDiskPorts2, createUpdateExecutor as createUpdateExecutor2, pathsForUpdate, resolveCliEntry } from "./store.js";
+import { SKIPPED_FILE } from "./config.js";
+import {
+  addSkipped,
+  clearSkipped,
+  createSkipDiskPorts,
+  isVersionSkipped,
+  MAX_SKIPPED_ENTRIES,
+  normalizeSkipped,
+  skipKey
+} from "./store.js";
+import {
+  compareReleaseVersions,
+  isPrereleaseVersion,
+  isVersionAllowedInChannel as isVersionAllowedInChannel2,
+  validReleaseVersion,
+  validVersion,
+  compareVersions
+} from "./service.js";
+import {
+  createUpdateQueuePorts as createUpdateQueuePorts2,
+  queuePathsForUpdate,
+  QUEUE_DIR_SEGMENT,
+  QUEUE_FILE,
+  QUEUE_LOCK_FILE,
+  QUEUE_LOCK_STALE_MS
+} from "./store.js";
+import {
+  QUEUE_INTENT_TTL_MS as QUEUE_INTENT_TTL_MS2,
+  cancelEnqueuedInQueue as cancelEnqueuedInQueue2,
+  emptyQueueState as emptyQueueState2,
+  enqueueInQueue as enqueueInQueue2,
+  isHeadOfQueue as isHeadOfQueue2,
+  normalizeQueueState as normalizeQueueState2,
+  pruneExpiredIntents as pruneExpiredIntents2,
+  queuePositionOf as queuePositionOf2,
+  releaseOwnerInQueue as releaseOwnerInQueue2,
+  setOwnerIfFree as setOwnerIfFree2,
+  visibleQueueFor as visibleQueueFor2
+} from "./queue.js";
 let sharedReader = null;
 let sharedReaderKey = "";
 let sharedDesktopPnpm = null;
@@ -96,11 +209,12 @@ async function getSharedReader(pluginId, config, overrides = {}) {
   const osHome = overrides.osHome ?? homedir();
   const homeDirDefault = defaultHomeDir(env, osHome);
   const targetPackageName = overrides.targetPackageName ?? config.targetPackageName;
+  const releaseChannel = overrides.releaseChannel ?? config.releaseChannel ?? "stable";
   const explicitTargetDir = typeof overrides.targetPackageDir === "string" && overrides.targetPackageDir ? String(overrides.targetPackageDir) : "";
   const loaded = await resolveTargetPackage(targetPackageName, explicitTargetDir ? { targetPackageDir: explicitTargetDir } : {}).catch(
     () => null
   );
-  const runningVersion = overrides.runningVersion ?? (loaded && validVersion(loaded.manifest.version) ? String(loaded.manifest.version) : null);
+  const runningVersion = overrides.runningVersion ?? (loaded && isVersionAllowedInChannel(loaded.manifest.version, releaseChannel) ? String(loaded.manifest.version) : null);
   if (!runningVersion) throw unknownProfile();
   let profileDirInput;
   if (overrides.profileDir) {
@@ -117,9 +231,116 @@ async function getSharedReader(pluginId, config, overrides = {}) {
   const confirmationTtlMs = overrides.confirmationTtlMs ?? config.confirmationTtlMs;
   const installTimeoutMs = overrides.installTimeoutMs ?? config.installTimeoutMs;
   const registryUrl = overrides.registryUrl ?? config.registryUrl;
-  const key = `${pluginId}\0${config.prefix}\0${runningVersion}\0${profileDirInput}\0${overrides.profileName ?? ""}\0${homeDirInput}\0${overrides.runInstall ? "exec" : ""}\0${environmentKind}\0${targetPackageName}\0${explicitTargetDir}`;
+  const key = `${pluginId}\0${config.prefix}\0${runningVersion}\0${profileDirInput}\0${overrides.profileName ?? ""}\0${homeDirInput}\0${overrides.runInstall ? "exec" : ""}\0${environmentKind}\0${targetPackageName}\0${explicitTargetDir}\0${releaseChannel}`;
   if (sharedReader && sharedReaderKey === key) return sharedReader;
   const disk = overrides.readJob && overrides.writeJob ? null : createUpdateDiskPorts(homeDirInput, pluginId, profileDirInput);
+  const queueTtlMs = typeof overrides.queueTtlMs === "number" && Number.isFinite(overrides.queueTtlMs) && overrides.queueTtlMs > 0 ? overrides.queueTtlMs : QUEUE_INTENT_TTL_MS;
+  const queueDisk = overrides.readQueue && overrides.writeQueue ? null : disk ? createUpdateQueuePorts(homeDirInput, profileDirInput) : null;
+  const queueNow = overrides.now ?? Date.now;
+  async function readQueueBestEffort() {
+    try {
+      if (overrides.readQueue) return normalizeQueueState(await overrides.readQueue());
+      if (queueDisk) return normalizeQueueState(await queueDisk.readQueue());
+    } catch {
+    }
+    return emptyQueueState();
+  }
+  async function writeQueueBestEffort(state) {
+    try {
+      if (overrides.writeQueue) await overrides.writeQueue(normalizeQueueState(state));
+      else if (queueDisk) await queueDisk.writeQueue(state);
+    } catch {
+    }
+  }
+  async function loadQueuePruned() {
+    const raw = await readQueueBestEffort();
+    const pruned = pruneExpiredIntents(raw, queueNow(), queueTtlMs);
+    if (pruned !== raw) await writeQueueBestEffort(pruned);
+    return pruned;
+  }
+  const baseTryAcquire = overrides.tryAcquireLock ?? disk?.tryAcquireLock;
+  const baseRelease = overrides.releaseLock ?? disk?.releaseLock;
+  const globalTryAcquire = overrides.tryAcquireGlobalLock ? (lockId) => overrides.tryAcquireGlobalLock(lockId, pluginId, { timeoutMs: installTimeoutMs }) : queueDisk ? (lockId) => queueDisk.tryAcquireGlobalLock(lockId, pluginId, { timeoutMs: installTimeoutMs }) : void 0;
+  const globalRelease = overrides.releaseGlobalLock ?? queueDisk?.releaseGlobalLock;
+  async function combinedTryAcquire(lockId) {
+    try {
+      if (globalTryAcquire && !await globalTryAcquire(lockId)) return false;
+      if (baseTryAcquire && !await baseTryAcquire(lockId)) {
+        if (globalRelease) {
+          try {
+            await globalRelease(lockId);
+          } catch {
+          }
+        }
+        return false;
+      }
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async function combinedRelease(lockId) {
+    try {
+      if (baseRelease) await baseRelease(lockId);
+    } catch {
+    }
+    try {
+      if (globalRelease) await globalRelease(lockId);
+    } catch {
+    }
+    try {
+      const current = await readQueueBestEffort();
+      const next = releaseOwnerInQueue(current, pluginId, lockId);
+      if (next.released) await writeQueueBestEffort(next.state);
+    } catch {
+    }
+  }
+  let memJobFallback = null;
+  async function mirroredWriteJob(job) {
+    if (overrides.writeJob) await overrides.writeJob(job);
+    else memJobFallback = job;
+    try {
+      if (!job) return;
+      const current = await readQueueBestEffort();
+      const pruned = pruneExpiredIntents(current, queueNow(), queueTtlMs);
+      if (job.state === "installing" || job.state === "verifying") {
+        let next = pruned;
+        if (next.owner && next.owner.jobId === job.id) {
+          next = {
+            version: 1,
+            owner: {
+              ...next.owner,
+              requestId: job.requestId ?? next.owner.requestId,
+              targetVersion: job.targetVersion ?? next.owner.targetVersion
+            },
+            waiting: next.waiting.filter((e) => !(e.pluginId === pluginId && (e.requestId ?? null) === (job.requestId ?? null)))
+          };
+        } else {
+          let base = next;
+          const age = queueNow() - (typeof base.owner?.startedAt === "number" ? base.owner.startedAt : 0);
+          if (base.owner && age > installTimeoutMs) base = { version: 1, owner: null, waiting: base.waiting };
+          next = setOwnerIfFree(base, {
+            pluginId,
+            jobId: job.id,
+            requestId: job.requestId,
+            targetVersion: job.targetVersion,
+            startedAt: queueNow()
+          }).state;
+        }
+        if (next !== pruned) await writeQueueBestEffort(next);
+        else if (pruned !== current) await writeQueueBestEffort(pruned);
+      } else {
+        const released = releaseOwnerInQueue(pruned, pluginId, job.id);
+        const out = released.released ? released.state : pruned;
+        if (out !== current) await writeQueueBestEffort(out);
+      }
+    } catch {
+    }
+  }
+  async function mirroredReadJob() {
+    if (overrides.readJob) return await overrides.readJob() ?? null;
+    return memJobFallback;
+  }
   const defaultRun = createUpdateExecutor({
     profileName: overrides.profileName ?? null,
     environmentKind,
@@ -137,32 +358,37 @@ async function getSharedReader(pluginId, config, overrides = {}) {
     pluginId,
     log: emitInstallLog
   });
-  sharedReader = createUpdateReader({
-    runningVersion,
-    profileDir: profileDirInput,
-    pluginId,
-    profileName: overrides.profileName ?? void 0,
-    homeDir: overrides.homeDir,
-    targetPackageDir: explicitTargetDir || void 0,
-    env,
-    osHome,
-    fetchImpl: overrides.fetchImpl,
-    now: overrides.now,
-    randomId: overrides.randomId,
-    nodeVersion: overrides.nodeVersion,
-    environmentKind,
-    targetPackageName,
-    registryUrl,
-    checkTimeoutMs,
-    confirmationTtlMs,
-    readInstalled: overrides.readInstalled,
-    readJob: overrides.readJob,
-    writeJob: overrides.writeJob,
-    tryAcquireLock: overrides.tryAcquireLock ?? disk?.tryAcquireLock,
-    releaseLock: overrides.releaseLock ?? disk?.releaseLock,
-    backupJob: overrides.backupJob ?? disk?.backupJob,
-    runInstall: overrides.runInstall ?? defaultRun
-  });
+  sharedReader = Object.assign(
+    createUpdateReader({
+      runningVersion,
+      profileDir: profileDirInput,
+      pluginId,
+      profileName: overrides.profileName ?? void 0,
+      homeDir: overrides.homeDir,
+      targetPackageDir: explicitTargetDir || void 0,
+      env,
+      osHome,
+      fetchImpl: overrides.fetchImpl,
+      now: overrides.now,
+      randomId: overrides.randomId,
+      nodeVersion: overrides.nodeVersion,
+      environmentKind,
+      targetPackageName,
+      registryUrl,
+      checkTimeoutMs,
+      confirmationTtlMs,
+      releaseChannel,
+      readInstalled: overrides.readInstalled,
+      readJob: mirroredReadJob,
+      writeJob: mirroredWriteJob,
+      tryAcquireLock: combinedTryAcquire,
+      releaseLock: combinedRelease,
+      backupJob: overrides.backupJob ?? disk?.backupJob,
+      runInstall: overrides.runInstall ?? defaultRun
+    }),
+    // 跨插件队列的面板侧读写口（#15）：与本次解析出的使用范围绑定，面板经电话可选参数消费。
+    { readQueuePruned: loadQueuePruned, writeQueueState: writeQueueBestEffort, queueTtlMs, queueNow }
+  );
   sharedReaderKey = key;
   return sharedReader;
 }
@@ -210,6 +436,22 @@ async function snapWithManual(reader, snapshot, config) {
     return { snapshot, manual: null };
   }
 }
+async function readEnvForPanel(reader) {
+  try {
+    if (typeof reader.readEnv !== "function") return null;
+    const env = await reader.readEnv();
+    if (!env || typeof env !== "object") return null;
+    return {
+      profileName: typeof env.profileName === "string" && env.profileName ? env.profileName : null,
+      environmentKind: typeof env.environmentKind === "string" && env.environmentKind ? env.environmentKind : null
+    };
+  } catch {
+    return null;
+  }
+}
+function wantsEnv(args) {
+  return !!args && args["includeEnv"] === true;
+}
 let phoneLogCtx = null;
 function emitInstallLog(level, event, fields) {
   try {
@@ -217,7 +459,19 @@ function emitInstallLog(level, event, fields) {
   } catch {
   }
 }
-function loggedPhone(method, kind, pluginId, fn) {
+function queueArgsOf(args) {
+  return {
+    includeQueue: !!args && args["includeQueue"] === true,
+    showOthers: !!args && args["showOthers"] === true
+  };
+}
+function checkExpiredError() {
+  return Object.assign(new Error("check-expired"), { code: "check-expired" });
+}
+function updateBusyError() {
+  return Object.assign(new Error("update-busy"), { code: "update-busy" });
+}
+function loggedPhone(method, kind, pluginId, fn, diagCtx) {
   return async function(args) {
     const t0 = Date.now();
     const emit = (level, event, fields) => {
@@ -226,15 +480,47 @@ function loggedPhone(method, kind, pluginId, fn) {
       } catch {
       }
     };
+    const safeArgs = args && typeof args === "object" ? args : {};
     try {
-      const out = await fn(args);
+      const out = await fn(safeArgs);
       const snapshot = out && out.snapshot ? out.snapshot : out;
       emit("info", "host.call", { method, latencyMs: Date.now() - t0, ok: true, kind, pluginId });
-      return { ok: true, snapshot, manual: out && out.snapshot ? out.manual ?? null : null, receipt: out && out.receipt ? out.receipt : null };
+      return {
+        ok: true,
+        snapshot,
+        manual: out && out.snapshot ? out.manual ?? null : null,
+        receipt: out && out.receipt ? out.receipt : null,
+        // 新增选填（#15）：调用方没要时不带该键，老调用形状不变。
+        ...out && out.queue ? { queue: out.queue } : {},
+        // 新增选填：使用范围一栏（只有调用方传了 includeEnv 才带，老调用形状不变）。
+        ...out && out.env ? { env: out.env } : {}
+      };
     } catch (error) {
       const payload = toUpdateErrorPayload(error);
       emit("warn", "host.call.fail", { method, kind, errorHash: hash8(String(error?.message || payload.error)), pluginId });
-      return { ok: false, ...payload };
+      let diag;
+      try {
+        const cfg = diagCtx?.config;
+        const overrides = diagCtx?.readerOverrides ?? {};
+        const envRaw = overrides?.environmentKind;
+        const runningRaw = overrides?.runningVersion;
+        const built = buildDiag({
+          errorCode: payload.error,
+          phoneKind: kind,
+          error,
+          args: safeArgs,
+          targetPackageName: cfg?.targetPackageName,
+          registryUrl: cfg?.registryUrl,
+          runningVersion: typeof runningRaw === "string" ? runningRaw : void 0,
+          latestVersion: void 0,
+          environmentKind: typeof envRaw === "string" ? envRaw : void 0,
+          latencyMs: Date.now() - t0
+        });
+        if (built && typeof built === "object") diag = built;
+      } catch {
+        diag = void 0;
+      }
+      return { ok: false, ...payload, ...diag ? { diag } : {} };
     }
   };
 }
@@ -252,7 +538,12 @@ function createHostUpdate(deps = {}, configInput) {
       ...readerOverrides,
       profileDir: args && args.profileDir ? String(args.profileDir) : readerOverrides.profileDir
     });
-    return snapWithManual(reader, await reader.status(), config);
+    const out = await snapWithManual(reader, await reader.status(), config);
+    const env = wantsEnv(args) ? { env: await readEnvForPanel(reader) } : {};
+    const { includeQueue, showOthers } = queueArgsOf(args);
+    if (!includeQueue) return { ...out, ...env };
+    const requestId = args && typeof args.requestId === "string" ? args.requestId : void 0;
+    return { ...out, ...env, queue: visibleQueueFor(await reader.readQueuePruned(), pluginId, showOthers, requestId) };
   }
   async function readCheck(args) {
     const reader = await getSharedReader(pluginId, config, {
@@ -261,21 +552,85 @@ function createHostUpdate(deps = {}, configInput) {
     });
     const result = await reader.check();
     const withManual = await snapWithManual(reader, result.snapshot, config);
-    return { snapshot: withManual.snapshot, manual: withManual.manual, receipt: result.receipt ?? null };
+    const env = wantsEnv(args) ? { env: await readEnvForPanel(reader) } : {};
+    const { includeQueue, showOthers } = queueArgsOf(args);
+    if (!includeQueue) return { snapshot: withManual.snapshot, manual: withManual.manual, receipt: result.receipt ?? null, ...env };
+    const requestId = args && typeof args.requestId === "string" ? args.requestId : void 0;
+    return {
+      snapshot: withManual.snapshot,
+      manual: withManual.manual,
+      receipt: result.receipt ?? null,
+      ...env,
+      queue: visibleQueueFor(await reader.readQueuePruned(), pluginId, showOthers, requestId)
+    };
   }
   async function runInstall(args) {
     const checkId = args && typeof args.checkId === "string" ? args.checkId : "";
     const requestId = args && typeof args.requestId === "string" ? args.requestId : "";
+    const { includeQueue, showOthers } = queueArgsOf(args);
+    const enqueueOnly = !!args && args["enqueueOnly"] === true;
+    const cancelQueued = !!args && args["cancelQueued"] === true;
     const reader = await getSharedReader(pluginId, config, {
       ...readerOverrides,
       profileDir: args && args.profileDir ? String(args.profileDir) : readerOverrides.profileDir
     });
-    return snapWithManual(reader, await reader.install({ checkId, requestId }), config);
+    const envPatch = wantsEnv(args) ? { env: await readEnvForPanel(reader) } : {};
+    if (cancelQueued) {
+      if (!validRequestId(requestId)) throw checkExpiredError();
+      const current = await reader.readQueuePruned();
+      const next = cancelEnqueuedInQueue(current, pluginId, requestId);
+      if (next.removed) await reader.writeQueueState(next.state);
+      const out = await snapWithManual(reader, await reader.status(), config);
+      return { ...out, ...envPatch, queue: visibleQueueFor(next.state, pluginId, showOthers, requestId) };
+    }
+    if (enqueueOnly) {
+      if (!validRequestId(requestId)) throw checkExpiredError();
+      const current = await reader.readQueuePruned();
+      const placed2 = enqueueInQueue(current, { pluginId, requestId, targetVersion: null, enqueuedAt: reader.queueNow() });
+      if (placed2.state !== current) await reader.writeQueueState(placed2.state);
+      const out = await snapWithManual(reader, await reader.status(), config);
+      return { ...out, ...envPatch, queue: visibleQueueFor(placed2.state, pluginId, showOthers, requestId) };
+    }
+    if (!checkId || !validRequestId(requestId)) {
+      const out = await snapWithManual(reader, await reader.install({ checkId, requestId }), config);
+      if (!includeQueue) return { ...out, ...envPatch };
+      return { ...out, ...envPatch, queue: visibleQueueFor(await reader.readQueuePruned(), pluginId, showOthers, requestId) };
+    }
+    const before = await reader.readQueuePruned();
+    const placed = enqueueInQueue(before, { pluginId, requestId, targetVersion: null, enqueuedAt: reader.queueNow() });
+    if (placed.state !== before) await reader.writeQueueState(placed.state);
+    if (queuePositionOf(placed.state, pluginId, requestId) !== 0 && !isHeadOfQueue(placed.state, pluginId, requestId)) {
+      throw updateBusyError();
+    }
+    try {
+      const out = await snapWithManual(reader, await reader.install({ checkId, requestId }), config);
+      if (!includeQueue) return { ...out, ...envPatch };
+      return { ...out, ...envPatch, queue: visibleQueueFor(await reader.readQueuePruned(), pluginId, showOthers, requestId) };
+    } catch (error) {
+      if (error?.code !== "update-busy") {
+        try {
+          const current = await reader.readQueuePruned();
+          const next = cancelEnqueuedInQueue(current, pluginId, requestId);
+          if (next.removed) await reader.writeQueueState(next.state);
+        } catch {
+        }
+      }
+      throw error;
+    }
   }
   const handlers = {
-    [phoneNames.updateStatus]: loggedPhone(phoneNames.updateStatus, "update-status", pluginId, readStatus),
-    [phoneNames.updateCheck]: loggedPhone(phoneNames.updateCheck, "update-check", pluginId, readCheck),
-    [phoneNames.updateInstall]: loggedPhone(phoneNames.updateInstall, "update-install", pluginId, runInstall)
+    [phoneNames.updateStatus]: loggedPhone(phoneNames.updateStatus, "update-status", pluginId, readStatus, {
+      config,
+      readerOverrides
+    }),
+    [phoneNames.updateCheck]: loggedPhone(phoneNames.updateCheck, "update-check", pluginId, readCheck, {
+      config,
+      readerOverrides
+    }),
+    [phoneNames.updateInstall]: loggedPhone(phoneNames.updateInstall, "update-install", pluginId, runInstall, {
+      config,
+      readerOverrides
+    })
   };
   return { phoneNames, handlers };
 }
@@ -288,22 +643,105 @@ function __resetSharedUpdateReaderForTests() {
   sharedDesktopPnpm = null;
 }
 export {
+  CHANGELOG_ALL_CATEGORIES,
+  CHANGELOG_DEFAULT_REGISTRY,
+  CHANGELOG_FETCH_MAX_BYTES,
+  CHANGELOG_FILENAME,
+  CHANGELOG_FOLDED,
+  CHANGELOG_MAX_BULLETS_PER_SECTION,
+  CHANGELOG_MAX_BULLET_CHARS,
+  CHANGELOG_MAX_CHARS,
+  CHANGELOG_MAX_ENTRIES,
+  CHANGELOG_MUST_SHOW,
+  CHANGELOG_NEUTRAL_HINT,
+  CHANGELOG_NEUTRAL_LINE,
+  CHANGELOG_TARBALL_MAX_BYTES,
+  CHANGELOG_TAR_MAX_BYTES,
+  COPY_BUDGET_CHARS,
+  DETAIL_MAX_CHARS,
+  DIAG_ACTIONS,
+  DIAG_DROP_ORDER,
+  DIAG_INLINE_BUDGET_BYTES,
+  DIAG_KEYS,
+  DIAG_KNOWN_TYPES,
+  DIAG_NEVER_DROP_KEYS,
+  DIAG_STAGES,
+  DIAG_STAGE_EXPECT,
+  DIAG_VERSION,
+  ENDORSED_REGISTRY_HOSTS,
+  KNOWN_GAP_FILE_URL_PREFIX,
+  MAX_SKIPPED_ENTRIES,
+  QUEUE_DIR_SEGMENT,
+  QUEUE_FILE,
+  QUEUE_INTENT_TTL_MS2 as QUEUE_INTENT_TTL_MS,
+  QUEUE_LOCK_FILE,
+  QUEUE_LOCK_STALE_MS,
+  REDACTED_PATH,
+  REDACTED_SECRET,
+  REDACTION_RULE_NAMES,
+  SKIPPED_FILE,
   __resetSharedUpdateReaderForTests,
+  addSkipped,
+  buildDiag2 as buildDiag,
   buildPhoneName,
   buildPhoneNames2 as buildPhoneNames,
+  cancelEnqueuedInQueue2 as cancelEnqueuedInQueue,
+  changelogForUpdate,
   checkEventCounts,
   checkEventFields,
+  clearSkipped,
+  compareReleaseVersions,
+  compareVersions,
   containingPackage,
   createHostUpdate,
+  createSkipDiskPorts,
   createUpdateDiskPorts2 as createUpdateDiskPorts,
   createUpdateExecutor2 as createUpdateExecutor,
+  createUpdateQueuePorts2 as createUpdateQueuePorts,
   defaultHomeDir2 as defaultHomeDir,
+  deriveAction,
+  deriveRouteMethod,
+  deriveStage,
   detectEnvironmentKind,
+  diagByteLength,
+  emptyQueueState2 as emptyQueueState,
+  enforceDiagBudget,
+  enforceBudget as enforceDiagBudgetForPhone,
+  enqueueInQueue2 as enqueueInQueue,
+  extractChangelogFromTar,
+  fetchReleaseChangelogText,
+  hasVisibleSections,
+  isHeadOfQueue2 as isHeadOfQueue,
+  isPrereleaseVersion,
+  isUnreleasedVersion,
+  isVersionAllowedInChannel2 as isVersionAllowedInChannel,
+  isVersionSkipped,
+  normalizeQueueState2 as normalizeQueueState,
+  normalizeSkipped,
+  parseChangelog,
   parseEventListManifest,
   pathsForUpdate,
   profileNameValid,
+  pruneExpiredIntents2 as pruneExpiredIntents,
+  queuePathsForUpdate,
+  queuePositionOf2 as queuePositionOf,
+  readInstalledChangelogText,
   registrySpec,
+  releaseOwnerInQueue2 as releaseOwnerInQueue,
+  renderChangelogHTML,
+  renderChangelogNeutral,
+  renderChangelogSection,
   resolveCliEntry,
+  resolveRegistryHost,
   resolveTargetPackage2 as resolveTargetPackage,
-  resolveUpdateConfig2 as resolveUpdateConfig
+  resolveUpdateConfig2 as resolveUpdateConfig,
+  sanitizeDetail,
+  sanitizeForCopy,
+  selectChangelogEntries,
+  setOwnerIfFree2 as setOwnerIfFree,
+  skipKey,
+  truncateToWordBoundary,
+  validReleaseVersion,
+  validVersion,
+  visibleQueueFor2 as visibleQueueFor
 };