@rom-weaver/cli 0.15.1 → 0.16.1

package/docs/completions/rom-weaver.elv

@@ -18,14 +18,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
     }
     var completions = [
         &'rom-weaver'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -35,41 +39,81 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --help 'Print help (see more with ''--help'')'
             cand -V 'Print version'
             cand --version 'Print version'
+            cand setup 'Install the offline identify database'
+            cand ingest 'Sort a file into ROMs and patches, unpacking and hashing along the way'
+            cand cheat 'List the cheat database''s entries for a ROM'
+            cand bundle 'Build and read rom-weaver-bundle.json patch recipes'
+            cand plan-extract-batch 'Plan a memory-/thread-aware concurrent extraction schedule from per-job source sizes (no I/O)'
+            cand completions 'Print a tab-completion script for your shell'
+            cand man 'Print or install the generated CLI man pages'
+            cand formats 'List the formats, codecs, and checksum algorithms this build supports'
             cand probe 'Identify a file: its format, its platform, and any header it carries'
             cand inspect 'Identify a file: its format, its platform, and any header it carries'
-            cand extract 'Unpack an archive or single-payload compressed format'
             cand checksum 'Compute checksums for a file, or for a ROM inside an archive'
             cand identify 'Identify a ROM title from its checksums'
-            cand setup 'Install the offline identify database'
-            cand ingest 'Sort a file into ROMs and patches, unpacking and hashing along the way'
+            cand extract 'Unpack an archive or single-payload compressed format'
             cand compress 'Pack files into an archive, disc image, or ROM-specific compressed format'
             cand trim 'Cut the padding off a ROM, or put it back'
+            cand weave 'Apply one or more patches to a ROM, in order (same as `patch apply`)'
             cand patch 'Apply, create, or check ROM patches'
-            cand bundle 'Build and read rom-weaver-bundle.json patch recipes'
+            cand save 'Inspect and edit supported persistent game saves'
             cand tools 'One-off recovery tools'
-            cand plan-extract-batch 'Plan a memory-/thread-aware concurrent extraction schedule from per-job source sizes (no I/O)'
-            cand weave 'Apply one or more patches to a ROM, in order (same as `patch apply`)'
-            cand completions 'Print a tab-completion script for your shell'
-            cand man 'Print or install the generated CLI man pages'
-            cand formats 'List the formats, codecs, and checksum algorithms this build supports'
             cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;probe'= {
-            cand -i 'File to identify. Use - to read from stdin'
-            cand --input 'File to identify. Use - to read from stdin'
-            cand -s 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
-            cand --select 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
-            cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --no-extract 'Do not look inside archives; identify the file itself'
+        &'rom-weaver;setup'= {
+            cand --database-dir 'Install into this directory instead of the per-user data directory'
+            cand --from 'Local rom-weaver-identify-data.tar.br; omit to download the archive for this version'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --force 'Download the database again even when it is already installed'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;ingest'= {
+            cand -i 'File to sort into ROMs and patches'
+            cand --input 'File to sort into ROMs and patches'
+            cand -o 'Directory to write anything unpacked along the way into'
+            cand --output 'Directory to write anything unpacked along the way into'
+            cand -d 'RWFP1 identify pack, raw or Brotli, for ROM titles (repeatable; native defaults to built-in data)'
+            cand --database 'RWFP1 identify pack, raw or Brotli, for ROM titles (repeatable; native defaults to built-in data)'
+            cand -s 'Pick which ROM to use when the archive holds more than one, by exact name, prefix, or glob (repeatable)'
+            cand --select 'Pick which ROM to use when the archive holds more than one, by exact name, prefix, or glob (repeatable)'
+            cand --sidecar-name 'Optional loose patch names to match against `source` without ingesting it. This keeps the browser''s sibling-sidecar lookup on the ingest command surface while reusing Rust''s matcher'
+            cand --split-bin 'For a multi-track CD-format CHD, write one BIN per track (--split-bin) or one merged BIN (--split-bin false). Omit to be asked'
+            cand --checksum 'Which checksums to compute for each ROM found (repeatable, comma-separable) [default: crc32,md5,sha1]'
+            cand --algo 'Which checksums to compute for each ROM found (repeatable, comma-separable) [default: crc32,md5,sha1]'
+            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --sidecar-only 'sidecar-only'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --no-nested-extract 'Stop after one layer; leave any archive found inside the input packed'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -78,22 +122,298 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand -h 'Print help (see more with ''--help'')'
             cand --help 'Print help (see more with ''--help'')'
         }
-        &'rom-weaver;inspect'= {
-            cand -i 'File to identify. Use - to read from stdin'
-            cand --input 'File to identify. Use - to read from stdin'
+        &'rom-weaver;cheat'= {
+            cand -i 'The ROM the cheats are for. Its header picks the cheat shard and its bytes decide each cheat''s delivery'
+            cand --input 'The ROM the cheats are for. Its header picks the cheat shard and its bytes decide each cheat''s delivery'
+            cand --cheat 'Database cheat to use, by record ID or exact description. Repeat for each cheat'
+            cand --cheat-database 'Directory holding manifest.json and the <system>.json cheat shards. Defaults to $ROM_WEAVER_CHEAT_DATABASE, then the per-user data directory'
+            cand --cheat-system 'Console the cheat shard is for (nes, snes, genesis, gameboy, gameboy-color, gba), when the ROM header does not say'
+            cand --game 'Use this database game ID instead of matching the ROM by checksum or title'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --allow-cheat-conflicts 'Let a later cheat overwrite an earlier one at the same offset instead of failing'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;bundle'= {
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help'
+            cand --help 'Print help'
+            cand create 'Write a rom-weaver-bundle.json recipe from local ROM and patch files'
+            cand parse 'Read a rom-weaver-bundle.json recipe and report what it points at'
+            cand schema 'Print the rom-weaver-bundle.json JSON Schema, for editors and hand-authoring'
+            cand help 'Print this message or the help of the given subcommand(s)'
+        }
+        &'rom-weaver;bundle;create'= {
+            cand -i 'ROM the patches apply to. Its checksums and size are read from the file and recorded in the bundle'
+            cand --input 'ROM the patches apply to. Its checksums and size are read from the file and recorded in the bundle'
+            cand --assume-in 'Take the ROM''s checksum and size on trust rather than reading it, as in crc32=1234abcd,size=1048576 (repeatable, comma-separable)'
+            cand --rom-url 'Where the ROM can be downloaded from. With --input, the local file still supplies the checksums; on its own, the bundle records only this url'
+            cand --rom-name 'Expected source ROM file name to show and use for output naming; a mismatch is advisory'
+            cand --rom-member 'Use this exact archive member or disc track as the bundle ROM target'
+            cand --patch 'Patch to list in the bundle. Repeat once per patch, in the order they should be applied'
+            cand --patch-id 'Identifier for the preceding --patch that stays the same across releases, so a replacement keeps its settings'
+            cand --patch-version 'Version of the preceding --patch, in whatever form its author uses'
+            cand --patch-name 'Name to show for the preceding --patch'
+            cand --patch-description 'What the preceding --patch does'
+            cand --patch-author 'Who made the preceding --patch'
+            cand --patch-label 'Short status note for the preceding --patch, such as beta or recommended'
+            cand --patch-optional 'Mark the preceding --patch optional, so it starts switched off and needs --with to run'
+            cand --patch-source-url 'Where the preceding --patch can be downloaded from. The local file is still read to build the bundle'
+            cand --patch-header 'Whether the preceding --patch applies to the ROM with or without its copier header: auto, keep, or strip'
+            cand --patch-basis 'Override the preceding --patch input rule: base or previous. Use auto to inherit the bundle rule'
+            cand --default-patch-basis 'Shared input ROM rule recorded in the v2 bundle: auto, base, or previous [default: auto]'
+            cand --patch-expect-in 'Checksum the ROM should have before the preceding --patch runs. Recorded only when it differs from the bundle''s ROM checksums (repeatable, comma-separable)'
+            cand --patch-expect-out 'Checksum the ROM should have after the preceding --patch runs. Recorded only when it differs from the final output checksums (repeatable, comma-separable)'
+            cand --expect-out 'Checksum the ROM should have once every patch has run, so users can confirm they got the right result (repeatable, comma-separable)'
+            cand --output-name 'File name the bundle suggests for the patched ROM'
+            cand --output-header 'Whether the patched ROM should keep its copier header: auto, keep, or strip'
+            cand --cheat 'Database cheat to use, by record ID or exact description. Repeat for each cheat'
+            cand --cheat-database 'Directory holding manifest.json and the <system>.json cheat shards. Defaults to $ROM_WEAVER_CHEAT_DATABASE, then the per-user data directory'
+            cand --cheat-system 'Console the cheat shard is for (nes, snes, genesis, gameboy, gameboy-color, gba), when the ROM header does not say'
+            cand --game 'Use this database game ID instead of matching the ROM by checksum or title'
+            cand -o 'Where to write the bundle. Name it rom-weaver-bundle.json, or add .gz or .zst to compress it'
+            cand --output 'Where to write the bundle. Name it rom-weaver-bundle.json, or add .gz or .zst to compress it'
+            cand --bundle 'Also pack the bundle and its ROM and patches into one shareable archive, such as release.zip'
+            cand --bundle-rom 'Pack this file into --bundle as the ROM, while --input supplies the checksums and metadata'
+            cand --checksum 'Which checksums to record for the ROM (repeatable, comma-separable) [default: crc32,md5,sha1]'
+            cand --algo 'Which checksums to record for the ROM (repeatable, comma-separable) [default: crc32,md5,sha1]'
+            cand --from 'Build the bundle from a hand-written rom-weaver-bundle.json instead of flags. Use - to read it from stdin'
+            cand --schema-ref 'Record this $schema URL in the bundle so editors can validate it. Left out unless asked for'
+            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --allow-cheat-conflicts 'Let a later cheat overwrite an earlier one at the same offset instead of failing'
+            cand --no-bundle-rom 'Keep the ROM out of --bundle and record only its checksums, so whoever applies the bundle brings their own copy'
+            cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;bundle;parse'= {
+            cand -i 'Bundle file, or an archive with a bundle at its root'
+            cand --input 'Bundle file, or an archive with a bundle at its root'
+            cand -s 'Handle only the bundle entries whose file name matches this exact name, prefix, or glob (repeatable)'
+            cand --select 'Handle only the bundle entries whose file name matches this exact name, prefix, or glob (repeatable)'
+            cand --filter 'Handle only the bundle''s rom entry or only its patch entries (repeatable, comma-separable)'
+            cand -o 'Directory to unpack the bundle''s files into. Without it, files packed in an archive are listed but not written out'
+            cand --output 'Directory to unpack the bundle''s files into. Without it, files packed in an archive are listed but not written out'
+            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --no-extract 'Report what the bundle contains without unpacking any of it'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;bundle;schema'= {
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;bundle;help'= {
+            cand create 'Write a rom-weaver-bundle.json recipe from local ROM and patch files'
+            cand parse 'Read a rom-weaver-bundle.json recipe and report what it points at'
+            cand schema 'Print the rom-weaver-bundle.json JSON Schema, for editors and hand-authoring'
+            cand help 'Print this message or the help of the given subcommand(s)'
+        }
+        &'rom-weaver;bundle;help;create'= {
+        }
+        &'rom-weaver;bundle;help;parse'= {
+        }
+        &'rom-weaver;bundle;help;schema'= {
+        }
+        &'rom-weaver;bundle;help;help'= {
+        }
+        &'rom-weaver;plan-extract-batch'= {
+            cand --job-size 'Source size in bytes for one job; repeat once per job, in input order'
+            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --max-concurrency 'Hard cap on jobs running at once; defaults to the thread budget'
+            cand --total-memory-bytes 'Total memory budget concurrent jobs may reserve (e.g. browser device memory); defaults to the platform''s physical memory'
+            cand --memory-ceiling-bytes 'Combined working-set ceiling to plan against, used verbatim (no fraction/clamp). The browser passes its own resolved, mobile-capped ceiling here; when set it overrides --total-memory-bytes'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help'
+            cand --help 'Print help'
+        }
+        &'rom-weaver;completions'= {
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;man'= {
+            cand --man-dir 'Directory to install pages into'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --install 'Install the generated pages instead of printing one'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;formats'= {
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;probe'= {
             cand -s 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
             cand --select 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
             cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand -i 'File to identify. Use - to read from stdin'
+            cand --input 'File to identify. Use - to read from stdin'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --no-extract 'Do not look inside archives; identify the file itself'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -102,32 +422,26 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand -h 'Print help (see more with ''--help'')'
             cand --help 'Print help (see more with ''--help'')'
         }
-        &'rom-weaver;extract'= {
-            cand -i 'Archive or single-payload compressed format to unpack'
-            cand --input 'Archive or single-payload compressed format to unpack'
-            cand -s 'Extract only these files, by exact name, prefix, or glob (repeatable). For example: --select ''game.disc0?.bin'''
-            cand --select 'Extract only these files, by exact name, prefix, or glob (repeatable). For example: --select ''game.disc0?.bin'''
-            cand --filter 'Extract only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
-            cand -o 'Directory to write the extracted files into'
-            cand --output 'Directory to write the extracted files into'
-            cand --checksum 'Also hash every extracted file (repeatable, comma-separable)'
-            cand --algo 'Also hash every extracted file (repeatable, comma-separable)'
-            cand --checksum-rom 'Like --checksum, but hash only the ROMs and skip sidecar files. Cannot be combined with --checksum'
-            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --split-bin 'Write a CD-format CHD as a CUE plus one BIN per track (*.trackNN.bin), rather than one merged BIN'
+        &'rom-weaver;inspect'= {
+            cand -s 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
+            cand --select 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
+            cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
+            cand -i 'File to identify. Use - to read from stdin'
+            cand --input 'File to identify. Use - to read from stdin'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --no-extract 'Do not look inside archives; identify the file itself'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
-            cand --no-nested-extract 'Stop after one layer; leave any archive found inside the input packed'
-            cand --force 'Overwrite files already in the output directory (without this, extraction stops instead)'
-            cand --probe 'Also report the format and platform of what was extracted, and fail if a lone payload matches no known platform'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -137,8 +451,6 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --help 'Print help (see more with ''--help'')'
         }
         &'rom-weaver;checksum'= {
-            cand -i 'File to hash. Use - to read from stdin'
-            cand --input 'File to hash. Use - to read from stdin'
             cand -a 'Which checksum to compute (repeatable, comma-separable)'
             cand --algo 'Which checksum to compute (repeatable, comma-separable)'
             cand --checksum 'Which checksum to compute (repeatable, comma-separable)'
@@ -149,18 +461,25 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --length 'How many bytes to hash from --start. Defaults to the rest of the file'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand -i 'File to hash. Use - to read from stdin'
+            cand --input 'File to hash. Use - to read from stdin'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --no-extract 'Do not look inside archives; hash the file itself'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
             cand --no-trim-fix 'Skip the extra checksums computed for how a trimmable ROM would hash trimmed or untrimmed'
             cand --probe 'Also report the platform of the hashed bytes, and fail if it matches no known platform'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --digest 'Print only the digest; requires one --algo (no labels or elapsed time)'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -177,25 +496,32 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand -d 'RWFP1 identify pack, raw or Brotli, to search instead of the built-in data (repeatable)'
             cand --database 'RWFP1 identify pack, raw or Brotli, to search instead of the built-in data (repeatable)'
             cand --system 'Search only this system''s pack. Takes a canonical platform name or a common alias (e.g. `snes`, `psx`)'
+            cand --name 'Search the database for games whose name matches QUERY, instead of identifying a file or checksum'
+            cand --title-index 'Search a cross-platform title index with --name instead of database packs'
+            cand --limit 'Maximum number of matches --name returns [default: 50]'
             cand --database-dir 'Directory of installed identify packs (*.pack plus optional catalog.json). Defaults to the per-user data directory'
             cand -s 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
             cand --select 'Pick which file inside the archive to use, by exact name, prefix, or glob (repeatable)'
             cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --offline 'Assert that identify performs no network access (it never does natively; this flag records the guarantee)'
             cand --exhaustive-database-search 'Search every installed pack instead of only the packs the detected platform routes to'
             cand --no-extract 'Do not look inside archives; identify the file itself'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
             cand --no-trim-fix 'Skip extra checksums for trimmed and untrimmed ROM forms'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -207,14 +533,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand help 'Print this message or the help of the given subcommand(s)'
         }
         &'rom-weaver;identify;database'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -235,14 +565,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;identify;database;list'= {
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -253,14 +587,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;identify;database;status'= {
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -271,14 +609,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;identify;database;path'= {
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -289,14 +631,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;identify;database;remove'= {
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -307,14 +653,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;identify;database;import-redump'= {
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -325,14 +675,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;identify;database;install-all'= {
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -344,14 +698,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         &'rom-weaver;identify;database;install-group'= {
             cand --from 'Local group archive; omit to download the archive for this version'
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -363,15 +721,19 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         &'rom-weaver;identify;database;install'= {
             cand --from 'Local Redump DAT ZIP file; omit to download from Redump'
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --all 'Install every platform in the dump'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -383,14 +745,18 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         &'rom-weaver;identify;database;update'= {
             cand --from 'Local Redump DAT ZIP file; omit to download from Redump'
             cand --database-dir 'Identify database directory. Defaults to the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -466,51 +832,37 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;identify;help;help'= {
         }
-        &'rom-weaver;setup'= {
-            cand --database-dir 'Install into this directory instead of the per-user data directory'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --force 'Download the database again even when it is already installed'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
-            cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
-            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
-            cand --color 'Keep colors even when output is piped'
-            cand --no-color 'Turn colors off'
-            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
-        }
-        &'rom-weaver;ingest'= {
-            cand -i 'File to sort into ROMs and patches'
-            cand --input 'File to sort into ROMs and patches'
-            cand -o 'Directory to write anything unpacked along the way into'
-            cand --output 'Directory to write anything unpacked along the way into'
-            cand -d 'RWFP1 identify pack, raw or Brotli, for ROM titles (repeatable; native defaults to built-in data)'
-            cand --database 'RWFP1 identify pack, raw or Brotli, for ROM titles (repeatable; native defaults to built-in data)'
-            cand -s 'Pick which ROM to use when the archive holds more than one, by exact name, prefix, or glob (repeatable)'
-            cand --select 'Pick which ROM to use when the archive holds more than one, by exact name, prefix, or glob (repeatable)'
-            cand --sidecar-name 'Optional loose patch names to match against `source` without ingesting it. This keeps the browser''s sibling-sidecar lookup on the ingest command surface while reusing Rust''s matcher'
-            cand --split-bin 'For a multi-track CD-format CHD, write one BIN per track (--split-bin) or one merged BIN (--split-bin false). Omit to be asked'
-            cand --checksum 'Which checksums to compute for each ROM found (repeatable, comma-separable) [default: crc32,md5,sha1]'
-            cand --algo 'Which checksums to compute for each ROM found (repeatable, comma-separable) [default: crc32,md5,sha1]'
+        &'rom-weaver;extract'= {
+            cand -s 'Extract only these files, by exact name, prefix, or glob (repeatable). For example: --select ''game.disc0?.bin'''
+            cand --select 'Extract only these files, by exact name, prefix, or glob (repeatable). For example: --select ''game.disc0?.bin'''
+            cand --filter 'Extract only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
+            cand --checksum 'Also hash every extracted file (repeatable, comma-separable)'
+            cand --algo 'Also hash every extracted file (repeatable, comma-separable)'
+            cand --checksum-rom 'Like --checksum, but hash only the ROMs and skip sidecar files. Cannot be combined with --checksum'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --sidecar-only 'sidecar-only'
+            cand --stdin-name 'Filename for input - (default: stdin.bin); one filename, no directories'
+            cand -i 'Input path; - reads stdin using a temporary file'
+            cand --input 'Input path; - reads stdin using a temporary file'
+            cand -o 'Output path; - writes one binary result to stdout (compress requires --format)'
+            cand --output 'Output path; - writes one binary result to stdout (compress requires --format)'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --split-bin 'Write a CD-format CHD as a CUE plus one BIN per track (*.trackNN.bin), rather than one merged BIN'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
             cand --no-nested-extract 'Stop after one layer; leave any archive found inside the input packed'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --force 'Overwrite files already in the output directory (without this, extraction stops instead)'
+            cand --probe 'Also report the format and platform of what was extracted, and fail if a lone payload matches no known platform'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -520,27 +872,30 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --help 'Print help (see more with ''--help'')'
         }
         &'rom-weaver;compress'= {
-            cand -i 'File to put in the archive; repeat for each one. For a disc image, pass the .cue or .gdi alone and its tracks come along'
-            cand --input 'File to put in the archive; repeat for each one. For a disc image, pass the .cue or .gdi alone and its tracks come along'
             cand -f 'Output format, such as zip, 7z, chd, rvz, or z3ds [default: from the --output extension]'
             cand --format 'Output format, such as zip, 7z, chd, rvz, or z3ds [default: from the --output extension]'
-            cand -o 'Where to write the archive'
-            cand --output 'Where to write the archive'
             cand --codec 'Compression method to use, as codec or codec:level (repeatable, comma-separable)'
             cand --level 'How hard to compress: min, very-low, low, medium, high, very-high, or max'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand --stdin-name 'Filename for input - (default: stdin.bin); one filename, no directories'
+            cand -i 'Input path; - reads stdin using a temporary file'
+            cand --input 'Input path; - reads stdin using a temporary file'
+            cand -o 'Output path; - writes one binary result to stdout (compress requires --format)'
+            cand --output 'Output path; - writes one binary result to stdout (compress requires --format)'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
-            cand -n 'Print the plan (inputs, output, format, codec, level, threads) and stop without writing'
-            cand --dry-run 'Print the plan (inputs, output, format, codec, level, threads) and stop without writing'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -550,35 +905,37 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --help 'Print help (see more with ''--help'')'
         }
         &'rom-weaver;trim'= {
-            cand -i 'File or folder to trim. Repeat for each one'
-            cand --input 'File or folder to trim. Repeat for each one'
-            cand -o 'Where to write the trimmed file. Only valid with a single trimmable input'
-            cand --output 'Where to write the trimmed file. Only valid with a single trimmable input'
             cand -e 'Save next to each original under this extension. {ext} stands for the original one, as in trim.{ext}'
             cand --extension 'Save next to each original under this extension. {ext} stands for the original one, as in trim.{ext}'
             cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand -i 'File or folder to trim. Repeat for each one'
+            cand --input 'File or folder to trim. Repeat for each one'
+            cand -o 'Output path; - writes one completed binary file to stdout'
+            cand --output 'Output path; - writes one completed binary file to stdout'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --in-place 'Overwrite the original instead of writing a new file'
-            cand -n 'Report what would be trimmed without writing anything'
-            cand --dry-run 'Report what would be trimmed without writing anything'
             cand --revert 'Pad a trimmed file back to full size (NDS, GBA, and 3DS only)'
             cand --untrim 'Pad a trimmed file back to full size (NDS, GBA, and 3DS only)'
             cand --restore 'Pad a trimmed file back to full size (NDS, GBA, and 3DS only)'
             cand --no-recursive 'When an input is a folder, look only at its top level'
             cand --no-filter 'Consider every file inside an archive, not just the ones that look like ROMs'
             cand --no-extract 'Do not look inside archives; trim only the files named directly'
-            cand --revert-marker 'Add a small footer recording what was cut, so --revert can restore the original exactly'
-            cand --reversible 'Add a small footer recording what was cut, so --revert can restore the original exactly'
+            cand --revert-marker 'Add a footer with the original size and a fill byte for --revert'
+            cand --reversible 'Add a footer with the original size and a fill byte for --revert'
             cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -587,29 +944,7 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand -h 'Print help (see more with ''--help'')'
             cand --help 'Print help (see more with ''--help'')'
         }
-        &'rom-weaver;patch'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
-            cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
-            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
-            cand --color 'Keep colors even when output is piped'
-            cand --no-color 'Turn colors off'
-            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help'
-            cand --help 'Print help'
-            cand apply 'Apply one or more patches to a ROM, in order'
-            cand weave 'Apply one or more patches to a ROM, in order'
-            cand validate 'Check that patches would apply cleanly, without writing anything'
-            cand create 'Build a patch from an original ROM and a changed one'
-            cand help 'Print this message or the help of the given subcommand(s)'
-        }
-        &'rom-weaver;patch;apply'= {
+        &'rom-weaver;weave'= {
             cand -i 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
             cand --input 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
             cand -s 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
@@ -618,8 +953,6 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
             cand --patch 'Patch to apply. Repeat once per patch; they run in the order given'
             cand --patch-select 'Pick which file to use inside the --patch archive before it. Repeatable, one per --patch; falls back to --select'
-            cand -o 'Where to write the patched ROM. Optional when a bundle already names the output'
-            cand --output 'Where to write the patched ROM. Optional when a bundle already names the output'
             cand --bundle 'Follow a rom-weaver-bundle.json recipe: a file path, or an http(s) URL'
             cand --with 'Turn on a bundle patch the bundle leaves off by default, matched by name or file name (repeatable)'
             cand --without 'Turn off a bundle patch, matched by name or file name (repeatable)'
@@ -632,34 +965,47 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --assume-in 'Take this checksum on trust instead of reading the ROM to compute it, as in crc32=1234abcd (repeatable, comma-separable)'
             cand --expect-in 'Stop unless the ROM about to be patched has this checksum, as in crc32=1234abcd (repeatable, comma-separable)'
             cand --patch-header 'Whether a patch applies to the ROM with or without its copier header: auto, keep, or strip [default: auto]'
-            cand --patch-basis 'Which ROM the preceding --patch was built against: auto, base, or previous [default: auto]'
+            cand --patch-basis 'Override the preceding --patch input rule: auto, base, or previous'
+            cand --patch-input-check 'Expected input checks for the preceding patch (repeatable, comma-separable)'
+            cand --patch-output-check 'Expected output checks for the preceding patch (repeatable, comma-separable)'
+            cand --default-patch-basis 'Shared input ROM rule for every patch: auto, base, or previous [default: auto]'
             cand --output-header 'Whether the finished ROM keeps its copier header: auto, keep, or strip [default: auto]'
             cand --n64-byte-order 'Byte order to put an N64 ROM in for each patch: auto, keep, big-endian, little-endian, or byte-swapped [default: auto]'
             cand --expect-out 'Fail unless the patched ROM has this checksum, as in sha1=abc... (repeatable, comma-separable)'
             cand --code 'Game Genie or GameShark/Pro Action Replay code to bake into the ROM. Repeat for each code'
-            cand --code-system 'Console the --code values are for (nes, snes, genesis, gameboy, gba, psx), when the ROM header does not say'
+            cand --code-system 'Console the --code values are for (nes, snes, genesis, 32x, sms, gamegear, sg1000, gameboy, gba, psx), when the ROM header does not say'
             cand --code-kind 'Which cheat scheme the --code values use: auto, game-genie, gameshark/par, or xploder'
+            cand --cheat 'Database cheat to use, by record ID or exact description. Repeat for each cheat'
+            cand --cheat-database 'Directory holding manifest.json and the <system>.json cheat shards. Defaults to $ROM_WEAVER_CHEAT_DATABASE, then the per-user data directory'
+            cand --cheat-system 'Console the cheat shard is for (nes, snes, genesis, gameboy, gameboy-color, gba), when the ROM header does not say'
+            cand --game 'Use this database game ID instead of matching the ROM by checksum or title'
             cand --emit-bundle 'Also write a rom-weaver-bundle.json recording this run, so someone else can repeat it'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand -o 'Output path; - writes one completed binary file to stdout'
+            cand --output 'Output path; - writes one completed binary file to stdout'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --no-extract 'Do not look inside archives; treat the input and every patch as raw files'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
+            cand --without-cheats 'Ignore every cheat the bundle records and run only its patch chain'
             cand --no-compress 'Write a plain ROM instead of compressing the result'
             cand --raw 'Write a plain ROM instead of compressing the result'
             cand --repair-checksum 'Recompute the ROM''s internal header checksum afterwards, so the console does not reject it (SNES, NES, GB, GBA, Mega Drive, SMS, N64, NDS)'
             cand --ignore-checksum-validation 'Apply the patch even when its own checksums do not match. Can produce a broken ROM'
+            cand --allow-cheat-conflicts 'Let a later cheat overwrite an earlier one at the same offset instead of failing'
             cand --tui 'Ask for each patch''s name, version, and author, then apply and write a bundle. Needs a terminal'
             cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
-            cand -n 'Print the plan (inputs, patches, output, format, codec, level, threads) and stop without writing'
-            cand --dry-run 'Print the plan (inputs, patches, output, format, codec, level, threads) and stop without writing'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -668,7 +1014,76 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand -h 'Print help (see more with ''--help'')'
             cand --help 'Print help (see more with ''--help'')'
         }
-        &'rom-weaver;patch;weave'= {
+        &'rom-weaver;patch'= {
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help'
+            cand --help 'Print help'
+            cand validate 'Check that patches would apply cleanly, without writing anything'
+            cand apply 'Apply one or more patches to a ROM, in order'
+            cand weave 'Apply one or more patches to a ROM, in order'
+            cand create 'Build a patch from an original ROM and a changed one'
+            cand help 'Print this message or the help of the given subcommand(s)'
+        }
+        &'rom-weaver;patch;validate'= {
+            cand -i 'ROM to check the patches against. May be an archive'
+            cand --input 'ROM to check the patches against. May be an archive'
+            cand -s 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
+            cand --select 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
+            cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
+            cand --patch 'Patch to check. Repeat once per patch; they are checked in the order given'
+            cand --patch-select 'Pick which file to use inside the --patch archive before it. Repeatable, one per --patch; falls back to --select'
+            cand --assume-in 'Take this checksum on trust instead of reading the ROM to compute it, as in crc32=1234abcd (repeatable, comma-separable)'
+            cand --expect-in 'Fail unless the ROM matches: a checksum (crc32=1234abcd), an exact size (size=N), or a floor (min-size=N). Repeatable, comma-separable'
+            cand --n64-byte-order 'Byte order to put an N64 ROM in before checking: auto, keep, big-endian, little-endian, or byte-swapped [default: auto]'
+            cand --patch-basis 'Override the preceding --patch input rule: auto, base, or previous'
+            cand --default-patch-basis 'Shared input ROM rule for every patch: auto, base, or previous [default: auto]'
+            cand --patch-input-check 'Checksum the preceding --patch expects to see going in, when the patch does not carry one (comma-separable; empty means none)'
+            cand --patch-output-check 'Checksum the preceding --patch should produce, when the patch does not carry one (comma-separable; empty means none)'
+            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand --no-extract 'Do not look inside archives; treat the input and every patch as raw files'
+            cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
+            cand --strip-header 'Remove the ROM''s copier header before checking (A78, LNX, NES, FDS, SMC signatures, plus the SNES and PCE size rules)'
+            cand --ignore-checksum-validation 'Report a patch as usable even when its own checksums do not match'
+            cand --independent 'Check every patch against the original ROM rather than as a chain, and report a verdict for each instead of stopping at the first failure'
+            cand --plan 'Report the order the patches would run in and what each would be checked against, without reading the ROM more than needed'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
+            cand --no-progress 'Hide progress'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
+            cand --color 'Keep colors even when output is piped'
+            cand --no-color 'Turn colors off'
+            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
+            cand -h 'Print help (see more with ''--help'')'
+            cand --help 'Print help (see more with ''--help'')'
+        }
+        &'rom-weaver;patch;apply'= {
             cand -i 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
             cand --input 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
             cand -s 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
@@ -677,8 +1092,6 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
             cand --patch 'Patch to apply. Repeat once per patch; they run in the order given'
             cand --patch-select 'Pick which file to use inside the --patch archive before it. Repeatable, one per --patch; falls back to --select'
-            cand -o 'Where to write the patched ROM. Optional when a bundle already names the output'
-            cand --output 'Where to write the patched ROM. Optional when a bundle already names the output'
             cand --bundle 'Follow a rom-weaver-bundle.json recipe: a file path, or an http(s) URL'
             cand --with 'Turn on a bundle patch the bundle leaves off by default, matched by name or file name (repeatable)'
             cand --without 'Turn off a bundle patch, matched by name or file name (repeatable)'
@@ -691,34 +1104,47 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --assume-in 'Take this checksum on trust instead of reading the ROM to compute it, as in crc32=1234abcd (repeatable, comma-separable)'
             cand --expect-in 'Stop unless the ROM about to be patched has this checksum, as in crc32=1234abcd (repeatable, comma-separable)'
             cand --patch-header 'Whether a patch applies to the ROM with or without its copier header: auto, keep, or strip [default: auto]'
-            cand --patch-basis 'Which ROM the preceding --patch was built against: auto, base, or previous [default: auto]'
+            cand --patch-basis 'Override the preceding --patch input rule: auto, base, or previous'
+            cand --patch-input-check 'Expected input checks for the preceding patch (repeatable, comma-separable)'
+            cand --patch-output-check 'Expected output checks for the preceding patch (repeatable, comma-separable)'
+            cand --default-patch-basis 'Shared input ROM rule for every patch: auto, base, or previous [default: auto]'
             cand --output-header 'Whether the finished ROM keeps its copier header: auto, keep, or strip [default: auto]'
             cand --n64-byte-order 'Byte order to put an N64 ROM in for each patch: auto, keep, big-endian, little-endian, or byte-swapped [default: auto]'
             cand --expect-out 'Fail unless the patched ROM has this checksum, as in sha1=abc... (repeatable, comma-separable)'
             cand --code 'Game Genie or GameShark/Pro Action Replay code to bake into the ROM. Repeat for each code'
-            cand --code-system 'Console the --code values are for (nes, snes, genesis, gameboy, gba, psx), when the ROM header does not say'
+            cand --code-system 'Console the --code values are for (nes, snes, genesis, 32x, sms, gamegear, sg1000, gameboy, gba, psx), when the ROM header does not say'
             cand --code-kind 'Which cheat scheme the --code values use: auto, game-genie, gameshark/par, or xploder'
+            cand --cheat 'Database cheat to use, by record ID or exact description. Repeat for each cheat'
+            cand --cheat-database 'Directory holding manifest.json and the <system>.json cheat shards. Defaults to $ROM_WEAVER_CHEAT_DATABASE, then the per-user data directory'
+            cand --cheat-system 'Console the cheat shard is for (nes, snes, genesis, gameboy, gameboy-color, gba), when the ROM header does not say'
+            cand --game 'Use this database game ID instead of matching the ROM by checksum or title'
             cand --emit-bundle 'Also write a rom-weaver-bundle.json recording this run, so someone else can repeat it'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand -o 'Output path; - writes one completed binary file to stdout'
+            cand --output 'Output path; - writes one completed binary file to stdout'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --no-extract 'Do not look inside archives; treat the input and every patch as raw files'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
+            cand --without-cheats 'Ignore every cheat the bundle records and run only its patch chain'
             cand --no-compress 'Write a plain ROM instead of compressing the result'
             cand --raw 'Write a plain ROM instead of compressing the result'
             cand --repair-checksum 'Recompute the ROM''s internal header checksum afterwards, so the console does not reject it (SNES, NES, GB, GBA, Mega Drive, SMS, N64, NDS)'
             cand --ignore-checksum-validation 'Apply the patch even when its own checksums do not match. Can produce a broken ROM'
+            cand --allow-cheat-conflicts 'Let a later cheat overwrite an earlier one at the same offset instead of failing'
             cand --tui 'Ask for each patch''s name, version, and author, then apply and write a bundle. Needs a terminal'
             cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
-            cand -n 'Print the plan (inputs, patches, output, format, codec, level, threads) and stop without writing'
-            cand --dry-run 'Print the plan (inputs, patches, output, format, codec, level, threads) and stop without writing'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -727,36 +1153,68 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand -h 'Print help (see more with ''--help'')'
             cand --help 'Print help (see more with ''--help'')'
         }
-        &'rom-weaver;patch;validate'= {
-            cand -i 'ROM to check the patches against. May be an archive'
-            cand --input 'ROM to check the patches against. May be an archive'
+        &'rom-weaver;patch;weave'= {
+            cand -i 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
+            cand --input 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
             cand -s 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
             cand --select 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
+            cand --target 'For a .cue or .gdi input, which track gets the patch. Matched like --select and must hit exactly one track'
             cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
-            cand --patch 'Patch to check. Repeat once per patch; they are checked in the order given'
+            cand --patch 'Patch to apply. Repeat once per patch; they run in the order given'
             cand --patch-select 'Pick which file to use inside the --patch archive before it. Repeatable, one per --patch; falls back to --select'
+            cand --bundle 'Follow a rom-weaver-bundle.json recipe: a file path, or an http(s) URL'
+            cand --with 'Turn on a bundle patch the bundle leaves off by default, matched by name or file name (repeatable)'
+            cand --without 'Turn off a bundle patch, matched by name or file name (repeatable)'
+            cand --compress-format 'Format to compress the patched ROM into [default: from the --output extension]'
+            cand --format 'Format to compress the patched ROM into [default: from the --output extension]'
+            cand --compress-codec 'Compression method to use, as codec or codec:level (repeatable, comma-separable)'
+            cand --codec 'Compression method to use, as codec or codec:level (repeatable, comma-separable)'
+            cand --compress-level 'How hard to compress: min, very-low, low, medium, high, very-high, or max [default: max]'
+            cand --level 'How hard to compress: min, very-low, low, medium, high, very-high, or max [default: max]'
             cand --assume-in 'Take this checksum on trust instead of reading the ROM to compute it, as in crc32=1234abcd (repeatable, comma-separable)'
-            cand --expect-in 'Fail unless the ROM matches: a checksum (crc32=1234abcd), an exact size (size=N), or a floor (min-size=N). Repeatable, comma-separable'
-            cand --n64-byte-order 'Byte order to put an N64 ROM in before checking: auto, keep, big-endian, little-endian, or byte-swapped [default: auto]'
-            cand --patch-basis 'Which ROM the preceding --patch was built against: auto, base, or previous [default: auto]'
-            cand --patch-input-check 'Checksum the preceding --patch expects to see going in, when the patch does not carry one (comma-separable; empty means none)'
-            cand --patch-output-check 'Checksum the preceding --patch should produce, when the patch does not carry one (comma-separable; empty means none)'
+            cand --expect-in 'Stop unless the ROM about to be patched has this checksum, as in crc32=1234abcd (repeatable, comma-separable)'
+            cand --patch-header 'Whether a patch applies to the ROM with or without its copier header: auto, keep, or strip [default: auto]'
+            cand --patch-basis 'Override the preceding --patch input rule: auto, base, or previous'
+            cand --patch-input-check 'Expected input checks for the preceding patch (repeatable, comma-separable)'
+            cand --patch-output-check 'Expected output checks for the preceding patch (repeatable, comma-separable)'
+            cand --default-patch-basis 'Shared input ROM rule for every patch: auto, base, or previous [default: auto]'
+            cand --output-header 'Whether the finished ROM keeps its copier header: auto, keep, or strip [default: auto]'
+            cand --n64-byte-order 'Byte order to put an N64 ROM in for each patch: auto, keep, big-endian, little-endian, or byte-swapped [default: auto]'
+            cand --expect-out 'Fail unless the patched ROM has this checksum, as in sha1=abc... (repeatable, comma-separable)'
+            cand --code 'Game Genie or GameShark/Pro Action Replay code to bake into the ROM. Repeat for each code'
+            cand --code-system 'Console the --code values are for (nes, snes, genesis, 32x, sms, gamegear, sg1000, gameboy, gba, psx), when the ROM header does not say'
+            cand --code-kind 'Which cheat scheme the --code values use: auto, game-genie, gameshark/par, or xploder'
+            cand --cheat 'Database cheat to use, by record ID or exact description. Repeat for each cheat'
+            cand --cheat-database 'Directory holding manifest.json and the <system>.json cheat shards. Defaults to $ROM_WEAVER_CHEAT_DATABASE, then the per-user data directory'
+            cand --cheat-system 'Console the cheat shard is for (nes, snes, genesis, gameboy, gameboy-color, gba), when the ROM header does not say'
+            cand --game 'Use this database game ID instead of matching the ROM by checksum or title'
+            cand --emit-bundle 'Also write a rom-weaver-bundle.json recording this run, so someone else can repeat it'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand -o 'Output path; - writes one completed binary file to stdout'
+            cand --output 'Output path; - writes one completed binary file to stdout'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --no-extract 'Do not look inside archives; treat the input and every patch as raw files'
             cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
-            cand --strip-header 'Remove the ROM''s copier header before checking (A78, LNX, NES, FDS, SMC signatures, plus the SNES and PCE size rules)'
-            cand --ignore-checksum-validation 'Report a patch as usable even when its own checksums do not match'
-            cand --independent 'Check every patch against the original ROM rather than as a chain, and report a verdict for each instead of stopping at the first failure'
-            cand --plan 'Report the order the patches would run in and what each would be checked against, without reading the ROM more than needed'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand --without-cheats 'Ignore every cheat the bundle records and run only its patch chain'
+            cand --no-compress 'Write a plain ROM instead of compressing the result'
+            cand --raw 'Write a plain ROM instead of compressing the result'
+            cand --repair-checksum 'Recompute the ROM''s internal header checksum afterwards, so the console does not reject it (SNES, NES, GB, GBA, Mega Drive, SMS, N64, NDS)'
+            cand --ignore-checksum-validation 'Apply the patch even when its own checksums do not match. Can produce a broken ROM'
+            cand --allow-cheat-conflicts 'Let a later cheat overwrite an earlier one at the same offset instead of failing'
+            cand --tui 'Ask for each patch''s name, version, and author, then apply and write a bundle. Needs a terminal'
+            cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -770,12 +1228,14 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --modified 'The changed ROM. Leave out when using --code, which produces the changed ROM for you'
             cand -f 'Patch format, such as bps, ips, or xdelta [default: from the --output extension]'
             cand --format 'Patch format, such as bps, ips, or xdelta [default: from the --output extension]'
-            cand -o 'Where to write the patch. Required unless --plan is used'
-            cand --output 'Where to write the patch. Required unless --plan is used'
             cand --assume-in 'Take the original ROM''s checksum on trust rather than reading the file, as in crc32=1234abcd (repeatable, comma-separable)'
             cand --code 'Build the patch from a Game Genie or GameShark/Pro Action Replay code instead of a second ROM. Repeat for each code; cannot be used with --modified'
-            cand --code-system 'Console the --code values are for (nes, snes, genesis, gameboy, gba, psx), when the ROM header does not say'
+            cand --code-system 'Console the --code values are for (nes, snes, genesis, 32x, sms, gamegear, sg1000, gameboy, gba, psx), when the ROM header does not say'
             cand --code-kind 'Which cheat scheme the --code values use: auto, game-genie, gameshark/par, or xploder'
+            cand --cheat 'Database cheat to use, by record ID or exact description. Repeat for each cheat'
+            cand --cheat-database 'Directory holding manifest.json and the <system>.json cheat shards. Defaults to $ROM_WEAVER_CHEAT_DATABASE, then the per-user data directory'
+            cand --cheat-system 'Console the cheat shard is for (nes, snes, genesis, gameboy, gameboy-color, gba), when the ROM header does not say'
+            cand --game 'Use this database game ID instead of matching the ROM by checksum or title'
             cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
             cand --solid-system 'SOLID patches only: console the ROM is for'
@@ -786,19 +1246,26 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --solid-contact 'SOLID patches only: how to reach the author. Switches the patch to its extended header'
             cand --solid-comment 'SOLID patches only: free-form note. Switches the patch to its extended header'
             cand --xdelta-secondary 'xdelta patches only: compress the patch''s own contents'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
+            cand -o 'Output path; - writes one completed binary file to stdout'
+            cand --output 'Output path; - writes one completed binary file to stdout'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
             cand --plan 'Only report which formats suit these two ROMs; write nothing'
             cand --ignore-checksum-validation 'Write the patch even when the format''s own consistency checks fail, and leave its checksums out'
             cand --checksum-name 'Put the original ROM''s crc32 in the patch file name, as [crc32:HEX]'
+            cand --allow-cheat-conflicts 'Let a later cheat overwrite an earlier one at the same offset instead of failing'
             cand --solid-extended 'SOLID patches only: use the extended header even with none of the extended fields filled in'
             cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -808,28 +1275,32 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --help 'Print help (see more with ''--help'')'
         }
         &'rom-weaver;patch;help'= {
-            cand apply 'Apply one or more patches to a ROM, in order'
             cand validate 'Check that patches would apply cleanly, without writing anything'
+            cand apply 'Apply one or more patches to a ROM, in order'
             cand create 'Build a patch from an original ROM and a changed one'
             cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;patch;help;apply'= {
-        }
         &'rom-weaver;patch;help;validate'= {
         }
+        &'rom-weaver;patch;help;apply'= {
+        }
         &'rom-weaver;patch;help;create'= {
         }
         &'rom-weaver;patch;help;help'= {
         }
-        &'rom-weaver;bundle'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;save'= {
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -837,128 +1308,97 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
             cand -h 'Print help'
             cand --help 'Print help'
-            cand create 'Write a rom-weaver-bundle.json recipe from local ROM and patch files'
-            cand parse 'Read a rom-weaver-bundle.json recipe and report what it points at'
-            cand schema 'Print the rom-weaver-bundle.json JSON Schema, for editors and hand-authoring'
+            cand identify 'Identify a supported game save without changing it'
+            cand inspect 'Show the sections and fields in a supported game save'
+            cand get 'Read one field from a supported game save'
+            cand export-schema 'Print the generic field schema for a supported game save'
+            cand set 'Write validated field changes to a new game save'
             cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;bundle;create'= {
-            cand -i 'ROM the patches apply to. Its checksums and size are read from the file and recorded in the bundle'
-            cand --input 'ROM the patches apply to. Its checksums and size are read from the file and recorded in the bundle'
-            cand --assume-in 'Take the ROM''s checksum and size on trust rather than reading it, as in crc32=1234abcd,size=1048576 (repeatable, comma-separable)'
-            cand --rom-url 'Where the ROM can be downloaded from. With --input, the local file still supplies the checksums; on its own, the bundle records only this url'
-            cand --rom-name 'Expected ROM file name to show and use for output naming; a supplied ROM with a different name only warns'
-            cand --patch 'Patch to list in the bundle. Repeat once per patch, in the order they should be applied'
-            cand --patch-id 'Identifier for the preceding --patch that stays the same across releases, so a replacement keeps its settings'
-            cand --patch-version 'Version of the preceding --patch, in whatever form its author uses'
-            cand --patch-name 'Name to show for the preceding --patch'
-            cand --patch-description 'What the preceding --patch does'
-            cand --patch-author 'Who made the preceding --patch'
-            cand --patch-label 'Short status note for the preceding --patch, such as beta or recommended'
-            cand --patch-optional 'Mark the preceding --patch optional, so it starts switched off and needs --with to run'
-            cand --patch-source-url 'Where the preceding --patch can be downloaded from. The local file is still read to build the bundle'
-            cand --patch-header 'Whether the preceding --patch applies to the ROM with or without its copier header: auto, keep, or strip'
-            cand --patch-basis 'Which ROM the preceding --patch was built against: base (the bundle''s ROM) or previous (the patch before it). Use auto to leave it out and let apply infer it'
-            cand --patch-expect-in 'Checksum the ROM should have before the preceding --patch runs. Recorded only when it differs from the bundle''s ROM checksums (repeatable, comma-separable)'
-            cand --patch-expect-out 'Checksum the ROM should have after the preceding --patch runs. Recorded only when it differs from the final output checksums (repeatable, comma-separable)'
-            cand --expect-out 'Checksum the ROM should have once every patch has run, so users can confirm they got the right result (repeatable, comma-separable)'
-            cand --output-name 'File name the bundle suggests for the patched ROM'
-            cand --output-header 'Whether the patched ROM should keep its copier header: auto, keep, or strip'
-            cand -o 'Where to write the bundle. Name it rom-weaver-bundle.json, or add .gz or .zst to compress it'
-            cand --output 'Where to write the bundle. Name it rom-weaver-bundle.json, or add .gz or .zst to compress it'
-            cand --bundle 'Also pack the bundle and its ROM and patches into one shareable archive, such as release.zip'
-            cand --bundle-rom 'Pack this file into --bundle as the ROM, while --input supplies the checksums and metadata'
-            cand --checksum 'Which checksums to record for the ROM (repeatable, comma-separable) [default: crc32,md5,sha1]'
-            cand --algo 'Which checksums to record for the ROM (repeatable, comma-separable) [default: crc32,md5,sha1]'
-            cand --from 'Build the bundle from a hand-written rom-weaver-bundle.json instead of flags. Use - to read it from stdin'
-            cand --schema-ref 'Record this $schema URL in the bundle so editors can validate it. Left out unless asked for'
-            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --no-bundle-rom 'Keep the ROM out of --bundle and record only its checksums, so whoever applies the bundle brings their own copy'
-            cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;save;identify'= {
+            cand --game 'Force a game id instead of detecting one'
+            cand --rom-sha1 'SHA-1 of the matching ROM, used to pick a game'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
             cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
             cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
+            cand -h 'Print help'
+            cand --help 'Print help'
         }
-        &'rom-weaver;bundle;parse'= {
-            cand -i 'Bundle file, or an archive with a bundle at its root'
-            cand --input 'Bundle file, or an archive with a bundle at its root'
-            cand -s 'Handle only the bundle entries whose file name matches this exact name, prefix, or glob (repeatable)'
-            cand --select 'Handle only the bundle entries whose file name matches this exact name, prefix, or glob (repeatable)'
-            cand --filter 'Handle only the bundle''s rom entry or only its patch entries (repeatable, comma-separable)'
-            cand -o 'Directory to unpack the bundle''s files into. Without it, files packed in an archive are listed but not written out'
-            cand --output 'Directory to unpack the bundle''s files into. Without it, files packed in an archive are listed but not written out'
-            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --no-extract 'Report what the bundle contains without unpacking any of it'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;save;inspect'= {
+            cand --game 'Force a game id instead of detecting one'
+            cand --rom-sha1 'SHA-1 of the matching ROM, used to pick a game'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
             cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
             cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
+            cand -h 'Print help'
+            cand --help 'Print help'
         }
-        &'rom-weaver;bundle;schema'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;save;get'= {
+            cand --game 'Force a game id instead of detecting one'
+            cand --rom-sha1 'SHA-1 of the matching ROM, used to pick a game'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
             cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
             cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
-        }
-        &'rom-weaver;bundle;help'= {
-            cand create 'Write a rom-weaver-bundle.json recipe from local ROM and patch files'
-            cand parse 'Read a rom-weaver-bundle.json recipe and report what it points at'
-            cand schema 'Print the rom-weaver-bundle.json JSON Schema, for editors and hand-authoring'
-            cand help 'Print this message or the help of the given subcommand(s)'
-        }
-        &'rom-weaver;bundle;help;create'= {
-        }
-        &'rom-weaver;bundle;help;parse'= {
-        }
-        &'rom-weaver;bundle;help;schema'= {
-        }
-        &'rom-weaver;bundle;help;help'= {
+            cand -h 'Print help'
+            cand --help 'Print help'
         }
-        &'rom-weaver;tools'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;save;export-schema'= {
+            cand --game 'Force a game id instead of detecting one'
+            cand --rom-sha1 'SHA-1 of the matching ROM, used to pick a game'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -966,54 +1406,66 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
             cand -h 'Print help'
             cand --help 'Print help'
-            cand ppf-undo 'Undo a PPF3 patch, using the undo data stored inside it'
-            cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;tools;ppf-undo'= {
-            cand -i 'The already-patched ROM to undo'
-            cand --input 'The already-patched ROM to undo'
-            cand --patch 'The PPF3 patch that was applied. It must carry undo data'
-            cand -o 'Where to write the restored ROM'
-            cand --output 'Where to write the restored ROM'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;save;set'= {
+            cand --game 'Force a game id instead of detecting one'
+            cand --rom-sha1 'SHA-1 of the matching ROM, used to pick a game'
+            cand -o 'Output path; - writes one completed binary file to stdout'
+            cand --output 'Output path; - writes one completed binary file to stdout'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Validate and preview every change without writing a file'
+            cand --dry-run 'Validate and preview every change without writing a file'
+            cand --force 'Overwrite an explicit output path if it already exists'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
             cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
             cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
+            cand -h 'Print help'
+            cand --help 'Print help'
         }
-        &'rom-weaver;tools;help'= {
-            cand ppf-undo 'Undo a PPF3 patch, using the undo data stored inside it'
+        &'rom-weaver;save;help'= {
+            cand identify 'Identify a supported game save without changing it'
+            cand inspect 'Show the sections and fields in a supported game save'
+            cand get 'Read one field from a supported game save'
+            cand export-schema 'Print the generic field schema for a supported game save'
+            cand set 'Write validated field changes to a new game save'
             cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;tools;help;ppf-undo'= {
+        &'rom-weaver;save;help;identify'= {
         }
-        &'rom-weaver;tools;help;help'= {
+        &'rom-weaver;save;help;inspect'= {
         }
-        &'rom-weaver;plan-extract-batch'= {
-            cand --job-size 'Source size in bytes for one job; repeat once per job, in input order'
-            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --max-concurrency 'Hard cap on jobs running at once; defaults to the thread budget'
-            cand --total-memory-bytes 'Total memory budget concurrent jobs may reserve (e.g. browser device memory); defaults to the platform''s physical memory'
-            cand --memory-ceiling-bytes 'Combined working-set ceiling to plan against, used verbatim (no fraction/clamp). The browser passes its own resolved, mobile-capped ceiling here; when set it overrides --total-memory-bytes'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;save;help;get'= {
+        }
+        &'rom-weaver;save;help;export-schema'= {
+        }
+        &'rom-weaver;save;help;set'= {
+        }
+        &'rom-weaver;save;help;help'= {
+        }
+        &'rom-weaver;tools'= {
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -1021,58 +1473,27 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
             cand -h 'Print help'
             cand --help 'Print help'
+            cand ppf-undo 'Undo a PPF3 patch, using the undo data stored inside it'
+            cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;weave'= {
-            cand -i 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
-            cand --input 'ROM to patch. May be an archive, a disc sheet (.cue/.gdi), or a bundle'
-            cand -s 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
-            cand --select 'Pick which file to use when the ROM or a patch is inside an archive, by exact name, prefix, or glob (repeatable). --patch-select overrides it for the patch it follows'
-            cand --target 'For a .cue or .gdi input, which track gets the patch. Matched like --select and must hit exactly one track'
-            cand --filter 'Consider only files that look like a rom or a patch, judged by extension (repeatable, comma-separable)'
-            cand --patch 'Patch to apply. Repeat once per patch; they run in the order given'
-            cand --patch-select 'Pick which file to use inside the --patch archive before it. Repeatable, one per --patch; falls back to --select'
-            cand -o 'Where to write the patched ROM. Optional when a bundle already names the output'
-            cand --output 'Where to write the patched ROM. Optional when a bundle already names the output'
-            cand --bundle 'Follow a rom-weaver-bundle.json recipe: a file path, or an http(s) URL'
-            cand --with 'Turn on a bundle patch the bundle leaves off by default, matched by name or file name (repeatable)'
-            cand --without 'Turn off a bundle patch, matched by name or file name (repeatable)'
-            cand --compress-format 'Format to compress the patched ROM into [default: from the --output extension]'
-            cand --format 'Format to compress the patched ROM into [default: from the --output extension]'
-            cand --compress-codec 'Compression method to use, as codec or codec:level (repeatable, comma-separable)'
-            cand --codec 'Compression method to use, as codec or codec:level (repeatable, comma-separable)'
-            cand --compress-level 'How hard to compress: min, very-low, low, medium, high, very-high, or max [default: max]'
-            cand --level 'How hard to compress: min, very-low, low, medium, high, very-high, or max [default: max]'
-            cand --assume-in 'Take this checksum on trust instead of reading the ROM to compute it, as in crc32=1234abcd (repeatable, comma-separable)'
-            cand --expect-in 'Stop unless the ROM about to be patched has this checksum, as in crc32=1234abcd (repeatable, comma-separable)'
-            cand --patch-header 'Whether a patch applies to the ROM with or without its copier header: auto, keep, or strip [default: auto]'
-            cand --patch-basis 'Which ROM the preceding --patch was built against: auto, base, or previous [default: auto]'
-            cand --output-header 'Whether the finished ROM keeps its copier header: auto, keep, or strip [default: auto]'
-            cand --n64-byte-order 'Byte order to put an N64 ROM in for each patch: auto, keep, big-endian, little-endian, or byte-swapped [default: auto]'
-            cand --expect-out 'Fail unless the patched ROM has this checksum, as in sha1=abc... (repeatable, comma-separable)'
-            cand --code 'Game Genie or GameShark/Pro Action Replay code to bake into the ROM. Repeat for each code'
-            cand --code-system 'Console the --code values are for (nes, snes, genesis, gameboy, gba, psx), when the ROM header does not say'
-            cand --code-kind 'Which cheat scheme the --code values use: auto, game-genie, gameshark/par, or xploder'
-            cand --emit-bundle 'Also write a rom-weaver-bundle.json recording this run, so someone else can repeat it'
-            cand -j 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --threads 'How many threads to use at most. auto uses every core; a format may still use fewer'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --no-extract 'Do not look inside archives; treat the input and every patch as raw files'
-            cand --no-ignore 'Also consider files normally skipped inside archives: readmes, images, checksum sidecars, and OS clutter such as .DS_Store'
-            cand --no-compress 'Write a plain ROM instead of compressing the result'
-            cand --raw 'Write a plain ROM instead of compressing the result'
-            cand --repair-checksum 'Recompute the ROM''s internal header checksum afterwards, so the console does not reject it (SNES, NES, GB, GBA, Mega Drive, SMS, N64, NDS)'
-            cand --ignore-checksum-validation 'Apply the patch even when its own checksums do not match. Can produce a broken ROM'
-            cand --tui 'Ask for each patch''s name, version, and author, then apply and write a bundle. Needs a terminal'
-            cand --force 'Overwrite the output if it already exists (without this, the command stops instead)'
-            cand -n 'Print the plan (inputs, patches, output, format, codec, level, threads) and stop without writing'
-            cand --dry-run 'Print the plan (inputs, patches, output, format, codec, level, threads) and stop without writing'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
+        &'rom-weaver;tools;ppf-undo'= {
+            cand -i 'The already-patched ROM to undo'
+            cand --input 'The already-patched ROM to undo'
+            cand --patch 'The PPF3 patch that was applied. It must carry undo data'
+            cand -o 'Output path; - writes one completed binary file to stdout'
+            cand --output 'Output path; - writes one completed binary file to stdout'
+            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: warn]'
+            cand -n 'Plan the command without changing files or downloading data'
+            cand --dry-run 'Plan the command without changing files or downloading data'
+            cand --json 'Print one complete JSON report; progress and diagnostics use stderr'
+            cand --jsonl 'Stream JSON events, including progress, one object per line'
+            cand --progress 'Show progress on stderr (off by default; JSONL includes progress)'
             cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
+            cand -v 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --verbose 'Show user diagnostics on stderr; repeat for developer detail (-vv debug, -vvv trace)'
+            cand --debug 'Show developer diagnostics and trace events on stderr (same as -vvv)'
+            cand -q 'Hide optional diagnostics and progress; keep results, warnings, and errors'
+            cand --quiet 'Hide optional diagnostics and progress; keep results, warnings, and errors'
             cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
             cand --color 'Keep colors even when output is piped'
             cand --no-color 'Turn colors off'
@@ -1081,81 +1502,61 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
             cand -h 'Print help (see more with ''--help'')'
             cand --help 'Print help (see more with ''--help'')'
         }
-        &'rom-weaver;completions'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
-            cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
-            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
-            cand --color 'Keep colors even when output is piped'
-            cand --no-color 'Turn colors off'
-            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
+        &'rom-weaver;tools;help'= {
+            cand ppf-undo 'Undo a PPF3 patch, using the undo data stored inside it'
+            cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;man'= {
-            cand --man-dir 'Directory to install pages into'
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --install 'Install the generated pages instead of printing one'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
-            cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
-            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
-            cand --color 'Keep colors even when output is piped'
-            cand --no-color 'Turn colors off'
-            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
+        &'rom-weaver;tools;help;ppf-undo'= {
         }
-        &'rom-weaver;formats'= {
-            cand --log-level 'How much rom-weaver logs to stderr. Separate from the normal output [default: off]'
-            cand --json 'Print one JSON object per line instead of human-readable output'
-            cand --progress 'Show progress even when output is piped to a file or another program'
-            cand --no-progress 'Hide progress'
-            cand -v 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand --verbose 'Log more: -v for info, -vv for debug, -vvv for trace'
-            cand -q 'Log errors only'
-            cand --quiet 'Log errors only'
-            cand --dep-trace 'Also log trace output from bundled libraries (for bug reports)'
-            cand --color 'Keep colors even when output is piped'
-            cand --no-color 'Turn colors off'
-            cand -y 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand --yes 'Answer yes to every confirmation instead of asking. Does not choose between candidates'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
+        &'rom-weaver;tools;help;help'= {
         }
         &'rom-weaver;help'= {
-            cand probe 'Identify a file: its format, its platform, and any header it carries'
-            cand extract 'Unpack an archive or single-payload compressed format'
-            cand checksum 'Compute checksums for a file, or for a ROM inside an archive'
-            cand identify 'Identify a ROM title from its checksums'
             cand setup 'Install the offline identify database'
             cand ingest 'Sort a file into ROMs and patches, unpacking and hashing along the way'
-            cand compress 'Pack files into an archive, disc image, or ROM-specific compressed format'
-            cand trim 'Cut the padding off a ROM, or put it back'
-            cand patch 'Apply, create, or check ROM patches'
+            cand cheat 'List the cheat database''s entries for a ROM'
             cand bundle 'Build and read rom-weaver-bundle.json patch recipes'
-            cand tools 'One-off recovery tools'
             cand plan-extract-batch 'Plan a memory-/thread-aware concurrent extraction schedule from per-job source sizes (no I/O)'
-            cand weave 'Apply one or more patches to a ROM, in order (same as `patch apply`)'
             cand completions 'Print a tab-completion script for your shell'
             cand man 'Print or install the generated CLI man pages'
             cand formats 'List the formats, codecs, and checksum algorithms this build supports'
+            cand probe 'Identify a file: its format, its platform, and any header it carries'
+            cand checksum 'Compute checksums for a file, or for a ROM inside an archive'
+            cand identify 'Identify a ROM title from its checksums'
+            cand extract 'Unpack an archive or single-payload compressed format'
+            cand compress 'Pack files into an archive, disc image, or ROM-specific compressed format'
+            cand trim 'Cut the padding off a ROM, or put it back'
+            cand weave 'Apply one or more patches to a ROM, in order (same as `patch apply`)'
+            cand patch 'Apply, create, or check ROM patches'
+            cand save 'Inspect and edit supported persistent game saves'
+            cand tools 'One-off recovery tools'
             cand help 'Print this message or the help of the given subcommand(s)'
         }
-        &'rom-weaver;help;probe'= {
+        &'rom-weaver;help;setup'= {
         }
-        &'rom-weaver;help;extract'= {
+        &'rom-weaver;help;ingest'= {
+        }
+        &'rom-weaver;help;cheat'= {
+        }
+        &'rom-weaver;help;bundle'= {
+            cand create 'Write a rom-weaver-bundle.json recipe from local ROM and patch files'
+            cand parse 'Read a rom-weaver-bundle.json recipe and report what it points at'
+            cand schema 'Print the rom-weaver-bundle.json JSON Schema, for editors and hand-authoring'
+        }
+        &'rom-weaver;help;bundle;create'= {
+        }
+        &'rom-weaver;help;bundle;parse'= {
+        }
+        &'rom-weaver;help;bundle;schema'= {
+        }
+        &'rom-weaver;help;plan-extract-batch'= {
+        }
+        &'rom-weaver;help;completions'= {
+        }
+        &'rom-weaver;help;man'= {
+        }
+        &'rom-weaver;help;formats'= {
+        }
+        &'rom-weaver;help;probe'= {
         }
         &'rom-weaver;help;checksum'= {
         }
@@ -1191,51 +1592,47 @@ set edit:completion:arg-completer[rom-weaver] = {|@words|
         }
         &'rom-weaver;help;identify;database;update'= {
         }
-        &'rom-weaver;help;setup'= {
-        }
-        &'rom-weaver;help;ingest'= {
+        &'rom-weaver;help;extract'= {
         }
         &'rom-weaver;help;compress'= {
         }
         &'rom-weaver;help;trim'= {
         }
+        &'rom-weaver;help;weave'= {
+        }
         &'rom-weaver;help;patch'= {
-            cand apply 'Apply one or more patches to a ROM, in order'
             cand validate 'Check that patches would apply cleanly, without writing anything'
+            cand apply 'Apply one or more patches to a ROM, in order'
             cand create 'Build a patch from an original ROM and a changed one'
         }
-        &'rom-weaver;help;patch;apply'= {
-        }
         &'rom-weaver;help;patch;validate'= {
         }
+        &'rom-weaver;help;patch;apply'= {
+        }
         &'rom-weaver;help;patch;create'= {
         }
-        &'rom-weaver;help;bundle'= {
-            cand create 'Write a rom-weaver-bundle.json recipe from local ROM and patch files'
-            cand parse 'Read a rom-weaver-bundle.json recipe and report what it points at'
-            cand schema 'Print the rom-weaver-bundle.json JSON Schema, for editors and hand-authoring'
+        &'rom-weaver;help;save'= {
+            cand identify 'Identify a supported game save without changing it'
+            cand inspect 'Show the sections and fields in a supported game save'
+            cand get 'Read one field from a supported game save'
+            cand export-schema 'Print the generic field schema for a supported game save'
+            cand set 'Write validated field changes to a new game save'
         }
-        &'rom-weaver;help;bundle;create'= {
+        &'rom-weaver;help;save;identify'= {
         }
-        &'rom-weaver;help;bundle;parse'= {
+        &'rom-weaver;help;save;inspect'= {
         }
-        &'rom-weaver;help;bundle;schema'= {
+        &'rom-weaver;help;save;get'= {
+        }
+        &'rom-weaver;help;save;export-schema'= {
+        }
+        &'rom-weaver;help;save;set'= {
         }
         &'rom-weaver;help;tools'= {
             cand ppf-undo 'Undo a PPF3 patch, using the undo data stored inside it'
         }
         &'rom-weaver;help;tools;ppf-undo'= {
         }
-        &'rom-weaver;help;plan-extract-batch'= {
-        }
-        &'rom-weaver;help;weave'= {
-        }
-        &'rom-weaver;help;completions'= {
-        }
-        &'rom-weaver;help;man'= {
-        }
-        &'rom-weaver;help;formats'= {
-        }
         &'rom-weaver;help;help'= {
         }
     ]