dsh-plugin-upgrader 1.6.3 → 1.7.0

package/lib/host/version.d.ts

@@ -1,9 +1,10 @@
 /**
- * Version ordering and release-link helpers.
+ * Version ordering, release-link helpers, and range matching.
  *
  * Everything here is pure: no I/O, no clock, no ambient state. The host half
- * uses it to sort published versions and to decide which GitHub page a version
- * line opens, and the test suite exercises it directly.
+ * uses it to sort published versions, to decide which GitHub page a version
+ * line opens, and to answer whether a published version is allowed on the
+ * runtime this profile is actually running.
  *
  * @module dsh-plugin-upgrader/lib/version
  */
@@ -38,6 +39,24 @@ export declare function comparePre(left: readonly string[], right: readonly stri
  * @returns negative when left is older.
  */
 export declare function compareVersions(left: string | undefined | null, right: string | undefined | null): number;
+/**
+ * Does a version fall inside a manifest range?
+ *
+ * The host gate calls `semver.satisfies(version, range, { includePrerelease:
+ * true })` before it installs anything, so prereleases take part in comparisons
+ * here for the same reason: a plugin declaring `>=0.2.0-rc.2 <0.3.0-0` accepts
+ * the `0.2.1-rc.5` build people actually run, and marking that version
+ * unusable would be a lie.
+ *
+ * Ranges this module cannot parse answer `true`. A manifest written in a way
+ * this parser does not understand must never be the reason a version is called
+ * incompatible — the host stays the judge, and the page only loses a hint.
+ *
+ * @param version - the version to test, such as `0.2.1-rc.5`.
+ * @param range - a range as a manifest writes it; `''` means "no limit".
+ * @returns whether the version is inside the range.
+ */
+export declare function satisfiesRange(version: string | undefined | null, range: string | undefined | null): boolean;
 /**
  * The tag a published version was released under.
  *

package/lib/host/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/host/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,4CAA4C;AAC5C,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,0DAA0D;IAC1D,GAAG,EAAE,MAAM,EAAE,CAAA;CACd;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,YAAY,GAAG,IAAI,CAWlF;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAsBpF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAUzG;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5F"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/host/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,4CAA4C;AAC5C,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,0DAA0D;IAC1D,GAAG,EAAE,MAAM,EAAE,CAAA;CACd;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,YAAY,GAAG,IAAI,CAWlF;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAsBpF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAUzG;AAkPD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAClC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAC/B,OAAO,CA0BT;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5F"}

package/lib/host/version.js

@@ -1,9 +1,10 @@
 /**
- * Version ordering and release-link helpers.
+ * Version ordering, release-link helpers, and range matching.
  *
  * Everything here is pure: no I/O, no clock, no ambient state. The host half
- * uses it to sort published versions and to decide which GitHub page a version
- * line opens, and the test suite exercises it directly.
+ * uses it to sort published versions, to decide which GitHub page a version
+ * line opens, and to answer whether a published version is allowed on the
+ * runtime this profile is actually running.
  *
  * @module dsh-plugin-upgrader/lib/version
  */
@@ -80,6 +81,280 @@ export function compareVersions(left, right) {
         a.patch - b.patch ||
         comparePre(a.pre, b.pre));
 }
