@detergent-software/atk 8.9.0-dev.3 → 8.9.0-dev.31

package/build/lib/update-check.js

@@ -5,10 +5,13 @@ import { gt as semverGt, valid as semverValid } from 'semver';
 import { getCacheDir, loadConfig } from './config.js';
 import { fetchWithRetry } from './fetch-retry.js';
 import { addNotice } from './notices.js';
+import { isOffline } from './offline.js';
 import { CLI_VERSION, isPreRelease, upgradeCommand } from './version.js';
-const NPM_REGISTRY_URL = 'https://registry.npmjs.org/@detergent-software/atk';
+/** The package's dist-tags alone (about 40 bytes), not its packument (over 1 MB). */
+export const NPM_DIST_TAGS_URL = 'https://registry.npmjs.org/-/package/@detergent-software%2fatk/dist-tags';
 const NPM_CACHE_FILE = 'npm-version.json';
-const DEFAULT_TTL_MINUTES = 60;
+/** How long the cached dist-tags stand before the check asks npm again; not the registry's `cacheTtlMinutes`. */
+export const UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 /** The JSON-mode refresh makes one attempt and gives up after this long, so it barely delays exit. */
 export const BACKGROUND_REFRESH_TIMEOUT_MS = 1_500;
 /**
@@ -28,17 +31,17 @@ export async function getUpdateInfo() {
         const channel = isPreRelease() ? 'dev' : 'latest';
         const cacheDir = getCacheDir(config);
         const cachePath = join(cacheDir, NPM_CACHE_FILE);
-        const ttlMinutes = config.cacheTtlMinutes ?? DEFAULT_TTL_MINUTES;
-        let latestVersion = await readCachedNpmVersion(cachePath, ttlMinutes, channel);
-        if (!latestVersion) {
-            const fetched = await fetchLatestFromNpm(channel);
-            if (!fetched) {
+        const cached = await readNpmCache(cachePath);
+        let tags = cached && cached.ageMs <= UPDATE_CHECK_INTERVAL_MS ? cached.tags : null;
+        if (!tags) {
+            tags = await fetchDistTags();
+            if (!tags) {
                 return null;
             }
-            latestVersion = fetched;
-            await writeNpmCache(cachePath, cacheDir, channel, fetched);
+            await writeNpmCache(cachePath, cacheDir, tags);
         }
-        if (!semverValid(CLI_VERSION) || !semverValid(latestVersion)) {
+        const latestVersion = tags[channel];
+        if (!latestVersion || !semverValid(CLI_VERSION) || !semverValid(latestVersion)) {
             return null;
         }
         if (!semverGt(latestVersion, CLI_VERSION)) {
@@ -73,20 +76,20 @@ export async function noteCachedUpdate() {
         const channel = isPreRelease() ? 'dev' : 'latest';
         const cacheDir = getCacheDir(config);
         const cachePath = join(cacheDir, NPM_CACHE_FILE);
-        const ttlMs = (config.cacheTtlMinutes ?? DEFAULT_TTL_MINUTES) * 60 * 1000;
-        const cached = await readNpmCache(cachePath, channel);
-        if (cached && semverValid(CLI_VERSION) && semverValid(cached.version) && semverGt(cached.version, CLI_VERSION)) {
+        const cached = await readNpmCache(cachePath);
+        const version = cached?.tags[channel];
+        if (version && semverValid(CLI_VERSION) && semverValid(version) && semverGt(version, CLI_VERSION)) {
             const command = upgradeCommand(channel);
             addNotice({
                 command,
                 kind: 'update-available',
-                text: `ATK ${cached.version} is available (this is ${CLI_VERSION}). Run \`${command}\` to update.`,
+                text: `ATK ${version} is available (this is ${CLI_VERSION}). Run \`${command}\` to update.`,
             });
         }
-        if (!cached || cached.ageMs > ttlMs) {
-            void fetchLatestFromNpm(channel, 'once').then(async (fetched) => {
-                if (fetched) {
-                    await writeNpmCache(cachePath, cacheDir, channel, fetched);
+        if (!cached || cached.ageMs > UPDATE_CHECK_INTERVAL_MS) {
+            void fetchDistTags('once').then(async (tags) => {
+                if (tags) {
+                    await writeNpmCache(cachePath, cacheDir, tags);
                 }
             });
         }
@@ -96,71 +99,67 @@ export async function noteCachedUpdate() {
     }
 }
 /**
- * The channel's dist-tag from npm, or null on any failure. `'retry'` uses the
- * shared retry policy; `'once'` makes a single attempt that is aborted after
- * {@link BACKGROUND_REFRESH_TIMEOUT_MS}.
+ * The `dev` and `latest` dist-tags from npm (either may be missing), or null on any failure
+ * or offline. `'retry'` uses the shared retry policy; `'once'` makes a single attempt that is
+ * aborted after {@link BACKGROUND_REFRESH_TIMEOUT_MS}.
  */
