@wpmoo/toolkit 0.9.29 → 0.9.30

package/dist/cockpit/daily-prompts.js

@@ -1,4 +1,4 @@
-import { listEnvironmentDatabases, normalizeDatabaseListResult, } from '../databases.js';
+import { listEnvironmentDatabases, findDatabaseSnapshots, normalizeDatabaseListResult, } from '../databases.js';
 import { listModulesInSourceRepo } from '../module-actions.js';
 import { listModuleRepos } from '../repo-actions.js';
 import { listSources } from '../source-actions.js';
@@ -6,6 +6,7 @@ import { handlePromptCancel, menuPromptMessage, } from '../menu-navigation.js';
 import { isPromptCancel, selectPrompt, textPrompt } from '../prompts/index.js';
 const manualModuleValue = '__wpmoo_manual_module_entry__';
 const manualDatabaseValue = '__wpmoo_manual_database_entry__';
+const manualSnapshotValue = '__wpmoo_manual_snapshot_entry__';
 function defaultCancelHandler(value, action) {
     handlePromptCancel(isPromptCancel(value), action);
 }
@@ -199,11 +200,37 @@ export async function collectDailyActionArgs(command, cwd, promptDepsArg = {}) {
         return [db, snapshotName];
     }
     if (command === 'restore-snapshot') {
-        const snapshotName = requiredString(await deps.text({
-            message: menuPromptMessage('Snapshot name', 'back'),
-            validate: (value) => (value.trim() ? undefined : 'Enter the snapshot name.'),
-        }), 'Snapshot name is required.', deps);
-        const db = await databaseArg(cwd, deps, 'Odoo database', 'devel');
+        const snapshots = findDatabaseSnapshots(cwd).snapshots;
+        let snapshotName;
+        let fallbackDatabase = 'devel';
+        if (snapshots.length > 0) {
+            const selected = await deps.select({
+                message: menuPromptMessage('Snapshot', 'back'),
+                options: [
+                    ...snapshots.map((snapshot) => ({ value: snapshot.name, label: snapshot.name })),
+                    { value: manualSnapshotValue, label: 'Manual entry' },
+                ],
+                initialValue: snapshots[0].name,
+            });
+            deps.handleCancel(selected, 'back');
+            if (selected !== manualSnapshotValue) {
+                snapshotName = String(selected);
+                fallbackDatabase = snapshots.find((snapshot) => snapshot.name === snapshotName)?.databaseName ?? fallbackDatabase;
+            }
+            else {
+                snapshotName = requiredString(await deps.text({
+                    message: menuPromptMessage('Snapshot name', 'back'),
+                    validate: (value) => (value.trim() ? undefined : 'Enter the snapshot name.'),
+                }), 'Snapshot name is required.', deps);
+            }
+        }
+        else {
+            snapshotName = requiredString(await deps.text({
+                message: menuPromptMessage('Snapshot name', 'back'),
+                validate: (value) => (value.trim() ? undefined : 'Enter the snapshot name.'),
+            }), 'Snapshot name is required.', deps);
+        }
+        const db = await databaseArg(cwd, deps, 'Odoo database', fallbackDatabase);
         return [snapshotName, db];
     }
     return [];

package/dist/cockpit/menu.js

