@cjhyy/code-shell-core 0.8.9 → 0.8.11

package/dist/plugins/installer/update.js

@@ -7,7 +7,7 @@ import { pluginInstallDir } from "./paths.js";
 import { installPluginFromPath } from "./install.js";
 import { installPluginFromSource } from "./installFromSource.js";
 import { parseSource } from "./parseSource.js";
-import { pluginInstallKey, readInstalledPlugins, removeInstallEntries, writeInstalledPlugins, } from "../installedPlugins.js";
+import { pluginInstallKey, mutateInstalledPlugins, readInstalledPlugins, removeInstallEntries, } from "../installedPlugins.js";
 import { pluginHookInstallRecord } from "../pluginHookIntegrity.js";
 import { pluginMcpInstallRecord } from "../pluginMcpIntegrity.js";
 import { readPluginMcp } from "./loadPluginMcp.js";
@@ -40,37 +40,37 @@ export async function reinstallAtomic(name, source, doInstall) {
     try {
         await doInstall();
         if (savedEntries) {
-            const data = readInstalledPlugins();
-            const installed = data.plugins[key] ?? [];
-            let changed = false;
-            for (const entry of installed) {
-                const next = pluginHookInstallRecord(entry.installPath, savedEntries);
-                const nextMcp = pluginMcpInstallRecord(entry.installPath, Object.keys(readPluginMcp(entry.installPath, name)).length > 0, savedEntries);
-                if (entry.hookDigest !== next.hookDigest ||
-                    entry.approvedHookDigest !== next.approvedHookDigest ||
-                    JSON.stringify(entry.approvedHookSnapshot) !==
-                        JSON.stringify(next.approvedHookSnapshot) ||
-                    entry.mcpDigest !== nextMcp.mcpDigest ||
-                    entry.approvedMcpDigest !== nextMcp.approvedMcpDigest) {
-                    entry.hookDigest = next.hookDigest;
-                    if (next.approvedHookDigest)
-                        entry.approvedHookDigest = next.approvedHookDigest;
-                    else
-                        delete entry.approvedHookDigest;
-                    if (next.approvedHookSnapshot)
-                        entry.approvedHookSnapshot = next.approvedHookSnapshot;
-                    else
-                        delete entry.approvedHookSnapshot;
-                    entry.mcpDigest = nextMcp.mcpDigest;
-                    if (nextMcp.approvedMcpDigest)
-                        entry.approvedMcpDigest = nextMcp.approvedMcpDigest;
-                    else
-                        delete entry.approvedMcpDigest;
-                    changed = true;
+            mutateInstalledPlugins((data) => {
+                const installed = data.plugins[key] ?? [];
+                let changed = false;
+                for (const entry of installed) {
+                    const next = pluginHookInstallRecord(entry.installPath, savedEntries);
+                    const nextMcp = pluginMcpInstallRecord(entry.installPath, Object.keys(readPluginMcp(entry.installPath, name)).length > 0, savedEntries);
+                    if (entry.hookDigest !== next.hookDigest ||
+                        entry.approvedHookDigest !== next.approvedHookDigest ||
+                        JSON.stringify(entry.approvedHookSnapshot) !==
+                            JSON.stringify(next.approvedHookSnapshot) ||
+                        entry.mcpDigest !== nextMcp.mcpDigest ||
+                        entry.approvedMcpDigest !== nextMcp.approvedMcpDigest) {
+                        entry.hookDigest = next.hookDigest;
+                        if (next.approvedHookDigest)
+                            entry.approvedHookDigest = next.approvedHookDigest;
+                        else
+                            delete entry.approvedHookDigest;
+                        if (next.approvedHookSnapshot)
+                            entry.approvedHookSnapshot = next.approvedHookSnapshot;
+                        else
+                            delete entry.approvedHookSnapshot;
+                        entry.mcpDigest = nextMcp.mcpDigest;
+                        if (nextMcp.approvedMcpDigest)
+                            entry.approvedMcpDigest = nextMcp.approvedMcpDigest;
+                        else
+                            delete entry.approvedMcpDigest;
+                        changed = true;
+                    }
                 }
-            }
-            if (changed)
-                writeInstalledPlugins(data);
+                return changed ? { value: data } : {};
+            });
         }
     }
     catch (err) {
@@ -78,13 +78,12 @@ export async function reinstallAtomic(name, source, doInstall) {
         await rm(dir, { recursive: true, force: true });
         await rename(backup, dir);
         if (savedEntries) {
-            // Restore in a single read-modify-write rather than one append per entry,
-            // which both narrows the race window against any concurrent writer and
-            // avoids re-appending onto whatever partial state doInstall() may have
-            // left for this key.
-            const data = readInstalledPlugins();
-            data.plugins[key] = savedEntries;
-            writeInstalledPlugins(data);
+            // Restore under the registry lock so a concurrent install of a different
+            // plugin cannot be lost while this plugin rolls back.
+            mutateInstalledPlugins((data) => {
+                data.plugins[key] = savedEntries;
+                return { value: data };
+            });
         }
         throw new PluginInstallError(`update failed; the old version of '${name}' was kept: ` +
             `${err instanceof Error ? err.message : String(err)}. Source: ${source}.`);

package/dist/plugins/knownMarketplaces.d.ts

@@ -1,8 +1,12 @@
+/** Read/write ~/.code-shell/plugins/known_marketplaces.json. */
+import type { KnownMarketplaces, KnownMarketplace } from "./types.js";
 /**
- * Read/write ~/.code-shell/plugins/known_marketplaces.json.
- * File format is byte-compatible with Claude Code's analogous file.
+ * The single source of truth for what a marketplace name may be.
+ *
+ * Exported so entry points (AddMarketplace) reject a bad name BEFORE cloning,
+ * rather than discovering it at persist time and orphaning the clone.
  */
-import type { KnownMarketplaces, KnownMarketplace } from "./types.js";
+export declare function isValidMarketplaceName(name: string): boolean;
 export declare function knownMarketplacesPath(): string;
 export declare function readKnownMarketplaces(): KnownMarketplaces;
 export declare function writeKnownMarketplaces(data: KnownMarketplaces): void;

package/dist/plugins/knownMarketplaces.js

@@ -1,46 +1,150 @@
+/** Read/write ~/.code-shell/plugins/known_marketplaces.json. */
+import { closeSync, constants, fstatSync, lstatSync, openSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+import { mutateJsonFile } from "../utils/file-mutex.js";
+const MAX_MARKETPLACE_FILE_BYTES = 4 * 1024 * 1024;
+const MAX_MARKETPLACES = 256;
+const MAX_NAME_LENGTH = 128;
+const MAX_PATH_LENGTH = 4_096;
+const MAX_TIMESTAMP_LENGTH = 128;
+const NAME_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
+const GITHUB_REPO_RE = /^[A-Za-z0-9][A-Za-z0-9-]{0,38}\/[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/;
 /**
- * Read/write ~/.code-shell/plugins/known_marketplaces.json.
- * File format is byte-compatible with Claude Code's analogous file.
+ * The single source of truth for what a marketplace name may be.
+ *
+ * Exported so entry points (AddMarketplace) reject a bad name BEFORE cloning,
+ * rather than discovering it at persist time and orphaning the clone.
  */
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { homedir } from "node:os";
+export function isValidMarketplaceName(name) {
+    return name.length <= MAX_NAME_LENGTH && NAME_RE.test(name);
+}
 function userHome() {
     return process.env.HOME ?? homedir();
 }
 export function knownMarketplacesPath() {
     return join(userHome(), ".code-shell", "plugins", "known_marketplaces.json");
 }
+function marketplaceOf(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return undefined;
+    const raw = value;
+    if (!raw.source || typeof raw.source !== "object" || Array.isArray(raw.source))
+        return undefined;
+    const source = raw.source;
+    const normalizedSource = source.source === "github" &&
+        typeof source.repo === "string" &&
+        GITHUB_REPO_RE.test(source.repo)
+        ? { source: "github", repo: source.repo }
+        : source.source === "git" &&
+            typeof source.url === "string" &&
+            source.url.length > 0 &&
+            source.url.length <= MAX_PATH_LENGTH &&
+            !source.url.includes("\0")
+            ? { source: "git", url: source.url }
+            : undefined;
+    if (!normalizedSource ||
+        typeof raw.installLocation !== "string" ||
+        raw.installLocation.length === 0 ||
+        raw.installLocation.length > MAX_PATH_LENGTH ||
+        raw.installLocation.includes("\0") ||
+        typeof raw.lastUpdated !== "string" ||
+        raw.lastUpdated.length === 0 ||
+        raw.lastUpdated.length > MAX_TIMESTAMP_LENGTH) {
+        return undefined;
+    }
+    const format = raw.format === "claude-code" || raw.format === "codex" || raw.format === "universal"
+        ? raw.format
+        : undefined;
+    if (raw.format !== undefined && !format)
+        return undefined;
+    return {
+        source: normalizedSource,
+        installLocation: raw.installLocation,
+        lastUpdated: raw.lastUpdated,
+        ...(format ? { format } : {}),
+    };
+}
+function parseKnownMarketplaces(raw) {
+    if (raw === undefined)
+        return Object.create(null);
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error("known marketplaces registry must be an object");
+    }
+    const entries = Object.entries(parsed);
+    if (entries.length > MAX_MARKETPLACES)
+        throw new Error("too many known marketplaces");
+    const result = Object.create(null);
+    for (const [name, value] of entries) {
+        // ISOLATE, don't throw. NAME_RE is stricter than the writers that produced
+        // these keys (AddMarketplace accepts any non-empty string, and
+        // assertSafePluginName permits spaces/non-ASCII), so a single legacy name
+        // like "My Market" used to make the whole registry read as empty AND make
+        // every subsequent write throw — unrecoverable, because the read reported
+        // nothing for the user to fix. Skipping matches registryOf() in
+        // installedPlugins.ts, which is the correct shape for this file family.
+        if (name.length > MAX_NAME_LENGTH || !NAME_RE.test(name))
+            continue;
+        const marketplace = marketplaceOf(value);
+        if (!marketplace)
+            continue;
+        result[name] = marketplace;
+    }
+    return result;
+}
 export function readKnownMarketplaces() {
     const path = knownMarketplacesPath();
-    if (!existsSync(path))
-        return {};
+    let descriptor;
     try {
-        const raw = JSON.parse(readFileSync(path, "utf-8"));
-        if (raw && typeof raw === "object" && !Array.isArray(raw)) {
-            return raw;
+        const metadata = lstatSync(path);
+        if (metadata.isSymbolicLink() ||
+            !metadata.isFile() ||
+            metadata.size > MAX_MARKETPLACE_FILE_BYTES) {
+            return Object.create(null);
+        }
+        descriptor = openSync(path, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
+        const opened = fstatSync(descriptor);
+        if (!opened.isFile() || opened.size > MAX_MARKETPLACE_FILE_BYTES) {
+            return Object.create(null);
         }
+        return parseKnownMarketplaces(readFileSync(descriptor, "utf8"));
     }
     catch {
-        // Corrupted file: treat as empty so the caller can recover by re-adding.
+        return Object.create(null);
     }
-    return {};
+    finally {
+        if (descriptor !== undefined)
+            closeSync(descriptor);
+    }
+}
+function mutateKnownMarketplaces(change) {
+    return mutateJsonFile(knownMarketplacesPath(), {
+        parse: parseKnownMarketplaces,
+        serialize: (value) => `${JSON.stringify(value, null, 2)}\n`,
+        mutation: change,
+        mode: 0o600,
+        maxBytes: MAX_MARKETPLACE_FILE_BYTES,
+    });
 }
 export function writeKnownMarketplaces(data) {
-    const path = knownMarketplacesPath();
-    mkdirSync(dirname(path), { recursive: true });
-    writeFileSync(path, JSON.stringify(data, null, 2) + "\n", "utf-8");
+    const validated = parseKnownMarketplaces(JSON.stringify(data));
+    mutateKnownMarketplaces(() => ({ value: validated }));
 }
 export function upsertKnownMarketplace(name, entry) {
-    const data = readKnownMarketplaces();
-    data[name] = entry;
-    writeKnownMarketplaces(data);
+    const marketplace = marketplaceOf(entry);
+    if (!NAME_RE.test(name) || !marketplace)
+        throw new Error("invalid known marketplace");
+    mutateKnownMarketplaces((current) => ({ value: { ...current, [name]: marketplace } }));
 }
 export function removeKnownMarketplace(name) {
-    const data = readKnownMarketplaces();
-    if (!(name in data))
+    if (!NAME_RE.test(name))
         return false;
-    delete data[name];
-    writeKnownMarketplaces(data);
-    return true;
+    return (mutateKnownMarketplaces((current) => {
+        if (!Object.prototype.hasOwnProperty.call(current, name))
+            return { result: false };
+        const next = { ...current };
+        delete next[name];
+        return { value: next, result: true };
+    }) ?? false);
 }

package/dist/plugins/pluginCatalog.js

@@ -1,10 +1,11 @@
-import { existsSync, readFileSync } from "node:fs";
+import { closeSync, constants, fstatSync, lstatSync, openSync, readFileSync } from "node:fs";
 import { createHash } from "node:crypto";
 import { join } from "node:path";
 import { readInstalledPlugins } from "./installedPlugins.js";
 import { pluginsRoot } from "./installer/paths.js";
 import { CANONICAL_PLUGIN_MANIFEST_FILE, CanonicalPluginManifest, } from "./installer/types.js";
 import { resolveSafePluginPath } from "./pluginInstaller.js";
+const MAX_CANONICAL_MANIFEST_BYTES = 4 * 1024 * 1024;
 /**
  * Stable content revision used to bind a user review to the exact template
  * instantiated later. Install paths and timestamps are intentionally excluded.
@@ -20,14 +21,27 @@ export function pluginAutomationTemplateRevision(installKey, template) {
 }
 function readCanonicalManifest(installPath) {
     const file = join(installPath, CANONICAL_PLUGIN_MANIFEST_FILE);
-    if (!existsSync(file))
-        return null;
+    let descriptor;
     try {
-        return CanonicalPluginManifest.parse(JSON.parse(readFileSync(file, "utf-8")));
+        const metadata = lstatSync(file);
+        if (metadata.isSymbolicLink() ||
+            !metadata.isFile() ||
+            metadata.size > MAX_CANONICAL_MANIFEST_BYTES) {
+            return null;
+        }
+        descriptor = openSync(file, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
+        const opened = fstatSync(descriptor);
+        if (!opened.isFile() || opened.size > MAX_CANONICAL_MANIFEST_BYTES)
+            return null;
+        return CanonicalPluginManifest.parse(JSON.parse(readFileSync(descriptor, "utf-8")));
     }
     catch {
         return null;
     }
+    finally {
+        if (descriptor !== undefined)
+            closeSync(descriptor);
+    }
 }
 function identityFromInstallKey(installKey, manifest) {
     const at = installKey.lastIndexOf("@");

package/dist/plugins/pluginHookApproval.js

@@ -1,4 +1,4 @@
-import { readInstalledPlugins, writeInstalledPlugins } from "./installedPlugins.js";
+import { mutateInstalledPlugins, readInstalledPlugins } from "./installedPlugins.js";
 import { inspectPluginHooks, pluginHookReviewSnapshot, pluginHookApprovalState, } from "./pluginHookIntegrity.js";
 function pluginNameFromKey(key) {
     const at = key.lastIndexOf("@");
@@ -86,75 +86,71 @@ export function reviewPluginHooks(target) {
 }
 /** Approve the exact install-time digest; changed-on-disk hooks cannot be blessed. */
 export function approvePluginHooks(target) {
-    const data = readInstalledPlugins();
-    const keys = matchingInstallKeys(data, target);
-    const out = [];
-    let writeNeeded = false;
-    for (const installKey of keys) {
-        for (const entry of data.plugins[installKey] ?? []) {
-            let entryChanged = false;
-            const snapshot = inspectPluginHooks(entry.installPath);
-            if (snapshot.state === "invalid") {
-                throw new Error(`plugin "${installKey}" hooks definition is invalid and cannot be approved: ${snapshot.error ?? "unknown error"}`);
-            }
-            if (entry.hookDigest && snapshot.digest !== entry.hookDigest) {
-                throw new Error(`plugin "${installKey}" hooks changed after install; reinstall or update before approving`);
-            }
-            if (!entry.hookDigest) {
-                entry.hookDigest = snapshot.digest;
-                entryChanged = true;
-                writeNeeded = true;
-            }
-            if (entry.approvedHookDigest !== entry.hookDigest) {
-                entry.approvedHookDigest = entry.hookDigest;
-                entryChanged = true;
-                writeNeeded = true;
-            }
-            const nextReview = pluginHookReviewSnapshot(snapshot);
-            if (JSON.stringify(entry.approvedHookSnapshot) !== JSON.stringify(nextReview)) {
-                entry.approvedHookSnapshot = nextReview;
-                entryChanged = true;
-                writeNeeded = true;
+    return (mutateInstalledPlugins((data) => {
+        const keys = matchingInstallKeys(data, target);
+        const out = [];
+        let writeNeeded = false;
+        for (const installKey of keys) {
+            for (const entry of data.plugins[installKey] ?? []) {
+                let entryChanged = false;
+                const snapshot = inspectPluginHooks(entry.installPath);
+                if (snapshot.state === "invalid") {
+                    throw new Error(`plugin "${installKey}" hooks definition is invalid and cannot be approved: ${snapshot.error ?? "unknown error"}`);
+                }
+                if (entry.hookDigest && snapshot.digest !== entry.hookDigest) {
+                    throw new Error(`plugin "${installKey}" hooks changed after install; reinstall or update before approving`);
+                }
+                if (!entry.hookDigest) {
+                    entry.hookDigest = snapshot.digest;
+                    entryChanged = true;
+                }
+                if (entry.approvedHookDigest !== entry.hookDigest) {
+                    entry.approvedHookDigest = entry.hookDigest;
+                    entryChanged = true;
+                }
+                const nextReview = pluginHookReviewSnapshot(snapshot);
+                if (JSON.stringify(entry.approvedHookSnapshot) !== JSON.stringify(nextReview)) {
+                    entry.approvedHookSnapshot = nextReview;
+                    entryChanged = true;
+                }
+                writeNeeded ||= entryChanged;
+                out.push(result(installKey, entry, entryChanged, snapshot));
             }
-            out.push(result(installKey, entry, entryChanged, snapshot));
         }
-    }
-    if (writeNeeded)
-        writeInstalledPlugins(data);
-    return out;
+        return { ...(writeNeeded ? { value: data } : {}), result: out };
+    }) ?? []);
 }
 /**
  * Revoke hook execution. Legacy entries are first migrated to a recorded
  * digest so revocation fails closed instead of falling back to legacy trust.
  */
 export function revokePluginHooks(target) {
-    const data = readInstalledPlugins();
-    const keys = matchingInstallKeys(data, target);
-    const out = [];
-    let writeNeeded = false;
-    for (const installKey of keys) {
-        for (const entry of data.plugins[installKey] ?? []) {
-            let entryChanged = false;
-            const snapshot = inspectPluginHooks(entry.installPath);
-            if (!entry.hookDigest) {
-                entry.hookDigest = snapshot.digest;
-                entryChanged = true;
-            }
-            if (snapshot.hasExecutableHooks || snapshot.state === "invalid") {
-                if (entry.approvedHookDigest !== undefined) {
-                    delete entry.approvedHookDigest;
+    return (mutateInstalledPlugins((data) => {
+        const keys = matchingInstallKeys(data, target);
+        const out = [];
+        let writeNeeded = false;
+        for (const installKey of keys) {
+            for (const entry of data.plugins[installKey] ?? []) {
+                let entryChanged = false;
+                const snapshot = inspectPluginHooks(entry.installPath);
+                if (!entry.hookDigest) {
+                    entry.hookDigest = snapshot.digest;
                     entryChanged = true;
                 }
+                if (snapshot.hasExecutableHooks || snapshot.state === "invalid") {
+                    if (entry.approvedHookDigest !== undefined) {
+                        delete entry.approvedHookDigest;
+                        entryChanged = true;
+                    }
+                }
+                else if (entry.approvedHookDigest !== entry.hookDigest) {
+                    entry.approvedHookDigest = entry.hookDigest;
+                    entryChanged = true;
+                }
+                writeNeeded ||= entryChanged;
+                out.push(result(installKey, entry, entryChanged, snapshot));
             }
-            else if (entry.approvedHookDigest !== entry.hookDigest) {
-                entry.approvedHookDigest = entry.hookDigest;
-                entryChanged = true;
-            }
-            writeNeeded ||= entryChanged;
-            out.push(result(installKey, entry, entryChanged, snapshot));
         }
-    }
-    if (writeNeeded)
-        writeInstalledPlugins(data);
-    return out;
+        return { ...(writeNeeded ? { value: data } : {}), result: out };
+    }) ?? []);
 }

package/dist/plugins/pluginMcpApproval.js

@@ -1,4 +1,4 @@
-import { readInstalledPlugins, writeInstalledPlugins } from "./installedPlugins.js";
+import { mutateInstalledPlugins, readInstalledPlugins } from "./installedPlugins.js";
 import { readPluginMcp } from "./installer/loadPluginMcp.js";
 import { pluginMcpApprovalState, pluginMcpDigest, } from "./pluginMcpIntegrity.js";
 function pluginNameFromKey(key) {
@@ -44,67 +44,65 @@ export function listPluginMcpTrust() {
 }
 /** Approve only the install-time MCP bytes; tampered bytes require update/reinstall. */
 export function approvePluginMcp(target) {
-    const data = readInstalledPlugins();
-    const keys = matchingInstallKeys(data, target);
-    const out = [];
-    let writeNeeded = false;
-    for (const installKey of keys) {
-        for (const entry of data.plugins[installKey] ?? []) {
-            let entryChanged = false;
-            const currentDigest = pluginMcpDigest(entry.installPath);
-            if (entry.mcpDigest && currentDigest !== entry.mcpDigest) {
-                throw new Error(`plugin "${installKey}" MCP config changed after install; reinstall or update before approving`);
-            }
-            if (!entry.mcpDigest) {
-                entry.mcpDigest = currentDigest;
-                entryChanged = true;
-            }
-            if (entry.approvedMcpDigest !== entry.mcpDigest) {
-                entry.approvedMcpDigest = entry.mcpDigest;
-                entryChanged = true;
+    return (mutateInstalledPlugins((data) => {
+        const keys = matchingInstallKeys(data, target);
+        const out = [];
+        let writeNeeded = false;
+        for (const installKey of keys) {
+            for (const entry of data.plugins[installKey] ?? []) {
+                let entryChanged = false;
+                const currentDigest = pluginMcpDigest(entry.installPath);
+                if (entry.mcpDigest && currentDigest !== entry.mcpDigest) {
+                    throw new Error(`plugin "${installKey}" MCP config changed after install; reinstall or update before approving`);
+                }
+                if (!entry.mcpDigest) {
+                    entry.mcpDigest = currentDigest;
+                    entryChanged = true;
+                }
+                if (entry.approvedMcpDigest !== entry.mcpDigest) {
+                    entry.approvedMcpDigest = entry.mcpDigest;
+                    entryChanged = true;
+                }
+                writeNeeded ||= entryChanged;
+                out.push(trustEntry(installKey, entry, entryChanged));
             }
-            writeNeeded ||= entryChanged;
-            out.push(trustEntry(installKey, entry, entryChanged));
         }
-    }
-    if (writeNeeded)
-        writeInstalledPlugins(data);
-    return out;
+        return { ...(writeNeeded ? { value: data } : {}), result: out };
+    }) ?? []);
 }
 /**
  * Revoke plugin MCP execution. Legacy entries first record their current
  * digest, preventing revocation from falling back to legacy compatibility.
  */
 export function revokePluginMcp(target) {
-    const data = readInstalledPlugins();
-    const keys = matchingInstallKeys(data, target);
-    const out = [];
-    let writeNeeded = false;
-    for (const installKey of keys) {
-        const plugin = pluginNameFromKey(installKey);
-        for (const entry of data.plugins[installKey] ?? []) {
-            let entryChanged = false;
-            const hasServers = Object.keys(readPluginMcp(entry.installPath, plugin)).length > 0;
-            const currentDigest = pluginMcpDigest(entry.installPath);
-            if (!entry.mcpDigest) {
-                entry.mcpDigest = currentDigest;
-                entryChanged = true;
-            }
-            if (hasServers || currentDigest !== entry.mcpDigest) {
-                if (entry.approvedMcpDigest !== undefined) {
-                    delete entry.approvedMcpDigest;
+    return (mutateInstalledPlugins((data) => {
+        const keys = matchingInstallKeys(data, target);
+        const out = [];
+        let writeNeeded = false;
+        for (const installKey of keys) {
+            const plugin = pluginNameFromKey(installKey);
+            for (const entry of data.plugins[installKey] ?? []) {
+                let entryChanged = false;
+                const hasServers = Object.keys(readPluginMcp(entry.installPath, plugin)).length > 0;
+                const currentDigest = pluginMcpDigest(entry.installPath);
+                if (!entry.mcpDigest) {
+                    entry.mcpDigest = currentDigest;
                     entryChanged = true;
                 }
+                if (hasServers || currentDigest !== entry.mcpDigest) {
+                    if (entry.approvedMcpDigest !== undefined) {
+                        delete entry.approvedMcpDigest;
+                        entryChanged = true;
+                    }
+                }
+                else if (entry.approvedMcpDigest !== entry.mcpDigest) {
+                    entry.approvedMcpDigest = entry.mcpDigest;
+                    entryChanged = true;
+                }
+                writeNeeded ||= entryChanged;
+                out.push(trustEntry(installKey, entry, entryChanged));
             }
-            else if (entry.approvedMcpDigest !== entry.mcpDigest) {
-                entry.approvedMcpDigest = entry.mcpDigest;
-                entryChanged = true;
-            }
-            writeNeeded ||= entryChanged;
-            out.push(trustEntry(installKey, entry, entryChanged));
         }
-    }
-    if (writeNeeded)
-        writeInstalledPlugins(data);
-    return out;
+        return { ...(writeNeeded ? { value: data } : {}), result: out };
+    }) ?? []);
 }