+/** A wildcard segment, which a range may write as `x`, `X`, or `*`. */
+const WILDCARD = /^[xX*]$/;
+/**
+ * Parse one possibly-partial version, the way a range writes it.
+ *
+ * @param value - `1`, `1.2`, `1.2.3`, `1.2.x`, `1.2.3-rc.1`.
+ * @returns the parts, with `null` for absent or wildcard segments, or `null`
+ * when the text is not a version at all.
+ */
+function parsePartial(value) {
+    const text = value.trim().replace(/^v/, '');
+    const match = /^(\d+|[xX*])(?:\.(\d+|[xX*]))?(?:\.(\d+|[xX*]))?(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(text);
+    if (match === null)
+        return null;
+    const segment = (raw) => {
+        if (raw === undefined || WILDCARD.test(raw))
+            return null;
+        return Number(raw);
+    };
+    const major = segment(match[1]);
+    // A wildcard in a lower segment means "any value here", so the segments
+    // after it cannot narrow the range either: `1.x.3` is `1.x`.
+    const minor = major === null ? null : segment(match[2]);
+    const patch = minor === null ? null : segment(match[3]);
+    return {
+        major,
+        minor,
+        patch,
+        pre: match[4] === undefined ? [] : match[4].split('.'),
+    };
+}
+/**
+ * Build one comparator.
+ *
+ * @param op - the comparison.
+ * @param major - major segment.
+ * @param minor - minor segment.
+ * @param patch - patch segment.
+ * @param pre - prerelease identifiers.
+ * @returns the comparator.
+ */
+function bound(op, major, minor, patch, pre = []) {
+    return { op, parts: { major, minor, patch, pre: [...pre] } };
+}
+/**
+ * The lower bound semver writes for a partial range, `>=x.y.z-0`.
+ *
+ * A missing segment means "any value here", so the range has to start below
+ * that segment's first release — prereleases of it included. That is why
+ * `1.2` expands to `>=1.2.0-0`, not `>=1.2.0`: the latter would reject
+ * `1.2.0-rc.1`, which a partial range accepts.
+ *
+ * `>=0.0.0-0` is true of every version, so it is dropped rather than emitted;
+ * carrying it would only make the comparator list longer than the one semver
+ * builds, and these lists are compared against semver's in the test suite.
+ *
+ * @param major - major segment.
+ * @param minor - minor segment.
+ * @param patch - patch segment.
+ * @param pre - prerelease identifiers; `['0']` when a segment was missing.
+ * @returns zero or one comparator.
+ */
+function atLeast(major, minor, patch, pre = []) {
+    if (major === 0 && minor === 0 && patch === 0 && pre.length === 1 && pre[0] === '0')
+        return [];
+    return [bound('>=', major, minor, patch, pre)];
+}
+/**
+ * The exclusive upper bound semver writes as `<x.y.z-0` for a partial range.
+ *
+ * The `-0` matters: with prereleases in play, `<0.3.0` would still admit
+ * `0.3.0-rc.1`, while `<0.3.0-0` does not. Plugin authors write this bound by
+ * hand (`<0.3.0-0`) and the ranges below have to mean the same thing.
+ *
+ * @param major - upper major.
+ * @param minor - upper minor.
+ * @param patch - upper patch.
+ * @returns the comparator.
+ */
+function belowRelease(major, minor, patch) {
+    return bound('<', major, minor, patch, ['0']);
+}
+/**
+ * Expand one written version into the comparators it stands for.
+ *
+ * The expansions follow `node-semver`, which is what the host's compatibility
+ * gate uses; agreeing with it is the whole point, because a version this page
+ * calls usable and the host then refuses is worse than no marking at all.
+ * `test/version.test.ts` pins the table below against the real package.
+ *
+ * @param partial - the version as written.
+ * @param op - the operator in front of it, `^` and `~` included.
+ * @returns comparators, or `null` when the range is not understood.
+ */
+function expand(partial, op) {
+    const { major, minor, patch, pre } = partial;
+    if (major === null)
+        return [];
+    const M = major;
+    const m = minor ?? 0;
+    const p = patch ?? 0;
+    /** A missing segment widens the range downwards, prereleases included. */
+    const open = ['0'];
+    switch (op) {
+        case '^':
+            if (minor === null)
+                return [...atLeast(M, 0, 0, open), belowRelease(M + 1, 0, 0)];
+            if (patch === null) {
+                return M === 0
+                    ? [...atLeast(0, m, 0, open), belowRelease(0, m + 1, 0)]
+                    : [...atLeast(M, m, 0, open), belowRelease(M + 1, 0, 0)];
+            }
+            if (M !== 0)
+                return [bound('>=', M, m, p, pre), belowRelease(M + 1, 0, 0)];
+            if (m !== 0)
+                return [bound('>=', 0, m, p, pre), belowRelease(0, m + 1, 0)];
+            return [bound('>=', 0, 0, p, pre), belowRelease(0, 0, p + 1)];
+        case '~':
+            // `~1.2.3` is `>=1.2.3 <1.3.0`, so the lower bound keeps the patch —
+            // that is what makes `~0.1.7-rc.1` refuse `0.1.6`.
+            if (minor === null)
+                return [...atLeast(M, 0, 0, open), belowRelease(M + 1, 0, 0)];
+            if (patch === null)
+                return [...atLeast(M, m, 0, open), belowRelease(M, m + 1, 0)];
+            return [bound('>=', M, m, p, pre), belowRelease(M, m + 1, 0)];
+        case '>':
+            if (minor === null)
+                return [bound('>=', M + 1, 0, 0)];
+            if (patch === null)
+                return [bound('>=', M, m + 1, 0)];
+            return [bound('>', M, m, p, pre)];
+        case '>=':
+            if (minor === null)
+                return atLeast(M, 0, 0, open);
+            if (patch === null)
+                return atLeast(M, m, 0, open);
+            return [bound('>=', M, m, p, pre)];
+        case '<':
+            if (minor === null)
+                return [belowRelease(M, 0, 0)];
+            if (patch === null)
+                return [belowRelease(M, m, 0)];
+            return [bound('<', M, m, p, pre)];
+        case '<=':
+            if (minor === null)
+                return [belowRelease(M + 1, 0, 0)];
+            if (patch === null)
+                return [belowRelease(M, m + 1, 0)];
+            return [bound('<=', M, m, p, pre)];
+        default:
+            if (minor === null)
+                return [...atLeast(M, 0, 0, open), belowRelease(M + 1, 0, 0)];
+            if (patch === null)
+                return [...atLeast(M, m, 0, open), belowRelease(M, m + 1, 0)];
+            return [bound('=', M, m, p, pre)];
+    }
+}
+/**
+ * Turn one alternative such as `>=0.2.0-rc.2 <0.3.0-0` into comparators.
+ *
+ * Two pieces of syntax are handled before the comparator loop: a hyphen range
+ * (`1.2.3 - 2.0.0`) and an operator separated from its version by a space
+ * (`>= 0.2.0`). Both are written by hand in real manifests, and refusing to
+ * read them would silently turn a real bound into "anything goes".
+ *
+ * @param text - one alternative, already split on `||`.
+ * @returns comparators, or `null` when a piece is not understood.
+ */
+function parseAlternative(text) {
+    const trimmed = text.trim();
+    if (trimmed === '')
+        return [];
+    const hyphen = /^(\S+)\s+-\s+(\S+)$/.exec(trimmed);
+    if (hyphen !== null) {
+        const low = parsePartial(hyphen[1]);
+        const high = parsePartial(hyphen[2]);
+        if (low === null || high === null)
+            return null;
+        /*
+         * A hyphen range is inclusive on both ends, and with prereleases in play
+         * semver widens it: `1.2.3 - 2.0.0` becomes `>=1.2.3-0 <2.0.1-0`. The lower
+         * `-0` admits `1.2.3-beta.1`; the upper bound bumps the last written
+         * segment so `2.0.1-rc.1` stays out.
+         */
+        const from = low.pre.length === 0 ? atLeast(low.major ?? 0, low.minor ?? 0, low.patch ?? 0, ['0']) : expand(low, '>=');
+        const upperMajor = high.major === null ? 0 : high.major;
+        const upperMinor = high.minor === null ? 0 : high.minor;
+        const upperPatch = high.patch === null ? 0 : high.patch;
+        const to = high.minor === null
+            ? [belowRelease(upperMajor + 1, 0, 0)]
+            : high.patch === null
+                ? [belowRelease(upperMajor, upperMinor + 1, 0)]
+                : [belowRelease(upperMajor, upperMinor, upperPatch + 1)];
+        if (from === null)
+            return null;
+        return [...from, ...to];
+    }
+    const comparators = [];
+    const normalized = trimmed.replace(/(~|\^|>=|<=|>|<|=)\s+(\S)/g, '$1$2');
+    for (const token of normalized.split(/\s+/)) {
+        const match = /^(~|\^|>=|<=|>|<|=)?(.+)$/.exec(token);
+        if (match === null)
+            return null;
+        const partial = parsePartial(match[2]);
+        if (partial === null)
+            return null;
+        const expanded = expand(partial, match[1] ?? '=');
+        if (expanded === null)
+            return null;
+        comparators.push(...expanded);
+    }
+    return comparators;
+}
+/**
+ * Compare two parsed versions.
+ *
+ * @param left - left version.
+ * @param right - right version.
+ * @returns negative, zero, or positive.
+ */
+function compareParts(left, right) {
+    return (left.major - right.major ||
+        left.minor - right.minor ||
+        left.patch - right.patch ||
+        comparePre(left.pre, right.pre));
+}
+/**
+ * Does a version fall inside a manifest range?
+ *
+ * The host gate calls `semver.satisfies(version, range, { includePrerelease:
+ * true })` before it installs anything, so prereleases take part in comparisons
+ * here for the same reason: a plugin declaring `>=0.2.0-rc.2 <0.3.0-0` accepts
+ * the `0.2.1-rc.5` build people actually run, and marking that version
+ * unusable would be a lie.
+ *
+ * Ranges this module cannot parse answer `true`. A manifest written in a way
+ * this parser does not understand must never be the reason a version is called
+ * incompatible — the host stays the judge, and the page only loses a hint.
+ *
+ * @param version - the version to test, such as `0.2.1-rc.5`.
+ * @param range - a range as a manifest writes it; `''` means "no limit".
+ * @returns whether the version is inside the range.
+ */
+export function satisfiesRange(version, range) {
+    const text = String(range ?? '').trim();
+    if (text === '')
+        return true;
+    const parts = parseVersion(version);
+    if (parts === null)
+        return true;
+    for (const alternative of text.split('||')) {
+        const comparators = parseAlternative(alternative);
+        if (comparators === null)
+            return true;
+        const passes = comparators.every((comparator) => {
+            const delta = compareParts(parts, comparator.parts);
+            switch (comparator.op) {
+                case '<':
+                    return delta < 0;
+                case '<=':
+                    return delta <= 0;
+                case '>':
+                    return delta > 0;
+                case '>=':
+                    return delta >= 0;
+                default:
+                    return delta === 0;
+            }
+        });
+        if (passes)
+            return true;
+    }
+    return false;
+}
 /**
  * The tag a published version was released under.
  *

package/lib/host/version.js.map

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

package/lib/index.d.ts

@@ -1,4 +1,6 @@
 import { type UpgraderConfig } from './host/config.ts';
+import { type StepOutcome } from './host/install.ts';
+import { type Phase } from './host/progress.ts';
 import { type HostContext } from './host/manager.ts';
 /**
  * The plugin's config schema, read by the loader before `apply` runs.
@@ -12,6 +14,82 @@ export { Config } from './host/config.ts';
 export declare const name = "plugin-upgrader";
 /** The web server is the only hard dependency; pluginManager is read lazily. */
 export declare const inject: string[];
+/** Lifecycle of one batch. */
+type JobStatus = 'queued' | 'running' | 'finished' | 'cancelled';
+/** One batch of steps, as the browser polls it. */
+interface JobRecord {
+    id: string;
+    status: JobStatus;
+    total: number;
+    done: number;
+    failed: number;
+    results: StepOutcome[];
+    log: string[];
+    /** Characters kept in `log`, so a chatty pnpm run cannot grow without limit. */
+    logChars: number;
+    cancelled: boolean;
+    startedAt: number;
+    finishedAt?: number;
+    heartbeatAt?: number;
+    /** The step being worked on, when one is in flight. */
+    current?: string;
+    /** When that step started, so the panel can show a live elapsed time. */
+    stepStartedAt?: number;
+    /** What that step is doing right now. */
+    phase?: Phase;
+    /**
+     * The last thing pnpm printed, trimmed.
+     *
+     * A phase alone cannot distinguish "downloading" from "stuck on the eleventh
+     * registry timeout", and those look identical to somebody watching a clock
+     * climb. This is the newest non-blank line, so the panel can show the actual
+     * work instead of only its category.
+     */
+    activity?: string;
+    /** 1-based number of the registry being tried, and how many there are. */
+    attempt?: {
+        index: number;
+        total: number;
+        registry: string | null;
+    };
+    cacheDirty?: boolean;
+    abandoned?: boolean;
+    /**
+     * The request ids this job has run under, newest last.
+     */
+    requestIds: string[];
+}
+/**
+ * The state that has to outlive a module replacement.
+ *
+ * `jobs` is keyed by job id and read by the poll route; `live` is the batch the
+ * manager events belong to. Both are reached through `globalThis` so a
+ * replacement module instance adopts a batch that is still running rather than
+ * answering `unknown-job` for it.
+ */
+interface JobStore {
+    jobs: Map<string, JobRecord>;
+    /** The job manager events belong to, while one is running. */
+    live: JobRecord | null;
+    /** The installation the manager is currently running, for cancellation. */
+    inFlight: {
+        requestId: string;
+    } | null;
+}
+/**
+ * The shared batch store, created once per process.
+ *
+ * Read through `globalThis` rather than a module-level constant: a replaced
+ * module gets a fresh scope, so a module-level map would be empty again and the
+ * very batch that caused the replacement would vanish.
+ *
+ * Exported so a test can prove a re-evaluated module adopts the same map
+ * instead of starting empty — which is the whole point of keeping it off the
+ * module scope.
+ *
+ * @returns the process-wide store.
+ */
+export declare function sharedJobStore(): JobStore;
 /**
  * Mount the host half.
  *

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAQrE,OAAO,EAEL,KAAK,WAAW,EAMjB,MAAM,mBAAmB,CAAA;AAE1B;;;;;;GAMG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,kEAAkE;AAClE,eAAO,MAAM,IAAI,oBAAoB,CAAA;AAErC,gFAAgF;AAChF,eAAO,MAAM,MAAM,UAAgB,CAAA;AAgGnC;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI,CA2drE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAIrE,OAAO,EAA4C,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE9F,OAAO,EAAa,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAG1D,OAAO,EAEL,KAAK,WAAW,EAMjB,MAAM,mBAAmB,CAAA;AAE1B;;;;;;GAMG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,kEAAkE;AAClE,eAAO,MAAM,IAAI,oBAAoB,CAAA;AAErC,gFAAgF;AAChF,eAAO,MAAM,MAAM,UAAgB,CAAA;AA8CnC,8BAA8B;AAC9B,KAAK,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,CAAA;AAyBhE,mDAAmD;AACnD,UAAU,SAAS;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,SAAS,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,WAAW,EAAE,CAAA;IACtB,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,gFAAgF;IAChF,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,yCAAyC;IACzC,KAAK,CAAC,EAAE,KAAK,CAAA;IACb;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,0EAA0E;IAC1E,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;IACnE,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;OAEG;IACH,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB;AAED;;;;;;;GAOG;AACH,UAAU,QAAQ;IAChB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC5B,8DAA8D;IAC9D,IAAI,EAAE,SAAS,GAAG,IAAI,CAAA;IACtB,2EAA2E;IAC3E,QAAQ,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CACvC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,IAAI,QAAQ,CAQzC;AAWD;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI,CAyfrE"}

package/lib/index.js

@@ -5,7 +5,8 @@ import { buildOverview } from './host/overview.js';
 import { runStep, validateStep } from './host/install.js';
 import { profileDirFrom, recoverPendingDrop } from './host/manifest.js';
 import { nextPhase } from './host/progress.js';
-import { probeRegistry } from './host/registry.js';
+import { dshRequirementOf, fetchPackument, probeRegistry } from './host/registry.js';
+import { runtimeVersionOf } from './host/runtime.js';
 import { asPluginManager, } from './host/manager.js';
 /**
  * The plugin's config schema, read by the loader before `apply` runs.
@@ -54,6 +55,50 @@ const ADOPTED_LOG_LIMIT = 60;
  * tail of a pnpm warning says what failed, the head only repeats the registry.
  */
 const ACTIVITY_CHARS = 120;
+/**
+ * Where the batch bookkeeping lives.
+ *
+ * These maps used to be locals of `apply`, which made every batch disappear the
+ * moment the host replaced this plugin's code. The host does exactly that while
+ * a batch is running: a batch is what upgrades other plugins, and HMR evicts
+ * any loaded file whose bytes changed — including this one, when the user
+ * upgrades the upgrader, or when a linked checkout is rebuilt. The tab then
+ * polls a job id the new instance has never heard of, gets `unknown-job`, and
+ * reports "lost contact" over an install that finished perfectly well.
+ *
+ * A module-level `const` would not fix that: HMR re-evaluates the module, so a
+ * fresh module scope is created and the map would start empty again. Only an
+ * object reached through `globalThis` outlives the re-evaluation. That is the
+ * point of the symbol — the same key is found by the replacement module, so the
+ * new instance adopts the batch that is still running in the old one instead of
+ * pretending it never existed.
+ *
+ * The map is still expected to empty out on a real restart, which is correct:
+ * a restarted host has no running batch to report.
+ */
+const JOB_STORE_KEY = Symbol.for('dsh-plugin-upgrader/jobs');
+/**
+ * The shared batch store, created once per process.
+ *
+ * Read through `globalThis` rather than a module-level constant: a replaced
+ * module gets a fresh scope, so a module-level map would be empty again and the
+ * very batch that caused the replacement would vanish.
+ *
+ * Exported so a test can prove a re-evaluated module adopts the same map
+ * instead of starting empty — which is the whole point of keeping it off the
+ * module scope.
+ *
+ * @returns the process-wide store.
+ */
+export function sharedJobStore() {
+    const scope = globalThis;
+    let store = scope[JOB_STORE_KEY];
+    if (store === undefined) {
+        store = { jobs: new Map(), live: null, inFlight: null };
+        scope[JOB_STORE_KEY] = store;
+    }
+    return store;
+}
 /**
  * Mount the host half.
  *
@@ -64,10 +109,8 @@ const ACTIVITY_CHARS = 120;
 export function apply(ctx, config) {
     const packumentCache = new Map();
     const tagCache = new Map();
-    const jobs = new Map();
-    let inFlight = null;
-    /** The job a manager event belongs to, while one is running. */
-    let liveJob = null;
+    const store = sharedJobStore();
+    const jobs = store.jobs;
     /**
      * The registry the user picked, read fresh on every use.
      *
@@ -108,6 +151,33 @@ export function apply(ctx, config) {
     };
     /** The manager, or a reason the request cannot be served. */
     const requireManager = () => asPluginManager(ctx.get('pluginManager', false));
+    /**
+     * The compatibility check handed to every step.
+     *
+     * It answers from the same packument the page already reads, so asking costs
+     * at most one registry request — and only for a package the page has never
+     * listed. When the requirement or the runtime version cannot be read, the
+     * answer is "unknown" and the manager's own gate stays the final word; that
+     * is deliberate, since guessing here would refuse versions that work.
+     *
+     * @returns the guard, or `undefined` when no runtime version could be read.
+     */
+    const buildGuard = () => {
+        const runtimeVersion = runtimeVersionOf(process.argv);
+        if (runtimeVersion === undefined)
+            return undefined;
+        return {
+            runtimeVersion,
+            requirementOf: async (name, version) => {
+                const { data } = await fetchPackument(chosenRegistry(), name, packumentCache, false);
+                if (data === undefined || data === null || typeof data !== 'object')
+                    return undefined;
+                const manifest = data.versions?.[version];
+                const requirement = dshRequirementOf(manifest);
+                return requirement === undefined ? undefined : { range: requirement.range };
+            },
+        };
+    };
     /**
      * Run a batch job to completion in the background.
      *
@@ -129,7 +199,7 @@ export function apply(ctx, config) {
         }
         job.status = 'running';
         job.heartbeatAt = Date.now();
-        liveJob = job;
+        store.live = job;
         const beat = setInterval(() => {
             job.heartbeatAt = Date.now();
         }, HEARTBEAT_MS);
@@ -145,9 +215,9 @@ export function apply(ctx, config) {
                 appendLog(job, `→ ${job.current}`);
                 const outcome = await runStep(manager, step, (message) => appendLog(job, message), (requestId) => {
                     job.requestIds.push(requestId);
-                    inFlight = { requestId };
-                }, chosenRegistry());
-                inFlight = null;
+                    store.inFlight = { requestId };
+                }, chosenRegistry(), buildGuard());
+                store.inFlight = null;
                 job.heartbeatAt = Date.now();
                 job.results.push(outcome);
                 job.done = job.results.length;
@@ -160,8 +230,15 @@ export function apply(ctx, config) {
         }
         finally {
             clearInterval(beat);
-            liveJob = null;
-            inFlight = null;
+            /*
+             * Only clear what this run owns. A replacement instance shares the store,
+             * so a blind `store.live = null` from a run that is finishing would blind
+             * whichever batch the new instance had just adopted.
+             */
+            if (store.live === job)
+                store.live = null;
+            if (store.inFlight?.requestId === job.requestIds.at(-1))
+                store.inFlight = null;
         }
         job.status = job.cancelled ? 'cancelled' : 'finished';
         job.current = undefined;
@@ -340,7 +417,7 @@ export function apply(ctx, config) {
                 running.cancelled = true;
                 appendLog(running, '! cancel requested');
                 const manager = requireManager();
-                const target = inFlight?.requestId ?? running.requestIds.at(-1);
+                const target = store.inFlight?.requestId ?? running.requestIds.at(-1);
                 if (manager !== undefined && target !== undefined && target !== '') {
                     try {
                         const outcome = await manager.cancelInstall(target);
@@ -424,7 +501,7 @@ export function apply(ctx, config) {
         }
     };
     subscribe('plugin-manager/install-log', (chunk) => {
-        const job = liveJob;
+        const job = store.live;
         if (job === null)
             return;
         const tagged = chunk.requestId !== undefined && chunk.requestId !== '';
@@ -454,7 +531,7 @@ export function apply(ctx, config) {
         }
     }, 'plugin-upgrader: install output');
     subscribe('plugin-manager/install-state', (state) => {
-        const job = liveJob;
+        const job = store.live;
         if (job === null)
             return;
         if (!job.requestIds.includes(state.requestId))