dsh-m 0.8.4 → 0.9.0

package/lib/host.js

@@ -4,6 +4,7 @@ import { createApiDispatcher } from './core/host-api.js';
 import { bindLoaderHost } from './core/live-plugin.js';
 import { createRegistryController } from './core/registry-controller.js';
 import { wireRegistrySettings, unwrapConfig } from './core/settings-compat.js';
+import { resolveActiveProfile } from './core/active-profile.js';
 import { registerTools } from './tools.js';
 import { appExitFromContext, scheduleRestart } from './core/restart.js';
 const require = createRequire(import.meta.url);
@@ -30,17 +31,21 @@ export const Config = Schema.object({
 export function apply(ctx, config) {
     // 卸载前的 live-disable 依赖 loader（skillhub 同款）
     bindLoaderHost(ctx);
+    // 0.9.0 双 profile（ADR-0005）：宿主当前 profile 单一事实源——apply 期解析一次，
+    // host 生命周期内不可变；GUI/工具/HTTP/缓存分段全部消费同一对象。
+    const profile = resolveActiveProfile(ctx);
+    ctx.logger?.info?.('dsh-m: active profile %s (dir=%s, source=%s)', profile.name, profile.dir, profile.source);
     // registry controller：active config / configured / pending / rejected 分离 + generation fence；
     // tools 与 Host API 共用同一 active config object（apply 原地更新字段，live 生效）。
     // unwrapConfig：0.1.7 上 volatile 字段是 cosmokit Volatile 引用，先解包成 plain 值再进 controller。
-    const controller = createRegistryController(unwrapConfig(config));
+    const controller = createRegistryController(unwrapConfig(config), { profile: profile.name });
     // DSH 0.1.2-rc.1 / 0.1.5-rc.1 / 0.1.7-rc.1 / 0.1.7-rc.2 都经 dsh-cmdline 暴露 appExit；
     // using it avoids guessing the service unit from release-specific cgroups.
     const appExit = appExitFromContext(ctx);
     const restart = (port = null) => scheduleRestart(port, { appExit });
     // 开关委派的官方服务探测（ADR-0001）：运行时按服务存在性探测，不判 DSH 版本号
     const getService = () => ctx.get?.('pluginManager');
-    registerTools(ctx, controller.config, { restart });
+    registerTools(ctx, controller.config, { restart }, profile);
     // 设置页接线（双代兼容，详见 core/settings-compat.ts）：
     // - ≤0.1.5：settings.register('dshm', …) scope（get/update/watch）；
     // - 0.1.7-rc.1 / rc.2：Config `.volatile()` 字段自动生成设置页（autoGenerate 默认开，无需 configure），
@@ -67,15 +72,21 @@ export function apply(ctx, config) {
             ctx.logger?.warn?.(err);
         }
     });
-    // 本地 API：单路由 + method 分发（防护与状态映射在 core/host-api.ts）
+    // 本地 API：单路由 + method 分发（信任检查与状态映射在 core/host-api.ts）。
+    // 0.9.0（ADR-0005）：入口信任检查全量委派官方 connection.requestRejection——
+    // Desktop 桥剥 Origin 的请求按官方语义（trustedHosts/loopback/cross-site/Origin:null）判定，
+    // 服务缺席或抛错一律 fail-closed 403（warn 一次）。
     ctx.inject(['webServer'], (c) => {
         const server = c.webServer;
+        const rejectRequest = createRequestRejection(ctx);
         const handleApi = createApiDispatcher({
             controller,
             pkg,
+            profile,
             deps: {
                 scheduleRestart: restart,
                 getService,
+                rejectRequest,
             },
         });
         server.register({
@@ -87,3 +98,30 @@ export function apply(ctx, config) {
         });
     });
 }
+/** 守卫式官方 requestRejection 委派：缺席/抛错 fail-closed 403（warn 一次，不刷日志）。 */
+function createRequestRejection(ctx) {
+    let warned = false;
+    const warnOnce = (err) => {
+        if (warned)
+            return;
+        warned = true;
+        ctx.logger?.warn?.('dsh-m: 官方 connection.requestRejection 不可用，/dshm 全入口 fail-closed 403（ADR-0005）');
+        if (err)
+            ctx.logger?.warn?.(err);
+    };
+    return (req) => {
+        try {
+            const connection = ctx.get?.('connection');
+            const reject = connection?.requestRejection;
+            if (typeof reject !== 'function') {
+                warnOnce(undefined);
+                return 403;
+            }
+            return reject.call(connection, { headers: req.headers }) ?? undefined;
+        }
+        catch (err) {
+            warnOnce(err);
+            return 403;
+        }
+    };
+}

package/lib/tools.js

@@ -4,6 +4,8 @@ import { installFromRegistry, listInstalledWithMeta, listMarket, uninstallPlugin
 import { COMMUNITY_CATEGORY_LABELS } from './core/community.js';
 import { appExitFromContext, scheduleRestart } from './core/restart.js';
 import { togglePlugin as coreTogglePlugin } from './core/toggle.js';
+import { resolveActiveProfile, assertWriteAllowed } from './core/active-profile.js';
+import { desktopInstallFromRegistry, desktopToggle } from './core/profile-ops.js';
 export const CATEGORY_LABELS = {
     market: '市场',
     tools: '工具',
@@ -55,7 +57,7 @@ function cloneJson(value) {
 function summaryOf(state) {
     return { isDefault: state.isDefault, status: state.status, stale: state.stale };
 }
-export function registerTools(ctx, cfg, deps = {}) {
+export function registerTools(ctx, cfg, deps = {}, profile = resolveActiveProfile(ctx)) {
     const timeoutMs = cfg.timeoutMs ?? 20_000;
     const m = {
         listMarket: deps.listMarket ?? listMarket,
@@ -63,6 +65,8 @@ export function registerTools(ctx, cfg, deps = {}) {
         installFromRegistry: deps.installFromRegistry ?? installFromRegistry,
         uninstallPlugin: deps.uninstallPlugin ?? uninstallPlugin,
         upgradePlugin: deps.upgradePlugin ?? upgradePlugin,
+        desktopInstall: deps.desktopInstall ?? desktopInstallFromRegistry,
+        desktopToggle: deps.desktopToggle ?? desktopToggle,
     };
     const restart = deps.restart ?? ((port = null) => scheduleRestart(port, { appExit: appExitFromContext(ctx) }));
     const toggle = deps.togglePlugin ?? coreTogglePlugin;
@@ -132,6 +136,8 @@ export function registerTools(ctx, cfg, deps = {}) {
                 namespace: 'host',
                 deadlineMs: SEARCH_CORE_DEADLINE_MS,
                 signal: exec?.signal,
+                profileDir: profile.dir,
+                profile: profile.name,
             });
             // 安装标注唯一来源：listMarket 的单次 profile 快照。
             // 状态不完整且存在可被误标的条目时 fail-closed——不把未知安装状态呈现成未安装；
@@ -173,7 +179,7 @@ export function registerTools(ctx, cfg, deps = {}) {
     }));
     ctx.tools.register(defineTool({
         name: 'dshm_list',
-        description: 'List plugins installed in the DSH web profile, annotated with 市场安装/非市场安装, sources, and outdated flags. Use when the user asks what plugins are installed or wants to manage local plugins.',
+        description: 'List plugins installed in the current DSH profile (web or desktop), annotated with 市场安装/非市场安装, sources, and outdated flags. Use when the user asks what plugins are installed or wants to manage local plugins.',
         parameters: {},
         output: {
             schema: { type: 'object', additionalProperties: true },
@@ -192,6 +198,8 @@ export function registerTools(ctx, cfg, deps = {}) {
                 namespace: 'host',
                 deadlineMs: INSTALLED_CORE_DEADLINE_MS,
                 signal: exec?.signal,
+                profileDir: profile.dir,
+                profile: profile.name,
             });
             return cloneJson({
                 registry: summaryOf(result.registryState),
@@ -239,6 +247,11 @@ export function registerTools(ctx, cfg, deps = {}) {
                 throw new Error('缺少收录 id');
             const version = typeof args.version === 'string' && args.version.trim() ? args.version.trim() : undefined;
             const force = args.force === true;
+            // 0.9.0：desktop → 官方 pluginManager 委派（新包）；未知 profile → 结构化拒绝
+            if (profile.kind !== 'web') {
+                assertWriteAllowed(profile, 'install');
+                return cloneJson(await m.desktopInstall(id, cfg, { version, forceIncompatible: force, namespace: 'host', profile: profile.name }));
+            }
             try {
                 return cloneJson(await m.installFromRegistry(id, cfg, { version, forceIncompatible: force, namespace: 'host' }));
             }
@@ -280,12 +293,17 @@ export function registerTools(ctx, cfg, deps = {}) {
                 throw new Error('缺少 pkg');
             if (typeof args.enabled !== 'boolean')
                 throw new Error('缺少 enabled（boolean）');
+            // 0.9.0：desktop → 官方管理器委派（服务缺席结构化拒绝）；web → 既有委派/降级
+            if (profile.kind !== 'web') {
+                assertWriteAllowed(profile, 'set-enabled');
+                return cloneJson(await m.desktopToggle(target, args.enabled, { getService: getService, profileDir: profile.dir }));
+            }
             return cloneJson(await toggle(target, args.enabled, { getService: getService }));
         },
     }));
     ctx.tools.register(defineTool({
         name: 'dshm_uninstall',
-        description: 'Uninstall a DSH plugin from the web profile by package name (pkg from dshm_list). Confirm with the user BEFORE calling. Does not delete plugin data; reports leftover paths instead.',
+        description: 'Uninstall a DSH plugin from the current DSH profile by package name (pkg from dshm_list). Confirm with the user BEFORE calling. Does not delete plugin data; reports leftover paths instead.',
         parameters: {
             pkg: { type: 'string', required: true, description: '包名 from dshm_list, e.g. dsh-web-search' },
         },
@@ -305,6 +323,7 @@ export function registerTools(ctx, cfg, deps = {}) {
             const target = String(args.pkg || '').trim();
             if (!target)
                 throw new Error('缺少 pkg');
+            assertWriteAllowed(profile, 'uninstall');
             return cloneJson(await m.uninstallPlugin(target, cfg, { namespace: 'host' }));
         },
     }));
@@ -338,6 +357,8 @@ export function registerTools(ctx, cfg, deps = {}) {
                 namespace: 'host',
                 deadlineMs: INSTALLED_CORE_DEADLINE_MS,
                 signal: exec?.signal,
+                profileDir: profile.dir,
+                profile: profile.name,
             });
             const items = result.items.map((it) => ({
                 pkg: it.pkg,
@@ -385,6 +406,7 @@ export function registerTools(ctx, cfg, deps = {}) {
             if (!target)
                 throw new Error('缺少 pkg');
             const force = args.force === true;
+            assertWriteAllowed(profile, 'upgrade');
             try {
                 return cloneJson(await m.upgradePlugin(target, cfg, { forceIncompatible: force, namespace: 'host' }));
             }
@@ -416,6 +438,7 @@ export function registerTools(ctx, cfg, deps = {}) {
         }),
         timeoutMs: 15_000,
         async execute() {
+            assertWriteAllowed(profile, 'restart');
             return cloneJson(restart(null));
         },
     }));
@@ -431,6 +454,7 @@ export function registerTools(ctx, cfg, deps = {}) {
                 'For installed plugins, call dshm_list / dshm_outdated. Upgrade only after the user confirms which one: dshm_upgrade. Uninstall only after confirmation: dshm_uninstall.',
                 'dshm_toggle switches a plugin on/off: confirm first unless the user already said it in the same message (把 skins 关掉 → execute directly); report live vs restart-required accordingly. ',
                 'dshm_restart only after the user agrees to restart; afterwards tell them to refresh once the page recovers.',
+                'dsh-m operates on the current host profile (web or desktop, per ping.profile): on desktop only read-only market + install-new-package + toggle work; upgrade/uninstall/self-upgrade/restart return structured refusals with guidance — relay them instead of retrying.',
             ].join(' '),
         });
     });
@@ -541,6 +565,17 @@ function renderOutdated(out) {
     return head.join('\n');
 }
 function renderUpgrade(out) {
+    // 0.8.5 修复：升级工具会命中装后守卫拦截（复用 installEntry，link/file prior 不可回退等），
+    // execute 返回 guard 形态结果——旧 render 没有该分支，把拦截渲染成「✅ undefined 已升级」假成功。
+    if (out.guard === true) {
+        return [
+            `⛔ 升级被装后守卫拦截：${out.message ?? ''}`,
+            `终态：${out.compensation?.status ?? '—'}（${out.compensation?.note ?? ''}）`,
+            out.repairBasis ? `修复依据：${out.repairBasis}` : null,
+            out.restartSafe === true ? '可以重启 DSH Web。' : '修复后再重启（不要现在一键重启）。',
+            '对用户如实说明守卫拦截与终态，不得说「已升级成功」或「已恢复原版本」。',
+        ].filter(Boolean).join('\n');
+    }
     const from = out.fromVersion ? `v${out.fromVersion} → ` : '';
     const to = out.version ? `v${out.version}` : out.sha ? out.sha.slice(0, 7) : '最新';
     const extra = buildsNote(out);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",