dep-up-surgeon 2.2.3 → 2.2.4

package/dist/cli/undo.js

@@ -0,0 +1,410 @@
+/**
+ * Implementation of the `dep-up-surgeon undo` subcommand.
+ *
+ * Given a `.dep-up-surgeon.last-run.json` report (the one written next to every CLI run,
+ * unless `--no-persist-report`), this module computes a reverse pass that:
+ *
+ *   1. Reverts `package.json` dependency ranges back to the `from` values recorded for each
+ *      successful upgrade (root + every workspace target).
+ *   2. Drops override pins that this run added and, when the attempt recorded a `previous`
+ *      value, restores the previous pin (i.e. if the advisory/manual pin REPLACED an
+ *      existing override, we don't silently delete the original).
+ *   3. Runs `<manager> install` so the lockfile reconverges to the reverted ranges.
+ *   4. Runs the validator (unless `--no-validate`) so the operator knows the project builds
+ *      with the reverted versions before they commit the undo.
+ *
+ * Safety contract:
+ *   - If `package.json` has drifted since the recorded run (e.g. another upgrade changed the
+ *     range), we **skip** that row with `reason: 'drifted'`. We never rewrite a range the
+ *     user moved out from under us.
+ *   - If the recorded run was `dryRun`, there's nothing to undo — we return a no-op report.
+ *   - The module does not know how to restore a lockfile snapshot; instead it asks the
+ *     manager to reinstall from the reverted `package.json`, which is the guarantee we
+ *     actually want. A future extension can layer on a lockfile-hash check.
+ *
+ * Everything heavy (install, validator) is injected via `opts.installer` / `opts.runValidator`
+ * so unit tests can exercise the reverse pass without network / process calls.
+ */
+import path from 'node:path';
+import fs from 'fs-extra';
+import { readOverrides, removeOverrideFromFile, applyOverrideInMemory, } from '../utils/overrides.js';
+import { runInstall } from '../utils/npm.js';
+import { log } from '../utils/logger.js';
+import { LAST_RUN_FILENAME, loadLastRunReport } from './lastRun.js';
+const DEP_SECTIONS = [
+    'dependencies',
+    'devDependencies',
+    'peerDependencies',
+    'optionalDependencies',
+];
+/**
+ * Run the full reverse pass. Returns a structured `UndoResult` describing what was reverted,
+ * what was skipped, and the outcome of the post-reverse install + validator. Never throws on
+ * recoverable errors — skipped / failed items are recorded on the result.
+ */
+export async function runUndo(opts) {
+    const file = opts.file ? path.resolve(opts.cwd, opts.file) : path.join(opts.cwd, LAST_RUN_FILENAME);
+    const persisted = opts.file
+        ? await readPersisted(file)
+        : await loadLastRunReport(opts.cwd);
+    if (!persisted) {
+        throw new Error(`undo: no run report found at ${file}. Pass --file <path> to point at a specific ` +
+            `${LAST_RUN_FILENAME}, or re-run dep-up-surgeon so it writes one.`);
+    }
+    if (persisted.dryRun) {
+        if (!opts.json) {
+            log.info(`undo: the recorded run was a dry-run; nothing to revert.`);
+        }
+        return {
+            sourceFile: file,
+            noop: true,
+            reverts: [],
+            overrides: [],
+            installs: [],
+        };
+    }
+    const manager = opts.manager ?? persisted.project?.manager ?? 'npm';
+    const targets = buildTargetMap(persisted, opts.cwd);
+    const reverts = [];
+    const overrides = [];
+    // ---- 1. Revert dep ranges ------------------------------------------------
+    const editedTargets = new Set();
+    for (const row of persisted.upgraded ?? []) {
+        if (!row.success || row.skipped)
+            continue;
+        const workspace = row.workspace ?? 'root';
+        const target = targets.get(workspace) ?? targets.get('root');
+        if (!target) {
+            reverts.push({
+                name: row.name,
+                workspace,
+                ok: false,
+                skipped: true,
+                reason: 'target-missing',
+                detail: `no target cwd found for workspace "${workspace}"`,
+            });
+            continue;
+        }
+        if (!row.from) {
+            reverts.push({
+                name: row.name,
+                workspace,
+                ok: false,
+                skipped: true,
+                reason: 'no-from',
+                detail: 'upgrade row did not record a `from` value',
+                ...(row.to ? { to: row.to } : {}),
+            });
+            continue;
+        }
+        const revert = await revertDepRange(target.packageJson, row.name, row.from, row.to);
+        reverts.push({
+            name: row.name,
+            workspace,
+            from: row.from,
+            ...(row.to ? { to: row.to } : {}),
+            ...(revert.section ? { section: revert.section } : {}),
+            ok: revert.ok,
+            skipped: !revert.ok,
+            ...(revert.reason ? { reason: revert.reason } : {}),
+            ...(revert.detail ? { detail: revert.detail } : {}),
+        });
+        if (revert.ok && !opts.planOnly) {
+            await fs.writeJson(target.packageJson, revert.pkg, { spaces: 2 });
+            editedTargets.add(target.cwd);
+        }
+    }
+    // ---- 2. Drop / restore overrides ----------------------------------------
+    for (const att of persisted.overrides?.attempts ?? []) {
+        if (!att.ok || att.skipped)
+            continue;
+        const pkgJson = targets.get('root')?.packageJson ?? path.join(opts.cwd, 'package.json');
+        if (!(await fs.pathExists(pkgJson))) {
+            overrides.push({
+                name: att.name,
+                ok: false,
+                skipped: true,
+                reason: 'missing-package-json',
+                detail: pkgJson,
+            });
+            continue;
+        }
+        const chain = att.chain && att.chain.length > 0 ? [...att.chain] : [att.name];
+        let result;
+        if (att.previous && att.previous !== att.applied) {
+            // Restore the pre-existing pin rather than deleting outright. This is the case where
+            // --apply-overrides REPLACED an existing override (e.g. we bumped 1.2.3 → 1.3.0); undo
+            // should put 1.2.3 back, not leave the transitive floating.
+            if (opts.planOnly) {
+                result = {
+                    name: att.name,
+                    chain,
+                    ...(att.applied ? { applied: att.applied } : {}),
+                    previous: att.previous,
+                    ok: true,
+                    skipped: false,
+                    reason: 'restored-previous',
+                    detail: `would restore ${att.previous}`,
+                };
+            }
+            else {
+                const entry = { name: chain[chain.length - 1], range: att.previous };
+                if (chain.length > 1)
+                    entry.parentChain = chain.slice(0, -1);
+                // Undo deliberately bypasses `applyOverrideToFile`'s "skip if existing >= target"
+                // semantics — a revert is allowed to move the pin backwards; that's literally the
+                // whole point. We call `applyOverrideInMemory` directly and write the result.
+                const pkg = (await fs.readJson(pkgJson));
+                const next = applyOverrideInMemory(pkg, manager, entry);
+                await fs.writeJson(pkgJson, next, { spaces: 2 });
+                editedTargets.add(opts.cwd);
+                result = {
+                    name: att.name,
+                    chain,
+                    ...(att.applied ? { applied: att.applied } : {}),
+                    previous: att.previous,
+                    ok: true,
+                    skipped: false,
+                    reason: 'restored-previous',
+                };
+            }
+        }
+        else {
+            if (opts.planOnly) {
+                result = {
+                    name: att.name,
+                    chain,
+                    ...(att.applied ? { applied: att.applied } : {}),
+                    ok: true,
+                    skipped: false,
+                    reason: 'dropped',
+                    detail: 'would drop',
+                };
+            }
+            else {
+                const removed = await removeOverrideFromFile(pkgJson, manager, { chain });
+                if (removed.removed) {
+                    editedTargets.add(opts.cwd);
+                    result = {
+                        name: att.name,
+                        chain,
+                        ...(att.applied ? { applied: att.applied } : {}),
+                        ok: true,
+                        skipped: false,
+                        reason: 'dropped',
+                    };
+                }
+                else {
+                    result = {
+                        name: att.name,
+                        chain,
+                        ...(att.applied ? { applied: att.applied } : {}),
+                        ok: false,
+                        skipped: true,
+                        reason: 'not-present',
+                        ...(removed.reason ? { detail: removed.reason } : {}),
+                    };
+                }
+            }
+        }
+        overrides.push(result);
+    }
+    // ---- 3. Post-reverse install --------------------------------------------
+    const installs = [];
+    if (!opts.planOnly && !opts.skipInstall && editedTargets.size > 0) {
+        const installer = opts.installer ?? runInstall;
+        for (const targetCwd of editedTargets) {
+            const r = await installer(targetCwd, manager, {});
+            const row = {
+                cwd: targetCwd,
+                ok: r.ok,
+                ...(r.command ? { command: r.command } : {}),
+                ...(typeof r.exitCode === 'number' ? { exitCode: r.exitCode } : {}),
+                ...(r.output ? { lastLines: tail(r.output, 40) } : {}),
+            };
+            installs.push(row);
+        }
+    }
+    // ---- 4. Post-reverse validator ------------------------------------------
+    let validation;
+    if (!opts.planOnly && !opts.skipValidator && installs.every((r) => r.ok)) {
+        if (opts.runValidator) {
+            validation = await opts.runValidator();
+        }
+    }
+    return {
+        sourceFile: file,
+        noop: false,
+        reverts,
+        overrides,
+        installs,
+        ...(validation ? { validation } : {}),
+    };
+}
+async function readPersisted(file) {
+    if (!(await fs.pathExists(file))) {
+        return undefined;
+    }
+    try {
+        return (await fs.readJson(file));
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Map workspace label → `{ cwd, packageJson }`. Falls back to the run's `cwd` when no
+ * targets block was persisted (single-root run).
+ */
+function buildTargetMap(persisted, invokedAt) {
+    const map = new Map();
+    const targets = persisted.targets ?? [];
+    if (targets.length === 0) {
+        const rootCwd = persisted.cwd ?? invokedAt;
+        map.set('root', {
+            cwd: rootCwd,
+            packageJson: path.join(rootCwd, 'package.json'),
+        });
+        return map;
+    }
+    for (const t of targets) {
+        map.set(t.label, { cwd: t.cwd, packageJson: t.packageJson });
+    }
+    if (!map.has('root')) {
+        const rootCwd = persisted.cwd ?? invokedAt;
+        map.set('root', {
+            cwd: rootCwd,
+            packageJson: path.join(rootCwd, 'package.json'),
+        });
+    }
+    return map;
+}
+/**
+ * Revert `name` back to `from` in whichever dep section currently holds it. Returns the
+ * modified `pkg` object alongside metadata about what section we touched. If the current
+ * range doesn't match the recorded `to`, we skip with `drifted` — the user modified the
+ * range out from under us and rewriting would be destructive.
+ *
+ * We do NOT assert the recorded `from` matches the version before the run; the run itself
+ * wrote it, so treating its `from` value as authoritative is exactly what the user wants.
+ */
+async function revertDepRange(packageJson, name, from, to) {
+    if (!(await fs.pathExists(packageJson))) {
+        return { ok: false, reason: 'missing', detail: `${packageJson} not found` };
+    }
+    const pkg = (await fs.readJson(packageJson));
+    for (const section of DEP_SECTIONS) {
+        const sec = pkg[section];
+        if (!sec || typeof sec !== 'object')
+            continue;
+        const map = sec;
+        if (!(name in map))
+            continue;
+        const current = typeof map[name] === 'string' ? map[name] : undefined;
+        if (to && current !== undefined && current !== to) {
+            // The recorded run landed on `to` but the current file holds something else — another
+            // run (or a human edit) changed it. Bail out of this row; undo is about REVERSING this
+            // specific run, not about steamrolling later history.
+            return {
+                ok: false,
+                reason: 'drifted',
+                detail: `current \`${section}.${name}\` is "${current}" but the run recorded "${to}"; leaving as-is`,
+            };
+        }
+        map[name] = from;
+        pkg[section] = map;
+        return { ok: true, pkg, section };
+    }
+    return {
+        ok: false,
+        reason: 'missing',
+        detail: `${name} not found in any dep section of ${path.basename(packageJson)}`,
+    };
+}
+/**
+ * Render a human-readable summary of an `UndoResult`. Used by the CLI when `--json` is not
+ * set; tests render the JSON directly.
+ */
+export function renderUndoHuman(result) {
+    const lines = [];
+    lines.push(`undo: replayed ${path.basename(result.sourceFile)}`);
+    if (result.noop) {
+        lines.push('  nothing to revert (recorded run was a dry-run)');
+        return lines.join('\n');
+    }
+    const reverted = result.reverts.filter((r) => r.ok);
+    const skipped = result.reverts.filter((r) => !r.ok);
+    const droppedOverrides = result.overrides.filter((r) => r.ok);
+    const skippedOverrides = result.overrides.filter((r) => !r.ok);
+    lines.push(`  ${reverted.length} dep range(s) reverted, ${skipped.length} skipped`);
+    for (const r of reverted) {
+        const ws = r.workspace === 'root' ? '' : ` [${r.workspace}]`;
+        lines.push(`    - ${r.name}${ws}: ${r.to ?? '?'} → ${r.from}`);
+    }
+    for (const r of skipped) {
+        const ws = r.workspace === 'root' ? '' : ` [${r.workspace}]`;
+        lines.push(`    ~ ${r.name}${ws}: skipped (${r.reason}${r.detail ? ` — ${r.detail}` : ''})`);
+    }
+    if (result.overrides.length > 0) {
+        lines.push(`  ${droppedOverrides.length} override(s) dropped, ${skippedOverrides.length} skipped`);
+        for (const o of droppedOverrides) {
+            const label = o.chain && o.chain.length > 1 ? o.chain.join('>') : o.name;
+            lines.push(`    - ${label}: ${o.reason}${o.previous ? ` (${o.applied} → ${o.previous})` : ` (dropped ${o.applied ?? '?'})`}`);
+        }
+        for (const o of skippedOverrides) {
+            const label = o.chain && o.chain.length > 1 ? o.chain.join('>') : o.name;
+            lines.push(`    ~ ${label}: skipped (${o.reason}${o.detail ? ` — ${o.detail}` : ''})`);
+        }
+    }
+    for (const inst of result.installs) {
+        lines.push(`  install @ ${inst.cwd}: ${inst.ok ? 'ok' : `failed (exit ${inst.exitCode ?? '?'})`}`);
+    }
+    if (result.validation) {
+        lines.push(`  validator: ${result.validation.ok ? 'ok' : 'failed'}`);
+    }
+    return lines.join('\n');
+}
+/** Take the last `n` lines of multi-line text, preserving order. */
+function tail(text, n) {
+    const lines = text.split(/\r?\n/);
+    return lines.slice(-n).join('\n');
+}
+/** True when the reverse pass succeeded end-to-end (reverts, installs, validator). */
+export function undoSucceeded(result) {
+    if (result.noop)
+        return true;
+    if (result.installs.some((i) => !i.ok))
+        return false;
+    if (result.validation && !result.validation.ok)
+        return false;
+    // Skipped revert rows are soft failures — the user knows about them — so we still return
+    // true so `--undo` can exit 0 when everything else is clean. The JSON report surfaces the
+    // per-row `skipped` so CI bots can be stricter if they care.
+    return true;
+}
+/**
+ * Verify a persisted run's overrides weren't already partially undone by a subsequent run.
+ * Exported so callers can cheaply check state before running the full reverse pass (e.g. a
+ * `--undo --dry-run` mode).
+ */
+export async function checkOverridesStillPresent(persisted, manager, cwd) {
+    const pkgJson = path.join(cwd, 'package.json');
+    if (!(await fs.pathExists(pkgJson)))
+        return { present: 0, missing: 0 };
+    const pkg = (await fs.readJson(pkgJson));
+    const read = readOverrides(pkg, manager);
+    let present = 0;
+    let missing = 0;
+    for (const att of persisted.overrides?.attempts ?? []) {
+        if (!att.ok || att.skipped)
+            continue;
+        const chain = att.chain && att.chain.length > 0 ? att.chain : [att.name];
+        const hit = read.entries.find((e) => e.chain.length === chain.length && e.chain.every((seg, i) => seg === chain[i]));
+        if (hit)
+            present++;
+        else
+            missing++;
+    }
+    return { present, missing };
+}
+//# sourceMappingURL=undo.js.map

package/dist/cli/undo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"undo.js","sourceRoot":"","sources":["../../src/cli/undo.ts"],"names":[],"mappings":"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"}

package/dist/cli/undoCommand.d.ts

@@ -0,0 +1,2 @@
+export declare function runUndoCommand(argv: string[], version: string): Promise<void>;
+//# sourceMappingURL=undoCommand.d.ts.map

package/dist/cli/undoCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"undoCommand.d.ts","sourceRoot":"","sources":["../../src/cli/undoCommand.ts"],"names":[],"mappings":"AAeA,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsHnF"}

