dsh-enhancement-suite 0.1.0 → 0.1.1

package/README.md

@@ -94,8 +94,8 @@ dsh-enhance update --profile headless
 ## How it installs
 
 1. Every plugin is installed through the **official CLI**: `dsh plugin --profile <profile> add <package>`. This suite never loads the plugins through its own dependency graph or its own cordis patch — the four upstream packages stay independent in the profile.
-2. `dsh-plugin-marketplace` declares `dsh.bundle.patch`, so `dsh plugin add` reconciles it into `dsh.profile.bundles` and its bundle layer auto-mounts it.
-3. The other three are plain dependencies; the suite appends their mount rows to the profile's `cordis.patch.yml` with the same safe, idempotent logic the marketplace's own one-click install uses (an empty `[]` patch is replaced correctly, duplicates are skipped, and a flow-style array is refused instead of corrupted).
+2. All four plugins now declare `dsh.bundle.patch` (as of vision 0.3.9 / soul-md 0.5.4 / tdai-memory 0.2.9 / marketplace 0.2.4), so `dsh plugin add` reconciles each into `dsh.profile.bundles` and its own bundle layer auto-mounts it.
+3. For profiles that mounted a plugin manually before it gained its bundle manifest, the suite **removes the stale manual row** from `cordis.patch.yml` — two mounts of the same entry id would abort boot. (Non-bundle third-party plugins still get the safe idempotent mount logic: empty `[]` patches are replaced correctly, duplicates are skipped, flow-style arrays are refused instead of corrupted.)
 4. Restart `dsh web` and the plugins load.
 
 Every step reports a clear `✓` / `✗`, failures are never swallowed, and no API key is read, printed, or forwarded.

package/bin/dsh-enhance.mjs

@@ -151,13 +151,36 @@ function isMountedInPatch(pkg, profile) {
  * Mirrors the marketplace's own logic: bundle plugins are skipped (their
  * bundle layer auto-mounts them), an empty `[]` patch is replaced with a
  * block-style insert list, and a non-empty flow-style array is refused
- * rather than corrupted.
+ * rather than corrupted. For bundle plugins, any STALE manual row left by an
+ * earlier non-bundle version is removed — two mounts of the same entry id
+ * abort boot.
  */
+function escapeRegExp(text) {
+  return String(text).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+/** Remove a `- id: ...` + `name: '<pkg>'` manual mount block, if present. */
+function stripManualRow(src, pkg) {
+  const pattern = new RegExp(`[ \\t]*- id: [^\\n]*\\n[ \\t]*name: ['"]${escapeRegExp(pkg)}['"]\\n?`, "g");
+  return src.replace(pattern, "");
+}
+
 function ensureMounted(pkg, profile) {
   const patch = join(profileDir(profile), "cordis.patch.yml");
   if (!existsSync(patch)) return { changed: false, note: "cordis.patch.yml not found; mount manually" };
-  if (isInProfileBundles(pkg, profile)) return { changed: false, note: "already mounted via dsh.profile.bundles" };
-  if (isBundlePackage(pkg, profile)) return { changed: false, note: "bundle plugin: auto-mounted via its own dsh.bundle layer" };
+  const inBundles = isInProfileBundles(pkg, profile);
+  if (inBundles || isBundlePackage(pkg, profile)) {
+    // The bundle layer auto-mounts this plugin. Remove a stale manual row
+    // (written before the package gained its dsh.bundle manifest) so boot
+    // does not fail with a duplicate loader entry.
+    let src = readFileSync(patch, "utf8");
+    const cleaned = stripManualRow(src, pkg);
+    if (cleaned !== src) {
+      if (process.env.DSH_ENHANCE_DRY_RUN !== "1") writeFileSync(patch, cleaned, "utf8");
+      return { changed: true, note: "removed stale manual mount row (bundle layer auto-mounts)" };
+    }
+    return { changed: false, note: inBundles ? "already mounted via dsh.profile.bundles" : "bundle plugin: auto-mounted via its own dsh.bundle layer" };
+  }
   let src = readFileSync(patch, "utf8");
   if (src.includes(`name: '${pkg}'`) || src.includes(`name: "${pkg}"`)) return { changed: false, note: "already mounted in cordis.patch.yml" };
   const id = pkg.replace(/^@[^/]+\//, "").replace(/[^a-z0-9-]/g, "-") || pkg;
@@ -398,9 +421,14 @@ function cmdDoctor(profile) {
       continue;
     }
     ok(`${p.emoji} ${p.name}: installed (${version})`);
-    const mounted = isInProfileBundles(p.name, profile) || isMountedInPatch(p.name, profile) || isBundlePackage(p.name, profile);
-    if (mounted) info(`   mounted: ${isInProfileBundles(p.name, profile) ? "dsh.profile.bundles" : isMountedInPatch(p.name, profile) ? "cordis.patch.yml" : "own dsh.bundle layer"}`);
-    else {
+    const inBundles = isInProfileBundles(p.name, profile);
+    const inPatch = isMountedInPatch(p.name, profile);
+    if (inBundles && inPatch) {
+      bad(`   duplicate mount: manual row in cordis.patch.yml AND dsh.profile.bundles — run "dsh-enhance install" to clean up`);
+      healthy = false;
+    } else if (inBundles || inPatch || isBundlePackage(p.name, profile)) {
+      info(`   mounted: ${inBundles ? "dsh.profile.bundles" : inPatch ? "cordis.patch.yml" : "own dsh.bundle layer"}`);
+    } else {
       bad(`   not mounted — run "dsh-enhance install"`);
       healthy = false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-enhancement-suite",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Enhancement suite for DeepSeek Harness — the official installer and registry for Scorp1o117's Vision, Soul/Persona, Memory & Marketplace plugins.",
   "type": "module",
   "license": "MIT",