dshmarket 1.60.0 → 1.61.0

package/lib/install.js

@@ -4,8 +4,9 @@
  * update staleness detection. Every function takes the plugin runner as a
  * parameter so tests can substitute a recording fake.
  */
-import { existsSync } from 'node:fs';
-import { join } from 'node:path';
+import { closeSync, existsSync, lstatSync, openSync, readlinkSync, readSync, rmSync, statSync } from 'node:fs';
+import { dirname, isAbsolute, join, resolve } from 'node:path';
+import { findDshInstallDir } from './dsh-install.js';
 import { classifyPnpmFailure, HOST_NAMESPACE_RE } from './pnpm-compat.js';
 import { conflictingEntryIds, dropFromManifest, hasDshManifest, hasLoadableEntry, pluginSubdirs, profileDir, readInstalled, readManifestDeps, readProfileBundles, dropUnparseableBuildKeys } from './profile.js';
 import { logEvent } from './log.js';
@@ -176,6 +177,7 @@ export async function withHoistRecovery(run, profile, pluginArgs, profileDirecto
         // construction: directories are only removed when their owning pid is
         // gone (the name carries it), so a live download is never touched.
         await cleanOrphanedStore(run, profile);
+        const diagnostics = diagnosticsTail(result);
         const failure = classifyPnpmFailure(`${result.stderr}\n${result.stdout}`, result.exitCode);
         if (failure !== null) {
             result = {
@@ -184,6 +186,13 @@ export async function withHoistRecovery(run, profile, pluginArgs, profileDirecto
                 ...(failure.replaceOutput === true ? { stdout: '' } : {}),
             };
         }
+        else if (diagnostics !== null) {
+            // The dsh CLI redirects the whole pnpm run into a file and leaves one
+            // line on stderr: `dsh: pnpm failed; diagnostics: <path>` (its own
+            // literal message). Everything a user or a report needs is in that
+            // file, so show its tail rather than the one line (#672).
+            result = { ...result, stderr: `${result.stderr}\n\n--- dsh diagnostics (${diagnostics.path}) ---\n${diagnostics.text}` };
+        }
         else if (result.pnpmError !== undefined && result.pnpmError !== '') {
             // Nothing matched, but pnpm DID say what went wrong — in its ndjson
             // stream, which never reaches stderr. Without this the user is shown
@@ -200,6 +209,54 @@ export async function withHoistRecovery(run, profile, pluginArgs, profileDirecto
     }
     return result;
 }
+/**
+ * The tail of the diagnostics file the dsh CLI pointed at, when it pointed at
+ * one (#672).
+ *
+ * `dsh plugin` writes pnpm's entire output to a file and prints only
+ * `dsh: pnpm failed; diagnostics: <path>`. For a failure the market cannot
+ * classify, that line is all it has — the reasons people reported (#244,
+ * #192, #138) were all "the UI shows one unhelpful line" for causes that
+ * were written down somewhere the UI never looked.
+ *
+ * Bounded on purpose: absolute paths only, a regular file, and at most the
+ * last {@link DIAGNOSTICS_TAIL_BYTES}. The path comes from our own child, but
+ * the market only ever needs the end of a log, and reading an arbitrary
+ * amount of an arbitrary file is not worth anything it could add.
+ *
+ * @returns the path and the text, or null when the output names no readable
+ *   diagnostics file.
+ */
+export function diagnosticsTail(result) {
+    const match = /(?:^|\n)\s*dsh: [^\n]*diagnostics:\s*(\S+)\s*$/m.exec(result.stderr)
+        ?? /(?:^|\n)\s*dsh: [^\n]*diagnostics:\s*(\S+)\s*$/m.exec(result.stdout);
+    if (match === null)
+        return null;
+    const path = match[1];
+    if (!isAbsolute(path))
+        return null;
+    try {
+        if (!statSync(path).isFile())
+            return null;
+        const size = statSync(path).size;
+        const start = Math.max(0, size - DIAGNOSTICS_TAIL_BYTES);
+        const handle = openSync(path, 'r');
+        try {
+            const buffer = Buffer.alloc(Math.min(DIAGNOSTICS_TAIL_BYTES, size));
+            readSync(handle, buffer, 0, buffer.length, start);
+            const text = buffer.toString('utf8').trim();
+            return text === '' ? null : { path, text };
+        }
+        finally {
+            closeSync(handle);
+        }
+    }
+    catch {
+        return null;
+    }
+}
+/** How much of a diagnostics file is worth showing. */
+const DIAGNOSTICS_TAIL_BYTES = 8192;
 /**
  * Whether pnpm never started at all, so the profile cannot have been touched.
  *
@@ -307,7 +364,7 @@ export async function retargetCollections(run, profile, before, target, explicit
  * profile at all, which is a broken plugin-command channel rather than
  * anything wrong with the plugin (#258).
  */
-export async function validateAddedPlugins(run, profile, before, explicitDir) {
+export async function validateAddedPlugins(run, profile, before, explicitDir, hostDirectory) {
     const dir = profileDir(profile, explicitDir);
     const addedNow = Object.keys(readInstalled(profile, dir)).filter(n => !before.has(n));
     const keep = [];
@@ -322,7 +379,7 @@ export async function validateAddedPlugins(run, profile, before, explicitDir) {
         // ship no entry of their own (#103) and must not be uninstalled here.
         if (!hasDshManifest(packageDir) || !hasLoadableEntry(dir, n)) {
             removedBroken.push(n);
-            await removeAndReconcile(run, profile, dir, n);
+            await removeAndReconcile(run, profile, dir, n, hostDirectory);
             continue;
         }
         const clash = conflictingEntryIds(dir, n, existingBundles);
@@ -331,7 +388,7 @@ export async function validateAddedPlugins(run, profile, before, explicitDir) {
             conflicts.push(...clash.map(hit => ({ name: n, ...hit })));
             removedBroken.push(n);
             logEvent('error', 'install', `${n}: loader entry id conflict with ${clash[0].owner} (${clash.map(hit => hit.id).join(', ')}) — removing, it would break the next boot`);
-            await removeAndReconcile(run, profile, dir, n);
+            await removeAndReconcile(run, profile, dir, n, hostDirectory);
             continue;
         }
         keep.push(n);
@@ -356,11 +413,14 @@ export async function validateAddedPlugins(run, profile, before, explicitDir) {
  * @param profile - the profile name for manifest writes.
  * @param dir - the profile directory the validation reads.
  * @param name - the package being removed.
+ * @param hostDirectory - the DSH host deployment directory whose node_modules
+ * may hold a bridge link for this package (#662); resolved when omitted.
  */
-async function removeAndReconcile(run, profile, dir, name) {
+async function removeAndReconcile(run, profile, dir, name, hostDirectory = findDshInstallDir()) {
     const result = await run(profile, ['remove', name]);
     const gone = !existsSync(join(dir, 'node_modules', name, 'package.json'));
     if (gone) {
+        removeDanglingHostBridge(name, dir, hostDirectory);
         if (dropFromManifest(profile, name, dir)) {
             logEvent('error', 'install', `${name}: remove ${result.exitCode === 0 ? 'skipped the manifest reconcile' : `failed (exit ${String(result.exitCode)})`} but the package is gone from disk — dropped its dependency/bundle rows so the next boot stays loadable`);
         }
@@ -370,6 +430,99 @@ async function removeAndReconcile(run, profile, dir, name) {
         logEvent('error', 'install', `${name}: remove failed (exit ${String(result.exitCode)})${result.timedOut ? ' timed out' : ''}${result.cancelled ? ' cancelled' : ''} and the package is still installed — its rows stay in the manifest; retry the uninstall`);
     }
 }
+/**
+ * The node_modules root of the DSH host deployment `directory` belongs to.
+ *
+ * CLI layouts install the host as `<prefix>/node_modules/@deepseek-ai/dsh`,
+ * so the shared root is two dirname steps up; a flat Desktop layout keeps
+ * the host package at the deployment root (#662's
+ * `<desktop-app>\dependencies\dsh`), with its pnpm-managed node_modules
+ * directly beside its package.json. `dshHostInfo()` already distinguishes
+ * the two — this is pure path arithmetic on whichever directory it returned.
+ */
+export function hostNodeModulesRoot(directory) {
+    const segments = directory.split(/[/\\]+/).filter(segment => segment !== '');
+    const n = segments.length;
+    if (n >= 3 && segments[n - 3].toLowerCase() === 'node_modules' && segments[n - 2].toLowerCase() === '@deepseek-ai') {
+        return resolve(dirname(dirname(directory)));
+    }
+    return resolve(directory, 'node_modules');
+}
+/**
+ * Normalize a link target for path comparison: restore the UNC device form
+ * (`\\?\UNC\server\share` back to `\\server\share` — stripped of its prefix
+ * it is no longer absolute and resolve() would re-root it against the
+ * cwd), then remove the NT device prefixes `\\?\` and the subst-style
+ * `\??\` mklink stores. Measured on Node 24/win32: readlinkSync returns
+ * the plain absolute path, so these branches only matter for links created
+ * outside Node — but a comparison must not silently miss because of them.
+ */
+export function normalizedLinkTarget(target) {
+    return target
+        .replace(/^\\\\\?\\UNC\\/, '\\\\')
+        .replace(/^(?:\\\\\?\\|\\\?\?\\)/, '');
+}
+/**
+ * Whether a link target names the profile's copy of a package. Junction
+ * targets keep the case they were created with, so the comparison is
+ * case-insensitive on win32, where the filesystem itself is.
+ */
+function pointsAtProfilePackage(target, expected) {
+    const left = resolve(normalizedLinkTarget(target));
+    const right = resolve(expected);
+    return process.platform === 'win32' ? left.toLowerCase() === right.toLowerCase() : left === right;
+}
+/**
+ * Remove the host-side bridge link a confirmed uninstall leaves dangling
+ * (#662). The official boot projects profile packages into the host
+ * deployment's node_modules as links (Junction or SymbolicLink — lstat
+ * reports both as symlinks) and never reclaims them, and `dsh plugin
+ * remove` knows nothing about them, so without this the link outlives the
+ * package it pointed at and every tool that lstats its way through
+ * node_modules (rg first among them) fails on it.
+ *
+ * The gate is deliberately total: only `<host node_modules>/<name>` is ever
+ * touched, only when that entry is a link whose normalized target is
+ * exactly this profile's copy of `name`, and only when that copy is really
+ * gone — a live bridge for a package that is still installed must survive.
+ * A null `hostDirectory` (no host locatable — a plain `dsh web` from a
+ * global install) is a documented no-op.
+ *
+ * @returns whether a dangling bridge was removed. Never throws: the removal
+ * this cleans up after already succeeded, and a cleanup failure must not
+ * fail the uninstall that triggered it.
+ */
+export function removeDanglingHostBridge(name, profileDirectory, hostDirectory) {
+    if (hostDirectory === null)
+        return false;
+    const bridge = join(hostNodeModulesRoot(hostDirectory), name);
+    const unlinked = join(profileDirectory, 'node_modules', name);
+    try {
+        if (!lstatSync(bridge).isSymbolicLink())
+            return false;
+        // The gone-check mirrors removeAndReconcile's manifest truth: a package
+        // whose package.json is gone is uninstalled even if an empty directory
+        // lingered behind, and its bridge is exactly the dangling link #662 is
+        // about.
+        if (!pointsAtProfilePackage(readlinkSync(bridge), unlinked) || existsSync(join(unlinked, 'package.json')))
+            return false;
+        // No `recursive`: rmSync on a link unlinks the link itself only
+        // (measured on win32/Node 24 for live and dangling junctions and dir
+        // symlinks), and leaving it off keeps a race that swaps the link for a
+        // real directory from ever deleting that directory's tree.
+        rmSync(bridge, { force: true });
+    }
+    catch (error) {
+        // ENOENT is the ordinary "no bridge there" answer (and a lost race
+        // while unlinking); anything else is worth a line in the log.
+        if (error.code !== 'ENOENT') {
+            logEvent('warn', 'uninstall', `${name}: host bridge cleanup skipped — ${error instanceof Error ? error.message : String(error)}`);
+        }
+        return false;
+    }
+    logEvent('info', 'uninstall', `${name}: removed the dangling host bridge the boot projection left at ${bridge}`);
+    return true;
+}
 /**
  * Group flat `{id, owner}` conflict hits by the installed plugin that owns
  * them. What the user has to decide is which PLUGINS to uninstall, not which

package/lib/routes.js

@@ -14,7 +14,7 @@ import { load as loadYaml } from 'js-yaml';
 import { forgetCatalog, loadRegistry, pluginCategories } from './registry.js';
 import { cleanHotDir, hotMount, hotUnmount, listHotMounts, MAX_FAVORITES, MAX_NOTE, mountClientOnlyDeps, purgeMarketState, readMarketState, writeMarketState, } from './hot.js';
 import { createGroup, deleteGroup, removeFromGroups, renameGroup, setGroupMembers } from './groups.js';
-import { dshHostInfo } from './dsh-install.js';
+import { dshHostInfo, findDshInstallDir } from './dsh-install.js';
 import { deriveHostCompatibility, DiscoveryManifestIndex } from './discovery-compatibility.js';
 import { configurePersistentLog, exportLogs, logEvent, readPersistentLog } from './log.js';
 import { marketFetch } from './net.js';
@@ -30,7 +30,7 @@ import { applyPreset, deletePreset, listPresets, previewPreset, savePreset } fro
 import { createProfileSnapshot, DEFAULT_MAX_SNAPSHOTS, deleteSnapshot, listSnapshots, restoreSnapshot } from './snapshot.js';
 import { trialValidate } from './trial.js';
 import { codeloadAllowBuildsKey, findCatalogEntryForLocal, findInstalledAlias, gitCommitOfTarget, githubCommitOfTarget, githubTargetAtCommit, gitAllowBuildsKey, gitRefOfTarget, gitTargetAtCommit, gitUpdateTarget, hostedRepoKey, pinnedGitAllowBuildsKey, installTargetFor, isGenerationLink, isLocalSpec, NPM_NAME_RE, repoOfTarget, restoreBlockedByWorkspace, restoreTargetForLocal, workspaceProtocolDeps } from './sources.js';
-import { failureDetail, groupConflictsByOwner, isStaleUpdate, parseIgnoredBuilds, parsePrepareKey, parsePrepareNotAllowed, pnpmBlockedByOpenFiles, pnpmNeverStarted, RELEASE_AGE_OVERRIDE, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.js';
+import { failureDetail, groupConflictsByOwner, isStaleUpdate, parseIgnoredBuilds, parsePrepareKey, parsePrepareNotAllowed, pnpmBlockedByOpenFiles, pnpmNeverStarted, RELEASE_AGE_OVERRIDE, removeDanglingHostBridge, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.js';
 import { classifyPnpmFailure } from './pnpm-compat.js';
 import { asChannel, CHANNELS, DIST_TAG, resolveChannel } from './channels.js';
 import { asRegion, githubProxyManaged, normalizeGithubProxy, REGIONS, routesFor, setActiveRegion, setCustomGithubProxy, } from './regions.js';
@@ -966,6 +966,9 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup) {
         // with two activation sources must not have the second one skipped
         // because the first succeeded.
         const unmounted = await hotUnmount(name);
+        // #662: the removal is confirmed — drop the host bridge link the boot
+        // projection may have left pointing at the now-gone package.
+        removeDanglingHostBridge(name, activeProfileDir, config.dshInstallDir ?? findDshInstallDir());
         const entryDisabled = await themes.setEntryDisabled(name, true);
         const hot = (unmounted || entryDisabled) && !native;
         if (native) {
@@ -3998,6 +4001,10 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup) {
                         // has just been removed. Only rows belonging to packages on the
                         // market's own disable list are touched — a hand-written row is
                         // the user's, not ours.
+                        // #662 first, while the filesystem is the only thing touched:
+                        // the market's own host bridge dangles the moment the remove
+                        // succeeds, and this route is the last code of ours to run.
+                        removeDanglingHostBridge(selfName, activeProfileDir, config.dshInstallDir ?? findDshInstallDir());
                         const purge = body.purge === true;
                         const restored = [];
                         if (purge) {
@@ -4287,6 +4294,13 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup) {
                             sendJson(response, 400, { error: 'the market cannot uninstall itself; use the dsh CLI' });
                             return;
                         }
+                        // The bridge cleanup this route performs joins the package name
+                        // into a host node_modules path (#662); a hand-edited manifest
+                        // carrying `../../evil` must not escape that join.
+                        if (!NPM_NAME_RE.test(name)) {
+                            sendJson(response, 400, { error: 'plugin is not installed' });
+                            return;
+                        }
                         if (readInstalled(config.profile, activeProfileDir)[name] === undefined) {
                             sendJson(response, 400, { error: 'plugin is not installed' });
                             return;
@@ -4372,6 +4386,10 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup) {
                         let hot = false;
                         if (ok || halfGone) {
                             invalidateUpdates();
+                            // #662: the removal is final (confirmed exit or reconciled
+                            // from disk truth) — the host node_modules bridge the boot
+                            // projection left for this package must not outlive it.
+                            removeDanglingHostBridge(name, activeProfileDir, config.dshInstallDir ?? findDshInstallDir());
                             hot = await hotUnmount(name);
                             // Bundle-layer plugins never hot-mount, but their loader entry
                             // is still LIVE in this process — after the remove deleted the

package/lib/types/install.d.ts

@@ -102,6 +102,31 @@ export declare function isUnpublishedHostPeer(pkg: string | undefined, profile:
 export declare function withHoistRecovery(run: PluginRunner, profile: string, pluginArgs: string[], profileDirectory?: string, options?: {
     releaseAgeBypass?: boolean;
 }): Promise<InstallResult>;
+/**
+ * The tail of the diagnostics file the dsh CLI pointed at, when it pointed at
+ * one (#672).
+ *
+ * `dsh plugin` writes pnpm's entire output to a file and prints only
+ * `dsh: pnpm failed; diagnostics: <path>`. For a failure the market cannot
+ * classify, that line is all it has — the reasons people reported (#244,
+ * #192, #138) were all "the UI shows one unhelpful line" for causes that
+ * were written down somewhere the UI never looked.
+ *
+ * Bounded on purpose: absolute paths only, a regular file, and at most the
+ * last {@link DIAGNOSTICS_TAIL_BYTES}. The path comes from our own child, but
+ * the market only ever needs the end of a log, and reading an arbitrary
+ * amount of an arbitrary file is not worth anything it could add.
+ *
+ * @returns the path and the text, or null when the output names no readable
+ *   diagnostics file.
+ */
+export declare function diagnosticsTail(result: {
+    stdout: string;
+    stderr: string;
+}): {
+    path: string;
+    text: string;
+} | null;
 /**
  * Whether pnpm never started at all, so the profile cannot have been touched.
  *
@@ -164,7 +189,7 @@ export declare function retargetCollections(run: PluginRunner, profile: string,
  * profile at all, which is a broken plugin-command channel rather than
  * anything wrong with the plugin (#258).
  */
-export declare function validateAddedPlugins(run: PluginRunner, profile: string, before: Set<string>, explicitDir?: string): Promise<{
+export declare function validateAddedPlugins(run: PluginRunner, profile: string, before: Set<string>, explicitDir?: string, hostDirectory?: string | null): Promise<{
     added: string[];
     keep: string[];
     removedBroken: string[];
@@ -174,6 +199,48 @@ export declare function validateAddedPlugins(run: PluginRunner, profile: string,
         owner: string;
     }[];
 }>;
+/**
+ * The node_modules root of the DSH host deployment `directory` belongs to.
+ *
+ * CLI layouts install the host as `<prefix>/node_modules/@deepseek-ai/dsh`,
+ * so the shared root is two dirname steps up; a flat Desktop layout keeps
+ * the host package at the deployment root (#662's
+ * `<desktop-app>\dependencies\dsh`), with its pnpm-managed node_modules
+ * directly beside its package.json. `dshHostInfo()` already distinguishes
+ * the two — this is pure path arithmetic on whichever directory it returned.
+ */
+export declare function hostNodeModulesRoot(directory: string): string;
+/**
+ * Normalize a link target for path comparison: restore the UNC device form
+ * (`\\?\UNC\server\share` back to `\\server\share` — stripped of its prefix
+ * it is no longer absolute and resolve() would re-root it against the
+ * cwd), then remove the NT device prefixes `\\?\` and the subst-style
+ * `\??\` mklink stores. Measured on Node 24/win32: readlinkSync returns
+ * the plain absolute path, so these branches only matter for links created
+ * outside Node — but a comparison must not silently miss because of them.
+ */
+export declare function normalizedLinkTarget(target: string): string;
+/**
+ * Remove the host-side bridge link a confirmed uninstall leaves dangling
+ * (#662). The official boot projects profile packages into the host
+ * deployment's node_modules as links (Junction or SymbolicLink — lstat
+ * reports both as symlinks) and never reclaims them, and `dsh plugin
+ * remove` knows nothing about them, so without this the link outlives the
+ * package it pointed at and every tool that lstats its way through
+ * node_modules (rg first among them) fails on it.
+ *
+ * The gate is deliberately total: only `<host node_modules>/<name>` is ever
+ * touched, only when that entry is a link whose normalized target is
+ * exactly this profile's copy of `name`, and only when that copy is really
+ * gone — a live bridge for a package that is still installed must survive.
+ * A null `hostDirectory` (no host locatable — a plain `dsh web` from a
+ * global install) is a documented no-op.
+ *
+ * @returns whether a dangling bridge was removed. Never throws: the removal
+ * this cleans up after already succeeded, and a cleanup failure must not
+ * fail the uninstall that triggered it.
+ */
+export declare function removeDanglingHostBridge(name: string, profileDirectory: string, hostDirectory: string | null): boolean;
 /**
  * Group flat `{id, owner}` conflict hits by the installed plugin that owns
  * them. What the user has to decide is which PLUGINS to uninstall, not which

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dshmarket",
   "description": "Visual plugin market inside DeepSeek Harness — browse, search, and one-click install community plugins. · DSH 可视化插件市场：逛一逛，点一下，装好。",
-  "version": "1.60.0",
+  "version": "1.61.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",

package/src/install.ts

@@ -5,9 +5,10 @@
  * parameter so tests can substitute a recording fake.
  */
 
-import { existsSync } from 'node:fs'
-import { join } from 'node:path'
+import { closeSync, existsSync, lstatSync, openSync, readlinkSync, readSync, rmSync, statSync } from 'node:fs'
+import { dirname, isAbsolute, join, resolve } from 'node:path'
 import type { InstallResult, PluginRunner } from './dsh-cli.ts'
+import { findDshInstallDir } from './dsh-install.ts'
 import { classifyPnpmFailure, HOST_NAMESPACE_RE, isTransientPnpmFailure } from './pnpm-compat.ts'
 import { conflictingEntryIds, dropFromManifest, hasDshManifest, hasLoadableEntry, pluginSubdirs, profileDir, readInstalled, readManifestDeps, readProfileBundles, dropUnparseableBuildKeys } from './profile.ts'
 import { logEvent } from './log.ts'
@@ -194,6 +195,7 @@ export async function withHoistRecovery(
     // construction: directories are only removed when their owning pid is
     // gone (the name carries it), so a live download is never touched.
     await cleanOrphanedStore(run, profile)
+    const diagnostics = diagnosticsTail(result)
     const failure = classifyPnpmFailure(`${result.stderr}\n${result.stdout}`, result.exitCode)
     if (failure !== null) {
       result = {
@@ -201,6 +203,12 @@ export async function withHoistRecovery(
         stderr: failure.replaceOutput === true ? failure.message : `${result.stderr}\n\n${failure.message}`,
         ...(failure.replaceOutput === true ? { stdout: '' } : {}),
       }
+    } else if (diagnostics !== null) {
+      // The dsh CLI redirects the whole pnpm run into a file and leaves one
+      // line on stderr: `dsh: pnpm failed; diagnostics: <path>` (its own
+      // literal message). Everything a user or a report needs is in that
+      // file, so show its tail rather than the one line (#672).
+      result = { ...result, stderr: `${result.stderr}\n\n--- dsh diagnostics (${diagnostics.path}) ---\n${diagnostics.text}` }
     } else if (result.pnpmError !== undefined && result.pnpmError !== '') {
       // Nothing matched, but pnpm DID say what went wrong — in its ndjson
       // stream, which never reaches stderr. Without this the user is shown
@@ -218,6 +226,51 @@ export async function withHoistRecovery(
   return result
 }
 
+/**
+ * The tail of the diagnostics file the dsh CLI pointed at, when it pointed at
+ * one (#672).
+ *
+ * `dsh plugin` writes pnpm's entire output to a file and prints only
+ * `dsh: pnpm failed; diagnostics: <path>`. For a failure the market cannot
+ * classify, that line is all it has — the reasons people reported (#244,
+ * #192, #138) were all "the UI shows one unhelpful line" for causes that
+ * were written down somewhere the UI never looked.
+ *
+ * Bounded on purpose: absolute paths only, a regular file, and at most the
+ * last {@link DIAGNOSTICS_TAIL_BYTES}. The path comes from our own child, but
+ * the market only ever needs the end of a log, and reading an arbitrary
+ * amount of an arbitrary file is not worth anything it could add.
+ *
+ * @returns the path and the text, or null when the output names no readable
+ *   diagnostics file.
+ */
+export function diagnosticsTail(result: { stdout: string; stderr: string }): { path: string; text: string } | null {
+  const match = /(?:^|\n)\s*dsh: [^\n]*diagnostics:\s*(\S+)\s*$/m.exec(result.stderr)
+    ?? /(?:^|\n)\s*dsh: [^\n]*diagnostics:\s*(\S+)\s*$/m.exec(result.stdout)
+  if (match === null) return null
+  const path = match[1]!
+  if (!isAbsolute(path)) return null
+  try {
+    if (!statSync(path).isFile()) return null
+    const size = statSync(path).size
+    const start = Math.max(0, size - DIAGNOSTICS_TAIL_BYTES)
+    const handle = openSync(path, 'r')
+    try {
+      const buffer = Buffer.alloc(Math.min(DIAGNOSTICS_TAIL_BYTES, size))
+      readSync(handle, buffer, 0, buffer.length, start)
+      const text = buffer.toString('utf8').trim()
+      return text === '' ? null : { path, text }
+    } finally {
+      closeSync(handle)
+    }
+  } catch {
+    return null
+  }
+}
+
+/** How much of a diagnostics file is worth showing. */
+const DIAGNOSTICS_TAIL_BYTES = 8192
+
 /**
  * Whether pnpm never started at all, so the profile cannot have been touched.
  *
@@ -330,7 +383,7 @@ export async function retargetCollections(
  * anything wrong with the plugin (#258).
  */
 export async function validateAddedPlugins(
-  run: PluginRunner, profile: string, before: Set<string>, explicitDir?: string,
+  run: PluginRunner, profile: string, before: Set<string>, explicitDir?: string, hostDirectory?: string | null,
 ): Promise<{ added: string[]; keep: string[]; removedBroken: string[]; conflicts: { name: string; id: string; owner: string }[] }> {
   const dir = profileDir(profile, explicitDir)
   const addedNow = Object.keys(readInstalled(profile, dir)).filter(n => !before.has(n))
@@ -346,7 +399,7 @@ export async function validateAddedPlugins(
     // ship no entry of their own (#103) and must not be uninstalled here.
     if (!hasDshManifest(packageDir) || !hasLoadableEntry(dir, n)) {
       removedBroken.push(n)
-      await removeAndReconcile(run, profile, dir, n)
+      await removeAndReconcile(run, profile, dir, n, hostDirectory)
       continue
     }
     const clash = conflictingEntryIds(dir, n, existingBundles)
@@ -356,7 +409,7 @@ export async function validateAddedPlugins(
       removedBroken.push(n)
       logEvent('error', 'install',
         `${n}: loader entry id conflict with ${clash[0].owner} (${clash.map(hit => hit.id).join(', ')}) — removing, it would break the next boot`)
-      await removeAndReconcile(run, profile, dir, n)
+      await removeAndReconcile(run, profile, dir, n, hostDirectory)
       continue
     }
     keep.push(n)
@@ -382,11 +435,14 @@ export async function validateAddedPlugins(
  * @param profile - the profile name for manifest writes.
  * @param dir - the profile directory the validation reads.
  * @param name - the package being removed.
+ * @param hostDirectory - the DSH host deployment directory whose node_modules
+ * may hold a bridge link for this package (#662); resolved when omitted.
  */
-async function removeAndReconcile(run: PluginRunner, profile: string, dir: string, name: string): Promise<void> {
+async function removeAndReconcile(run: PluginRunner, profile: string, dir: string, name: string, hostDirectory: string | null = findDshInstallDir()): Promise<void> {
   const result = await run(profile, ['remove', name])
   const gone = !existsSync(join(dir, 'node_modules', name, 'package.json'))
   if (gone) {
+    removeDanglingHostBridge(name, dir, hostDirectory)
     if (dropFromManifest(profile, name, dir)) {
       logEvent('error', 'install',
         `${name}: remove ${result.exitCode === 0 ? 'skipped the manifest reconcile' : `failed (exit ${String(result.exitCode)})`} but the package is gone from disk — dropped its dependency/bundle rows so the next boot stays loadable`)
@@ -399,6 +455,99 @@ async function removeAndReconcile(run: PluginRunner, profile: string, dir: strin
   }
 }
 
+/**
+ * The node_modules root of the DSH host deployment `directory` belongs to.
+ *
+ * CLI layouts install the host as `<prefix>/node_modules/@deepseek-ai/dsh`,
+ * so the shared root is two dirname steps up; a flat Desktop layout keeps
+ * the host package at the deployment root (#662's
+ * `<desktop-app>\dependencies\dsh`), with its pnpm-managed node_modules
+ * directly beside its package.json. `dshHostInfo()` already distinguishes
+ * the two — this is pure path arithmetic on whichever directory it returned.
+ */
+export function hostNodeModulesRoot(directory: string): string {
+  const segments = directory.split(/[/\\]+/).filter(segment => segment !== '')
+  const n = segments.length
+  if (n >= 3 && segments[n - 3].toLowerCase() === 'node_modules' && segments[n - 2].toLowerCase() === '@deepseek-ai') {
+    return resolve(dirname(dirname(directory)))
+  }
+  return resolve(directory, 'node_modules')
+}
+
+/**
+ * Normalize a link target for path comparison: restore the UNC device form
+ * (`\\?\UNC\server\share` back to `\\server\share` — stripped of its prefix
+ * it is no longer absolute and resolve() would re-root it against the
+ * cwd), then remove the NT device prefixes `\\?\` and the subst-style
+ * `\??\` mklink stores. Measured on Node 24/win32: readlinkSync returns
+ * the plain absolute path, so these branches only matter for links created
+ * outside Node — but a comparison must not silently miss because of them.
+ */
+export function normalizedLinkTarget(target: string): string {
+  return target
+    .replace(/^\\\\\?\\UNC\\/, '\\\\')
+    .replace(/^(?:\\\\\?\\|\\\?\?\\)/, '')
+}
+
+/**
+ * Whether a link target names the profile's copy of a package. Junction
+ * targets keep the case they were created with, so the comparison is
+ * case-insensitive on win32, where the filesystem itself is.
+ */
+function pointsAtProfilePackage(target: string, expected: string): boolean {
+  const left = resolve(normalizedLinkTarget(target))
+  const right = resolve(expected)
+  return process.platform === 'win32' ? left.toLowerCase() === right.toLowerCase() : left === right
+}
+
+/**
+ * Remove the host-side bridge link a confirmed uninstall leaves dangling
+ * (#662). The official boot projects profile packages into the host
+ * deployment's node_modules as links (Junction or SymbolicLink — lstat
+ * reports both as symlinks) and never reclaims them, and `dsh plugin
+ * remove` knows nothing about them, so without this the link outlives the
+ * package it pointed at and every tool that lstats its way through
+ * node_modules (rg first among them) fails on it.
+ *
+ * The gate is deliberately total: only `<host node_modules>/<name>` is ever
+ * touched, only when that entry is a link whose normalized target is
+ * exactly this profile's copy of `name`, and only when that copy is really
+ * gone — a live bridge for a package that is still installed must survive.
+ * A null `hostDirectory` (no host locatable — a plain `dsh web` from a
+ * global install) is a documented no-op.
+ *
+ * @returns whether a dangling bridge was removed. Never throws: the removal
+ * this cleans up after already succeeded, and a cleanup failure must not
+ * fail the uninstall that triggered it.
+ */
+export function removeDanglingHostBridge(name: string, profileDirectory: string, hostDirectory: string | null): boolean {
+  if (hostDirectory === null) return false
+  const bridge = join(hostNodeModulesRoot(hostDirectory), name)
+  const unlinked = join(profileDirectory, 'node_modules', name)
+  try {
+    if (!lstatSync(bridge).isSymbolicLink()) return false
+    // The gone-check mirrors removeAndReconcile's manifest truth: a package
+    // whose package.json is gone is uninstalled even if an empty directory
+    // lingered behind, and its bridge is exactly the dangling link #662 is
+    // about.
+    if (!pointsAtProfilePackage(readlinkSync(bridge), unlinked) || existsSync(join(unlinked, 'package.json'))) return false
+    // No `recursive`: rmSync on a link unlinks the link itself only
+    // (measured on win32/Node 24 for live and dangling junctions and dir
+    // symlinks), and leaving it off keeps a race that swaps the link for a
+    // real directory from ever deleting that directory's tree.
+    rmSync(bridge, { force: true })
+  } catch (error) {
+    // ENOENT is the ordinary "no bridge there" answer (and a lost race
+    // while unlinking); anything else is worth a line in the log.
+    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      logEvent('warn', 'uninstall', `${name}: host bridge cleanup skipped — ${error instanceof Error ? error.message : String(error)}`)
+    }
+    return false
+  }
+  logEvent('info', 'uninstall', `${name}: removed the dangling host bridge the boot projection left at ${bridge}`)
+  return true
+}
+
 /**
  * Group flat `{id, owner}` conflict hits by the installed plugin that owns
  * them. What the user has to decide is which PLUGINS to uninstall, not which

package/src/routes.ts

@@ -19,7 +19,7 @@ import {
   mountClientOnlyDeps, purgeMarketState, readMarketState, writeMarketState,
 } from './hot.ts'
 import { createGroup, deleteGroup, removeFromGroups, renameGroup, setGroupMembers } from './groups.ts'
-import { dshHostInfo } from './dsh-install.ts'
+import { dshHostInfo, findDshInstallDir } from './dsh-install.ts'
 import { deriveHostCompatibility, DiscoveryManifestIndex } from './discovery-compatibility.ts'
 import { configurePersistentLog, exportLogs, logEvent, readPersistentLog } from './log.ts'
 import { marketFetch } from './net.ts'
@@ -38,7 +38,7 @@ import { applyPreset, deletePreset, listPresets, previewPreset, savePreset } fro
 import { createProfileSnapshot, DEFAULT_MAX_SNAPSHOTS, deleteSnapshot, listSnapshots, restoreSnapshot } from './snapshot.ts'
 import { trialValidate } from './trial.ts'
 import { codeloadAllowBuildsKey, findCatalogEntryForLocal, findInstalledAlias, gitCommitOfTarget, githubCommitOfTarget, githubTargetAtCommit, gitAllowBuildsKey, gitRefOfTarget, gitTargetAtCommit, gitUpdateTarget, hostedRepoKey, pinnedGitAllowBuildsKey, installTargetFor, isGenerationLink, isLocalSpec, NPM_NAME_RE, repoOfTarget, restoreBlockedByWorkspace, restoreTargetForLocal, workspaceProtocolDeps } from './sources.ts'
-import { failureDetail, groupConflictsByOwner, isStaleUpdate, parseIgnoredBuilds, parsePrepareKey, parsePrepareNotAllowed, pnpmBlockedByOpenFiles, pnpmNeverStarted, RELEASE_AGE_OVERRIDE, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.ts'
+import { failureDetail, groupConflictsByOwner, isStaleUpdate, parseIgnoredBuilds, parsePrepareKey, parsePrepareNotAllowed, pnpmBlockedByOpenFiles, pnpmNeverStarted, RELEASE_AGE_OVERRIDE, removeDanglingHostBridge, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.ts'
 import { classifyPnpmFailure } from './pnpm-compat.ts'
 import { asChannel, CHANNELS, DIST_TAG, resolveChannel, type Channel } from './channels.ts'
 import {
@@ -1094,6 +1094,9 @@ export function mountMarketRoutes(
     // with two activation sources must not have the second one skipped
     // because the first succeeded.
     const unmounted = await hotUnmount(name)
+    // #662: the removal is confirmed — drop the host bridge link the boot
+    // projection may have left pointing at the now-gone package.
+    removeDanglingHostBridge(name, activeProfileDir, config.dshInstallDir ?? findDshInstallDir())
     const entryDisabled = await themes.setEntryDisabled(name, true)
     const hot = (unmounted || entryDisabled) && !native
     if (native) {
@@ -4158,6 +4161,10 @@ sendJson(response, 200, { updates })
             // has just been removed. Only rows belonging to packages on the
             // market's own disable list are touched — a hand-written row is
             // the user's, not ours.
+            // #662 first, while the filesystem is the only thing touched:
+            // the market's own host bridge dangles the moment the remove
+            // succeeds, and this route is the last code of ours to run.
+            removeDanglingHostBridge(selfName, activeProfileDir, config.dshInstallDir ?? findDshInstallDir())
             const purge = body.purge === true
             const restored: string[] = []
             if (purge) {
@@ -4447,6 +4454,13 @@ sendJson(response, 200, { updates })
               sendJson(response, 400, { error: 'the market cannot uninstall itself; use the dsh CLI' })
               return
             }
+            // The bridge cleanup this route performs joins the package name
+            // into a host node_modules path (#662); a hand-edited manifest
+            // carrying `../../evil` must not escape that join.
+            if (!NPM_NAME_RE.test(name)) {
+              sendJson(response, 400, { error: 'plugin is not installed' })
+              return
+            }
             if (readInstalled(config.profile, activeProfileDir)[name] === undefined) {
               sendJson(response, 400, { error: 'plugin is not installed' })
               return
@@ -4532,6 +4546,10 @@ sendJson(response, 200, { updates })
             let hot = false
             if (ok || halfGone) {
               invalidateUpdates()
+              // #662: the removal is final (confirmed exit or reconciled
+              // from disk truth) — the host node_modules bridge the boot
+              // projection left for this package must not outlive it.
+              removeDanglingHostBridge(name, activeProfileDir, config.dshInstallDir ?? findDshInstallDir())
               hot = await hotUnmount(name)
               // Bundle-layer plugins never hot-mount, but their loader entry
               // is still LIVE in this process — after the remove deleted the