waybetter 0.6.0 → 0.7.0

package/README.md

@@ -120,9 +120,8 @@ const Shell = createShell({ ...site, panel: { id: 'app', title: 'wayBetter', com
 - `waybetter store sign [--init] --key <private key>` / `waybetter store verify --pub <key file>`: Ed25519 signature over the exact catalog bytes; any listed public key verifies (rotation). The private key is never printed or copied.
 - `waybetter strings check <pack> [--inventory <file>] [--verbose]`: validates a string pack (data that replaces the wrapped site's own UI strings: `waybetter/runtime/stringPacks`, `waybetter/runtime/stringPackHook`, `waybetter/runtime/textNet`) against the site's string inventory and prints its coverage; the inventories otherwise come from `waybetter.strings.json` in the app's root.
 - `waybetter i18n check [--write] [--verbose] [locale…]`: checks an app's catalogs (and the framework's in the same languages) with the `waybetter/i18n/check` rules, bundled plugins' inline English and the generated files; `--write` regenerates `languages.json` and the native localization files (macOS, Linux). `waybetter i18n extract [--missing]`: keys the code looks up that English lacks, and English keys without a literal lookup. Both read `waybetter.i18n.json` in the app's root (`locales`, `sources`, `nativeSources`, `bundledPlugins`, `runtimeKeys`, `supported`, `native`; schema: `i18n-config.schema.json`). `supported` lists the languages in the supported tier; every other catalog gets `tier: "community"` in the generated `languages.json` (`languages.schema.json`), and an app resolves its automatic language choices only to supported ones (`createLanguage({ supported })`).
-- `waybetter release windows|macos`: signed native releases and the update manifest (`waybetter.release.json`). The Windows build runs path-free (below) and every artifact must pass the privacy scan before anything is copied or signed.
+- `waybetter release windows|macos`: signed native releases and the update manifest (`waybetter.release.json`). The Windows build runs path-free (below); `WAYBETTER_RELEASE_CHECK` can name a command run on every artifact before anything is copied or signed.
 - `waybetter build-env -- <command>`: runs a build (`tauri build`, `cargo build`) so the binary holds none of the machine's paths: the home folder, the workspace, `CARGO_HOME`, `RUSTUP_HOME` and `CARGO_TARGET_DIR` become `/home`, `/src`, `/cargo`, `/rustup` and `/target` (`--remap-path-prefix` appended to the flags already in `RUSTFLAGS`/`CARGO_ENCODED_RUSTFLAGS`, `/PDBALTPATH` on MSVC; for C and C++ a build script compiles, `-ffile-prefix-map` on gcc and clang and, on MSVC, `/d1trimfile:<root>` in `CL` and `/PDBALTPATH` in `LINK`, which reach the cc crate, CMake and MSBuild alike). Without a command it prints that environment (`--json`).
-- `waybetter privacy-scan <paths…> [--terms <file>] [--tracked] [--history]`: searches files, binaries (UTF-8 and UTF-16), archives (zip, tar, gzip, zstd, .deb, DMG; NSIS installers, AppImages and xz with 7-Zip or the matching tool), git-tracked files and a repository's whole history for forbidden terms: the lines of a file kept outside every repository (`--terms`, `WAYBETTER_FORBIDDEN_TERMS`, or `"forbiddenTerms"` in `waybetter.release.json`) plus this machine's account name. A name is a hit as a whole word in any case; a name of three characters or fewer only in a path or as the capitalized word. Output shows file and line or offset with the term masked (`m***`); exit 1 on a hit, 2 when a container could not be opened. Reviewed false positives: `"privacyAllowlist"`, lines of `<file glob>: <regex over the context, the term written <term>>`.
 - `windows/languages/<Language>.nsh`: the Windows installer's messages for the languages Tauri does not ship, next to the installer template (`windows/installer.nsi`).
 
 ## Plugin UI kit (`runtime/ui`)

package/bin/waybetter.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // The `waybetter` command: `waybetter store build|sign|verify` (cli/store.mjs),
 // `waybetter release windows|macos|linux` (cli/release.mjs), `waybetter manifests` (cli/manifests.mjs), `waybetter i18n check|extract`
-// (cli/i18n.mjs), `waybetter privacy-scan` (cli/privacy.mjs) and `waybetter build-env`
+// (cli/i18n.mjs), `waybetter build-env`
 // (cli/buildenv.mjs), `waybetter dev` (cli/dev.mjs: watchers + tauri dev), `waybetter strings check`
 // (cli/strings.mjs).
 import { readFileSync } from 'node:fs';
@@ -9,7 +9,6 @@ import { BUILD_ENV_USAGE, buildEnvCommand } from '../cli/buildenv.mjs';
 import { DEV_USAGE, devCommand } from '../cli/dev.mjs';
 import { MANIFESTS_USAGE, manifestsCommand } from '../cli/manifests.mjs';
 import { I18N_USAGE, i18nCommand } from '../cli/i18n.mjs';
-import { PRIVACY_USAGE, privacyCommand } from '../cli/privacy.mjs';
 import { STORE_USAGE, storeCommand } from '../cli/store.mjs';
 import { STRINGS_USAGE, stringsCommand } from '../cli/strings.mjs';
 import { RELEASE_USAGE, releaseCommand } from '../cli/release.mjs';
@@ -26,8 +25,6 @@ try {
     process.exitCode = await i18nCommand(rest);
   } else if (area === 'strings') {
     process.exitCode = await stringsCommand(rest);
-  } else if (area === 'privacy-scan') {
-    process.exitCode = privacyCommand(rest);
   } else if (area === 'build-env') {
     process.exitCode = buildEnvCommand(rest);
   } else if (area === 'dev') {
@@ -35,7 +32,7 @@ try {
   } else if (area === '--version' || area === '-v') {
     console.log(JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version);
   } else {
-    console.log(`${STORE_USAGE}\n\n${RELEASE_USAGE}\n\n${MANIFESTS_USAGE}\n\n${I18N_USAGE}\n\n${STRINGS_USAGE}\n\n${PRIVACY_USAGE}\n\n${BUILD_ENV_USAGE}
+    console.log(`${STORE_USAGE}\n\n${RELEASE_USAGE}\n\n${MANIFESTS_USAGE}\n\n${I18N_USAGE}\n\n${STRINGS_USAGE}\n\n${BUILD_ENV_USAGE}
 
 ${DEV_USAGE}`);
     if (area && area !== '--help' && area !== '-h') process.exitCode = 1;

package/cli/buildenv.mjs

@@ -18,7 +18,7 @@
 //   waybetter build-env -- tauri build        run a command with that environment
 //   waybetter build-env [--json]              show it
 //
-// `waybetter release windows` builds with it. It is not a proof: `waybetter privacy-scan` is.
+// `waybetter release windows` builds with it.
 import { spawnSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';

package/cli/release.mjs

@@ -17,17 +17,13 @@
 //     "prepareCommand": "bun install --frozen-lockfile",  // remote/WSL builds: runs first in the unpacked sources
 //     "distribution": { "publisher": "CRT", "id": "CRT.Name", "homepage": "https://...", "license": "...", "shortDescription": "...", "downloadBase": "https://..." },
 //                                                        // manifests written after each release step (see cli/manifests.mjs)
-//     "exportExclude": ["verification"],                    // remote/WSL builds: app-repo paths left out of the upload
-//     "forbiddenTerms": "~/.better-twttr-keys/forbidden-names.txt",       // optional, outside the repo
-//     "privacyAllowlist": "privacy-allowlist.txt"                         // optional, reviewed false positives
+//     "exportExclude": ["verification"]                     // remote/WSL builds: app-repo paths left out of the upload
 //   }
 //
-// Privacy: the Windows build runs with the path-free build environment (cli/buildenv.mjs), and
-// every artifact (the installer and what it installs, the main binary, the front end, the dmg and
-// the updater bundle) goes through `waybetter privacy-scan` (cli/privacy.mjs) before anything is
-// copied, signed or written: a forbidden term, or a container that cannot be opened (the NSIS
-// installer needs 7-Zip), stops the release. The terms are the file "forbiddenTerms" names (or
-// WAYBETTER_FORBIDDEN_TERMS) plus this machine's account name and home folder name.
+// The Windows build runs with the path-free build environment (cli/buildenv.mjs). Every artifact
+// (the installer, the main binary, the front end, the dmg and the updater bundle) goes through the
+// optional release check (cli/releasecheck.mjs, WAYBETTER_RELEASE_CHECK) before anything is
+// copied, signed or written.
 //
 // The private key is read only into the build's environment (Windows) or handed to the Tauri
 // signer by path (macOS). Nothing here prints, copies or moves it.
@@ -37,7 +33,7 @@ import { homedir } from 'node:os';
 import { dirname, isAbsolute, join, relative, resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { pathFreeBuildEnv } from './buildenv.mjs';
-import { assertClean } from './privacy.mjs';
+import { runReleaseCheck } from './releasecheck.mjs';
 import { CHANNELS, resolveSpec, writeManifests } from './manifests.mjs';
 import { buildLinuxWsl, buildMacRemote, scanBuilt } from './remote.mjs';
 
@@ -65,10 +61,9 @@ export const RELEASE_USAGE = `Usage:
       linux-x86_64 to latest.json (run the Windows step first).
 
 Config: ${CONFIG_FILE} in the app's root (product, artifact, desktopDir, keysDir, keysDirEnv,
-cdnBase, apiBase, outDir, optional manifestValidator, forbiddenTerms, privacyAllowlist). Env:
-CARGO_TARGET_DIR, CDN_BASE, DEPLOY_TARGET, CDN_DIR, RELEASES_DIR, WAYBETTER_FORBIDDEN_TERMS,
-WAYBETTER_7Z. The build is path-free (waybetter build-env) and every artifact must pass
-waybetter privacy-scan. Nothing is ever uploaded.`;
+cdnBase, apiBase, outDir, optional manifestValidator). Env: CARGO_TARGET_DIR, CDN_BASE,
+DEPLOY_TARGET, CDN_DIR, RELEASES_DIR, WAYBETTER_RELEASE_CHECK (an optional command run on every
+artifact first). The build is path-free (waybetter build-env). Nothing is ever uploaded.`;
 
 class ReleaseError extends Error {}
 const fail = message => { throw new ReleaseError(message); };
@@ -127,8 +122,6 @@ export function normalizeReleaseConfig(raw, root) {
     distribution: raw.distribution,
     exportExclude: Array.isArray(raw.exportExclude) ? raw.exportExclude.map(String) : [],
     manifestValidator: validator && { module: at(validator.module), export: validator.export, hint: validator.hint },
-    forbiddenTerms: raw.forbiddenTerms === undefined ? undefined : at(home(text('forbiddenTerms'))),
-    privacyAllowlist: raw.privacyAllowlist === undefined ? undefined : at(text('privacyAllowlist')),
   };
 }
 
@@ -179,9 +172,9 @@ function readVersion(config) {
   return { version, productName: conf.productName, binary, dist };
 }
 
-/** The release gate: no artifact may hold a forbidden term (see cli/privacy.mjs). */
+/** The optional release check (cli/releasecheck.mjs) over every artifact that exists. */
 function gate(config, paths, env, log) {
-  assertClean(paths.filter(path => path && existsSync(path)), { terms: config.forbiddenTerms, allowlist: config.privacyAllowlist, cwd: config.root, env, log, label: 'release: privacy-scan' });
+  runReleaseCheck(paths.filter(path => path && existsSync(path)), { env, log, label: 'release: check' });
 }
 
 function option(args, name) {

package/cli/releasecheck.mjs

@@ -0,0 +1,15 @@
+// An optional, owner-supplied check run on every artifact before a release copies, signs or writes
+// anything: WAYBETTER_RELEASE_CHECK names a command (run through the shell) that gets the artifact
+// paths as arguments. A non-zero exit stops the release. Unset, nothing runs.
+import { spawnSync } from 'node:child_process';
+
+export const RELEASE_CHECK_ENV = 'WAYBETTER_RELEASE_CHECK';
+
+export function runReleaseCheck(paths, { env = process.env, log = console.log, label = 'release check' } = {}) {
+  const command = env[RELEASE_CHECK_ENV];
+  if (!command || !paths.length) return;
+  const quoted = paths.map(path => `'${String(path).replaceAll("'", "'\\''")}'`).join(' ');
+  log(`${label}: ${paths.length} file(s)`);
+  const result = spawnSync(`${command} ${quoted}`, { shell: true, stdio: 'inherit', env });
+  if (result.status !== 0) throw new Error(`${label} failed (exit ${result.status ?? result.signal})`);
+}

package/cli/remote.mjs

@@ -1,7 +1,7 @@
 // Remote and WSL builds for `waybetter release macos|linux`: the committed state of an app (its
 // git HEAD plus every submodule at the commit the app records) is exported, sent to the machine
 // that builds it, built there through `waybetter build-env` (no build path in the binary) and the
-// artifacts come back to be scanned (`waybetter privacy-scan`) and, later, signed on this machine.
+// artifacts come back to be checked (the optional release check) and, later, signed on this machine.
 // Nothing here touches the working tree the developer has open, and no key ever leaves this
 // machine: the remote build is unsigned (updater artifacts off), signing is `waybetter release`.
 //
@@ -18,7 +18,7 @@ import { spawnSync } from 'node:child_process';
 import { existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { basename, join, relative, resolve } from 'node:path';
-import { assertClean } from './privacy.mjs';
+import { runReleaseCheck } from './releasecheck.mjs';
 
 class RemoteError extends Error {}
 const fail = message => { throw new RemoteError(message); };
@@ -250,11 +250,11 @@ export function buildLinuxWsl({ config, distro = 'Ubuntu-22.04', remoteDir, ref
 
 const relTauri = (config, name) => `${relative(config.root, config.tauriDir).replaceAll('\\', '/')}/${name}`;
 
-/** Scans built artifacts here (the terms never leave this machine) and prints their sizes. */
+/** Prints the built artifacts' sizes and runs the optional release check on them here. */
 export function scanBuilt(config, files, { env = process.env, log = console.log } = {}) {
   for (const file of files) {
     if (!existsSync(file)) fail(`expected build output missing: ${file}`);
     log(`built: ${basename(file)} ${(statSync(file).size / 1048576).toFixed(1)} MB`);
   }
-  assertClean(files, { terms: config.forbiddenTerms, allowlist: config.privacyAllowlist, cwd: config.root, env, log, label: 'release: privacy-scan' });
+  runReleaseCheck(files, { env, log, label: 'release: check' });
 }

package/cli/store.mjs

@@ -15,7 +15,19 @@ import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node
 import { dirname, isAbsolute, join, relative, resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 
+/**
+ * Two catalog files, one source. `catalog.json` is format 2 and lists only the kinds every app
+ * since the first release knows (theme, plugin, strings): an app from before a kind existed refuses
+ * a whole catalog that lists it. `catalog.v3.json` is format 3, lists everything (icons, builtin, ...)
+ * and is read first by apps that know it; they fall back to `catalog.json` when it is not published.
+ * `waybetter store build` writes both from the same items; `sign` and `verify` handle both.
+ */
 export const CATALOG_FORMAT = 2;
+export const CATALOG_FORMAT_NEXT = 3;
+export const CATALOG_FILE = 'catalog.json';
+export const CATALOG_FILE_NEXT = 'catalog.v3.json';
+/** The kinds format 2 may list; a newer kind is format 3 only. */
+export const LEGACY_KINDS = ['theme', 'plugin', 'strings'];
 export const DEFAULT_BASE = 'https://waybetter.fyi/store/';
 /** The framework's download hosts (waybetter-host `DEFAULT_HOSTS`). */
 export const DEFAULT_HOSTS = [
@@ -25,6 +37,9 @@ export const DEFAULT_HOSTS = [
 ];
 export const PERMISSIONS = ['storage', 'ui', 'clipboard', 'account', 'users', 'commands', 'network', 'network:none'];
 const MAX_BYTES = 2 * 1024 * 1024;
+/** An icon pack file (the runtime's `ICON_LIMITS.packBytes`). */
+const MAX_ICONS_BYTES = 120_000;
+const KINDS = ['theme', 'plugin', 'strings', 'icons', 'builtin'];
 const MAX_ITEMS = 500;
 const MAX_CATALOG_BYTES = 1024 * 1024;
 // SPKI DER prefix of an Ed25519 public key; the raw 32 bytes follow it.
@@ -84,7 +99,7 @@ export function itemProblems(item, hosts) {
   if (!item || typeof item !== 'object' || Array.isArray(item)) return ['not an object'];
   for (const key of Object.keys(item)) if (!ITEM_FIELDS.has(key)) bad.push(`unknown field ${key}`);
   if (!Array.isArray(item.apps) || !item.apps.length || item.apps.length > 16 || !item.apps.every(validAppId) || new Set(item.apps).size !== item.apps.length) bad.push('apps');
-  if (item.kind !== 'theme' && item.kind !== 'plugin' && item.kind !== 'strings') bad.push('kind');
+  if (!KINDS.includes(item.kind)) bad.push('kind');
   // Any item may name its licence and credit its authors; only a string pack has a language.
   if ((item.license !== undefined && (!text(item.license, 60) || !String(item.license).trim())) || (item.credits !== undefined && !text(item.credits, 600))) bad.push('license or credits');
   if (item.kind !== 'strings' && item.language !== undefined) bad.push('language');
@@ -92,10 +107,18 @@ export function itemProblems(item, hosts) {
   if (!text(item.name, 60) || !String(item.name).trim() || !text(item.author ?? '', 60) || !text(item.description ?? '', 600)) bad.push('name, author or description');
   if (!text(item.version, 32) || !item.version || !text(item.category ?? '', 32)) bad.push('version or category');
   if (item.tags !== undefined && (!Array.isArray(item.tags) || item.tags.length > 12 || !item.tags.every(tag => text(tag, 32)))) bad.push('tags');
-  if (typeof item.url !== 'string' || !item.url.startsWith('https://') || (hosts && !allowedUrl(item.url, hosts))) bad.push('url (host not allowed)');
+  if (item.kind === 'builtin') {
+    // A feature that ships inside the app (an area plugin): nothing to download, so nothing to point at or hash.
+    for (const key of ['url', 'sha256', 'size', 'file', 'permissions', 'colors', 'language']) if (item[key] !== undefined) bad.push('built-in item fields');
+  } else {
+    if (typeof item.url !== 'string' || !item.url.startsWith('https://') || (hosts && !allowedUrl(item.url, hosts))) bad.push('url (host not allowed)');
+  }
   if (item.preview !== undefined && (typeof item.preview !== 'string' || !item.preview.startsWith('https://') || (hosts && !allowedUrl(item.preview, hosts)))) bad.push('preview');
-  if (typeof item.sha256 !== 'string' || !/^[0-9a-f]{64}$/.test(item.sha256)) bad.push('sha256');
-  if (!Number.isInteger(item.size) || item.size <= 0 || item.size > MAX_BYTES) bad.push('size');
+  if (item.kind !== 'builtin') {
+    if (typeof item.sha256 !== 'string' || !/^[0-9a-f]{64}$/.test(item.sha256)) bad.push('sha256');
+    if (!Number.isInteger(item.size) || item.size <= 0 || item.size > (item.kind === 'icons' ? MAX_ICONS_BYTES : MAX_BYTES)) bad.push('size');
+  }
+  if (item.kind === 'icons' && (item.file !== undefined || item.permissions !== undefined || item.colors !== undefined)) bad.push('icon pack fields');
   if (item.kind === 'plugin') {
     if (!validFileName(item.file) || item.colors != null) bad.push('plugin file');
     const p = item.permissions;
@@ -118,7 +141,7 @@ export function catalogProblems(catalog, { app, hosts = DEFAULT_HOSTS } = {}) {
   const out = [];
   if (!catalog || typeof catalog !== 'object') return ['catalog: not an object'];
   for (const key of Object.keys(catalog)) if (!['format', 'name', 'generatedAt', 'items'].includes(key)) out.push(`catalog: unknown field ${key}`);
-  if (catalog.format !== CATALOG_FORMAT) out.push(`catalog: format must be ${CATALOG_FORMAT}`);
+  if (catalog.format !== CATALOG_FORMAT && catalog.format !== CATALOG_FORMAT_NEXT) out.push(`catalog: format must be ${CATALOG_FORMAT} or ${CATALOG_FORMAT_NEXT}`);
   if (typeof catalog.name !== 'string' || typeof catalog.generatedAt !== 'string') out.push('catalog: name and generatedAt are strings');
   if (!Array.isArray(catalog.items)) return [...out, 'catalog: items must be a list'];
   if (catalog.items.length > MAX_ITEMS) out.push(`catalog: more than ${MAX_ITEMS} items`);
@@ -127,6 +150,7 @@ export function catalogProblems(catalog, { app, hosts = DEFAULT_HOSTS } = {}) {
   for (const item of catalog.items) {
     const where = `item ${item?.kind}:${item?.id}`;
     for (const problem of itemProblems(item, app && item?.apps?.includes(app) ? hosts : undefined)) out.push(`${where}: invalid ${problem}`);
+    if (catalog.format === CATALOG_FORMAT && !LEGACY_KINDS.includes(item?.kind)) out.push(`${where}: a format ${CATALOG_FORMAT} catalog lists only ${LEGACY_KINDS.join(', ')} (older apps refuse the whole file otherwise); this kind belongs in ${CATALOG_FILE_NEXT}`);
     for (const a of Array.isArray(item?.apps) ? item.apps : []) {
       const id = `${a}/${item.kind}/${item.id}`;
       if (ids.has(id)) out.push(`${where}: duplicate for app ${a}`);
@@ -146,12 +170,15 @@ export function catalogProblems(catalog, { app, hosts = DEFAULT_HOSTS } = {}) {
 /**
  * Builds `config.app`'s part of the shared catalog in `out`: writes the files the config returns,
  * replaces the app's items (other apps' items stay as they are), removes files only the app's old
- * items used, validates the whole catalog and writes `catalog.json` (sign it afterwards).
+ * items used, validates the whole catalog and writes `catalog.v3.json` (every item) and `catalog.json`
+ * (the kinds older apps know), sign both afterwards.
  *
  * config: { app, name?, base?, out?, hosts?, items(context) → [{ kind, id, name, author, version,
  *   description, category, tags, file (plugins), permissions (plugins), colors (themes), language
  *   (string packs), license, credits,
  *   path ('plugins/x.plugin.js'), bytes (Buffer|string), preview?: { path, bytes } }] }
+ * Kinds: theme, plugin, strings, icons (an icon pack, `icons/<id>.icons.json`) and builtin (a
+ * feature that ships inside the app, shown in the Store as built in: no path or bytes).
  */
 export async function buildStore(config, options = {}) {
   const app = config.app;
@@ -160,11 +187,14 @@ export async function buildStore(config, options = {}) {
   if (!/^https:\/\/[^/]+\/(.*\/)?$/.test(base)) throw new Error('base must be an https URL ending in /');
   const out = resolve(options.out ?? config.out ?? '.');
   const hosts = config.hosts ?? DEFAULT_HOSTS;
-  const catalogPath = join(out, 'catalog.json');
-  const previous = existsSync(catalogPath) ? JSON.parse(readFileSync(catalogPath, 'utf8')) : null;
+  const catalogPath = join(out, CATALOG_FILE);
+  const nextPath = join(out, CATALOG_FILE_NEXT);
+  // The full list (format 3) is what to start from: it has every app's items of every kind.
+  const source = existsSync(nextPath) ? nextPath : catalogPath;
+  const previous = existsSync(source) ? JSON.parse(readFileSync(source, 'utf8')) : null;
   const kept = [];
   const oldFiles = new Set();
-  for (const item of previous?.format === CATALOG_FORMAT ? previous.items : []) {
+  for (const item of previous?.format === CATALOG_FORMAT || previous?.format === CATALOG_FORMAT_NEXT ? previous.items : []) {
     if (!item.apps?.includes(app)) { kept.push(item); continue; }
     for (const url of [item.url, item.preview]) if (url?.startsWith(base)) oldFiles.add(url.slice(base.length));
     const others = item.apps.filter(a => a !== app);
@@ -181,12 +211,16 @@ export async function buildStore(config, options = {}) {
   const files = new Map();
   const toBytes = value => (Buffer.isBuffer(value) ? value : Buffer.from(String(value), 'utf8'));
   for (const entry of entries) {
-    const bytes = toBytes(entry.bytes);
-    files.set(entry.path, { target: inside(entry.path), bytes });
-    const item = { apps: [app], kind: entry.kind, id: entry.id, name: entry.name, author: entry.author ?? '', version: entry.version, description: entry.description ?? '', category: entry.category ?? '', tags: entry.tags ?? [], url: `${base}${entry.path}` };
-    if (entry.kind === 'plugin') item.file = entry.file;
-    item.sha256 = sha256(bytes);
-    item.size = bytes.length;
+    const item = { apps: [app], kind: entry.kind, id: entry.id, name: entry.name, author: entry.author ?? '', version: entry.version, description: entry.description ?? '', category: entry.category ?? '', tags: entry.tags ?? [] };
+    // A built-in item has no file: the app already has it.
+    if (entry.kind !== 'builtin') {
+      const bytes = toBytes(entry.bytes);
+      files.set(entry.path, { target: inside(entry.path), bytes });
+      item.url = `${base}${entry.path}`;
+      if (entry.kind === 'plugin') item.file = entry.file;
+      item.sha256 = sha256(bytes);
+      item.size = bytes.length;
+    }
     if (entry.preview) {
       files.set(entry.preview.path, { target: inside(entry.preview.path), bytes: toBytes(entry.preview.bytes) });
       item.preview = `${base}${entry.preview.path}`;
@@ -199,23 +233,27 @@ export async function buildStore(config, options = {}) {
     items.push(item);
   }
   const catalog = {
-    format: CATALOG_FORMAT,
+    format: CATALOG_FORMAT_NEXT,
     name: config.name ?? previous?.name ?? 'wayBetter Store',
     generatedAt: new Date().toISOString().replace(/\.\d+Z$/, 'Z'),
     items: [...kept, ...items],
   };
   // Nothing is written unless the whole catalog is valid.
-  const problems = catalogProblems(catalog, { app, hosts });
+  // The same items twice: everything for apps that know the newer kinds, and what every app knows.
+  const legacy = { ...catalog, format: CATALOG_FORMAT, items: catalog.items.filter(item => LEGACY_KINDS.includes(item.kind)) };
+  const problems = [...catalogProblems(catalog, { app, hosts }), ...catalogProblems(legacy, { app, hosts })];
   if (problems.length) throw new Error(`the catalog would be invalid:\n  ${problems.join('\n  ')}`);
   const json = `${JSON.stringify(catalog, null, 2)}\n`;
+  const legacyJson = `${JSON.stringify(legacy, null, 2)}\n`;
   if (Buffer.byteLength(json) > MAX_CATALOG_BYTES) throw new Error('the catalog is larger than apps accept (1 MiB)');
   for (const { target, bytes } of files.values()) { mkdirSync(dirname(target), { recursive: true }); writeFileSync(target, bytes); }
   // Files this app's previous build wrote and no item uses any more (never another app's files).
   const stillUsed = new Set(kept.flatMap(item => [item.url, item.preview]).filter(url => url?.startsWith(base)).map(url => url.slice(base.length)));
   for (const path of oldFiles) if (!files.has(path) && !stillUsed.has(path)) rmSync(inside(path), { force: true });
   mkdirSync(out, { recursive: true });
-  writeFileSync(catalogPath, json);
-  return { catalog, path: catalogPath, items };
+  writeFileSync(nextPath, json);
+  writeFileSync(catalogPath, legacyJson);
+  return { catalog, legacy, path: catalogPath, nextPath, items };
 }
 
 // ---- Keys and signatures ----------------------------------------------------------------------
@@ -286,6 +324,12 @@ function parse(argv) {
   return out;
 }
 
+/** `catalog.json` and, next to it, `catalog.v3.json` when it exists (one source, two files); any other file alone. */
+export function catalogFiles(file) {
+  const next = join(dirname(file), CATALOG_FILE_NEXT);
+  return file.endsWith(CATALOG_FILE) && !file.endsWith(CATALOG_FILE_NEXT) && existsSync(next) ? [file, next] : [file];
+}
+
 /** Runs `waybetter store …`; returns the lines to print. Throws on errors. */
 export async function storeCommand(argv) {
   const [command, ...rest] = argv;
@@ -297,7 +341,7 @@ export async function storeCommand(argv) {
     const config = (await import(pathToFileURL(resolve(options.config)).href)).default;
     const { path, items } = await buildStore(config, { out: options.out, base: options.base });
     const count = kind => items.filter(item => item.kind === kind).length;
-    return [`store: ${config.app}: ${count('plugin')} plugins, ${count('theme')} themes → ${path}`, 'Now sign it: waybetter store sign <catalog.json> --key <private key>'];
+    return [`store: ${config.app}: ${count('plugin')} plugins, ${count('theme')} themes, ${count('icons')} icon packs, ${count('builtin')} built-in → ${path} and ${CATALOG_FILE_NEXT}`, 'Now sign both: waybetter store sign <catalog.json> --key <private key>'];
   }
   if (command === 'sign') {
     if (!key) throw new Error('sign needs --key (or WAYBETTER_STORE_KEY)');
@@ -307,18 +351,26 @@ export async function storeCommand(argv) {
       return [`${created ? 'Created the store key' : 'Store key already exists'}; public key ${publicKey} → ${options.pub[0]}`];
     }
     if (!existsSync(key)) throw new Error(`no store key at ${key} (create it once with --init)`);
-    const publicKey = signFile(catalog, key);
-    const keys = options.pub.length ? options.pub.map(file => readFileSync(file, 'utf8').trim()) : [publicKey];
-    if (!verifyFile(catalog, keys)) throw new Error(`signature of ${catalog} does NOT verify with ${options.pub.join(', ') || 'the key'}`);
-    return [`Signed and verified ${catalog}.sig`];
+    const lines = [];
+    for (const file of catalogFiles(catalog)) {
+      const publicKey = signFile(file, key);
+      const keys = options.pub.length ? options.pub.map(pub => readFileSync(pub, 'utf8').trim()) : [publicKey];
+      if (!verifyFile(file, keys)) throw new Error(`signature of ${file} does NOT verify with ${options.pub.join(', ') || 'the key'}`);
+      lines.push(`Signed and verified ${file}.sig`);
+    }
+    return lines;
   }
   if (command === 'verify') {
     if (!options.pub.length) throw new Error('verify needs --pub');
     const keys = options.pub.map(file => readFileSync(file, 'utf8').trim());
-    if (!verifyFile(catalog, keys)) throw new Error(`signature of ${catalog} does NOT verify with ${options.pub.join(', ')}`);
-    const problems = catalogProblems(JSON.parse(readFileSync(catalog, 'utf8')), { app: options.app });
-    if (problems.length) throw new Error(`${catalog} is signed but invalid:\n  ${problems.join('\n  ')}`);
-    return [`Verified ${catalog}.sig`];
+    const lines = [];
+    for (const file of catalogFiles(catalog)) {
+      if (!existsSync(`${file}.sig`) || !verifyFile(file, keys)) throw new Error(`signature of ${file} does NOT verify with ${options.pub.join(', ')}`);
+      const problems = catalogProblems(JSON.parse(readFileSync(file, 'utf8')), { app: options.app });
+      if (problems.length) throw new Error(`${file} is signed but invalid:\n  ${problems.join('\n  ')}`);
+      lines.push(`Verified ${file}.sig`);
+    }
+    return lines;
   }
   throw new Error(USAGE);
 }

package/cli/strings.mjs

@@ -77,6 +77,8 @@ export async function checkPack(packFile, inventories, { verbose = false } = {})
   const coverage = rules.coverage(match.inventory, compiled);
   lines.push(`${pack.name} (${pack.language}) for ${pack.site}/${pack.catalog}, inventory build ${match.inventory.build ?? 'unknown'}`);
   lines.push(`${report.total} strings: ${report.valid} valid, ${report.rejected.length} refused, ${report.unknown.length} unknown`);
+  if (pack.when?.languages) lines.push(`Applies only while the site shows: ${pack.when.languages.join(', ')}`);
+  if (pack.rewrite) lines.push(`Rewords ${Object.keys(pack.rewrite.words).length} words inside the site's own text: ${Object.keys(pack.rewrite.words).slice(0, 6).join(', ')}${Object.keys(pack.rewrite.words).length > 6 ? ', …' : ''}`);
   const list = (items, render) => {
     for (const item of verbose ? items : items.slice(0, LISTED)) lines.push(`  ${render(item)}`);
     if (!verbose && items.length > LISTED) lines.push(`  … ${items.length - LISTED} more (--verbose lists all)`);

package/dist/runtime/stringPackHook.js

@@ -27,7 +27,7 @@ export function installStringPacks(win, setups, options = {}) {
                 refused.push(error instanceof Error ? error.message : String(error));
             }
         }
-        const usable = packs.filter(pack => pack.values.size > 0);
+        const usable = packs.filter(pack => pack.values.size > 0 || pack.rewrite);
         return {
             catalog: setup.adapter.catalog, adapter: setup.adapter, packs, refused, usable,
             engine: usable.length || options.mark ? createStringEngine(setup.inventory, usable) : null,
@@ -66,7 +66,7 @@ export function installStringPacks(win, setups, options = {}) {
             continue;
         const sink = {
             seen(group = 'main') { state.seen[group] = (state.seen[group] ?? 0) + 1; },
-            matched(language) { state.languages.add(String(language)); },
+            matched(language) { state.languages.add(String(language)); engine.setLanguage(String(language)); },
             resolve(id, original) {
                 try {
                     state.keys += 1;

package/dist/runtime/stringPackHook.js.map

@@ -1 +1 @@
-{"version":3,"file":"stringPackHook.js","sourceRoot":"","sources":["../../../runtime/src/stringPackHook.ts"],"names":[],"mappings":"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","sourcesContent":["// String packs in the page (published as `waybetter/runtime/stringPackHook`): the per-site\n// \"catalog hook adapter\" interface, the installer that connects adapters to the engine of\n// stringPacks.ts, a self-check that says when a hook did not match, and the generic half of a\n// common hook point (a webpack chunk array).\n//\n// How a site hands its strings to its own code is that site's implementation detail, so the hook\n// is an adapter the app supplies. One site can have several catalogs (different builds of the\n// site, different key spaces); each gets its own adapter, inventory and packs.\n//\n// Everything here fails open: an exception inside a wrapper leaves the site's own behaviour as it\n// was, and with no pack installed nothing is hooked at all.\nimport {\n  compilePack, createStringEngine, type CompiledPack, type EngineStats, type PackReport, type PageInventory, type StringEngine,\n  type StringInventory,\n} from './stringPacks.ts';\n\n// -------------------------------------------------------------------------------------------\n// The adapter interface\n\n/** What an adapter reports to and asks from the framework. None of these throw. */\nexport type CatalogSink = {\n  /** A catalog file of this adapter was seen loading (whether or not the hook then matches). */\n  seen(group?: string): void;\n  /** The hook matched: the site is about to register values in `language`. */\n  matched(language: string, group?: string): void;\n  /** The value to register for `id`: a pack's, or exactly `original`. */\n  resolve(id: string, original: unknown): unknown;\n};\n\nexport type CatalogHookAdapter = {\n  /** The catalog (key space) this adapter hooks; packs and the inventory name the same one. */\n  catalog: string;\n  /** Installs the hook at document start; returns its removal. Must not change the site's objects. */\n  install(win: Window, sink: CatalogSink): () => void;\n};\n\nexport type CatalogSetup = {\n  adapter: CatalogHookAdapter;\n  inventory: StringInventory | PageInventory;\n  /** Pack documents in application order (a later one wins). Untrusted data: validated here. */\n  packs: readonly unknown[];\n};\n\n/**\n * `ok`: the hook matched and keys went through it.\n * `not-matched`: a catalog file was seen but the hook did not match it (the site changed).\n * `no-catalog`: no catalog file was seen at all (another build of the site, or not loaded yet).\n */\nexport type HookStatus = 'pending' | 'ok' | 'not-matched' | 'no-catalog';\n\nexport type CatalogReport = {\n  catalog: string;\n  status: HookStatus;\n  /** Languages the site registered through the hook. */\n  languages: string[];\n  /** Catalog files seen, per group. */\n  seen: Record<string, number>;\n  packs: { name: string; language: string; report: PackReport }[];\n  /** Pack documents that were refused as a whole. */\n  refused: string[];\n  engine: EngineStats;\n};\n\nexport type StringPacksHandle = {\n  status(catalog?: string): HookStatus;\n  report(): CatalogReport[];\n  /** The engines, per catalog (the originals they keep are what a restore needs). */\n  engine(catalog: string): StringEngine | undefined;\n  dispose(): void;\n};\n\nexport type StringPacksOptions = {\n  /** When the self-check decides (default 15 s after install). */\n  settleMs?: number;\n  /** Called once per catalog when its status is decided (`ok` as soon as it is reached). */\n  onStatus?: (report: CatalogReport) => void;\n  /**\n   * Translate mode: every value passes through here after the packs (the marker of\n   * stringPackTranslate.ts), and the catalog is hooked even without a usable pack.\n   */\n  mark?: (id: string, value: unknown) => unknown;\n};\n\ntype TimerWindow = { setTimeout(handler: () => void, ms: number): unknown; clearTimeout(id: never): void };\n\n/**\n * Installs the adapters that have at least one usable pack. A catalog without packs is not hooked\n * (the site runs untouched), so its status stays `pending`.\n */\nexport function installStringPacks(win: Window, setups: readonly CatalogSetup[], options: StringPacksOptions = {}): StringPacksHandle {\n  const timers = win as unknown as TimerWindow;\n  const states = setups.map(setup => {\n    const packs: CompiledPack[] = [];\n    const refused: string[] = [];\n    for (const document of setup.packs) {\n      try {\n        packs.push(compilePack(document, setup.inventory));\n      } catch (error) {\n        refused.push(error instanceof Error ? error.message : String(error));\n      }\n    }\n    const usable = packs.filter(pack => pack.values.size > 0);\n    return {\n      catalog: setup.adapter.catalog, adapter: setup.adapter, packs, refused, usable,\n      engine: usable.length || options.mark ? createStringEngine(setup.inventory, usable) : null,\n      seen: {} as Record<string, number>, languages: new Set<string>(), keys: 0, settled: false, told: false,\n      remove: null as null | (() => void),\n    };\n  });\n  type State = (typeof states)[number];\n\n  const status = (state: State): HookStatus => {\n    if (state.languages.size && state.keys > 0) return 'ok';\n    if (!state.settled) return 'pending';\n    return Object.keys(state.seen).length ? 'not-matched' : 'no-catalog';\n  };\n  const reportOf = (state: State): CatalogReport => ({\n    catalog: state.catalog,\n    status: status(state),\n    languages: [...state.languages],\n    seen: { ...state.seen },\n    packs: state.packs.map(pack => ({ name: pack.name, language: pack.language, report: pack.report })),\n    refused: [...state.refused],\n    engine: state.engine?.stats() ?? { seen: 0, applied: 0, unlisted: [], mismatched: [] },\n  });\n  const tell = (state: State) => {\n    if (state.told || status(state) === 'pending') return;\n    state.told = true;\n    try { options.onStatus?.(reportOf(state)); } catch { /* a reporter must not break the page */ }\n  };\n\n  for (const state of states) {\n    const engine = state.engine;\n    if (!engine) continue;\n    const sink: CatalogSink = {\n      seen(group = 'main') { state.seen[group] = (state.seen[group] ?? 0) + 1; },\n      matched(language) { state.languages.add(String(language)); },\n      resolve(id, original) {\n        try {\n          state.keys += 1;\n          const resolved = engine.resolve(id, original);\n          const value = options.mark ? options.mark(id, resolved) : resolved;\n          if (state.keys === 1) tell(state);\n          return value;\n        } catch {\n          return original;\n        }\n      },\n    };\n    try {\n      state.remove = state.adapter.install(win, sink);\n    } catch {\n      state.remove = null;\n    }\n  }\n\n  const hooked = states.filter(state => state.engine);\n  const timer = hooked.length\n    ? timers.setTimeout(() => { for (const state of hooked) { state.settled = true; tell(state); } }, options.settleMs ?? 15000)\n    : null;\n\n  return {\n    status: catalog => {\n      const state = catalog ? states.find(item => item.catalog === catalog) : hooked[0] ?? states[0];\n      return state ? status(state) : 'pending';\n    },\n    report: () => states.map(reportOf),\n    engine: catalog => states.find(item => item.catalog === catalog)?.engine ?? undefined,\n    dispose() {\n      if (timer !== null) timers.clearTimeout(timer as never);\n      for (const state of states) {\n        try { state.remove?.(); } catch { /* the hook is gone either way */ }\n        state.remove = null;\n      }\n    },\n  };\n}\n\n// -------------------------------------------------------------------------------------------\n// A webpack chunk array as the hook point\n//\n// A webpack site loads its code as chunks pushed onto a global array\n// (`(globalThis.webpackChunk_x ||= []).push([ids, modules, runtime?])`); webpack's runtime later\n// replaces the array's `push` with its own and replays what is already there. Watching the array\n// therefore sees every chunk before its modules are installed, whichever loads first.\n\ntype Chunk = [unknown, Record<string, unknown> | unknown[], ...unknown[]];\n\n/**\n * Calls `onChunk(chunk, script)` for every chunk pushed onto `win[name]`, before the site's own\n * `push` gets it; `script` is the URL of the script doing the push (`''` when unknown). Install at\n * document start. The array and webpack's own `push` replacement keep working unchanged: the\n * wrapper calls exactly the `push` that was current when it was read, with the same arguments. An\n * exception in `onChunk` is swallowed. Returns the removal.\n */\nexport function watchChunkArray(win: object, name: string, onChunk: (chunk: Chunk, script: string) => void): () => void {\n  const holder = win as Record<string, unknown> & { document?: { currentScript?: { src?: string } | null } };\n  const existing = holder[name];\n  const array: unknown[] = Array.isArray(existing) ? existing : [];\n  if (!Array.isArray(existing)) holder[name] = array;\n  const done = new WeakSet<object>();\n  let current: (...items: unknown[]) => number = array.push;\n  let active = true;\n  const look = (items: ArrayLike<unknown>) => {\n    if (!active) return;\n    for (let index = 0; index < items.length; index += 1) {\n      const chunk = items[index];\n      if (typeof chunk !== 'object' || chunk === null || done.has(chunk)) continue;\n      done.add(chunk);\n      try {\n        onChunk(chunk as Chunk, holder.document?.currentScript?.src ?? '');\n      } catch {\n        // Fail open: the chunk goes on to the site exactly as it came.\n      }\n    }\n  };\n  try {\n    Object.defineProperty(array, 'push', {\n      configurable: true,\n      enumerable: false,\n      get() {\n        const target = current;\n        return function push(this: unknown, ...items: unknown[]) {\n          look(items);\n          return target.apply(this, items);\n        };\n      },\n      set(next: (...items: unknown[]) => number) { current = next; },\n    });\n  } catch {\n    return () => {};\n  }\n  return () => {\n    active = false;\n    try {\n      if (current === Array.prototype.push) delete (array as { push?: unknown }).push;\n      else Object.defineProperty(array, 'push', { configurable: true, enumerable: false, writable: true, value: current });\n    } catch {\n      // Left as the pass-through wrapper.\n    }\n  };\n}\n\n/**\n * Wraps the module factories of one chunk so that what they `require` passes through `map`:\n * `map(exports)` returns a replacement for that one call, or `undefined` to hand out the module's\n * own exports. The module itself is never changed (return a shadow, e.g. `Object.create(exports)`).\n * Only call this for a chunk you have identified; other chunks must stay untouched.\n */\nexport function mapChunkRequires(chunk: Chunk, map: (exports: unknown) => unknown): void {\n  const modules = chunk[1];\n  if (typeof modules !== 'object' || modules === null) return;\n  const table = modules as Record<string, unknown>;\n  for (const id of Object.keys(table)) {\n    const factory = table[id];\n    if (typeof factory !== 'function') continue;\n    table[id] = function (this: unknown, module: unknown, exports: unknown, require: unknown, ...rest: unknown[]) {\n      let through = require;\n      if (typeof require === 'function') {\n        try {\n          through = new Proxy(require, {\n            apply(target, self, args) {\n              const result = Reflect.apply(target as (...a: unknown[]) => unknown, self, args);\n              try {\n                const replaced = map(result);\n                return replaced === undefined ? result : replaced;\n              } catch {\n                return result;\n              }\n            },\n          });\n        } catch {\n          through = require;\n        }\n      }\n      return (factory as (...a: unknown[]) => unknown).call(this, module, exports, through, ...rest);\n    };\n  }\n}\n"]}
+{"version":3,"file":"stringPackHook.js","sourceRoot":"","sources":["../../../runtime/src/stringPackHook.ts"],"names":[],"mappings":"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","sourcesContent":["// String packs in the page (published as `waybetter/runtime/stringPackHook`): the per-site\n// \"catalog hook adapter\" interface, the installer that connects adapters to the engine of\n// stringPacks.ts, a self-check that says when a hook did not match, and the generic half of a\n// common hook point (a webpack chunk array).\n//\n// How a site hands its strings to its own code is that site's implementation detail, so the hook\n// is an adapter the app supplies. One site can have several catalogs (different builds of the\n// site, different key spaces); each gets its own adapter, inventory and packs.\n//\n// Everything here fails open: an exception inside a wrapper leaves the site's own behaviour as it\n// was, and with no pack installed nothing is hooked at all.\nimport {\n  compilePack, createStringEngine, type CompiledPack, type EngineStats, type PackReport, type PageInventory, type StringEngine,\n  type StringInventory,\n} from './stringPacks.ts';\n\n// -------------------------------------------------------------------------------------------\n// The adapter interface\n\n/** What an adapter reports to and asks from the framework. None of these throw. */\nexport type CatalogSink = {\n  /** A catalog file of this adapter was seen loading (whether or not the hook then matches). */\n  seen(group?: string): void;\n  /** The hook matched: the site is about to register values in `language`. */\n  matched(language: string, group?: string): void;\n  /** The value to register for `id`: a pack's, or exactly `original`. */\n  resolve(id: string, original: unknown): unknown;\n};\n\nexport type CatalogHookAdapter = {\n  /** The catalog (key space) this adapter hooks; packs and the inventory name the same one. */\n  catalog: string;\n  /** Installs the hook at document start; returns its removal. Must not change the site's objects. */\n  install(win: Window, sink: CatalogSink): () => void;\n};\n\nexport type CatalogSetup = {\n  adapter: CatalogHookAdapter;\n  inventory: StringInventory | PageInventory;\n  /** Pack documents in application order (a later one wins). Untrusted data: validated here. */\n  packs: readonly unknown[];\n};\n\n/**\n * `ok`: the hook matched and keys went through it.\n * `not-matched`: a catalog file was seen but the hook did not match it (the site changed).\n * `no-catalog`: no catalog file was seen at all (another build of the site, or not loaded yet).\n */\nexport type HookStatus = 'pending' | 'ok' | 'not-matched' | 'no-catalog';\n\nexport type CatalogReport = {\n  catalog: string;\n  status: HookStatus;\n  /** Languages the site registered through the hook. */\n  languages: string[];\n  /** Catalog files seen, per group. */\n  seen: Record<string, number>;\n  packs: { name: string; language: string; report: PackReport }[];\n  /** Pack documents that were refused as a whole. */\n  refused: string[];\n  engine: EngineStats;\n};\n\nexport type StringPacksHandle = {\n  status(catalog?: string): HookStatus;\n  report(): CatalogReport[];\n  /** The engines, per catalog (the originals they keep are what a restore needs). */\n  engine(catalog: string): StringEngine | undefined;\n  dispose(): void;\n};\n\nexport type StringPacksOptions = {\n  /** When the self-check decides (default 15 s after install). */\n  settleMs?: number;\n  /** Called once per catalog when its status is decided (`ok` as soon as it is reached). */\n  onStatus?: (report: CatalogReport) => void;\n  /**\n   * Translate mode: every value passes through here after the packs (the marker of\n   * stringPackTranslate.ts), and the catalog is hooked even without a usable pack.\n   */\n  mark?: (id: string, value: unknown) => unknown;\n};\n\ntype TimerWindow = { setTimeout(handler: () => void, ms: number): unknown; clearTimeout(id: never): void };\n\n/**\n * Installs the adapters that have at least one usable pack. A catalog without packs is not hooked\n * (the site runs untouched), so its status stays `pending`.\n */\nexport function installStringPacks(win: Window, setups: readonly CatalogSetup[], options: StringPacksOptions = {}): StringPacksHandle {\n  const timers = win as unknown as TimerWindow;\n  const states = setups.map(setup => {\n    const packs: CompiledPack[] = [];\n    const refused: string[] = [];\n    for (const document of setup.packs) {\n      try {\n        packs.push(compilePack(document, setup.inventory));\n      } catch (error) {\n        refused.push(error instanceof Error ? error.message : String(error));\n      }\n    }\n    const usable = packs.filter(pack => pack.values.size > 0 || pack.rewrite);\n    return {\n      catalog: setup.adapter.catalog, adapter: setup.adapter, packs, refused, usable,\n      engine: usable.length || options.mark ? createStringEngine(setup.inventory, usable) : null,\n      seen: {} as Record<string, number>, languages: new Set<string>(), keys: 0, settled: false, told: false,\n      remove: null as null | (() => void),\n    };\n  });\n  type State = (typeof states)[number];\n\n  const status = (state: State): HookStatus => {\n    if (state.languages.size && state.keys > 0) return 'ok';\n    if (!state.settled) return 'pending';\n    return Object.keys(state.seen).length ? 'not-matched' : 'no-catalog';\n  };\n  const reportOf = (state: State): CatalogReport => ({\n    catalog: state.catalog,\n    status: status(state),\n    languages: [...state.languages],\n    seen: { ...state.seen },\n    packs: state.packs.map(pack => ({ name: pack.name, language: pack.language, report: pack.report })),\n    refused: [...state.refused],\n    engine: state.engine?.stats() ?? { seen: 0, applied: 0, unlisted: [], mismatched: [] },\n  });\n  const tell = (state: State) => {\n    if (state.told || status(state) === 'pending') return;\n    state.told = true;\n    try { options.onStatus?.(reportOf(state)); } catch { /* a reporter must not break the page */ }\n  };\n\n  for (const state of states) {\n    const engine = state.engine;\n    if (!engine) continue;\n    const sink: CatalogSink = {\n      seen(group = 'main') { state.seen[group] = (state.seen[group] ?? 0) + 1; },\n      matched(language) { state.languages.add(String(language)); engine.setLanguage(String(language)); },\n      resolve(id, original) {\n        try {\n          state.keys += 1;\n          const resolved = engine.resolve(id, original);\n          const value = options.mark ? options.mark(id, resolved) : resolved;\n          if (state.keys === 1) tell(state);\n          return value;\n        } catch {\n          return original;\n        }\n      },\n    };\n    try {\n      state.remove = state.adapter.install(win, sink);\n    } catch {\n      state.remove = null;\n    }\n  }\n\n  const hooked = states.filter(state => state.engine);\n  const timer = hooked.length\n    ? timers.setTimeout(() => { for (const state of hooked) { state.settled = true; tell(state); } }, options.settleMs ?? 15000)\n    : null;\n\n  return {\n    status: catalog => {\n      const state = catalog ? states.find(item => item.catalog === catalog) : hooked[0] ?? states[0];\n      return state ? status(state) : 'pending';\n    },\n    report: () => states.map(reportOf),\n    engine: catalog => states.find(item => item.catalog === catalog)?.engine ?? undefined,\n    dispose() {\n      if (timer !== null) timers.clearTimeout(timer as never);\n      for (const state of states) {\n        try { state.remove?.(); } catch { /* the hook is gone either way */ }\n        state.remove = null;\n      }\n    },\n  };\n}\n\n// -------------------------------------------------------------------------------------------\n// A webpack chunk array as the hook point\n//\n// A webpack site loads its code as chunks pushed onto a global array\n// (`(globalThis.webpackChunk_x ||= []).push([ids, modules, runtime?])`); webpack's runtime later\n// replaces the array's `push` with its own and replays what is already there. Watching the array\n// therefore sees every chunk before its modules are installed, whichever loads first.\n\ntype Chunk = [unknown, Record<string, unknown> | unknown[], ...unknown[]];\n\n/**\n * Calls `onChunk(chunk, script)` for every chunk pushed onto `win[name]`, before the site's own\n * `push` gets it; `script` is the URL of the script doing the push (`''` when unknown). Install at\n * document start. The array and webpack's own `push` replacement keep working unchanged: the\n * wrapper calls exactly the `push` that was current when it was read, with the same arguments. An\n * exception in `onChunk` is swallowed. Returns the removal.\n */\nexport function watchChunkArray(win: object, name: string, onChunk: (chunk: Chunk, script: string) => void): () => void {\n  const holder = win as Record<string, unknown> & { document?: { currentScript?: { src?: string } | null } };\n  const existing = holder[name];\n  const array: unknown[] = Array.isArray(existing) ? existing : [];\n  if (!Array.isArray(existing)) holder[name] = array;\n  const done = new WeakSet<object>();\n  let current: (...items: unknown[]) => number = array.push;\n  let active = true;\n  const look = (items: ArrayLike<unknown>) => {\n    if (!active) return;\n    for (let index = 0; index < items.length; index += 1) {\n      const chunk = items[index];\n      if (typeof chunk !== 'object' || chunk === null || done.has(chunk)) continue;\n      done.add(chunk);\n      try {\n        onChunk(chunk as Chunk, holder.document?.currentScript?.src ?? '');\n      } catch {\n        // Fail open: the chunk goes on to the site exactly as it came.\n      }\n    }\n  };\n  try {\n    Object.defineProperty(array, 'push', {\n      configurable: true,\n      enumerable: false,\n      get() {\n        const target = current;\n        return function push(this: unknown, ...items: unknown[]) {\n          look(items);\n          return target.apply(this, items);\n        };\n      },\n      set(next: (...items: unknown[]) => number) { current = next; },\n    });\n  } catch {\n    return () => {};\n  }\n  return () => {\n    active = false;\n    try {\n      if (current === Array.prototype.push) delete (array as { push?: unknown }).push;\n      else Object.defineProperty(array, 'push', { configurable: true, enumerable: false, writable: true, value: current });\n    } catch {\n      // Left as the pass-through wrapper.\n    }\n  };\n}\n\n/**\n * Wraps the module factories of one chunk so that what they `require` passes through `map`:\n * `map(exports)` returns a replacement for that one call, or `undefined` to hand out the module's\n * own exports. The module itself is never changed (return a shadow, e.g. `Object.create(exports)`).\n * Only call this for a chunk you have identified; other chunks must stay untouched.\n */\nexport function mapChunkRequires(chunk: Chunk, map: (exports: unknown) => unknown): void {\n  const modules = chunk[1];\n  if (typeof modules !== 'object' || modules === null) return;\n  const table = modules as Record<string, unknown>;\n  for (const id of Object.keys(table)) {\n    const factory = table[id];\n    if (typeof factory !== 'function') continue;\n    table[id] = function (this: unknown, module: unknown, exports: unknown, require: unknown, ...rest: unknown[]) {\n      let through = require;\n      if (typeof require === 'function') {\n        try {\n          through = new Proxy(require, {\n            apply(target, self, args) {\n              const result = Reflect.apply(target as (...a: unknown[]) => unknown, self, args);\n              try {\n                const replaced = map(result);\n                return replaced === undefined ? result : replaced;\n              } catch {\n                return result;\n              }\n            },\n          });\n        } catch {\n          through = require;\n        }\n      }\n      return (factory as (...a: unknown[]) => unknown).call(this, module, exports, through, ...rest);\n    };\n  }\n}\n"]}

package/dist/runtime/stringPackTranslate.d.ts

@@ -31,6 +31,7 @@ export type TranslateWords = {
     key: string;
     original: string;
     parameters: string;
+    plural: string;
     save: string;
     cancel: string;
     remove: string;
@@ -44,7 +45,8 @@ export type TranslateUiOptions = {
     marker: Marker;
     site: string;
     catalog: string;
-    words?: Partial<TranslateWords>;
+    /** The bar's and the editor's words; a function is asked again each time they are drawn (the app's language may change). */
+    words?: Partial<TranslateWords> | (() => Partial<TranslateWords>);
     /** Leaves translate mode (the app drops the flag and reloads). */
     exit(): void;
 };

package/dist/runtime/stringPackTranslate.js

@@ -85,7 +85,7 @@ export function checkEdit(lookup, id, value) {
 export const TRANSLATE_WORDS = {
     bar: 'Translate mode', hint: 'Click a word to change it.', edits: count => `${count} ${count === 1 ? 'edit' : 'edits'}`,
     exportPack: 'Copy pack file', copied: 'Pack file copied', exit: 'Leave', reload: 'Reload to see it',
-    key: 'Key', original: 'Now', parameters: 'Parameters', save: 'Save', cancel: 'Cancel', remove: 'Remove edit',
+    key: 'Key', original: 'Now', parameters: 'Parameters', plural: 'plural', save: 'Save', cancel: 'Cancel', remove: 'Remove edit',
     notTranslatable: 'This string cannot be changed by a pack yet.', choose: 'Which one?',
 };
 const CSS = `
@@ -108,7 +108,7 @@ button.primary { background: #2563eb; }
  */
 export function installTranslateUi(win, options) {
     const doc = win.document;
-    const words = { ...TRANSLATE_WORDS, ...options.words };
+    const currentWords = () => ({ ...TRANSLATE_WORDS, ...(typeof options.words === 'function' ? options.words() : options.words) });
     const lookup = inventoryLookup(options.inventory);
     const storage = win.sessionStorage;
     const draft = () => readDraft(storage) ?? { language: '', name: '', strings: {} };
@@ -135,6 +135,7 @@ export function installTranslateUi(win, options) {
         return el;
     };
     const renderBar = () => {
+        const words = currentWords();
         bar.replaceChildren();
         const title = doc.createElement('b');
         title.textContent = words.bar;
@@ -151,6 +152,7 @@ export function installTranslateUi(win, options) {
     };
     const closePop = () => { pop?.remove(); pop = null; };
     const edit = (id, x, y, now) => {
+        const words = currentWords();
         closePop();
         pop = doc.createElement('div');
         pop.className = 'pop';
@@ -174,7 +176,7 @@ export function installTranslateUi(win, options) {
         }
         if (shape.params?.length) {
             const params = doc.createElement('small');
-            params.textContent = `${words.parameters}: ${shape.params.map(name => `{${name}}${shape.plural?.includes(name) ? ' (plural)' : ''}`).join(', ')}`;
+            params.textContent = `${words.parameters}: ${shape.params.map(name => `{${name}}${shape.plural?.includes(name) ? ` (${words.plural})` : ''}`).join(', ')}`;
             pop.append(params);
         }
         const input = doc.createElement('textarea');
@@ -215,6 +217,7 @@ export function installTranslateUi(win, options) {
         return [];
     };
     const onClick = (event) => {
+        const words = currentWords();
         if (event.composedPath().includes(host))
             return;
         const found = keysAt(event.target);