@wpmoo/toolkit 0.9.29 → 0.9.31

package/README.md

@@ -108,7 +108,7 @@ The cockpit is the daily workspace. It starts with environment status and then s
 ```text
 WPMoo Cockpit
 |-- Command palette /
-|   |-- search commands such as /test, /logs, /doctor, /safe-reset
+|   |-- search commands such as /test, /modules, /install-module, /doctor, /safe-reset
 |-- Services
 |   |-- start
 |   |-- stop
@@ -141,19 +141,24 @@ WPMoo Cockpit
 
 Every cockpit action maps to a direct command, so the same workflow can be used interactively or scripted:
 
+When an environment has many module candidates, module selection switches to
+search so names, repositories, and source categories can be filtered quickly.
+
 ```bash
 ./moo start
 ./moo logs odoo
 ./moo update sale
 ./moo test sale
 ./moo snapshot devel before-update
+./moo snapshot --list
 ./moo restore-snapshot --dry-run before-update devel
 ```
 
-In `WPMOO_ENV=stage`, `install` and `update` require `WPMOO_ALLOW_STAGE_LIFECYCLE=1`.
-In `WPMOO_ENV=prod`, `install`, `update`, and `test` require `WPMOO_ALLOW_PROD_LIFECYCLE=1`.
+In `WPMOO_ENV=stage`, `install`, `update`, `stop`, and `restart` require `WPMOO_ALLOW_STAGE_LIFECYCLE=1`.
+In `WPMOO_ENV=prod`, `install`, `update`, `test`, `stop`, and `restart` require `WPMOO_ALLOW_PROD_LIFECYCLE=1`.
 `resetdb` and real `restore-snapshot` require `WPMOO_ALLOW_DESTRUCTIVE=1` in `stage` and `prod`.
 `restore-snapshot --dry-run` remains allowed for preview.
+For short-lived local approvals, add JSONL entries to `.wpmoo/approvals.jsonl`; generated `.gitignore` keeps that ledger out of Git.
 
 Module source actions also have direct commands. Default is `private`; pass `--source-type oca` or `--source-type external` for non-private source repositories:
 
@@ -176,6 +181,9 @@ npx @wpmoo/toolkit doctor --json --postgres
 ```
 
 JSON output is optional; human-readable output remains the default.
+Human `doctor` output is grouped into stable sections (`Generated files`,
+`Compose`, `Source repositories`, `PostgreSQL`, and `Host tools`) so terminal
+operators can see which lifecycle layer needs attention first.
 `doctor --postgres` runs read-only PostgreSQL diagnostics as advisory checks only; it
 does not perform automatic tuning.
 Incomplete or malformed PostgreSQL metric rows are reported as unavailable diagnostics
@@ -191,7 +199,10 @@ Current advisory checks include:
 - optional unused index advisory output when index usage data is available;
 - WAL and capacity visibility including WAL activity and disk-level pressure context;
 - slow-query and query-plan readiness checks for common `log_min_duration_statement`
-  and `pg_stat_statements` prerequisites.
+  and `pg_stat_statements` prerequisites;
+- read-only PostgreSQL configuration visibility for `shared_buffers`, `work_mem`,
+  `maintenance_work_mem`, `effective_cache_size`, and
+  `shared_preload_libraries`.
 
 `npx @wpmoo/toolkit doctor --postgres` and
 `npx @wpmoo/toolkit doctor --json --postgres` use the same checks, and the
@@ -201,6 +212,8 @@ JSON variant exposes a versioned PostgreSQL diagnostics contract.
 `doctor --json --postgres` keeps the JSON contract stable by versioning the
 `postgres` payload; individual fields are optional so automation can safely handle
 environments where PostgreSQL does not expose a metric.
+All `doctor --json` reports also include optional `sections` entries that group
+checks, warnings, and errors without changing the legacy flat arrays.
 
 JSON compatibility policy:
 
@@ -232,6 +245,16 @@ warning while keeping the scoped package release valid.
   packages are valid.
 - **Smoke expectation**: run `npm run smoke:published -- "$VERSION"` after the
   release tag workflow completes.
