dsh-unplug 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.2.0 (2026-08-20)
+
+- New `reconcile` command: auto-fix dangling bundles and orphaned patch rows
+  (profile manifest + profile/home cordis.patch.yml), with `--yes`/`force: true`.
+- CLI and agent tool both expose `reconcile`.
+
+## 0.1.1 (2026-08-20)
+
+- resolvePlugin now scans installed bundle patches, so `remove`/`disable`/`enable`
+  work when a plugin row lives only inside the bundle package (not the profile patch).
+- Tests for bundle-only row resolution.
+
 ## 0.1.0 (2026-08-20)
 
 - Initial release.

package/lib/cli.js

@@ -7,6 +7,7 @@
 import { dshHome } from './lib/paths.js';
 import { audit } from './lib/audit.js';
 import { removePlugin, setPluginEnabled } from './lib/remove.js';
+import { reconcile } from './lib/reconcile.js';
 function usage() {
     return [
         'dsh-unplug — plug/unplug any DeepSeek Harness plugin cleanly',
@@ -20,6 +21,7 @@ function usage() {
         '  disable <plugin>   Disable without deleting (removes from bundles, keeps deps)',
         '  enable <plugin>    Re-enable a disabled plugin (re-adds to bundles, clears disabled flag)',
         '  audit              Detect orphaned rows, dangling bundles, missing patch files',
+        '  reconcile          Auto-fix dangling bundles and orphaned rows',
         '',
         'Options:',
         '  --profile <name>   Profile name (default: default)',
@@ -131,6 +133,14 @@ export async function main(argv) {
                 const result = audit(resolvedHome, profile);
                 return printResult({ ...result, command, profile }, json);
             }
+            case 'reconcile': {
+                if (!yes) {
+                    console.error('reconcile requires --yes to confirm');
+                    return 2;
+                }
+                const result = reconcile(resolvedHome, profile);
+                return printResult({ ...result, command }, json);
+            }
             case 'remove': {
                 if (!yes) {
                     console.error('remove requires --yes to confirm');

package/lib/index.js

@@ -9,6 +9,7 @@ import { satisfiesCaret } from './lib/version.js';
 import { dshHome } from './lib/paths.js';
 import { audit } from './lib/audit.js';
 import { removePlugin, setPluginEnabled } from './lib/remove.js';
+import { reconcile } from './lib/reconcile.js';
 export const name = 'dsh-unplug';
 export const inject = ['tools'];
 export const TESTED_PEER_RANGE = '^0.1.0-rc.6';
@@ -47,7 +48,7 @@ export function apply(ctx, config) {
             command: {
                 type: 'string',
                 required: true,
-                enum: ['list', 'remove', 'disable', 'enable', 'audit'],
+                enum: ['list', 'remove', 'disable', 'enable', 'audit', 'reconcile'],
                 description: 'Action to perform',
             },
             plugin: {
@@ -105,6 +106,19 @@ export function apply(ctx, config) {
                         const result = audit(home, profile);
                         return { schema: 'dsh-unplug/v1', ok: true, command: args.command, profile, bundles: result.bundles, disabledBundles: result.disabledBundles };
                     }
+                    case 'reconcile': {
+                        if (!args.force)
+                            return errorReport('UNPLUG_REQUIRES_FORCE', 'reconcile requires `force: true` to confirm the cleanup', profile, args.command);
+                        const result = reconcile(home, profile);
+                        return {
+                            schema: result.schema,
+                            ok: result.ok,
+                            command: args.command,
+                            profile: result.profile,
+                            fixedBundles: result.fixedBundles,
+                            fixedRows: result.fixedRows,
+                        };
+                    }
                     case 'remove': {
                         if (!args.force)
                             return errorReport('UNPLUG_REQUIRES_FORCE', 'Remove requires `force: true` to confirm the destructive operation', profile, args.command);

package/lib/lib/reconcile.js

@@ -0,0 +1,54 @@
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+import { audit } from './audit.js';
+import { bundlesOf, disabledBundlesOf, readProfileManifest, removeBundle, writeProfileManifest } from './manifest.js';
+import { parsePatch, removeEntry } from './patches.js';
+import { isResolvable } from './resolve.js';
+/**
+ * Auto-fix dangling state: remove unresolvable bundles from the profile manifest
+ * and strip patch rows that reference packages which are not installed.
+ */
+export function reconcile(home, profileName) {
+    const profileDir = path.join(home, 'profiles', profileName);
+    const manifestPath = path.join(profileDir, 'package.json');
+    if (!existsSync(manifestPath)) {
+        throw new Error(`profile "${profileName}" not found at ${profileDir}`);
+    }
+    const manifest = readProfileManifest(profileDir);
+    const fixedBundles = [];
+    for (const pkg of [...new Set([...bundlesOf(manifest), ...disabledBundlesOf(manifest)])]) {
+        if (!isResolvable(profileDir, pkg)) {
+            removeBundle(manifest, pkg);
+            fixedBundles.push(pkg);
+        }
+    }
+    if (fixedBundles.length > 0)
+        writeProfileManifest(profileDir, manifest);
+    const resolvable = new Set([...bundlesOf(manifest), ...disabledBundlesOf(manifest)]);
+    let fixedRows = 0;
+    for (const file of [path.join(profileDir, 'cordis.patch.yml'), path.join(home, 'cordis.patch.yml')]) {
+        if (!existsSync(file))
+            continue;
+        let text = readFileSync(file, 'utf8');
+        let changed = false;
+        for (;;) {
+            const { entries } = parsePatch(text);
+            const orphan = entries.find((entry) => entry.name !== undefined && !resolvable.has(entry.name));
+            if (orphan === undefined)
+                break;
+            text = removeEntry(text, orphan.id).text;
+            fixedRows++;
+            changed = true;
+        }
+        if (changed)
+            writeFileSync(file, text, 'utf8');
+    }
+    return {
+        schema: 'dsh-unplug/v1',
+        ok: true,
+        profile: profileName,
+        fixedBundles,
+        fixedRows,
+        audit: audit(home, profileName),
+    };
+}

package/lib/lib/remove.js

@@ -6,12 +6,23 @@ import { removeEntry, setEntryDisabled } from './patches.js';
 import { readFileSync, writeFileSync } from 'node:fs';
 import { audit } from './audit.js';
 import { parsePatch } from './patches.js';
+import { resolveBundlePatchPath } from './resolve.js';
 function resolvePlugin(home, profileDir, profileName, plugin) {
     const manifest = readProfileManifest(profileDir);
     const allBundles = [...(manifest.dsh?.profile?.bundles ?? []), ...(manifest.dsh?.profile?.disabledBundles ?? [])];
     // Direct bundle name match
     if (allBundles.includes(plugin))
         return { bundleName: plugin, rowId: plugin };
+    // Scan every installed bundle's patch rows too (rows live in node_modules).
+    for (const pkg of allBundles) {
+        const patchPath = resolveBundlePatchPath(profileDir, pkg);
+        if (patchPath === undefined || !existsSync(patchPath))
+            continue;
+        for (const entry of parsePatch(readFileSync(patchPath, 'utf8')).entries) {
+            if (entry.id === plugin || entry.name === plugin)
+                return { bundleName: pkg, rowId: entry.id };
+        }
+    }
     // Check patch rows for id/name match
     for (const file of [path.join(profileDir, 'cordis.patch.yml'), path.join(home, 'cordis.patch.yml')]) {
         if (!existsSync(file))

package/lib/types/lib/reconcile.d.ts

@@ -0,0 +1,14 @@
+import { type AuditResult } from './audit.js';
+export interface ReconcileResult {
+    schema: 'dsh-unplug/v1';
+    ok: boolean;
+    profile: string;
+    fixedBundles: string[];
+    fixedRows: number;
+    audit: AuditResult;
+}
+/**
+ * Auto-fix dangling state: remove unresolvable bundles from the profile manifest
+ * and strip patch rows that reference packages which are not installed.
+ */
+export declare function reconcile(home: string, profileName: string): ReconcileResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-unplug",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Plug/unplug any DeepSeek Harness plugin cleanly: list every mounted layer, disable/enable without deleting, remove bundles + patch rows + dependencies in one pass, and audit for orphaned/dangling plugin state. Zero runtime dependencies; read-only by default.",
   "type": "module",
   "main": "lib/index.js",