package/dist/cli/undoCommand.js

@@ -0,0 +1,101 @@
+/**
+ * Dedicated entry point for `dep-up-surgeon undo`. Like `doctor`, this subcommand has its
+ * own commander program because `undo` only needs a tiny subset of the main flow's options,
+ * and threading it as a flag would force every upgrade-time option to grow a guard.
+ *
+ * Exit-code contract:
+ *   - reverse pass succeeded (or noop) → 0
+ *   - persisted run file not found / can't be parsed → 2
+ *   - install or validator failed during the reverse pass → 1
+ */
+import path from 'node:path';
+import { Command } from 'commander';
+import { log } from '../utils/logger.js';
+import { renderUndoHuman, runUndo, undoSucceeded } from './undo.js';
+export async function runUndoCommand(argv, version) {
+    const cmd = new Command();
+    cmd
+        .name('dep-up-surgeon undo')
+        .description('Reverse the most recent `dep-up-surgeon` run using `.dep-up-surgeon.last-run.json`. ' +
+        'Reverts `package.json` dep ranges to their `from` values, drops override pins this ' +
+        'run added (or restores the previous pin when the run replaced an existing one), ' +
+        'runs a fresh `<manager> install`, then runs the validator so you see green/red before ' +
+        'you commit the revert. Skips rows whose current `package.json` value has drifted from ' +
+        'the recorded `to`, so another run\'s changes are never clobbered. Pair with `--json` ' +
+        'for machine-readable output in CI.')
+        .version(version)
+        .option('--file <path>', 'Use a specific run report instead of `.dep-up-surgeon.last-run.json` in cwd. Useful when ' +
+        'the directory has been cleaned up or you want to replay a report from a CI artifact.')
+        .option('--json', 'Emit the structured `UndoResult` as JSON on stdout instead of the human format.', false)
+        .option('--dry-run', 'Compute the reverse plan and print it, but do not touch `package.json`, do not run install, do not run the validator.', false)
+        .option('--no-validate', 'Skip the post-reverse validator. Use when the project has no test/build script or when you ' +
+        'only care that the dep ranges rolled back cleanly.')
+        .option('--validate <cmd>', 'Run this command as the post-reverse validator (same semantics as the upgrade flow\'s `--validate`).')
+        .option('--skip-install', 'Skip the post-reverse `<manager> install`. Only use when you plan to run install yourself ' +
+        '(e.g. in a follow-up CI step) — the lockfile will otherwise diverge from the reverted `package.json`.', false)
+        .option('--package-manager <mgr>', 'Override the manager recorded in the run report (auto / npm / pnpm / yarn).', 'auto')
+        .option('--cwd <path>', 'Run the undo against this directory instead of the current one.');
+    // Strip the `undo` dispatch token the same way `doctor` does.
+    const forwarded = [argv[0], argv[1], ...argv.slice(3)];
+    cmd.parse(forwarded);
+    const opts = cmd.opts();
+    const cwd = opts.cwd ? path.resolve(process.cwd(), opts.cwd) : process.cwd();
+    const skipValidator = opts.validate === false;
+    const validatorCommand = typeof opts.validate === 'string' ? opts.validate : undefined;
+    try {
+        // Build a validator closure that mirrors the main flow's behavior: if the user passed a
+        // command we shell that out; otherwise `validateProject` auto-detects test / build. This
+        // keeps `--validate "my-cmd"` working identically across `upgrade`, `doctor`, and `undo`.
+        const runValidator = async () => {
+            if (skipValidator)
+                return { ok: true };
+            try {
+                const { validateProject } = await import('../core/validator.js');
+                const fs = await import('fs-extra');
+                const pkg = await fs.default.readJson(path.join(cwd, 'package.json'));
+                const manager = opts.packageManager && opts.packageManager !== 'auto'
+                    ? opts.packageManager
+                    : 'npm';
+                const vr = await validateProject(cwd, pkg, {
+                    ...(validatorCommand ? { command: validatorCommand, source: 'cli' } : {}),
+                    manager,
+                });
+                return {
+                    ok: vr.ok,
+                    ...(vr.command ? { command: vr.command } : {}),
+                    ...(vr.output ? { lastLines: vr.output } : {}),
+                };
+            }
+            catch {
+                // Validator crash != project broken for undo's purposes — report ok so we don't
+                // exit 1 purely because the validator harness itself errored. The reverse pass has
+                // already written the correct ranges; the operator can run their tests manually.
+                return { ok: true };
+            }
+        };
+        const result = await runUndo({
+            cwd,
+            ...(opts.file ? { file: opts.file } : {}),
+            ...(opts.packageManager && opts.packageManager !== 'auto'
+                ? { manager: opts.packageManager }
+                : {}),
+            ...(opts.dryRun ? { planOnly: true } : {}),
+            ...(opts.skipInstall ? { skipInstall: true } : {}),
+            ...(skipValidator ? { skipValidator: true } : {}),
+            ...(skipValidator ? {} : { runValidator }),
+            ...(opts.json ? { json: true } : {}),
+        });
+        if (opts.json) {
+            process.stdout.write(JSON.stringify(result, null, 2) + '\n');
+        }
+        else {
+            process.stdout.write(renderUndoHuman(result) + '\n');
+        }
+        process.exit(undoSucceeded(result) ? 0 : 1);
+    }
+    catch (e) {
+        log.error(`undo failed: ${e instanceof Error ? e.message : String(e)}`);
+        process.exit(2);
+    }
+}
+//# sourceMappingURL=undoCommand.js.map