+- **Deterministic smoke target**: pin the target package explicitly so smoke checks
+  are reproducible across reruns:
+
+  ```bash
+  VERSION="$(node -p "require('./package.json').version")"
+  WPMOO_PUBLISHED_PACKAGE_SPEC="@wpmoo/toolkit@$VERSION" npm run smoke:published -- "$VERSION"
+  ```
+
+  Use one pinned command for each target artifact you validate; the workflow itself
+  remains valid only when required scoped artifacts pass.
 - **1.0 release smoke**: For `1.0.0`, generated-environment acceptance smoke is
   required before the release is considered final.
 

package/dist/approval-ledger.js

@@ -0,0 +1,74 @@
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+const approvalScopes = [
+    'destructive',
+    'stage-lifecycle',
+    'prod-lifecycle',
+    'no-recent-snapshot',
+    'migration-risk',
+];
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function isApprovalScope(value) {
+    return typeof value === 'string' && approvalScopes.includes(value);
+}
+function isEnvironmentKind(value) {
+    return value === 'stage' || value === 'prod';
+}
+function isFutureIsoDate(value, now) {
+    if (typeof value !== 'string' || !value.trim()) {
+        return false;
+    }
+    const expiresAt = Date.parse(value);
+    return Number.isFinite(expiresAt) && expiresAt > now.getTime();
+}
+function activeApprovalFromLine(line, options) {
+    let parsed;
+    try {
+        parsed = JSON.parse(line);
+    }
+    catch {
+        return undefined;
+    }
+    if (!isRecord(parsed)) {
+        return undefined;
+    }
+    if (!isApprovalScope(parsed.scope) || !isEnvironmentKind(parsed.environment)) {
+        return undefined;
+    }
+    if (parsed.environment !== options.environment) {
+        return undefined;
+    }
+    const command = typeof parsed.command === 'string' ? parsed.command : undefined;
+    if (command && command !== options.command) {
+        return undefined;
+    }
+    if (!isFutureIsoDate(parsed.expiresAt, options.now)) {
+        return undefined;
+    }
+    return {
+        scope: parsed.scope,
+        environment: parsed.environment,
+        ...(command ? { command: command } : {}),
+        expiresAt: parsed.expiresAt,
+        ...(typeof parsed.reason === 'string' && parsed.reason.trim() ? { reason: parsed.reason.trim() } : {}),
+        label: `approval:${parsed.scope}`,
+    };
+}
+export async function readActiveApprovals(target, options) {
+    let content;
+    try {
+        content = await readFile(join(target, '.wpmoo/approvals.jsonl'), 'utf8');
+    }
+    catch {
+        return [];
+    }
+    const resolvedOptions = { ...options, now: options.now ?? new Date() };
+    return content
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter(Boolean)
+        .map((line) => activeApprovalFromLine(line, resolvedOptions))
+        .filter((approval) => Boolean(approval));
+}

package/dist/cli-routes/doctor.js

@@ -0,0 +1,20 @@
+import { parseArgs } from '../args.js';
+import { booleanOption, jsonOption } from './options.js';
+export function doctorOptionsFromArgs(argv) {
+    const { values } = parseArgs(argv);
+    const keys = Object.keys(values);
+    const allowedKeys = new Set(['fix', 'json', 'postgres']);
+    if (!keys.every((key) => allowedKeys.has(key))) {
+        throw new Error('Usage: wpmoo doctor');
+    }
+    const options = {
+        json: jsonOption(values),
+    };
+    if (Object.hasOwn(values, 'fix')) {
+        options.fix = booleanOption(values, 'fix', false);
+    }
+    if (Object.hasOwn(values, 'postgres')) {
+        options.postgres = booleanOption(values, 'postgres', false);
+    }
+    return options;
+}

package/dist/cli-routes/options.js

@@ -0,0 +1,36 @@
+export function stringOption(values, key) {
+    const value = values[key];
+    return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+export function optionalSourceTypeValue(values) {
+    const value = stringOption(values, 'sourceType');
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === 'private' || value === 'oca' || value === 'external') {
+        return value;
+    }
+    throw new Error(`Invalid value for --source-type: ${value}`);
+}
+export function sourceTypeValue(values) {
+    return optionalSourceTypeValue(values) ?? 'private';
+}
+export function booleanOption(values, key, fallback) {
+    const value = values[key];
+    if (value === undefined)
+        return fallback;
+    if (typeof value === 'boolean')
+        return value;
+    const normalized = value.toLowerCase().trim();
+    if (['true', '1', 'yes', 'y'].includes(normalized))
+        return true;
+    if (['false', '0', 'no', 'n'].includes(normalized))
+        return false;
+    throw new Error(`Invalid boolean value for --${key}: ${value}`);
+}
+export function jsonOption(values) {
+    return booleanOption(values, 'json', false);
+}
+export function printJson(value) {
+    console.log(JSON.stringify(value));
+}