-async function fetchLatestFromNpm(channel, attempts = 'retry') {
+async function fetchDistTags(attempts = 'retry') {
+    if (isOffline()) {
+        return null;
+    }
     try {
         const init = { headers: { accept: 'application/json' } };
         const response = attempts === 'retry'
-            ? await fetchWithRetry(NPM_REGISTRY_URL, init)
-            : await globalThis.fetch(NPM_REGISTRY_URL, {
+            ? await fetchWithRetry(NPM_DIST_TAGS_URL, init)
+            : await globalThis.fetch(NPM_DIST_TAGS_URL, {
                 ...init,
                 signal: AbortSignal.timeout(BACKGROUND_REFRESH_TIMEOUT_MS),
             });
         if (!response.ok) {
             return null;
         }
-        const raw = await response.text();
-        const body = JSON.parse(raw);
-        const distTags = body['dist-tags'];
-        if (!distTags || typeof distTags !== 'object') {
-            return null;
-        }
-        const value = distTags[channel];
-        return typeof value === 'string' ? value : null;
+        const tags = pickDistTags(JSON.parse(await response.text()));
+        return tags.dev || tags.latest ? tags : null;
     }
     catch {
         return null;
     }
 }
-async function readCachedNpmVersion(cachePath, ttlMinutes, channel) {
-    const cached = await readNpmCache(cachePath, channel);
-    return cached && cached.ageMs <= ttlMinutes * 60 * 1000 ? cached.version : null;
+/** The string `dev` and `latest` entries of a dist-tags object; anything else is dropped. */
+function pickDistTags(body) {
+    const tags = {};
+    if (body && typeof body === 'object') {
+        for (const channel of ['dev', 'latest']) {
+            const value = Reflect.get(body, channel);
+            if (typeof value === 'string') {
+                tags[channel] = value;
+            }
+        }
+    }
+    return tags;
 }
-/** The channel's cached version and the cache file's age, or null when there is none. */
-async function readNpmCache(cachePath, channel) {
+/**
+ * The cached dist-tags and the cache file's age, or null when there is no readable cache.
+ * One fetch writes every tag, so the file's age holds for each of them, present or not.
+ */
+async function readNpmCache(cachePath) {
     try {
         const fileStat = await stat(cachePath);
-        const raw = await readFile(cachePath, 'utf-8');
-        const parsed = JSON.parse(raw);
-        const value = parsed[channel];
-        return typeof value === 'string' ? { ageMs: Date.now() - fileStat.mtimeMs, version: value } : null;
+        const tags = pickDistTags(JSON.parse(await readFile(cachePath, 'utf-8')));
+        return { ageMs: Date.now() - fileStat.mtimeMs, tags };
     }
     catch {
         return null;
     }
 }
-async function writeNpmCache(cachePath, cacheDir, channel, version) {
+/** Replaces the cache with npm's latest answer, so a tag npm no longer has goes too. */
+async function writeNpmCache(cachePath, cacheDir, tags) {
     try {
-        let existing = {};
-        try {
-            const raw = await readFile(cachePath, 'utf-8');
-            existing = JSON.parse(raw);
-        }
-        catch {
-            existing = {};
-        }
-        const merged = {
-            ...existing,
-            [channel]: version,
-            fetchedAt: Date.now(),
-        };
+        const file = { ...tags, fetchedAt: Date.now() };
         if (!existsSync(cacheDir)) {
             await mkdir(cacheDir, { recursive: true });
         }
-        await writeFile(cachePath, JSON.stringify(merged), 'utf-8');
+        await writeFile(cachePath, JSON.stringify(file), 'utf-8');
     }
     catch {
         // Non-fatal — banner can still render without a write.

package/build/lib/update-check.js.map

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

package/build/lib/updater.d.ts

@@ -4,6 +4,7 @@ import type { Registry } from './schemas/index.js';
 import type { InstalledAsset, Lockfile } from './schemas/lockfile.js';
 import { ApiCodeError, type ErrorGuidance } from './errors.js';
 import { type InstallResult } from './installer.js';
+import { type LocalEdits } from './local-edits.js';
 import { type Scope } from './scope.js';
 export interface OutdatedAsset {
     /** Whether the asset is frozen. */
@@ -40,6 +41,11 @@ export interface UndeclaredRemoval {
     }>;
 }
 export interface UpdateAssetsResult {
+    /**
+     * Assets skipped during bulk update because files they placed were edited (`localEdits`), with
+     * those files. `force` updates them.
+     */
+    editedSkipped?: Array<OutdatedAsset & Pick<LocalEdits, 'dependencies' | 'files' | 'unchecked'>>;
     /** Assets skipped because they were uninstalled for this tool (`excludedTools`). */
     excludedSkipped?: Array<{
         name: string;
@@ -105,10 +111,17 @@ export interface UpdateOptions {
      * every tool and the lockfile stay on the version they had.
      */
     failedFor?: Map<string, string>;
-    /** Force update even if the asset is pinned. */
+    /** Force update even if the asset is pinned, and overwrite local edits. */
     force?: boolean;
     /** Set of frozen asset composite keys in format `${type}:${org ?? ''}:${name}`. */
     frozenAssets?: Set<string>;
+    /**
+     * The installed assets with local edits (`findLocalEdits`), keyed like `frozenAssets`: an update
+     * would overwrite them, so without `force` a bulk update skips them and a named one, or one whose
+     * plan replaces an edited dependency, is refused. Found once before a multi-tool run, so every
+     * tool skips the same assets and the lockfile keeps one version for them.
+     */
+    localEdits?: Map<string, LocalEdits>;
     /** Callback for progress updates. */
     onProgress?: (message: string) => void;
     /** Project root directory. */
@@ -146,6 +159,7 @@ export interface UpdateWarning {
     command: string;
     message: string;
 }
+type AssetIdentity = Pick<InstalledAsset, 'name' | 'org' | 'type'>;
 export declare class UpdaterError extends ApiCodeError {
     name: string;
 }
@@ -215,4 +229,20 @@ export declare function updateAsset(assetName: string, installed: InstalledAsset
  * bypasses the outdated check and updates directly to the specified version.
  */
 export declare function updateAssets(assetNames: string[] | undefined, lockfile: Lockfile, registry: Registry, options: UpdateOptions): Promise<UpdateAssetsResult>;
+/**
+ * `localEdits` plus, for each of `outdated` without edits of its own, the edits of the installed
+ * dependencies its update to `targetVersion` (else its `latestVersion`) would replace or remove for
+ * any of `adapters`, under the asset's key with those dependencies named. An update skips or
+ * refuses such an asset as it does one with its own edits. Found once, before a multi-tool run
+ * changes any files, and for the dry run the same way, so both list the same assets.
+ */
+export declare function withDependencyEdits(outdated: Array<AssetIdentity & {
+    latestVersion: string;
+}>, lockfile: Lockfile, registry: Registry, localEdits: Map<string, LocalEdits>, { adapters, projectDir, scope, targetVersion, }: {
+    adapters: Adapter[];
+    projectDir: string;
+    scope?: Scope;
+    targetVersion?: string;
+}): Map<string, LocalEdits>;
+export {};
 //# sourceMappingURL=updater.d.ts.map

package/build/lib/updater.d.ts.map

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

package/build/lib/updater.js

@@ -6,14 +6,15 @@ import { getConfigEntriesForTool } from './config-entries.js';
 import { ApiCodeError, asSentence, errorGuidance, errorMessage, isRunWideFailure, } from './errors.js';
 import { restoreFiles, snapshotFiles } from './file-snapshot.js';
 import { executeInstallPlan, fetchPlanFiles, FileConflictError, InstallerError, installFailureMessage, InstallPlanError, } from './installer.js';
-import { addAssetToLockfile, findDependencyAsset, findDependents, findInstalledAsset, getLockfilePath, readLockfile, writeLockfile, } from './lockfile.js';
+import {} from './local-edits.js';
+import { addAssetToLockfile, findDependencyAsset, findDependents, findInstalledAsset, getLockfilePath, identityKey, readLockfile, writeLockfile, } from './lockfile.js';
 import { withoutKeptDependencies } from './multi-tool-install.js';
 import { formatOrgName, parseOrgFromName, scopeSwitchGuidance } from './org.js';
 import { findAsset } from './registry.js';
 import { resolveInstallPlan } from './resolver.js';
 import { fromRoot } from './root-path.js';
 import { scopedCommand, scopeLabel } from './scope.js';
-import { removeUndeclaredCopy, uninstallAsset } from './uninstaller.js';
+import { planUninstall, removeUndeclaredCopy, uninstallAsset } from './uninstaller.js';
 export class UpdaterError extends ApiCodeError {
     name = 'UpdaterError';
 }
@@ -198,6 +199,9 @@ export async function updateAssets(assetNames, lockfile, registry, options) {
         if (installed.pinnedVersion && !options.force) {
             throw pinnedError(`Asset "${name}" is pinned to version "${installed.pinnedVersion}".`, spec, options.scope);
         }
+        const edits = options.force ? undefined : options.localEdits?.get(compositeKey);
+        if (edits)
+            throw localEditsError(name, [edits], spec, options.scope);
         // Uninstalled for this tool: leave it alone (updating would reinstall it here). The
         // other tools in a multi-tool update still get the new version.
         if (excludedAtVersion(registry, installed, options.targetVersion, options.adapter)) {
@@ -238,6 +242,7 @@ export async function updateAssets(assetNames, lockfile, registry, options) {
     }
     const outdated = checkOutdated(lockfile, registry, options.frozenAssets);
     let toUpdate;
+    const editedSkipped = [];
     const frozenSkipped = [];
     const skipped = [];
     if (assetNames && assetNames.length > 0) {
@@ -265,11 +270,17 @@ export async function updateAssets(assetNames, lockfile, registry, options) {
                 throw pinnedError(`Asset "${asset.name}" is pinned.`, assetSpec(asset, options.type), options.scope);
             }
         }
+        for (const asset of toUpdate) {
+            const edits = options.force ? undefined : options.localEdits?.get(identityKey(asset));
+            if (edits)
+                throw localEditsError(asset.name, [edits], assetSpec(asset, options.type), options.scope);
+        }
     }
     else {
-        // Bulk update: skip pinned and frozen assets without error
+        // Bulk update: skip pinned, frozen and edited assets without error
         toUpdate = [];
         for (const asset of outdated) {
+            const edits = options.force ? undefined : options.localEdits?.get(identityKey(asset));
             if (asset.frozen) {
                 frozenSkipped.push(asset);
                 const thaw = scopedCommand(`atk thaw ${asset.name}`, options.scope);
@@ -280,6 +291,17 @@ export async function updateAssets(assetNames, lockfile, registry, options) {
                 const force = scopedCommand(`atk update ${asset.name} --force`, options.scope);
                 options.onProgress?.(`Skipping pinned asset ${asset.name} (pinned, use "${force}" to override)`);
             }
+            else if (edits) {
+                const { dependencies, files, unchecked } = edits;
+                editedSkipped.push({
+                    ...asset,
+                    ...(dependencies ? { dependencies } : {}),
+                    files,
+                    ...(unchecked ? { unchecked } : {}),
+                });
+                const force = scopedCommand(`atk update ${assetSpec(asset, options.type)} --force`, options.scope);
+                options.onProgress?.(`Skipping ${asset.name}: it has local edits (use "${force}" to overwrite them)`);
+            }
             else {
                 toUpdate.push(asset);
             }
@@ -320,6 +342,7 @@ export async function updateAssets(assetNames, lockfile, registry, options) {
     });
     if (toUpdate.length === 0) {
         return {
+            ...(editedSkipped.length > 0 ? { editedSkipped } : {}),
             ...(excludedSkipped.length > 0 ? { excludedSkipped } : {}),
             ...(failedSkipped.length > 0 ? { failedSkipped } : {}),
             failures: [],
@@ -382,6 +405,7 @@ export async function updateAssets(assetNames, lockfile, registry, options) {
         toolLockfile = await withInstalledEntries(toolLockfile, updated.plan, options).catch(() => toolLockfile);
     }
     return {
+        ...(editedSkipped.length > 0 ? { editedSkipped } : {}),
         ...(excludedSkipped.length > 0 ? { excludedSkipped } : {}),
         ...(failedSkipped.length > 0 ? { failedSkipped } : {}),
         failures,
@@ -392,10 +416,95 @@ export async function updateAssets(assetNames, lockfile, registry, options) {
         ...(undeclared.length > 0 ? { undeclared } : {}),
     };
 }
+/**
+ * `localEdits` plus, for each of `outdated` without edits of its own, the edits of the installed
+ * dependencies its update to `targetVersion` (else its `latestVersion`) would replace or remove for
+ * any of `adapters`, under the asset's key with those dependencies named. An update skips or
+ * refuses such an asset as it does one with its own edits. Found once, before a multi-tool run
+ * changes any files, and for the dry run the same way, so both list the same assets.
+ */
+export function withDependencyEdits(outdated, lockfile, registry, localEdits, { adapters, projectDir, scope, targetVersion, }) {
+    const withDependencies = new Map(localEdits);
+    if (localEdits.size === 0)
+        return withDependencies;
+    for (const asset of outdated) {
+        const installed = lockfileEntryFor(lockfile, asset);
+        if (!installed || localEdits.has(identityKey(installed)))
+            continue;
+        const version = targetVersion ?? asset.latestVersion;
+        const resolved = findAsset(registry, installed.name, installed.type, version, installed.org);
+        if (!resolved || resolved.asset.org !== installed.org)
+            continue;
+        const edited = new Map();
+        for (const adapter of adapters) {
+            if (!supportsType(adapter, installed.type) || isExcludedForTool(installed, adapter.tool))
+                continue;
+            let plan;
+            try {
+                plan = planFor(registry, installed, resolved.version, { adapter, lockfile, projectDir, scope });
+            }
+            catch {
+                // The update itself refuses it (a pinned dependency it would move) and says why.
+                continue;
+            }
+            const newDeps = resolved.versionData.dependencies ?? [];
+            for (const edits of editsReplacedBy(plan, installed, newDeps, lockfile, adapter, localEdits)) {
+                edited.set(identityKey(edits), edits);
+            }
+        }
+        if (edited.size === 0)
+            continue;
+        const deps = [...edited.values()];
+        withDependencies.set(identityKey(installed), {
+            dependencies: deps.map(({ name, org, type }) => ({ name, ...(org ? { org } : {}), type })),
+            files: deps.flatMap((e) => e.files),
+            name: installed.name,
+            ...(installed.org ? { org: installed.org } : {}),
+            type: installed.type,
+            ...(deps.some((e) => e.unchecked) ? { unchecked: true } : {}),
+        });
+    }
+    return withDependencies;
+}
 /** How a command names an asset: `@org/name`, with `--type` when the run was given one. */
 function assetSpec(asset, type) {
     return `${formatOrgName(asset.org, asset.name)}${type ? ` --type ${asset.type}` : ''}`;
 }
+/**
+ * The installed dependencies of `installed` an update to a version needing `newDeps` removes, as its
+ * cleanup does: dependencies it no longer declares, installed as dependencies, that no other asset
+ * the adapter's tool has depends on, and the dependencies only they needed.
+ */
+function droppedDependencies(installed, newDeps, lockfile, adapter) {
+    const newDepKeys = new Set(newDeps.map((d) => `${d.type}:${d.name}`));
+    return (installed.dependencies ?? [])
+        .filter((d) => !newDepKeys.has(`${d.type}:${d.name}`))
+        .flatMap((d) => {
+        const dep = findDependencyAsset(lockfile, d, installed.org);
+        if (!dep || (dep.installReason ?? 'direct') !== 'dependency')
+            return [];
+        const others = findDependents(lockfile, dep.name, dep.type, dep.org).filter((other) => !isSameAsset(other, installed) && !isExcludedForTool(other, adapter.tool));
+        // The cleanup uninstalls it with cascade, which also removes the dependencies only it needed.
+        return others.length === 0
+            ? [dep, ...planUninstall(lockfile, dep.name, dep.org, dep.type, [adapter.tool]).orphanedDependencies]
+            : [];
+    });
+}
+/**
+ * The local edits of the installed dependencies an update of `installed` with `plan` replaces (the
+ * plan's other entries) or removes (see {@link droppedDependencies}). Entries `localEdits` holds for
+ * an asset because of its own dependencies (`dependencies` set) don't count.
+ */
+function editsReplacedBy(plan, installed, newDeps, lockfile, adapter, localEdits) {
+    const keys = new Set([
+        ...plan.entries.filter((e) => !isSameAsset(e.asset, installed)).map((e) => identityKey(e.asset)),
+        ...droppedDependencies(installed, newDeps, lockfile, adapter).map(identityKey),
+    ]);
+    return [...keys].flatMap((key) => {
+        const edits = localEdits.get(key);
+        return edits && !edits.dependencies ? [edits] : [];
+    });
+}
 /**
  * The skip record for an asset whose update would move a dependency whose own update failed for
  * an earlier tool in the run: that tool kept the version the lockfile records, so moving it here
@@ -499,6 +608,23 @@ function liftFailure(installed, error) {
         ...errorGuidance(error),
     };
 }
+/**
+ * The refusal to update `assetName` over local edits: its own (`edits` is the asset's) or those
+ * of a dependency the update replaces. The command forces the update of `spec` in its scope.
+ */
+function localEditsError(assetName, edits, spec, scope) {
+    const files = [...new Set(edits.flatMap((e) => e.files))].join(', ');
+    const own = edits.some((e) => e.name === assetName && !e.dependencies);
+    const dependencies = edits.flatMap((e) => e.dependencies ?? (e.name === assetName ? [] : [e]));
+    const names = [...new Set(dependencies.map((d) => `"${formatOrgName(d.org, d.name)}"`))].join(', ');
+    const command = scopedCommand(`atk update ${spec} --force`, scope);
+    const unchecked = edits.some((e) => e.unchecked)
+        ? " Some files couldn't be checked against the registry's versions, so they may only be an earlier version's."
+        : '';
+    return new UpdaterError(own
+        ? `Asset "${assetName}" has local edits (${files}), which updating it would overwrite. Use --force to overwrite them.`
+        : `Updating "${assetName}" would overwrite local edits in ${names} (${files}). Use --force to overwrite them.`, { command, hint: `Copy the edits somewhere else first, or pass --force to overwrite them.${unchecked}` });
+}
 /** The lockfile entry of an outdated asset: same name, type and org. */
 function lockfileEntryFor(lockfile, asset) {
     return (lockfile.assets ?? []).find((a) => isSameAsset(a, asset));
@@ -591,14 +717,27 @@ async function updateAssetPlanned(assetName, installed, registry, options) {
     // Dependencies this tool already has at a version the new one accepts stay as they are, as in
     // `atk install`; moving a pinned one refuses the update before anything changes.
     let plan;
+    let kept;
     try {
-        const kept = { ...options, lockfile: options.toolLockfile ?? (await readLockfile(projectDir)) };
+        kept = { ...options, lockfile: options.toolLockfile ?? (await readLockfile(projectDir)) };
         plan = planFor(registry, installed, toVersion, kept);
     }
     catch (planError) {
         throw new UpdaterError(`Failed to update "${assetName}" to v${toVersion}: ${failureReason(planError, installed)} ` +
             `v${fromVersion} is still installed.`, errorGuidance(planError));
     }
+    // The update replaces the asset and each installed dependency its plan moves, and removes the ones
+    // it drops: refuse before the download when one has local edits.
+    if (!options.force && options.localEdits) {
+        const own = options.localEdits.get(identityKey(installed));
+        const newDeps = resolved.versionData.dependencies ?? [];
+        const edited = [
+            ...(own ? [own] : []),
+            ...editsReplacedBy(plan, installed, newDeps, kept.lockfile, adapter, options.localEdits),
+        ];
+        if (edited.length > 0)
+            throw localEditsError(assetName, edited, assetSpec(installed, options.type), scope);
+    }
     // Download the target version before removing anything, so a refused download (an outdated
     // CLI, an expired sign-in, the API down) leaves the installed version in place.
     onProgress?.(`Downloading ${assetName}@${toVersion}...`);