dsh-m 0.2.8 → 0.2.10

package/lib/core/dsh-cli.js

@@ -201,6 +201,46 @@ function syncProgress(tracker) {
     if (snap.error !== null)
         progress.error = snap.error;
 }
+export const PNPM_OUTCOME_CODES = {
+    CONFIG_MISMATCH: 'ERR_PNPM_LOCKFILE_CONFIG_MISMATCH',
+    OUTDATED_LOCKFILE: 'ERR_PNPM_OUTDATED_LOCKFILE',
+    NO_MATCHING_VERSION: 'ERR_PNPM_NO_MATCHING_VERSION',
+    UNUSED_PATCH: 'ERR_PNPM_UNUSED_PATCH',
+    PUBLIC_HOIST_PATTERN_DIFF: 'ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF',
+};
+/**
+ * 对 pnpm/dsh 原始输出文本做六类归一解释。分类发生在任何文案改写之前；
+ * 上层（事务/market）只消费 class + code 常量，永不 regex 原始输出。
+ */
+export function classifyPnpmError(text) {
+    const raw = String(text ?? '');
+    if (raw.includes(PNPM_OUTCOME_CODES.NO_MATCHING_VERSION)) {
+        return { class: 'retryable-lag', code: PNPM_OUTCOME_CODES.NO_MATCHING_VERSION };
+    }
+    if (raw.includes(PNPM_OUTCOME_CODES.CONFIG_MISMATCH)) {
+        return { class: 'config-drift', code: PNPM_OUTCOME_CODES.CONFIG_MISMATCH };
+    }
+    if (raw.includes(PNPM_OUTCOME_CODES.OUTDATED_LOCKFILE)) {
+        return { class: 'config-drift', code: PNPM_OUTCOME_CODES.OUTDATED_LOCKFILE };
+    }
+    if (raw.includes(PNPM_OUTCOME_CODES.UNUSED_PATCH)) {
+        return { class: 'unused-patch', code: PNPM_OUTCOME_CODES.UNUSED_PATCH };
+    }
+    if (isPrepareBlocked(raw))
+        return { class: 'needs-builds' };
+    const m = /(ERR_PNPM_[A-Z0-9_]+)/.exec(raw);
+    return { class: 'hard-fail', code: m?.[1] };
+}
+/** 统一的命令取消错误形态（runCommand 调用前已取消与运行中取消同款）。 */
+function commandAbortError() {
+    const err = new Error('命令已取消');
+    err.name = 'AbortError';
+    return err;
+}
+function truncateOutput(text) {
+    const raw = String(text ?? '');
+    return raw.length <= 800 ? raw : raw.slice(-800);
+}
 export function webProfileName() {
     return WEB_PROFILE;
 }
@@ -274,19 +314,6 @@ function writeDangerouslyAllowAllBuilds(profileDirectory) {
     writeFileSync(file, next);
     return true;
 }