package/dist/cli-routes/reset.js

@@ -0,0 +1,11 @@
+import { resolve } from 'node:path';
+import { parseArgs } from '../args.js';
+import { booleanOption, stringOption } from './options.js';
+export function resetCommandOptionsFromArgs(argv) {
+    const { values } = parseArgs(argv);
+    return {
+        target: resolve(stringOption(values, 'target') ?? process.cwd()),
+        stage: booleanOption(values, 'stage', true),
+        dryRun: booleanOption(values, 'dryRun', false),
+    };
+}

package/dist/cli-routes/source.js

@@ -0,0 +1,123 @@
+import { resolve } from 'node:path';
+import { parseArgs } from '../args.js';
+import { commandOdooVersion } from '../environment-version.js';
+import { outroPrompt } from '../prompts/index.js';
+import { addModuleRepo, removeModuleRepo } from '../repo-actions.js';
+import { normalizeRepositoryUrl } from '../repo-url.js';
+import { listSources, renderSourceList, renderSourceSyncPlan, sourceListJson, sourceSyncPlan, sourceSyncPlanJson, sourceSyncJson, syncSources, } from '../source-actions.js';
+import { renderBanner } from '../templates.js';
+import { booleanOption, jsonOption, optionalSourceTypeValue, printJson, sourceTypeValue, stringOption, } from './options.js';
+export function renderedSourceRepoPath(target, sourceType, repoPath) {
+    if (repoPath) {
+        return `${target}/odoo/custom/src/${sourceType}/${repoPath}`;
+    }
+    return `${target}/odoo/custom/src/${sourceType}`;
+}
+export async function addRepoOptionsFromArgs(argv) {
+    const { values } = parseArgs(argv);
+    const repoUrl = stringOption(values, 'repoUrl') ?? stringOption(values, 'sourceRepoUrl');
+    if (!repoUrl) {
+        return undefined;
+    }
+    const target = resolve(stringOption(values, 'target') ?? process.cwd());
+    return {
+        target,
+        repoUrl: normalizeRepositoryUrl(repoUrl),
+        repoPath: stringOption(values, 'repo') ?? stringOption(values, 'sourcePath'),
+        sourceType: sourceTypeValue(values),
+        odooVersion: await commandOdooVersion(target, stringOption(values, 'odooVersion')),
+        initEmptyRepos: booleanOption(values, 'initEmptyRepos', false),
+        stage: booleanOption(values, 'stage', true),
+    };
+}
+export function removeRepoOptionsFromArgs(argv) {
+    const { values } = parseArgs(argv);
+    const repoPath = stringOption(values, 'repo') ?? stringOption(values, 'sourcePath');
+    if (!repoPath) {
+        return undefined;
+    }
+    return {
+        target: resolve(stringOption(values, 'target') ?? process.cwd()),
+        repoPath,
+        sourceType: optionalSourceTypeValue(values),
+        stage: booleanOption(values, 'stage', true),
+    };
+}
+export function sourceUsage() {
+    return 'Usage: wpmoo source <list|sync|add|remove> [options]';
+}
+export function sourceSyncOptionsFromArgs(argv) {
+    const { values } = parseArgs(argv);
+    return {
+        target: resolve(stringOption(values, 'target') ?? process.cwd()),
+        stage: booleanOption(values, 'stage', true),
+        json: jsonOption(values),
+        dryRun: booleanOption(values, 'dryRun', false),
+    };
+}
+export function sourceListOptionsFromArgs(argv) {
+    const { values } = parseArgs(argv);
+    return {
+        target: resolve(stringOption(values, 'target') ?? process.cwd()),
+        json: jsonOption(values),
+    };
+}
+export async function runSourceCommand(argv) {
+    const [subcommand, ...subcommandArgv] = argv;
+    if (!subcommand) {
+        throw new Error(sourceUsage());
+    }
+    if (subcommand === 'list') {
+        const options = sourceListOptionsFromArgs(subcommandArgv);
+        const sources = await listSources(options.target);
+        if (options.json) {
+            printJson(sourceListJson(sources));
+            return;
+        }
+        console.log(renderBanner());
+        console.log(renderSourceList(sources));
+        return;
+    }
+    if (subcommand === 'sync') {
+        const options = sourceSyncOptionsFromArgs(subcommandArgv);
+        if (options.dryRun) {
+            const plan = await sourceSyncPlan(options.target);
+            if (options.json) {
+                printJson(sourceSyncPlanJson(plan));
+                return;
+            }
+            console.log(renderBanner());
+            console.log(renderSourceSyncPlan(plan));
+            return;
+        }
+        const sources = await syncSources({ target: options.target, stage: options.stage });
+        if (options.json) {
+            printJson(sourceSyncJson(sources, options.target));
+            return;
+        }
+        console.log(renderBanner());
+        outroPrompt(`Synced source manifest in ${options.target}.`);
+        return;
+    }
+    if (subcommand === 'add') {
+        const options = await addRepoOptionsFromArgs(subcommandArgv);
+        if (!options) {
+            throw new Error('Usage: wpmoo source add --repo-url <url> [--source-type private|oca|external]');
+        }
+        console.log(renderBanner());
+        await addModuleRepo(options);
+        outroPrompt(`Added source repo under ${renderedSourceRepoPath(options.target, options.sourceType ?? 'private', options.repoPath)}.`);
+        return;
+    }
+    if (subcommand === 'remove') {
+        const options = removeRepoOptionsFromArgs(subcommandArgv);
+        if (!options) {
+            throw new Error('Usage: wpmoo source remove --repo <name> [--source-type private|oca|external]');
+        }
+        console.log(renderBanner());
+        await removeModuleRepo(options);
+        outroPrompt(`Removed source repo ${options.repoPath} from ${options.target}.`);
+        return;
+    }
+    throw new Error(sourceUsage());
+}