@@ -35,6 +35,7 @@ function commandName(command) {
 }
 const disabledReasonNextStep = {
     'No modules found.': 'Next: choose "Add module" first.',
+    'No snapshots found.': 'Next: choose "Create snapshot" first.',
     'Services stopped.': 'Next: choose "Start services" first.',
     'Already running.': 'Next: choose "Stop services" or "Restart services".',
     'Docker not running.': 'Next: start Docker, then choose "Start services".',
@@ -66,10 +67,14 @@ function moduleDisabledReason(command, moduleCount) {
 function sourceRepoDisabledReason(command, sourceRepoCount) {
     return sourceRepoCount === 0 && command.id === 'add-module' ? 'No source repos found.' : undefined;
 }
-function disabledReason(command, serviceStatus, moduleCount, sourceRepoCount) {
+function snapshotDisabledReason(command, snapshotCount) {
+    return snapshotCount === 0 && command.id === 'restore-snapshot' ? 'No snapshots found.' : undefined;
+}
+function disabledReason(command, serviceStatus, moduleCount, sourceRepoCount, snapshotCount) {
     return (serviceDisabledReason(command, serviceStatus) ??
         moduleDisabledReason(command, moduleCount) ??
-        sourceRepoDisabledReason(command, sourceRepoCount));
+        sourceRepoDisabledReason(command, sourceRepoCount) ??
+        snapshotDisabledReason(command, snapshotCount));
 }
 function commandDisabledValue(reason) {
     if (!reason) {
@@ -77,7 +82,7 @@ function commandDisabledValue(reason) {
     }
     return reason;
 }
-function categoryChoices(category, index, serviceStatus, moduleCount, sourceRepoCount) {
+function categoryChoices(category, index, serviceStatus, moduleCount, sourceRepoCount, snapshotCount) {
     const choices = [
         promptSeparator(categoryHeading(category)),
         ...topLevelCommands
@@ -87,7 +92,7 @@ function categoryChoices(category, index, serviceStatus, moduleCount, sourceRepo
                 value: command,
                 name: commandName(command),
                 short: command.label,
-                disabled: commandDisabledValue(disabledReason(command, serviceStatus, moduleCount, sourceRepoCount)),
+                disabled: commandDisabledValue(disabledReason(command, serviceStatus, moduleCount, sourceRepoCount, snapshotCount)),
             };
         }),
     ];
@@ -120,8 +125,8 @@ function menuDeps(deps = {}) {
 function isCockpitCommand(value) {
     return typeof value === 'object' && value !== null && 'id' in value && 'slashAlias' in value;
 }
-function topLevelChoices(serviceStatus, moduleCount, sourceRepoCount) {
-    return topLevelCategoryOrder.flatMap((category, index) => categoryChoices(category, index, serviceStatus, moduleCount, sourceRepoCount));
+function topLevelChoices(serviceStatus, moduleCount, sourceRepoCount, snapshotCount) {
+    return topLevelCategoryOrder.flatMap((category, index) => categoryChoices(category, index, serviceStatus, moduleCount, sourceRepoCount, snapshotCount));
 }
 function defaultCommand(serviceStatus) {
     if (serviceStatus?.kind === 'running') {
@@ -134,7 +139,7 @@ function defaultCommand(serviceStatus) {
 }
 export async function selectCockpitTopLevelMenu(options = {}) {
     const deps = menuDeps(options);
-    const choices = topLevelChoices(options.serviceStatus, options.moduleCount, options.sourceRepoCount);
+    const choices = topLevelChoices(options.serviceStatus, options.moduleCount, options.sourceRepoCount, options.snapshotCount);
     const cancelAction = 'back';
     const selected = await deps.select({
         message: '',

package/dist/cockpit/module-browser.js

@@ -1,7 +1,7 @@
 import { styleText } from 'node:util';
 import { listModulesInEnvironment, } from '../module-actions.js';
 import { handlePromptCancel, } from '../menu-navigation.js';
-import { isPromptCancel, promptSeparator, selectPrompt, } from '../prompts/index.js';
+import { isPromptCancel, promptSeparator, searchPrompt, selectPrompt, } from '../prompts/index.js';
 const sourceTypeLabels = {
     private: 'Private',
     oca: 'OCA',
@@ -10,6 +10,7 @@ const sourceTypeLabels = {
 const sourceTypeOrder = ['private', 'oca', 'external'];
 const minimumPageSize = 8;
 const reservedRows = 7;
+const searchableModuleThreshold = 20;
 function rgb(red, green, blue, value) {
     return `\u001B[38;2;${red};${green};${blue}m${value}\u001B[39m`;
 }
@@ -51,6 +52,7 @@ function defaultCancelHandler(value, action) {
 function deps(options = {}) {
     return {
         select: options.select ?? ((selectOptions) => selectPrompt(selectOptions)),
+        search: options.search ?? ((searchOptions) => searchPrompt(searchOptions)),
         handleCancel: options.handleCancel ?? defaultCancelHandler,
     };
 }
@@ -92,14 +94,89 @@ export function moduleBrowserChoices(modules) {
     }
     return choices;
 }
+function normalizeModuleSearchTerm(term) {
+    return (term ?? '')
+        .trim()
+        .toLowerCase()
+        .replace(/[/:]+/g, ' ')
+        .split(/\s+/u)
+        .filter(Boolean);
+}
+function searchableModuleFields(module) {
+    const repoSlugName = module.repoSlug?.split('/').at(-1) ?? '';
+    return [
+        module.moduleName,
+        module.repoPath,
+        repoSlugName,
+        module.sourceType,
+        sourceContext(module),
+    ].map((value) => value.toLowerCase());
+}
+function moduleSearchScore(module, terms) {
+    if (terms.length === 0) {
+        return 50;
+    }
+    const moduleName = module.moduleName.toLowerCase();
+    const repoPath = module.repoPath.toLowerCase();
+    if (terms.some((term) => moduleName === term)) {
+        return 0;
+    }
+    if (terms.some((term) => moduleName.startsWith(term))) {
+        return 1;
+    }
+    if (terms.some((term) => repoPath === term)) {
+        return 2;
+    }
+    if (terms.some((term) => repoPath.startsWith(term))) {
+        return 3;
+    }
+    if (terms.some((term) => module.sourceType === term)) {
+        return 4;
+    }
+    return 5;
+}
+export function searchModuleBrowserChoices(modules, term) {
+    const terms = normalizeModuleSearchTerm(term);
+    const moduleWidth = Math.max(...modules.map((module) => module.moduleName.length), 1);
+    return modules
+        .filter((module) => {
+        if (terms.length === 0) {
+            return true;
+        }
+        const fields = searchableModuleFields(module);
+        return terms.every((term) => fields.some((field) => field.includes(term)));
+    })
+        .sort((left, right) => {
+        const score = moduleSearchScore(left, terms) - moduleSearchScore(right, terms);
+        return score || left.sourceType.localeCompare(right.sourceType) || left.repoPath.localeCompare(right.repoPath) || left.moduleName.localeCompare(right.moduleName);
+    })
+        .map((module) => ({
+        value: module,
+        name: moduleChoiceName(module, moduleWidth),
+        description: sourceContext(module),
+        short: module.moduleName,
+    }));
+}
 export async function selectModuleFromBrowser(target, options = {}) {
     const modules = await listModulesInEnvironment(target);
     if (modules.length === 0) {
         return undefined;
     }
-    const moduleChoices = moduleBrowserChoices(modules);
     const promptDeps = deps(options);
     const cancelAction = options.cancelAction ?? 'back';
+    if (modules.length > searchableModuleThreshold) {
+        const selected = await promptDeps.search({
+            message: 'Search modules',
+            pageSize: pageSize(modules.length),
+            source: (term) => searchModuleBrowserChoices(modules, term),
+        });
+        promptDeps.handleCancel(selected, cancelAction);
+        if (typeof selected === 'object' && selected !== null && 'moduleName' in selected) {
+            return selected;
+        }
+        return undefined;
+    }
+    const moduleChoices = moduleBrowserChoices(modules);
     const selected = await promptDeps.select({
         message: '',
         choices: moduleChoices,

package/dist/daily-actions.js

@@ -1,10 +1,11 @@
 import { spawn } from 'node:child_process';
 import { access } from 'node:fs/promises';
 import { join } from 'node:path';
+import { readActiveApprovals } from './approval-ledger.js';
 import { appendAuditLog } from './audit-log.js';
 import { readEnvFile, selectedComposeEnvironment } from './compose-layout.js';
-import { defaultDatabaseSnapshotMaxAgeMs, findDatabaseSnapshots, normalizeDatabaseName } from './databases.js';
-import { evaluateDailyActionPolicy, } from './environment-policy.js';
+import { defaultDatabaseSnapshotMaxAgeMs, findDatabaseSnapshots, normalizeDatabaseName, normalizeSnapshotName, restoreSnapshotPreflight, } from './databases.js';
+import { evaluateDailyActionPolicy, parseEnvironmentKind, } from './environment-policy.js';
 import { markerPath } from './environment.js';
 import { scanMigrationRisks } from './migrations.js';
 export const dailyActionCommands = [
@@ -69,7 +70,7 @@ function usage(command) {
     if (command === 'resetdb')
         return 'Usage: wpmoo resetdb [db] [module[,module]]';
     if (command === 'snapshot')
-        return 'Usage: wpmoo snapshot [db] [snapshot-name]';
+        return 'Usage: wpmoo snapshot [--list] [db] [snapshot-name]';
     if (command === 'restore-snapshot')
         return 'Usage: wpmoo restore-snapshot [--dry-run] <snapshot-name> [db]';
     if (command === 'lint')
@@ -133,7 +134,8 @@ function restoreSnapshotArgs(argv) {
     if (args.length < 1 || args.length > 2 || args.some((arg) => arg.startsWith('-'))) {
         throw new Error(usage('restore-snapshot'));
     }
-    const validatedArgs = args.length === 2 ? validateDatabaseArg(args, 1) : args;
+    const snapshotName = normalizeSnapshotName(args[0]);
+    const validatedArgs = args.length === 2 ? validateDatabaseArg([snapshotName, args[1]], 1) : [snapshotName];
     return dryRun ? ['--dry-run', ...validatedArgs] : validatedArgs;
 }
 function testArgs(argv) {
@@ -180,7 +182,8 @@ function scriptArgs(command, argv) {
     }
     if (command === 'snapshot') {
         rejectLeadingHyphenDatabaseArg(argv);
-        return validateDatabaseArg(positionalArgs(command, argv, 0, 2), 0);
+        const args = validateDatabaseArg(positionalArgs(command, argv, 0, 2), 0);
+        return args.length === 2 ? [args[0], normalizeSnapshotName(args[1])] : args;
     }
     if (command === 'restore-snapshot')
         return restoreSnapshotArgs(argv);
@@ -212,7 +215,7 @@ function envValue(env, key) {
 function flagEnabled(env, key) {
     return envValue(env, key) === '1';
 }
-function approvedFlags(env) {
+function envApprovedFlags(env) {
     return [
         'WPMOO_ALLOW_DESTRUCTIVE',
         'WPMOO_ALLOW_STAGE_LIFECYCLE',
@@ -221,6 +224,12 @@ function approvedFlags(env) {
         'WPMOO_ALLOW_MIGRATIONS',
     ].filter((key) => flagEnabled(env, key));
 }
+function hasApproval(approvals, scope) {
+    return approvals.some((approval) => approval.scope === scope);
+}
+function approvalFlagLabels(approvals) {
+    return [...new Set(approvals.map((approval) => approval.label))];
+}
 function requiresMigrationApproval(command) {
     return command === 'install' || command === 'update' || command === 'test';
 }
@@ -230,6 +239,25 @@ function noRecentSnapshotMessage(command, environment) {
 function migrationRiskMessage(command, environment) {
     return `Refusing migration-risk command '${command}' in WPMOO_ENV=${environment}. Review detected migration scripts or set WPMOO_ALLOW_MIGRATIONS=1 to run it intentionally.`;
 }
+function restoreSnapshotWarningKind(issue) {
+    if (issue === 'missing snapshot dump')
+        return 'restore-snapshot-missing-dump';
+    if (issue === 'missing snapshot filestore')
+        return 'restore-snapshot-missing-filestore';
+    if (issue.startsWith('snapshot database mismatch:'))
+        return 'restore-snapshot-db-name-mismatch';
+    return undefined;
+}
+function restoreSnapshotDryRunPreflight(command, args, cwd) {
+    if (command !== 'restore-snapshot' || args[0] !== '--dry-run') {
+        return undefined;
+    }
+    const snapshotName = args[1];
+    if (!snapshotName) {
+        return undefined;
+    }
+    return restoreSnapshotPreflight(cwd, snapshotName, args[2] ?? 'devel');
+}
 async function auditDailyActionPreview(preview) {
     if (preview.environment !== 'prod' || !preview.auditWorthy) {
         return;
@@ -250,19 +278,32 @@ export async function dailyActionSafetyPreview(command, argv, cwd = process.cwd(
     const args = scriptArgs(command, argv);
     const env = await readEnvFile(cwd);
     const envName = envValue(env, 'WPMOO_ENV') || selectedComposeEnvironment(env);
+    const environment = parseEnvironmentKind(envName);
+    const approvals = await readActiveApprovals(cwd, { command, environment });
     const policy = evaluateDailyActionPolicy(command, args, {
         envName,
-        allowDestructive: envValue(env, 'WPMOO_ALLOW_DESTRUCTIVE'),
-        allowStageLifecycle: envValue(env, 'WPMOO_ALLOW_STAGE_LIFECYCLE'),
-        allowProdLifecycle: envValue(env, 'WPMOO_ALLOW_PROD_LIFECYCLE'),
+        allowDestructive: envValue(env, 'WPMOO_ALLOW_DESTRUCTIVE') || (hasApproval(approvals, 'destructive') ? '1' : undefined),
+        allowStageLifecycle: envValue(env, 'WPMOO_ALLOW_STAGE_LIFECYCLE') || (hasApproval(approvals, 'stage-lifecycle') ? '1' : undefined),
+        allowProdLifecycle: envValue(env, 'WPMOO_ALLOW_PROD_LIFECYCLE') || (hasApproval(approvals, 'prod-lifecycle') ? '1' : undefined),
     });
     const warnings = [];
+    const restoreSnapshot = restoreSnapshotDryRunPreflight(command, args, cwd);
+    if (restoreSnapshot) {
+        for (const issue of restoreSnapshot.issues) {
+            const kind = restoreSnapshotWarningKind(issue);
+            if (!kind) {
+                continue;
+            }
+            warnings.push({ kind, message: issue, blocking: false });
+        }
+    }
     const snapshotRequired = policy.isDestructive && (policy.env === 'stage' || policy.env === 'prod');
     const snapshot = snapshotRequired ? findDatabaseSnapshots(cwd) : undefined;
     const noRecentSnapshot = snapshotRequired &&
         snapshot &&
         (snapshot.newestSnapshotAgeMs === null || snapshot.newestSnapshotAgeMs > defaultDatabaseSnapshotMaxAgeMs) &&
-        !flagEnabled(env, 'WPMOO_ALLOW_NO_RECENT_SNAPSHOT');
+        !flagEnabled(env, 'WPMOO_ALLOW_NO_RECENT_SNAPSHOT') &&
+        !hasApproval(approvals, 'no-recent-snapshot');
     if (noRecentSnapshot) {
         warnings.push({
             kind: 'no-recent-snapshot',
@@ -274,7 +315,7 @@ export async function dailyActionSafetyPreview(command, argv, cwd = process.cwd(
     const migrations = requiresMigrationApproval(command) && (policy.env === 'stage' || policy.env === 'prod')
         ? await scanMigrationRisks(cwd)
         : undefined;
-    if (migrations?.risk && !flagEnabled(env, 'WPMOO_ALLOW_MIGRATIONS')) {
+    if (migrations?.risk && !flagEnabled(env, 'WPMOO_ALLOW_MIGRATIONS') && !hasApproval(approvals, 'migration-risk')) {
         warnings.push({
             kind: 'migration-risk',
             requiredFlag: 'WPMOO_ALLOW_MIGRATIONS',
@@ -303,8 +344,10 @@ export async function dailyActionSafetyPreview(command, argv, cwd = process.cwd(
                 snapshotPaths: snapshot.snapshotPaths,
             }
             : undefined,
+        restoreSnapshot,
         migrations,
-        approvedFlags: approvedFlags(env),
+        approvals,
+        approvedFlags: [...envApprovedFlags(env), ...approvalFlagLabels(approvals)],
     };
 }
 export async function dailyActionPlan(command, argv, cwd = process.cwd()) {