-export function rewritePnpmError(err) {
-    const text = err instanceof Error ? err.message : String(err);
-    if (/ERR_PNPM_UNUSED_PATCH/.test(text)) {
-        return new Error('profile 的补丁配置（patchedDependencies）里存在不再使用的条目，pnpm 拒绝执行。卸载时 dsh-m 会自动摘除目标包自己的补丁条目；仍报此错通常是其他包留有失效补丁，请手工清理 profile 的 pnpm-workspace.yaml。');
-    }
-    if (isPrepareBlocked(text)) {
-        return new Error('该插件需要执行构建脚本（prepare），pnpm 默认拦截。dsh-m 已写入 profile 的 dangerouslyAllowAllBuilds 并重试；若仍失败请检查 web profile 是否可写。');
-    }
-    if (/ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF/.test(text)) {
-        return new Error('当前 profile 的 node_modules 由不同主版本的 pnpm 生成，安装前需要先重建依赖。');
-    }
-    return err instanceof Error ? err : new Error(text);
-}
 /**
  * 失败摘要：命令失败时从完整输出里提取可诊断的行，而不是盲取末尾。
  * 2026-09-05 实证（dsh-better-sidebar 安装失败）：pnpm ndjson 错误行 ~1.2KB，
@@ -327,8 +354,33 @@ export function errorDigest(out, maxChars = 800) {
     }
     return text.slice(-maxChars);
 }
+/**
+ * 停止宽限（毫秒）归一：允许显式 0（立即 SIGKILL）；负数/NaN/Infinity/垃圾值一律回落
+ * 缺省。Y1（第四轮复审）：`Number(raw) || 5000` 会把 -1 当真值、把显式 0 吞成缺省。
+ */
+const KILL_GRACE_DEFAULT_MS = 5_000;
+function normalizeKillGrace(raw) {
+    const value = typeof raw === 'number' ? raw : Number(raw);
+    return Number.isFinite(value) && value >= 0 ? value : null;
+}
+export { normalizeKillGrace };
+function killGraceDefault() {
+    const raw = process.env.DSH_KILL_GRACE_MS;
+    if (raw === undefined || raw.trim() === '')
+        return KILL_GRACE_DEFAULT_MS;
+    return normalizeKillGrace(raw) ?? KILL_GRACE_DEFAULT_MS;
+}
+/** SIGKILL 后组存活轮询的硬上限（毫秒）：防 D 态进程导致永不 settle。 */
+const GROUP_POLL_CAP_MS = 10_000;
 export async function runCommand(command, args, options) {
     return new Promise((resolvePromise, reject) => {
+        // R4a（终审复审）：AbortSignal 的事件不会对后注册的 listener 重放——调用前已取消的
+        // signal 必须在 spawn 前拒绝，否则命令会完整执行副作用。检查与 listener 注册之间为
+        // 同步代码，无交织窗口。
+        if (options.signal?.aborted) {
+            reject(commandAbortError());
+            return;
+        }
         const child = spawn(command, args, {
             cwd: options.cwd,
             env: { ...process.env, ...options.env, CI: 'true' },
@@ -338,41 +390,89 @@ export async function runCommand(command, args, options) {
         });
         let out = '';
         let settled = false;
+        let stopping = false;
+        let pendingError;
+        let killTimer;
+        let pollTimer;
+        let pollDeadline = 0;
+        // 组语义仅 POSIX + detached（child 是组长）才成立；Windows/非 detached 只保证 direct child
+        const groupSupported = process.platform !== 'win32' && child.pid !== undefined;
+        const groupAlive = () => {
+            if (!groupSupported)
+                return false;
+            try {
+                process.kill(-child.pid, 0);
+                return true;
+            }
+            catch (err) {
+                // ESRCH = 组不存在；EPERM 等保守视为仍存活
+                return err.code !== 'ESRCH';
+            }
+        };
         const finish = (err) => {
             if (settled)
                 return;
             settled = true;
             clearTimeout(timer);
+            if (killTimer !== undefined)
+                clearTimeout(killTimer);
+            if (pollTimer !== undefined)
+                clearTimeout(pollTimer);
             options.signal?.removeEventListener('abort', onAbort);
             if (err)
                 reject(err);
             else
                 resolvePromise(out);
         };
-        const killChild = () => {
-            if (process.platform !== 'win32' && child.pid !== undefined) {
+        const signalGroup = (sig) => {
+            if (groupSupported) {
                 try {
-                    process.kill(-child.pid, 'SIGTERM');
+                    process.kill(-child.pid, sig);
                     return;
                 }
                 catch {
-                    /* fall through */
+                    /* fall through：组可能已消失 */
                 }
             }
             try {
-                child.kill('SIGTERM');
+                child.kill(sig);
             }
             catch {
                 /* already gone */
             }
         };
+        const pollGroupGone = () => {
+            if (settled)
+                return;
+            // SIGKILL 已发：组消失（或超过轮询硬上限，防 D 态进程）才 settle
+            if (!groupAlive() || Date.now() > pollDeadline) {
+                finish(pendingError);
+                return;
+            }
+            pollTimer = setTimeout(pollGroupGone, 25);
+        };
+        /**
+         * F1-R（第三轮复审）：停止协议以「进程组不存在」为 settle 前提——SIGTERM 进程组 →
+         * 宽限后 SIGKILL → 轮询确认组消失。direct child 提前 close 不清除 kill 定时器
+         * （同组后代可能仍忽略 SIGTERM 并写 profile）。
+         */
+        const stopChild = (err) => {
+            if (settled || stopping)
+                return;
+            stopping = true;
+            pendingError = err;
+            signalGroup('SIGTERM');
+            killTimer = setTimeout(() => {
+                signalGroup('SIGKILL');
+                pollDeadline = Date.now() + GROUP_POLL_CAP_MS;
+                pollGroupGone();
+            }, normalizeKillGrace(options.killGraceMs) ?? killGraceDefault());
+        };
         const timer = setTimeout(() => {
-            killChild();
-            finish(new Error(`命令超时 ${options.timeoutMs}ms`));
+            stopChild(new Error(`命令超时 ${options.timeoutMs}ms`));
         }, options.timeoutMs);
         const onAbort = () => {
-            killChild();
-            finish(new Error('命令已取消'));
+            stopChild(commandAbortError());
         };
         options.signal?.addEventListener('abort', onAbort, { once: true });
         child.stdout?.on('data', (chunk) => {
@@ -385,8 +485,20 @@ export async function runCommand(command, args, options) {
             out = (out + text).slice(-256 * 1024);
             options.onChunk?.(text);
         });
-        child.on('error', (err) => finish(err));
+        child.on('error', (err) => {
+            // F1-R：停止协议进行中，迟到的 error（如 kill 竞态）只作诊断，不得提前收口
+            if (stopping)
+                return;
+            finish(err);
+        });
         child.on('close', (code) => {
+            if (stopping) {
+                // direct child close ≠ 进程组停止：组仍存活 → 保留 SIGKILL 定时器/轮询，不 settle
+                if (groupAlive())
+                    return;
+                finish(pendingError);
+                return;
+            }
             if (code === 0)
                 finish();
             else
@@ -409,6 +521,7 @@ export async function runDshPlugin(profile, pluginArgs, deps = {}) {
         return await run(argv.file, [...argv.args, 'plugin', '--profile', profile, ...prepared], {
             cwd: argv.cwd,
             timeoutMs: deps.timeoutMs ?? installTimeoutMs(),
+            signal: deps.signal,
             env: { CI: 'true' },
             viaShell: argv.viaShell,
             detached: process.platform !== 'win32',
@@ -430,47 +543,127 @@ export async function runDshPlugin(profile, pluginArgs, deps = {}) {
     }
 }
 /**
- * 安装。返回 usedAllowAllBuilds 供 UI 明确报告「该插件执行了构建脚本」。
- * source 形如：`pkg@1.2.3`（npm 精确锁定）或 `github:owner/repo#sha`（锁 SHA）。
+ * 加装阶梯工厂（导出、可注入、可测试；生产与测试共用同一实现）。
+ * 阶梯：add → prepare 被拦时写 dangerouslyAllowAllBuilds 重试 →
+ * PUBLIC_HOIST_PATTERN_DIFF 时 `install --no-frozen-lockfile` 重建后重试 →
+ * 耗尽归类返回。对**原始错误文本**分类；永不 throw，一律返回 RunnerOutcome。
  */
-export async function addDshPlugin(source, deps = {}) {
-    const run = deps.runDshPlugin ?? runDshPlugin;
+export function makeAddViaLadder(deps) {
+    const run = deps.runDshPlugin;
     const allowAllBuilds = deps.allowAllBuilds ?? writeDangerouslyAllowAllBuilds;
-    const retryAfterPrepare = async () => {
-        const changed = allowAllBuilds(deps.profileDir ?? webProfileDir());
-        try {
-            return { output: await run(WEB_PROFILE, ['add', source]), usedAllowAllBuilds: true };
-        }
-        catch (retryErr) {
-            throw rewritePnpmError(retryErr);
-        }
-    };
-    try {
-        return { output: await run(WEB_PROFILE, ['add', source]), usedAllowAllBuilds: false };
-    }
-    catch (err) {
-        const text = err instanceof Error ? err.message : String(err);
-        if (text.includes('ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF')) {
-            await run(WEB_PROFILE, ['install', '--no-frozen-lockfile']);
+    const opts = (signal) => (signal !== undefined ? { signal } : undefined);
+    return async (source, profileDir, signal) => {
+        const retryAfterPrepare = async () => {
+            // Y2（终审复审）：allowAll 写入本身失败也必须转换为结果，维持「永不 throw」契约
             try {
-                return { output: await run(WEB_PROFILE, ['add', source]), usedAllowAllBuilds: false };
+                allowAllBuilds(profileDir);
+            }
+            catch (err) {
+                const text = errText(err);
+                return { class: 'hard-fail', output: truncateOutput(text) };
+            }
+            try {
+                const output = await run(WEB_PROFILE, ['add', source], opts(signal));
+                return { class: 'ok', output: truncateOutput(output), usedAllowAllBuilds: true };
             }
             catch (retryErr) {
-                if (!isPrepareBlocked(retryErr instanceof Error ? retryErr.message : String(retryErr))) {
-                    throw rewritePnpmError(retryErr);
+                return { ...classifyPnpmError(errText(retryErr)), output: truncateOutput(errText(retryErr)) };
+            }
+        };
+        try {
+            const output = await run(WEB_PROFILE, ['add', source], opts(signal));
+            return { class: 'ok', output: truncateOutput(output), usedAllowAllBuilds: false };
+        }
+        catch (err) {
+            const text = errText(err);
+            if (text.includes(PNPM_OUTCOME_CODES.PUBLIC_HOIST_PATTERN_DIFF)) {
+                try {
+                    await run(WEB_PROFILE, ['install', '--no-frozen-lockfile'], opts(signal));
+                }
+                catch (rebuildErr) {
+                    const rebuildText = errText(rebuildErr);
+                    return { ...classifyPnpmError(rebuildText), output: truncateOutput(rebuildText) };
                 }
-                return retryAfterPrepare();
+                try {
+                    const output = await run(WEB_PROFILE, ['add', source], opts(signal));
+                    return { class: 'ok', output: truncateOutput(output), usedAllowAllBuilds: false };
+                }
+                catch (retryErr) {
+                    const retryText = errText(retryErr);
+                    if (isPrepareBlocked(retryText))
+                        return retryAfterPrepare();
+                    return { ...classifyPnpmError(retryText), output: truncateOutput(retryText) };
+                }
+            }
+            if (!isPrepareBlocked(text)) {
+                return { ...classifyPnpmError(text), output: truncateOutput(text) };
             }
+            return retryAfterPrepare();
         }
-        if (!isPrepareBlocked(text))
-            throw rewritePnpmError(err);
-        return retryAfterPrepare();
-    }
+    };
+}
+function errText(err) {
+    return err instanceof Error ? err.message : String(err);
 }
 /** 卸载（转发 pnpm remove；调用方须先做 live-disable）。 */
 export async function removeDshPlugin(pkg, deps = {}) {
     if (!isSafePluginTarget(pkg))
         throw new Error(`无效插件包名: ${pkg}`);
     const run = deps.runDshPlugin ?? runDshPlugin;
-    return run(WEB_PROFILE, ['remove', pkg]);
+    return run(WEB_PROFILE, ['remove', pkg], deps.profileDir !== undefined || deps.signal !== undefined
+        ? { profileDir: deps.profileDir, signal: deps.signal }
+        : undefined);
+}
+function rawOutcome(text) {
+    const out = String(text ?? '');
+    return { ...classifyPnpmError(out), output: out.length <= 800 ? out : out.slice(-800) };
+}
+/**
+ * 生产 runner：add 走 makeAddViaLadder（prepare/hoist 在途自愈在 adapter 内耗尽）；
+ * remove 包 removeDshPlugin（原始文本分类）；frozen/rebuild 直接 spawn pnpm。
+ * 四操作统一收 signal；output 截 800。
+ */
+export function makeDshRunner(profileDir) {
+    const ladder = makeAddViaLadder({ runDshPlugin });
+    return {
+        async add(spec, signal) {
+            return ladder(spec, profileDir, signal);
+        },
+        async remove(pkg, signal) {
+            try {
+                const output = await removeDshPlugin(pkg, { profileDir, signal });
+                return { class: 'ok', output: output.length <= 800 ? output : output.slice(-800) };
+            }
+            catch (err) {
+                return rawOutcome(errText(err));
+            }
+        },
+        async frozenInstall(signal) {
+            try {
+                // F1-R：detached 使 pnpm（及其后代）进入独立进程组，abort/超时可整组终止
+                const output = await runCommand('pnpm', ['--dir', profileDir, 'install', '--frozen-lockfile'], {
+                    timeoutMs: installTimeoutMs(),
+                    signal,
+                    detached: process.platform !== 'win32',
+                });
+                return { class: 'ok', output: output.length <= 800 ? output : output.slice(-800) };
+            }
+            catch (err) {
+                return rawOutcome(errText(err));
+            }
+        },
+        async rebuildInstall(signal) {
+            try {
+                const output = await runCommand('pnpm', ['--dir', profileDir, 'install', '--no-frozen-lockfile'], {
+                    timeoutMs: installTimeoutMs(),
+                    signal,
+                    detached: process.platform !== 'win32',
+                });
+                return { class: 'ok', output: output.length <= 800 ? output : output.slice(-800) };
+            }
+            catch (err) {
+                return rawOutcome(errText(err));
+            }
+        },
+    };
 }

package/lib/core/host-api.js

@@ -6,8 +6,9 @@
  * 顶层必须是非 null/非数组对象且有 method → `ping` 跳过 guard，否则
  * trustedRestartRequest host-equivalence guard → typed method/业务错误映射 → 其他 500。
  */
-import { BOOT_ID, addDshPlugin, publicInstallStatus } from './dsh-cli.js';
+import { BOOT_ID, publicInstallStatus } from './dsh-cli.js';
 import { listInstalledWithMeta, listMarket, installFromRegistry, uninstallPlugin, upgradePlugin, } from './market.js';
+import { runProfileTransaction, TransactionError, makeNpmWarmPackument } from './profile-transaction.js';
 import { readInstalledPluginReadme } from './installed.js';
 import { isNewerVersion, npmLatest } from './versions.js';
 import { RegistryConfigError } from './registry-controller.js';
@@ -129,6 +130,25 @@ function errorStatus(err) {
     }
     if (err instanceof ApiProtocolError)
         return { status: err.status, payload: { ok: false, error: err.message } };
+    if (err instanceof TransactionError) {
+        // detail 白名单投影：结构化事实，不含 raw output（GUI 只读 error，零改动）
+        const r = err.result;
+        return {
+            status: 500,
+            payload: {
+                ok: false,
+                error: err.message,
+                detail: {
+                    status: r.status,
+                    kind: r.kind,
+                    failure: r.failure,
+                    healActions: r.healActions,
+                    snapshotRestoreVerified: r.snapshotRestoreVerified,
+                    profileConverged: r.profileConverged,
+                },
+            },
+        };
+    }
     return { status: 500, payload: { ok: false, error: err instanceof Error ? err.message : String(err) } };
 }
 export function createApiDispatcher(ctx) {
@@ -140,6 +160,7 @@ export function createApiDispatcher(ctx) {
         upgradePlugin: ctx.deps?.upgradePlugin ?? upgradePlugin,
         checkRegistryEntries: ctx.deps?.checkRegistryEntries ?? checkRegistryEntries,
         npmLatest: ctx.deps?.npmLatest ?? npmLatest,
+        runTransaction: ctx.deps?.runTransaction ?? runProfileTransaction,
     };
     const cfg = () => ctx.controller.config;
     return async function handleApi(req, res) {
@@ -165,8 +186,19 @@ export function createApiDispatcher(ctx) {
                 }
                 case 'self-upgrade': {
                     const latest = await d.npmLatest(ctx.pkg.name, cfg().timeoutMs ?? 20_000);
-                    const result = await ctx.onMutation(() => addDshPlugin(`${ctx.pkg.name}@${latest.version}`));
-                    payload = { pkg: ctx.pkg.name, version: latest.version, usedAllowAllBuilds: result.usedAllowAllBuilds, needsRestart: true };
+                    // 缺 integrity 一律 fail closed，不进事务
+                    if (!latest.integrity) {
+                        throw new Error(`npm metadata 缺少 dist integrity：${ctx.pkg.name}@${latest.version}，拒绝升级`);
+                    }
+                    const result = await d.runTransaction({ kind: 'install-npm', pkg: ctx.pkg.name, version: latest.version, integrity: latest.integrity, signal }, { warmPackument: makeNpmWarmPackument(cfg().timeoutMs ?? 20_000) });
+                    if (!result.ok)
+                        throw new TransactionError(result);
+                    payload = {
+                        pkg: ctx.pkg.name,
+                        version: latest.version,
+                        usedAllowAllBuilds: result.usedAllowAllBuilds === true,
+                        needsRestart: true,
+                    };
                     break;
                 }
                 case 'registry': {
@@ -220,7 +252,7 @@ export function createApiDispatcher(ctx) {
                     if (!id)
                         throw new ApiProtocolError(400, '缺少 id');
                     const version = typeof body.version === 'string' ? body.version : undefined;
-                    const result = await ctx.onMutation(() => d.installFromRegistry(id, cfg(), { version, namespace: 'host' }));
+                    const result = await d.installFromRegistry(id, cfg(), { version, namespace: 'host', signal });
                     payload = { ...result };
                     break;
                 }
@@ -228,7 +260,7 @@ export function createApiDispatcher(ctx) {
                     const target = strArg(body, 'pkg');
                     if (!target)
                         throw new ApiProtocolError(400, '缺少 pkg');
-                    const result = await ctx.onMutation(() => d.uninstallPlugin(target, cfg(), { namespace: 'host' }));
+                    const result = await d.uninstallPlugin(target, cfg(), { namespace: 'host', signal });
                     payload = { ...result };
                     break;
                 }
@@ -236,7 +268,7 @@ export function createApiDispatcher(ctx) {
                     const target = strArg(body, 'pkg');
                     if (!target)
                         throw new ApiProtocolError(400, '缺少 pkg');
-                    const result = await ctx.onMutation(() => d.upgradePlugin(target, cfg(), { namespace: 'host' }));
+                    const result = await d.upgradePlugin(target, cfg(), { namespace: 'host', signal });
                     payload = { ...result };
                     break;
                 }

package/lib/core/installed.js

@@ -1,10 +1,16 @@
 /**
  * 已装插件识别（DESIGN.md §3）：profile 的 package.json 是唯一事实源，
  * 不引入额外状态文件。移植自 skillhub installed-plugins.ts（去 README 暂缓）。
+ *
+ * 完整性契约（2026-09-09）：枚举结果必含 `complete`——只有当顶层 manifest 与每个
+ * 依赖的 package.json 都可读、可解析为非数组对象、且每项都能归类（DSH 插件 → items /
+ * 确认非 DSH → others）时才为 true；任一项「无法判断」即 complete:false（partial 结果
+ * 保留，该依赖不计入 others）。当前 complete 仅被 listMarket → dshm_search 消费；
+ * 已装列表（listInstalledWithMeta）/ dshm_list / CLI list·outdated / 升级路径的
+ * incomplete 展示与处理为后续独立任务。
  */
 import { open, readFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
-import { isSafePluginTarget, removeDshPlugin } from './dsh-cli.js';
 import { webProfileDir } from './env.js';
 const PKG_NAME_RE = /^(@[A-Za-z0-9-*~][A-Za-z0-9-*._~]*\/)?[A-Za-z0-9-._~]+$/;
 export function isSafePkgName(raw) {
@@ -58,30 +64,74 @@ export function githubRepoFromRepository(raw) {
     const m = /github\.com[/:]([A-Za-z0-9._-]+)\/([A-Za-z0-9._-]+?)(?:\.git)?$/i.exec(url.trim());
     return m ? `${m[1]}/${m[2]}` : null;
 }
-export async function readPkgJson(dir) {
+/** JSON 合法根：非 null、非数组的对象（typeof [] === 'object'，数组必须显式排除）。 */
+function isRecord(value) {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+/** 单包 package.json 唯一读取实现：读不到 / 坏 JSON / 根非对象一律 ok:false。 */
+async function readPkgJsonResult(dir) {
+    let raw;
     try {
-        const raw = JSON.parse(await readFile(join(dir, 'package.json'), 'utf8'));
-        return raw && typeof raw === 'object' ? raw : null;
+        raw = JSON.parse(await readFile(join(dir, 'package.json'), 'utf8'));
     }
     catch {
-        return null;
+        return { ok: false };
     }
+    if (!isRecord(raw))
+        return { ok: false };
+    return { ok: true, value: raw };
 }
-export async function readProfileDeps(profileDir) {
+export async function readPkgJson(dir) {
+    const result = await readPkgJsonResult(dir);
+    return result.ok ? result.value ?? null : null;
+}
+/** 空 deps 统一无原型容器：与逐项解析产物保持同一原型语义，继承属性不得伪装成依赖成员。 */
+function emptyDeps() {
+    return Object.create(null);
+}
+/**
+ * 顶层 profile package.json 唯一读取实现（完整性 + partial 语义）：
+ * - 读不到 / 坏 JSON / 根非数组对象 → complete:false, deps:{}（manifest 缺失 ≠ 合法空 profile）；
+ * - 合法但无 dependencies 字段，或 dependencies 为空对象 → complete:true, deps:{}（唯一合法空形态）；
+ * - dependencies 存在但类型非法（null/数组/标量）→ complete:false, deps:{}；
+ * - 逐项：key 不安全（isSafePkgName 拒绝 `__proto__`、`_`/`.` 开头分段等）或 spec 非字符串/纯空白
+ *   → 该项计入 incomplete（complete:false）并跳过，其余合法项保留。
+ *   容器为无原型对象（Object.create(null)）——第二层防御：特殊属性名不受 Object.prototype
+ *   setter/继承语义影响，数据结构与早退路径的空容器保持一致。
+ */
+async function readProfileDepsResult(profileDir) {
+    let raw;
     try {
-        const raw = JSON.parse(await readFile(join(profileDir, 'package.json'), 'utf8'));
-        if (!raw || typeof raw !== 'object' || !raw.dependencies || typeof raw.dependencies !== 'object')
-            return {};
-        const out = {};
-        for (const [name, spec] of Object.entries(raw.dependencies)) {
-            if (typeof spec === 'string' && spec !== '')
-                out[name] = spec;
-        }
-        return out;
+        raw = JSON.parse(await readFile(join(profileDir, 'package.json'), 'utf8'));
     }
     catch {
-        return {};
+        return { complete: false, deps: emptyDeps() };
+    }
+    if (!isRecord(raw))
+        return { complete: false, deps: emptyDeps() };
+    if (!Object.prototype.hasOwnProperty.call(raw, 'dependencies'))
+        return { complete: true, deps: emptyDeps() };
+    const dependencies = raw.dependencies;
+    if (!isRecord(dependencies))
+        return { complete: false, deps: emptyDeps() };
+    let complete = true;
+    const deps = emptyDeps();
+    for (const [name, spec] of Object.entries(dependencies)) {
+        if (!isSafePkgName(name)) {
+            complete = false;
+            continue;
+        }
+        if (typeof spec !== 'string' || spec.trim() === '') {
+            complete = false;
+            continue;
+        }
+        deps[name] = spec;
     }
+    return { complete, deps };
+}
+/** 宽松读取（README 路径）：只返回可确认的依赖项，个别非法项被跳过而不是整体丢弃。 */
+export async function readProfileDeps(profileDir) {
+    return (await readProfileDepsResult(profileDir)).deps;
 }
 function sanitizePkgJson(raw, fallbackName) {
     return {
@@ -93,17 +143,31 @@ function sanitizePkgJson(raw, fallbackName) {
         githubRepo: githubRepoFromRepository(raw.repository),
     };
 }
-/** 枚举 web profile 已安装插件（只读）。 */
+/** 枚举 web profile 已安装插件（只读）。complete:false 时 items/others 为 partial 结果（已确认部分保留）。 */
 export async function listInstalledPlugins(profileDir = webProfileDir()) {
     const root = resolve(profileDir);
-    const deps = await readProfileDeps(root);
+    const result = await readProfileDepsResult(root);
+    let complete = result.complete;
+    const deps = result.deps;
     const items = [];
     let others = 0;
     for (const pkg of Object.keys(deps).sort()) {
         const spec = deps[pkg];
         const dir = resolvePluginDir(root, pkg, spec);
-        const raw = dir ? await readPkgJson(dir) : null;
-        if (!raw || !('dsh' in raw)) {
+        if (!dir) {
+            // 依赖键不安全、目录无法解析 → 无法判断（不冒充非 DSH）
+            complete = false;
+            continue;
+        }
+        const rawResult = await readPkgJsonResult(dir);
+        if (!rawResult.ok) {
+            // package.json 缺失/不可读/坏 JSON/根非对象 → 无法判断
+            complete = false;
+            continue;
+        }
+        const raw = rawResult.value;
+        if (!('dsh' in raw)) {
+            // 确认非 DSH 依赖
             others += 1;
             continue;
         }
@@ -121,23 +185,7 @@ export async function listInstalledPlugins(profileDir = webProfileDir()) {
             githubRepo: githubRepoFromRepository(raw.repository),
         });
     }
-    return { items, others, profileDir: root };
-}
-/** 从 web profile 卸载已安装的 dsh 插件。pkg 必须来自 profile 依赖（先 live-disable，见 market.ts）。 */
-export async function removeInstalledPlugin(pkg, profileDir = webProfileDir(), deps = {}) {
-    const key = String(pkg || '').trim();
-    if (!isSafePkgName(key) || !isSafePluginTarget(key))
-        throw new Error(`无效插件包名: ${pkg}`);
-    const root = resolve(profileDir);
-    const listed = await readProfileDeps(root);
-    if (!(key in listed))
-        throw new Error(`web profile 未安装该插件: ${key}`);
-    const dir = resolvePluginDir(root, key, listed[key]);
-    const raw = dir ? await readPkgJson(dir) : null;
-    if (!raw || !('dsh' in raw))
-        throw new Error(`不是 dsh 插件: ${key}`);
-    await removeDshPlugin(key, deps);
-    return { pkg: key };
+    return { items, others, complete, profileDir: root };
 }
 // ---------- README 预览（借鉴 skillhub，64KB 截断） ----------
 const README_MAX_BYTES = 64 * 1024;
@@ -170,8 +218,11 @@ export async function readInstalledPluginReadme(pkg, profileDir = webProfileDir(
         throw new Error(`无效插件包名: ${pkg}`);
     const root = resolve(profileDir);
     const deps = await readProfileDeps(root);
-    if (!(key in deps))
+    // 授权边界必须用 own-property 判定：`in` 会沿原型链命中继承属性（如 'constructor'），
+    // 绕过「pkg 必须来自 profile dependencies」的成员约束
+    if (!Object.hasOwn(deps, key)) {
         throw new Error(`web profile 未安装该插件: ${key}`);
+    }
     const dir = resolvePluginDir(root, key, deps[key]);
     if (!dir)
         throw new Error(`无法解析插件目录: ${key}`);