package/dist/cli.js

@@ -11,10 +11,14 @@ import { selectModuleAction } from './cockpit/module-action-menu.js';
 import { selectModuleFromBrowser } from './cockpit/module-browser.js';
 import { selectCockpitTopLevelMenu } from './cockpit/menu.js';
 import { confirmCockpitCommandRisk } from './cockpit/safety.js';
+import { doctorOptionsFromArgs } from './cli-routes/doctor.js';
+import { booleanOption, jsonOption, optionalSourceTypeValue, printJson, stringOption } from './cli-routes/options.js';
+import { resetCommandOptionsFromArgs } from './cli-routes/reset.js';
+import { addRepoOptionsFromArgs, removeRepoOptionsFromArgs, renderedSourceRepoPath, runSourceCommand, } from './cli-routes/source.js';
 import { detectDevelopmentEnvironment } from './environment.js';
 import { commandOdooVersion } from './environment-version.js';
 import { defaultAgentSkillsTemplateUrl } from './external-templates.js';
-import { listEnvironmentDatabases, normalizeDatabaseListResult } from './databases.js';
+import { findDatabaseSnapshots, databaseSnapshotCatalogJson, listEnvironmentDatabases, normalizeDatabaseListResult, renderDatabaseSnapshotCatalog, } from './databases.js';
 import { isDailyActionCommand, runDailyAction, runDailyActionWithStyledOutput } from './daily-actions.js';
 import { getDoctorReport, runDoctor } from './doctor.js';
 import { getOriginUrl, realGit } from './git.js';
@@ -29,7 +33,7 @@ import { inferGitHubOwner, inferRepoPath, normalizeRepositoryUrl } from './repo-
 import { addModuleRepo, listModuleRepos, removeModuleRepo } from './repo-actions.js';
 import { renderSafeResetPreview, safeResetEnvironment } from './safe-reset.js';
 import { getServiceRuntimeStatus, renderServiceRuntimeStatusLine, } from './service-runtime-status.js';