package/dist/cli/undoCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"undoCommand.js","sourceRoot":"","sources":["../../src/cli/undoCommand.ts"],"names":[],"mappings":"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"}

package/dist/cli.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import { program } from 'commander';
 import prompts from 'prompts';
-import { appendIgnoreToRc, loadConfig, mergeIgnoreLists, resolveValidateOptions, } from './config/loadConfig.js';
+import { appendIgnoreToRc, loadConfig, mergeIgnoreLists, mergeOverrideSources, resolveValidateOptions, } from './config/loadConfig.js';
 import { buildStructuredReport, printStructuredCliSummary } from './cli/report.js';
 import { computeRetryFailedIgnores, LAST_RUN_FILENAME, loadLastRunReport, persistLastRunReport, } from './cli/lastRun.js';
 import { resolveSummaryDestination, writeSummary } from './cli/summary.js';
@@ -122,6 +122,14 @@ async function main() {
         await runDoctorCommand(process.argv, version);
         return;
     }
+    // `undo` reads `.dep-up-surgeon.last-run.json` and reverses the last run (dep ranges +
+    // overrides + reinstall + validate). Same early-dispatch pattern as `doctor` so the
+    // subcommand doesn't inherit the upgrade flow's 70+ options.
+    if (process.argv[2] === 'undo') {
+        const { runUndoCommand } = await import('./cli/undoCommand.js');
+        await runUndoCommand(process.argv, version);
+        return;
+    }
     program
         .name('dep-up-surgeon')
         .description('Upgrade npm dependencies one-by-one with install + test/build validation and rollback on failure.')
