@deepseek-ai/dsh-plugin-manager 0.2.1-alpha.2 → 0.2.1-alpha.3

package/lib/types/index.d.ts

@@ -40,6 +40,11 @@ export declare class PluginManager extends TypertRemoteService {
     static Config: z<Config>;
     /** Management bundles remain protected if their files become unreadable. */
     private readonly managementBundles;
+    /**
+     * The registry each package was last installed from by this manager in this process. pnpm verifies lockfile tarball
+     * URLs against its default registry unless they belong to a named registry, so a later removal names it again.
+     */
+    private readonly installedFrom;
     private readonly ownerEntryId;
     private readonly packageOperations;
     private readonly profile;
@@ -146,7 +151,22 @@ export declare class PluginManager extends TypertRemoteService {
     private bundleRows;
     private protectsManager;
     private configure;
+    /**
+     * Publish the profile's runtime resolution without HMR, unless a deselected startup bundle still runs and needs the
+     * current table. A publication that needs a restart waits for the restart the result already reports.
+     */
     private refreshPackages;
+    /**
+     * Apply a package change: without HMR, publish the runtime resolution when that is safe, then {@link reload}.
+     * @param requiredIds Entry ids that must start.
+     * @returns The reload's outcome.
+     */
+    private publishAndReload;
+    /**
+     * Apply the saved profile; with HMR it recomposes live, including the runtime resolution.
+     * @param requiredIds Entry ids that must start.
+     * @returns Warnings about entries that were already inactive, and why the change waits for a restart, if it does.
+     */
     private reload;
     private change;
     private diskState;

package/lib/types/index.js

@@ -42,13 +42,13 @@ import { withFileLock, writeFileAtomic } from '@deepseek-ai/dsh-atomic-write';
 import z from '@deepseek-ai/schemastery';
 import { TypertRemoteService, Remote } from '@deepseek-ai/dsh-typert-protocol';
 import { pluginEntryId, readPluginInventory } from '@deepseek-ai/dsh-host-plugin-inventory';
-import { readPluginMeta, readProfileManifest, resolveBundleDir, loadOverlayPatches, composeEntries, reconcileProfilePatches, readProfilePatches, OPTIONAL_BUNDLES, bundlePatchPaths, evaluatePluginCompatibility, readProfileCompatibility, readProfileVersionExemptions, setProfileVersionExemption, PROFILE_COMPATIBILITY_FILENAME, OFFICIAL_ON_DEMAND_CATALOG, getDshRuntimeVersion, } from '@deepseek-ai/dsh-app-boot';
+import { readPluginMeta, readProfileManifest, resolveBundleDir, loadOverlayPatches, composeEntries, readProfilePatches, OPTIONAL_BUNDLES, bundlePatchPaths, evaluatePluginCompatibility, readProfileCompatibility, readProfileVersionExemptions, setProfileVersionExemption, PROFILE_COMPATIBILITY_FILENAME, OFFICIAL_ON_DEMAND_CATALOG, getDshRuntimeVersion, ResolutionRestartRequired, } from '@deepseek-ai/dsh-app-boot';
 import { bundleManifest, readProfileRegistry, registryArguments, runProfilePnpm, saveManifest, viewProfilePackage } from "./operations.js";
 import { classifyInstallFailure } from "./install-failure.js";
 import { officialBundleInstallTarget } from "./official-install-target.js";
 import { dependencySpec, InvalidInstallSpecError, parseInstallSpec } from "./install-spec.js";
 import { attributeFailure, normalizeRegistry, NPMMIRROR_REGISTRY, registryPlan } from "./registry.js";
-import { writePluginEnabled } from "./patch.js";
+import { flatten, writePluginEnabled } from "./patch.js";
 import { incompatiblePlugin, ManagementFailure } from "./failure.js";
 import { approveBuilds, recordPendingBuilds } from "./build-approval.js";
 import { checkGithubConnection } from "./github-connection.js";
@@ -62,7 +62,7 @@ const protectedModules = new Set([
     '@deepseek-ai/dsh-host-webserver', '@deepseek-ai/dsh-client-modules',
     '@deepseek-ai/dsh-client-ui-settings-plugin-inventory', '@deepseek-ai/dsh-client-ui-plugin-manager',
     '@deepseek-ai/dsh-host-plugin-inventory', '@deepseek-ai/dsh-typert-registry',
-    '@deepseek-ai/dsh-api-remotes',
+    '@deepseek-ai/dsh-api-remotes', '@deepseek-ai/dsh-api-remote-access',
     '@deepseek-ai/cordis-plugin-timer', '@deepseek-ai/dsh-client-connection',
     '@deepseek-ai/dsh-host-frontend-static', '@deepseek-ai/dsh-tools',
     '@deepseek-ai/dsh-hmr',
@@ -71,10 +71,6 @@ const protectedModules = new Set([
 const RESTORED_FILES = ['package.json', 'pnpm-lock.yaml'];
 /** pnpm's colour escapes, which a JSON answer may be wrapped in. */
 const ANSI_SEQUENCE = /\x1b\[[0-9;]*m/g;
-/** Flatten only the groups addressable by the profile's patch composer. */
-function flatten(rows) {
-    return rows.flatMap(row => [row, ...(row.group && Array.isArray(row.config) ? flatten(row.config) : [])]);
-}
 /** Preserve the exact observed diagnostic, including non-Error failures. */
 function messageOf(error) { return error instanceof Error ? error.message : String(error); }
 /** An expected refusal keeps its code; anything else becomes an operation error carrying its exact diagnostic. */
@@ -128,6 +124,37 @@ function printedError(printed) {
     const { code, message } = error;
     return [code, message].filter((part) => typeof part === 'string').join('  ');
 }
+/** The bundles a profile manifest selects. */
+function bundleSelection(manifest) {
+    return manifest.dsh?.profile?.bundles ?? [];
+}
+/**
+ * The package an installation spec names before pnpm runs: a registry name, a local directory's manifest name, or the
+ * dependency saved with this git or tarball spec, compared as the plugin list shows saved specs.
+ * @param spec The installation spec.
+ * @param dependencies The profile's saved dependencies.
+ * @param profileDir The profile directory saved local paths are relative to.
+ * @returns The package name, or `undefined` when only the installation tells it.
+ */
+function specPackageName(spec, dependencies, profileDir) {
+    const parsed = parsedForRegistry(spec);
+    if (parsed.kind === 'registry')
+        return parsed.name;
+    if (parsed.kind === 'path')
+        return packageName(parsed.path);
+    const specs = parsed.kind === 'tarball' && parsed.path !== undefined ? [spec, `file:${parsed.path}`] : [spec];
+    return Object.entries(dependencies).find(([dependency, saved]) => specs.includes(dependencySpec(dependency, saved, profileDir)))?.[0];
+}
+/** The package name a local directory declares, or `undefined` without a readable manifest. */
+function packageName(dir) {
+    try {
+        return readProfileManifest('dsh', dir).name;
+    }
+    catch (_error) {
+        // pnpm reports the unreadable directory itself.
+        return undefined;
+    }
+}
 /** The spec's form, for deciding whether a failed attempt was the registry's; a form the parser refuses has no host of its own. */
 function parsedForRegistry(spec) {
     try {
@@ -198,6 +225,11 @@ let PluginManager = (() => {
         });
         /** Management bundles remain protected if their files become unreadable. */
         managementBundles = (__runInitializers(this, _instanceExtraInitializers), new Set());
+        /**
+         * The registry each package was last installed from by this manager in this process. pnpm verifies lockfile tarball
+         * URLs against its default registry unless they belong to a named registry, so a later removal names it again.
+         */
+        installedFrom = new Map();
         ownerEntryId;
         packageOperations = new Set();
         profile;
@@ -252,7 +284,7 @@ let PluginManager = (() => {
         setVersionExemption(packageVersion, runtimeVersion, enabled, acceptRisk) {
             return this.change(result => this.configure(async () => {
                 await setProfileVersionExemption(this.profile.dir, packageVersion, runtimeVersion, enabled, acceptRisk === true);
-                result.warnings = await this.reload();
+                Object.assign(result, await this.reload());
             }), { stage: 'enable', target: packageVersion, enabled }, 'bundle');
         }
         /** Read current plugins, including why a row cannot be changed through the profile patch.
@@ -283,7 +315,7 @@ let PluginManager = (() => {
         listBundles() {
             const manifest = readProfileManifest('dsh', this.profile.dir);
             const exemptions = readProfileVersionExemptions(this.profile.dir);
-            const selected = manifest.dsh?.profile?.bundles ?? [];
+            const selected = bundleSelection(manifest);
             const recorded = manifest.dependencies ?? {};
             const dependencies = Object.keys(recorded);
             const installation = JSON.parse(readFileSync(this.profile.installAnchor, 'utf8'));
@@ -388,7 +420,7 @@ let PluginManager = (() => {
             const manifest = readProfileManifest('dsh', this.profile.dir);
             const installation = JSON.parse(readFileSync(this.profile.installAnchor, 'utf8'));
             const known = new Set([
-                ...manifest.dsh?.profile?.bundles ?? [], ...Object.keys(manifest.dependencies ?? {}), ...Object.keys(installation.dependencies ?? {}),
+                ...bundleSelection(manifest), ...Object.keys(manifest.dependencies ?? {}), ...Object.keys(installation.dependencies ?? {}),
             ]);
             const plan = registryPlan(options?.registry, await this.registries());
             const registry = plan[0];
@@ -477,8 +509,8 @@ let PluginManager = (() => {
                     throw new ManagementFailure('unknown-plugin');
                 if (row.readOnlyReason !== undefined)
                     throw new ManagementFailure(row.readOnlyReason);
-                await writePluginEnabled(this.profile.patchPath, row.patchId, row.moduleName, enabled);
-                result.warnings = await this.reload(enabled ? [row.patchId] : []);
+                await writePluginEnabled(this.profile, row.patchId, row.moduleName, enabled);
+                Object.assign(result, await this.reload(enabled ? [row.patchId] : []));
                 const current = (await this.listPlugins()).find(item => item.entryId === id);
                 return current?.enabled !== enabled && this.ownerContext.get('hmr') !== undefined ? 'overridden' : undefined;
             }), { stage: 'enable', target: id, enabled }, 'plugin');
@@ -491,11 +523,7 @@ let PluginManager = (() => {
         setBundleEnabled(name, enabled) {
             return this.change(result => this.configure(async () => {
                 await this.selectBundle(name, enabled);
-                if (enabled)
-                    await this.refreshPackages();
-                result.warnings = await this.reload(enabled ? this.bundleRows(name).map(row => row.id) : []);
-                if (!enabled && this.ownerContext.get('hmr') !== undefined)
-                    await this.refreshPackages();
+                Object.assign(result, enabled ? await this.publishAndReload(this.bundleRows(name).map(row => row.id)) : await this.reload());
             }), { stage: 'enable', target: name, enabled }, 'bundle');
         }
         /**
@@ -524,12 +552,17 @@ let PluginManager = (() => {
                     throw new ManagementFailure('invalid-spec');
                 if (stopped())
                     throw new InstallCancelledError();
+                const before = readProfileManifest('dsh', this.profile.dir).dependencies ?? {};
+                // With HMR, an installed package is removed before another version is installed, so its plugins stop first.
+                const known = specPackageName(spec, before, this.profile.dir);
+                if (this.ownerContext.get('hmr') !== undefined && known !== undefined && Object.hasOwn(before, known)) {
+                    throw new ManagementFailure('already-installed');
+                }
                 if (options?.approvedBuilds !== undefined) {
                     await approveBuilds(this.profile.dir, options.approvedBuilds);
                     result.approvedBuilds = options.approvedBuilds;
                 }
                 const files = await this.readRestoredFiles();
-                const before = readProfileManifest('dsh', this.profile.dir).dependencies ?? {};
                 let name;
                 let version;
                 try {
@@ -557,6 +590,7 @@ let PluginManager = (() => {
                     // The last run is the result's; the registries asked stay listed whatever the outcome.
                     const plan = registryPlan(options?.registry, await this.registries());
                     let run;
+                    let used = null;
                     for (const [index, registry] of plan.entries()) {
                         if (index > 0)
                             await this.restoreFiles(files);
@@ -564,6 +598,7 @@ let PluginManager = (() => {
                         if (stopped())
                             throw new InstallCancelledError();
                         result.registries.push(registry);
+                        used = registry;
                         announce('installing', { registry, index: index + 1, total: plan.length });
                         run = await this.runPnpm(['add', spec, ...options?.saveExact === true ? ['--save-exact'] : [], ...registryArguments(registry)], control.abort.signal, requestId);
                         result.packageResult = run;
@@ -608,11 +643,11 @@ let PluginManager = (() => {
                     }
                     const after = readProfileManifest('dsh', this.profile.dir).dependencies ?? {};
                     const installed = Object.keys(after).filter(name => before[name] !== after[name]);
-                    // Registry retries can retain the saved range after a partial installation.
+                    // Without HMR a repeated installation can leave the saved dependency as it was.
                     if (installed.length === 0) {
-                        const parsed = parsedForRegistry(spec);
-                        const localName = parsed.kind === 'path' ? readProfileManifest('dsh', parsed.path).name : undefined;
-                        installed.push(...Object.keys(after).filter(name => name === localName || spec === name || spec.startsWith(`${name}@`)));
+                        const local = specPackageName(spec, after, this.profile.dir);
+                        if (local !== undefined && Object.hasOwn(after, local))
+                            installed.push(local);
                     }
                     const target = installed[0];
                     if (installed.length !== 1 || target === undefined)
@@ -628,6 +663,7 @@ let PluginManager = (() => {
                     for (const file of bundlePatchPaths(dir, manifest.dsh.bundle))
                         loadOverlayPatches('dsh', file);
                     version = manifest.version;
+                    this.installedFrom.set(name, used);
                 }
                 catch (error) {
                     // pnpm has exited by now, so the files it rewrote go back as they were.
@@ -644,11 +680,12 @@ let PluginManager = (() => {
                 return this.configure(async () => {
                     if (options?.enabled !== false)
                         await this.selectBundle(name, true);
-                    if (Object.hasOwn(before, name))
-                        return 'restart-required';
-                    await this.refreshPackages();
-                    if (options?.enabled !== false)
-                        result.warnings = await this.reload();
+                    // Without HMR the replaced package's plugins keep running until the restart the result already reports.
+                    if (Object.hasOwn(before, name) && this.ownerContext.get('hmr') === undefined)
+                        return;
+                    // A selected bundle's own rows must start.
+                    const selected = bundleSelection(readProfileManifest('dsh', this.profile.dir)).includes(name);
+                    Object.assign(result, await this.publishAndReload(selected ? this.bundleRows(name).map(row => row.id) : []));
                 });
             }, { stage: 'install', target: spec, enabled: options?.enabled !== false }, 'install');
             control.result = result;
@@ -699,7 +736,7 @@ let PluginManager = (() => {
                     const contributions = bundle.error === undefined ? this.bundleRows(name) : [];
                     if (bundle.enabled) {
                         await this.selectBundle(name, false);
-                        result.warnings = await this.reload();
+                        Object.assign(result, await this.reload());
                     }
                     if ([...this.ctx.loader.entries()].some(entry => entry.fiber?.uid != null
                         && contributions.some(row => row.id === entry.options.id && row.name === entry.options.name))) {
@@ -709,11 +746,15 @@ let PluginManager = (() => {
                 });
                 if (!installed)
                     return;
-                result.packageResult = await this.runPnpm(['remove', name]);
+                // `pnpm remove` takes no `--registry` option; the generic configuration flag sets the same setting. A package
+                // installed before this process started is removed with the registry an installation asks first.
+                const registry = this.installedFrom.has(name) ? this.installedFrom.get(name) : this.configuredRegistries.registry;
+                result.packageResult = await this.runPnpm(['remove', name, ...typeof registry === 'string' ? [`--config.registry=${registry}`] : []]);
                 if (result.packageResult.exitCode !== 0 || result.packageResult.timedOut === true) {
                     throw new Error(result.packageResult.output);
                 }
-                await this.configure(() => this.refreshPackages());
+                this.installedFrom.delete(name);
+                Object.assign(result, await this.configure(() => this.publishAndReload()));
             }, { stage: 'remove', target: name }, 'remove');
         }
         /** The rows a bundle's patch inserts and the existing rows it changes; an unreadable patch throws. */
@@ -807,7 +848,7 @@ let PluginManager = (() => {
         }
         async selectBundle(name, enabled) {
             const manifest = readProfileManifest('dsh', this.profile.dir);
-            const previous = manifest.dsh?.profile?.bundles ?? [];
+            const previous = bundleSelection(manifest);
             if (enabled || !previous.includes(name)) {
                 const metadata = bundleManifest(name, this.profile.dir, this.profile.installAnchor);
                 if (metadata === undefined)
@@ -859,28 +900,64 @@ let PluginManager = (() => {
             const apply = () => { this.abort.signal.throwIfAborted(); return operation(); };
             return hmr === undefined ? apply() : hmr.runExclusive(apply);
         }
+        /**
+         * Publish the profile's runtime resolution without HMR, unless a deselected startup bundle still runs and needs the
+         * current table. A publication that needs a restart waits for the restart the result already reports.
+         */
         async refreshPackages() {
-            if (this.ownerContext.get('hmr') === undefined) {
-                const selected = readProfileManifest('dsh', this.profile.dir).dsh?.profile?.bundles ?? [];
-                // Deselected startup bundles still run without HMR and need the existing package table.
-                if (this.profile.startedBundles.some(name => !selected.includes(name)))
-                    return;
+            const selected = bundleSelection(readProfileManifest('dsh', this.profile.dir));
+            if (this.profile.startedBundles.some(name => !selected.includes(name)))
+                return;
+            try {
+                const packages = this.ownerContext.get('pluginPackages');
+                // A dropped mapping's bundle is not running: the guard above keeps the table while a deselected startup bundle runs.
+                if (packages?.resolution !== undefined)
+                    await packages.refresh();
+            }
+            catch (error) {
+                if (!(error instanceof ResolutionRestartRequired))
+                    throw error;
             }
-            await this.ownerContext.get('pluginPackages')?.refresh();
         }
-        async reload(requiredIds = []) {
+        /**
+         * Apply a package change: without HMR, publish the runtime resolution when that is safe, then {@link reload}.
+         * @param requiredIds Entry ids that must start.
+         * @returns The reload's outcome.
+         */
+        async publishAndReload(requiredIds = []) {
             if (this.ownerContext.get('hmr') === undefined)
-                return [];
-            return reconcileProfilePatches(this.ownerContext.root, readProfilePatches('dsh', this.profile), 'dsh', requiredIds);
+                await this.refreshPackages();
+            return this.reload(requiredIds);
+        }
+        /**
+         * Apply the saved profile; with HMR it recomposes live, including the runtime resolution.
+         * @param requiredIds Entry ids that must start.
+         * @returns Warnings about entries that were already inactive, and why the change waits for a restart, if it does.
+         */
+        async reload(requiredIds = []) {
+            const hmr = this.ownerContext.get('hmr');
+            if (hmr === undefined) {
+                // Startup-only profiles recompose at restart; the saved patches still have to compose.
+                composeEntries([readProfilePatches('dsh', this.profile)]);
+                return { warnings: [] };
+            }
+            const { warnings, pending, restartReason } = await hmr.reconcileProfile(requiredIds);
+            const restart = restartReason ?? pending[0]?.reason;
+            return restart === undefined ? { warnings } : { warnings, restartReason: restart };
         }
         async change(operation, request, reason) {
             return withFileLock(join(this.profile.dir, 'package.json'), async () => {
                 this.abort.signal.throwIfAborted();
                 const before = this.diskState();
                 const result = { ...request, changed: false,
-                    application: this.ownerContext.get('hmr') !== undefined ? 'applied' : 'restart-required' };
+                    ...this.ownerContext.get('hmr') !== undefined ? { application: 'applied' } : { application: 'restart-required', restartReason: 'no-hmr' } };
                 try {
-                    result.application = await operation(result) ?? result.application;
+                    const outcome = await operation(result);
+                    if (outcome !== undefined)
+                        result.application = outcome;
+                    // A reload that waits for a restart leaves the change saved but not applied.
+                    else if (result.application === 'applied' && result.restartReason !== undefined)
+                        result.application = 'restart-required';
                 }
                 catch (error) {
                     if (error instanceof InstallCancelledError) {
@@ -891,6 +968,8 @@ let PluginManager = (() => {
                         result.error = managementError(error);
                     }
                 }
+                if (result.application !== 'restart-required')
+                    delete result.restartReason;
                 result.changed = before !== this.diskState();
                 this.ownerContext.emit('plugin-manager/changed', { reason });
                 return result;

package/lib/types/operations.d.ts

@@ -62,6 +62,7 @@ export declare function saveManifest(dir: string, manifest: ProfileManifest): Pr
  * @param options Output, activation and cancellation policy.
  * @returns Exit status, whether the silence bound stopped the run, and the diagnostic path.
  * A compatibility denial returns exit code 1. Service output is bounded; CLI output uses inherited descriptors.
+ * The diagnostic file is closed on return or rejection, including preparation and spawn failures.
  */
 export declare function runProfilePnpm(context: PackageOperationContext, args: readonly string[], options: PackageOperationOptions): Promise<PackageResult>;
 /** Initialize and run the dsh plugin command with the same write lock as the service.