-import { listSources, renderSourceList, sourceListJson, sourceSyncJson, syncSources, } from './source-actions.js';
+import { listSources, } from './source-actions.js';
 import { backupTargetPath, expectedTargetConfirmation, inspectEnvironmentTarget, renderExistingEnvironmentSummary, renderForeignEnvironmentTargetWarning, } from './environment-target-preflight.js';
 import { getGitHubPrerequisiteStatus, renderGitHubPrerequisiteGuidance, } from './github-prerequisites.js';
 import { checkGitHubRepositories, createGitHubRepositories, manualCreateCommands, } from './repository-preflight.js';
@@ -88,42 +92,6 @@ async function selectDefaultGitHubOwner(cancelAction = 'exit', preferredOwner) {
         return preferredOwner;
     }
 }
-function stringOption(values, key) {
-    const value = values[key];
-    return typeof value === 'string' && value.trim() ? value.trim() : undefined;
-}
-function optionalSourceTypeValue(values) {
-    const value = stringOption(values, 'sourceType');
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === 'private' || value === 'oca' || value === 'external') {
-        return value;
-    }
-    throw new Error(`Invalid value for --source-type: ${value}`);
-}
-function sourceTypeValue(values) {
-    return optionalSourceTypeValue(values) ?? 'private';
-}
-function booleanOption(values, key, fallback) {
-    const value = values[key];
-    if (value === undefined)
-        return fallback;
-    if (typeof value === 'boolean')
-        return value;
-    const normalized = value.toLowerCase().trim();
-    if (['true', '1', 'yes', 'y'].includes(normalized))
-        return true;
-    if (['false', '0', 'no', 'n'].includes(normalized))
-        return false;
-    throw new Error(`Invalid boolean value for --${key}: ${value}`);
-}
-function jsonOption(values) {
-    return booleanOption(values, 'json', false);
-}
-function printJson(value) {
-    console.log(JSON.stringify(value));
-}
 function supportsAnsi() {
     return Boolean(process.stdout.isTTY) && process.env.NO_COLOR === undefined;
 }
@@ -149,12 +117,6 @@ function shellQuote(value) {
         return value;
     return `'${value.replaceAll("'", "'\\''")}'`;
 }
-function renderedSourceRepoPath(target, sourceType, repoPath) {
-    if (repoPath) {
-        return `${target}/odoo/custom/src/${sourceType}/${repoPath}`;
-    }
-    return `${target}/odoo/custom/src/${sourceType}`;
-}
 function renderPostCreateGuidance(target, cwd) {
     const relativeTarget = relative(cwd, target) || '.';
     const cdCommand = `cd ${shellQuote(relativeTarget)}`;
@@ -270,7 +232,7 @@ async function showStartup(argv, skipUpdateCheck, details) {
     }
     console.log();
 }
-async function selectCockpitCommandFromMenu(serviceStatus, moduleCount, sourceRepoCount) {
+async function selectCockpitCommandFromMenu(serviceStatus, moduleCount, sourceRepoCount, snapshotCount) {
     const legacyServiceStatus = serviceStatus.kind === 'services-running' ||
         serviceStatus.kind === 'db-ready' ||
         serviceStatus.kind === 'odoo-not-ready' ||
@@ -281,6 +243,7 @@ async function selectCockpitCommandFromMenu(serviceStatus, moduleCount, sourceRe
         serviceStatus: legacyServiceStatus,
         moduleCount,
         sourceRepoCount,
+        snapshotCount,
     });
     if (selection.kind === 'exit') {
         return 'exit';
@@ -520,23 +483,6 @@ async function optionsFromPrompts(showIntro = true, cancelAction = 'exit') {
         },
     };
 }
-async function addRepoOptionsFromArgs(argv) {
-    const { values } = parseArgs(argv);
-    const repoUrl = stringOption(values, 'repoUrl') ?? stringOption(values, 'sourceRepoUrl');
-    if (!repoUrl) {
-        return undefined;
-    }
-    const target = resolve(stringOption(values, 'target') ?? process.cwd());
-    return {
-        target,
-        repoUrl: normalizeRepositoryUrl(repoUrl),
-        repoPath: stringOption(values, 'repo') ?? stringOption(values, 'sourcePath'),
-        sourceType: sourceTypeValue(values),
-        odooVersion: await commandOdooVersion(target, stringOption(values, 'odooVersion')),
-        initEmptyRepos: booleanOption(values, 'initEmptyRepos', false),
-        stage: booleanOption(values, 'stage', true),
-    };
-}
 async function addRepoOptionsFromPrompts(showIntro = true, cancelAction = 'exit') {
     showSubmenuIntro('Add source repo as submodule', showIntro, cancelAction);
     const target = process.cwd();
@@ -680,112 +626,6 @@ async function addModuleOptionsFromPrompts(showIntro = true, cancelAction = 'exi
         stage: true,
     };
 }