@@ -197,6 +205,12 @@ async function main() {
     }
     const config = await loadConfig(cwd);
     const ignore = mergeIgnoreLists(config.ignore, opts.ignore);
+    for (const w of config.warnings ?? []) {
+        log.warn(`rc: ${w}`);
+    }
+    if ((config.overrides?.length ?? 0) > 0 && !jsonOutput) {
+        log.info(`rc: loaded ${config.overrides.length} override pin${config.overrides.length === 1 ? '' : 's'} from .dep-up-surgeonrc (will run through the same install + validator + rollback cycle as --apply-overrides)`);
+    }
     // ---- Load .dep-up-surgeon.policy.{yaml,json} ----
     const { loadPolicy } = await import('./config/policy.js');
     const policyResult = await loadPolicy(cwd);
@@ -571,32 +585,34 @@ async function main() {
         // Runs AFTER enrichments so we have the final `upgraded` list, and BEFORE the summary so
         // the summary writer + JSON consumers see `report.overrides`. `--override` works
         // standalone (no --security-only required); `--apply-overrides` still needs an audit.
-        const hasManualOverrides = Array.isArray(opts.override) && opts.override.length > 0;
+        const hasCliOverrides = Array.isArray(opts.override) && opts.override.length > 0;
+        const hasRcOverrides = (config.overrides?.length ?? 0) > 0;
+        const hasManualOverrides = hasCliOverrides || hasRcOverrides;
         const wantsAdvisoryOverrides = Boolean(opts.applyOverrides);
         if ((wantsAdvisoryOverrides || hasManualOverrides) && !dryRun) {
-            // Parse manual selectors up-front so we can warn about malformed entries even if the
-            // audit path is skipped. A malformed selector is fatal (not just skipped) because the
-            // user asked for something we can't represent.
-            let manualOverrides = [];
-            let manualError;
-            if (hasManualOverrides) {
-                const { parseOverrideSelector } = await import('./utils/overrides.js');
-                for (const raw of opts.override) {
-                    const parsed = parseOverrideSelector(raw);
-                    if (!parsed || !parsed.range) {
-                        manualError = `invalid --override selector "${raw}" (expected "<chain>@<range>" where chain is a package name, "parent>child", or "parent/child")`;
-                        break;
-                    }
-                    manualOverrides.push({ chain: parsed.chain, range: parsed.range, source: raw });
-                }
-            }
-            if (manualError) {
-                log.error(manualError);
-                process.exitCode = 1;
-            }
-            else if (wantsAdvisoryOverrides &&
+            // Merge rc-sourced + CLI selectors. The merger dedupes by chain (CLI wins on conflict),
+            // normalizes selector strings, and surfaces malformed CLI entries as warnings — but NOT
+            // as a fatal error, because we still want the valid rc entries to apply even when the
+            // user typo'd one `--override` flag.
+            const merged = mergeOverrideSources(config.overrides, opts.override);
+            for (const w of merged.warnings) {
+                log.warn(w);
+            }
+            const manualOverrides = merged.entries.map((e) => {
+                const spec = {
+                    chain: e.chain,
+                    range: e.range,
+                };
+                if (e.source)
+                    spec.source = e.source;
+                if (e.reason)
+                    spec.reason = e.reason;
+                return spec;
+            });
+            const effectivelyHasManual = manualOverrides.length > 0;
+            if (wantsAdvisoryOverrides &&
                 (!opts.securityOnly || !auditResult || auditResult.advisories.length === 0) &&
-                !hasManualOverrides) {
+                !effectivelyHasManual) {
                 if (!jsonOutput) {
                     log.warn('--apply-overrides requires --security-only with at least one audit advisory; skipping.');
                 }