-function removeRepoOptionsFromArgs(argv) {
-    const { values } = parseArgs(argv);
-    const repoPath = stringOption(values, 'repo') ?? stringOption(values, 'sourcePath');
-    if (!repoPath) {
-        return undefined;
-    }
-    return {
-        target: resolve(stringOption(values, 'target') ?? process.cwd()),
-        repoPath,
-        sourceType: optionalSourceTypeValue(values),
-        stage: booleanOption(values, 'stage', true),
-    };
-}
-function resetCommandOptionsFromArgs(argv) {
-    const { values } = parseArgs(argv);
-    return {
-        target: resolve(stringOption(values, 'target') ?? process.cwd()),
-        stage: booleanOption(values, 'stage', true),
-        dryRun: booleanOption(values, 'dryRun', false),
-    };
-}
-function doctorOptionsFromArgs(argv) {
-    const { values } = parseArgs(argv);
-    const keys = Object.keys(values);
-    const allowedKeys = new Set(['fix', 'json', 'postgres']);
-    if (!keys.every((key) => allowedKeys.has(key))) {
-        throw new Error('Usage: wpmoo doctor');
-    }
-    const options = {
-        json: jsonOption(values),
-    };
-    if (Object.hasOwn(values, 'fix')) {
-        options.fix = booleanOption(values, 'fix', false);
-    }
-    if (Object.hasOwn(values, 'postgres')) {
-        options.postgres = booleanOption(values, 'postgres', false);
-    }
-    return options;
-}
-function sourceUsage() {
-    return 'Usage: wpmoo source <list|sync|add|remove> [options]';
-}
-function sourceSyncOptionsFromArgs(argv) {
-    const { values } = parseArgs(argv);
-    return {
-        target: resolve(stringOption(values, 'target') ?? process.cwd()),
-        stage: booleanOption(values, 'stage', true),
-        json: jsonOption(values),
-    };
-}
-function sourceListOptionsFromArgs(argv) {
-    const { values } = parseArgs(argv);
-    return {
-        target: resolve(stringOption(values, 'target') ?? process.cwd()),
-        json: jsonOption(values),
-    };
-}
-async function runSourceCommand(argv) {
-    const [subcommand, ...subcommandArgv] = argv;
-    if (!subcommand) {
-        throw new Error(sourceUsage());
-    }
-    if (subcommand === 'list') {
-        const options = sourceListOptionsFromArgs(subcommandArgv);
-        const sources = await listSources(options.target);
-        if (options.json) {
-            printJson(sourceListJson(sources));
-            return;
-        }
-        console.log(renderBanner());
-        console.log(renderSourceList(sources));
-        return;
-    }
-    if (subcommand === 'sync') {
-        const options = sourceSyncOptionsFromArgs(subcommandArgv);
-        const sources = await syncSources({ target: options.target, stage: options.stage });
-        if (options.json) {
-            printJson(sourceSyncJson(sources, options.target));
-            return;
-        }
-        console.log(renderBanner());
-        outroPrompt(`Synced source manifest in ${options.target}.`);
-        return;
-    }
-    if (subcommand === 'add') {
-        const options = await addRepoOptionsFromArgs(subcommandArgv);
-        if (!options) {
-            throw new Error('Usage: wpmoo source add --repo-url <url> [--source-type private|oca|external]');
-        }
-        console.log(renderBanner());
-        await addModuleRepo(options);
-        outroPrompt(`Added source repo under ${renderedSourceRepoPath(options.target, options.sourceType ?? 'private', options.repoPath)}.`);
-        return;
-    }
-    if (subcommand === 'remove') {
-        const options = removeRepoOptionsFromArgs(subcommandArgv);
-        if (!options) {
-            throw new Error('Usage: wpmoo source remove --repo <name> [--source-type private|oca|external]');
-        }
-        console.log(renderBanner());
-        await removeModuleRepo(options);
-        outroPrompt(`Removed source repo ${options.repoPath} from ${options.target}.`);
-        return;
-    }
-    throw new Error(sourceUsage());
-}
 async function confirmSafeResetFromMenu(options) {
     notePrompt(renderSafeResetPreview(options.target, options.stage), 'Safe reset preview');
     const confirmed = await confirmPrompt({
@@ -836,6 +676,7 @@ function removeModuleOptionsFromArgs(argv) {
         moduleName,
         sourceType: optionalSourceTypeValue(values),
         deleteFiles: booleanOption(values, 'deleteFiles', false),
+        dryRun: booleanOption(values, 'dryRun', false),
         stage: booleanOption(values, 'stage', true),
     };
 }
@@ -1493,7 +1334,7 @@ export async function runCli(cliArgv = process.argv.slice(2), cwd = process.cwd(
         };
         while (true) {
             try {
-                const command = await selectCockpitCommandFromMenu(serviceStatus, status.kind === 'environment' ? status.moduleCandidateCount : undefined, status.kind === 'environment' ? status.sourceRepoCount : undefined);
+                const command = await selectCockpitCommandFromMenu(serviceStatus, status.kind === 'environment' ? status.moduleCandidateCount : undefined, status.kind === 'environment' ? status.sourceRepoCount : undefined, status.kind === 'environment' ? findDatabaseSnapshots(cwd).snapshots.length : undefined);
                 if (command === 'exit') {
                     return;
                 }
@@ -1579,14 +1420,14 @@ export async function runCli(cliArgv = process.argv.slice(2), cwd = process.cwd(
         const options = removeModuleOptionsFromArgs(route.argv);
         if (options) {
             console.log(renderBanner());
-            await removeModuleFromSourceRepo(options);
-            outroPrompt(`Removed module ${options.moduleName} from source repo ${options.repoPath}.`);
+            const report = await removeModuleFromSourceRepo(options);
+            outroPrompt(report.dryRun ? report.summary : `Removed module ${options.moduleName} from source repo ${options.repoPath}.`);
             return;
         }
         await showStartup(argv, skipUpdateCheck);
         const promptedOptions = await removeModuleOptionsFromPrompts();
-        await removeModuleFromSourceRepo(promptedOptions);
-        outroPrompt(`Removed module ${promptedOptions.moduleName} from source repo ${promptedOptions.repoPath}.`);
+        const report = await removeModuleFromSourceRepo(promptedOptions);
+        outroPrompt(report.dryRun ? report.summary : `Removed module ${promptedOptions.moduleName} from source repo ${promptedOptions.repoPath}.`);
         return;
     }
     if (route.command === 'reset') {
@@ -1611,6 +1452,9 @@ export async function runCli(cliArgv = process.argv.slice(2), cwd = process.cwd(
             doctorOptions.postgres = options.postgres;
         }
         if (options.json) {
+            if (doctorOptions.fix) {
+                throw new Error('doctor --json --fix is not supported; run doctor --fix for human-readable auto-fix output, then doctor --json to inspect the post-fix state.');
+            }
             printJson(await getDoctorReport(cwd, doctorOptions));
             return;
         }
@@ -1634,6 +1478,20 @@ export async function runCli(cliArgv = process.argv.slice(2), cwd = process.cwd(
         console.log(await renderEnvironmentStatusForTarget(cwd));
         return;
     }
+    if (route.command === 'snapshot' && route.argv[0] === '--list') {
+        const { values } = parseArgs(route.argv);
+        const keys = Object.keys(values);
+        if (!keys.every((key) => key === 'list' || key === 'json')) {
+            throw new Error('Usage: wpmoo snapshot [--list] [db] [snapshot-name]');
+        }
+        if (jsonOption(values)) {
+            printJson(databaseSnapshotCatalogJson(cwd));
+            return;
+        }
+        console.log(renderBanner());
+        console.log(renderDatabaseSnapshotCatalog(cwd));
+        return;
+    }
     if (isDailyActionCommand(route.command)) {
         console.log(renderBanner());
         await runDailyAction(route.command, await resolveDailyActionModuleTargets(route.command, route.argv, cwd), cwd);