dsh-agent-plugins-market 0.5.1 → 0.5.2

package/lib/index.js

@@ -1,4 +1,3 @@
-import { mountSuiteContext } from './context.js';
 import { Catalog } from './application/catalog.js';
 import { RuntimeReconciler } from './runtime/reconciler.js';
 import { inspectToolRegistry } from './runtime/tool-registry-observer.js';
@@ -60,12 +59,10 @@ export function apply(ctx, config = {}) {
         providerControl = control;
         return new SuiteSkillProvider(catalog, key => hostLocale.t(key));
     });
-    const disposeContext = mountSuiteContext(ctx, catalog, key => hostLocale.t(key));
     ctx.inject(['webServer', 'loader'], hostCtx => {
         hostCtx.effect(() => mountSuiteRoutes(hostCtx, catalog), 'dsh-agent-plugins-market: http routes');
     });
     ctx.effect(() => () => {
         void runtime.dispose();
-        disposeContext();
     }, 'dsh-agent-plugins-market: lifecycle');
 }

package/lib/runtime/host-locale.js

@@ -1,8 +1,7 @@
 /**
  * Host-side runtime locale: bilingual copy for strings injected into agent
- * context (agent-definition wrappers, command acknowledgements, the
- * `agent_plugins` tool), resolved from the harness's `locale.preference`
- * setting.
+ * context (agent-definition wrappers and command acknowledgements), resolved
+ * from the harness's `locale.preference` setting.
  *
  * The web client resolves locale through its own injected service; the host
  * process has no such service, so this module reads `$DSH_HOME/settings.yaml`
@@ -16,26 +15,14 @@ const zh = {
     agentDefinitionIntro: '当任务匹配下方描述时，通过 subagent 工具创建子代理并将「定义正文」原样作为指令执行。',
     commandForwardTitle: '[Agent Plugins 命令 /{command}（来自 {suite}）]',
     commandAcknowledged: '/{command} 已转交模型执行（{suite}）',
-    agentCommandHint: '子代理',
-    agentPluginsToolDescription: '查询当前会话启用的 Agent Plugins：列出插件清单、技能与 MCP 工具前缀；技能正文通过 skill 工具加载。',
-    agentPluginsListAction: 'list: 列出全部 Agent Plugins；info: 查看单个 Agent Plugins 详情',
-    agentPluginsSuiteId: 'info 动作时必填：Agent Plugins id',
-    agentPluginsSourceId: 'info 动作时可选：Agent Plugins 所属仓库源 id',
-    agentPluginsListNote: '技能正文通过 skill 工具按 name 加载；MCP 工具名形如 mcp__<plugin>__<server>__<tool>。',
-    agentPluginsNotFound: '未找到 Agent Plugins "{suiteId}"（仅列出用户级已启用 Agent Plugins）'
+    agentCommandHint: '子代理'
 };
 const en = {
     agentDefinitionTitle: '## Subagent definition (from Agent Plugins {suite}, Claude Code agents format)',
     agentDefinitionIntro: 'When the task matches the description below, create a subagent through the subagent tool and pass the definition body verbatim as its instructions.',
     commandForwardTitle: '[Agent Plugins command /{command} (from {suite})]',
     commandAcknowledged: '/{command} forwarded to the model for execution ({suite})',
-    agentCommandHint: 'subagent',
-    agentPluginsToolDescription: 'Query the Agent Plugins enabled in the current session: list suites, skills, and MCP tool prefixes; skill bodies load through the skill tool.',
-    agentPluginsListAction: 'list: list every Agent Plugin; info: inspect one Agent Plugin in detail',
-    agentPluginsSuiteId: 'required for the info action: the Agent Plugin id',
-    agentPluginsSourceId: 'optional for the info action: the source repository id of the Agent Plugin',
-    agentPluginsListNote: 'Load skill bodies through the skill tool by name; MCP tool names look like mcp__<plugin>__<server>__<tool>.',
-    agentPluginsNotFound: 'Agent Plugin "{suiteId}" not found (only user-dimension enabled Agent Plugins are listed)'
+    agentCommandHint: 'subagent'
 };
 const DICTS = { zh, en };
 /** Resolve the active host language from settings; unknown values default to zh. */

package/lib/runtime/mcp-mounts.js

@@ -5,6 +5,8 @@ export class McpMountRegistry {
     live = new Map();
     names = new Map();
     overridesProvider = async () => new Map();
+    /** Serialize mount and unmount passes so a disable cannot race an in-flight spawn. */
+    reconcileQueue = Promise.resolve();
     constructor(ctx, pluginDataRoot) {
         this.ctx = ctx;
         this.pluginDataRoot = pluginDataRoot;
@@ -13,8 +15,14 @@ export class McpMountRegistry {
     setOverridesProvider(provider) {
         this.overridesProvider = provider;
     }
-    /** Mount/unmount MCP servers to match the enabled suites exactly. */
+    /** Queue one reconciliation behind any in-flight mount/unmount pass. */
     async reconcile(enabledSuites) {
+        const run = this.reconcileQueue.then(() => this.reconcileNow(enabledSuites));
+        this.reconcileQueue = run.then(() => undefined, () => undefined);
+        return run;
+    }
+    /** Mount/unmount MCP servers to match the enabled suites exactly. */
+    async reconcileNow(enabledSuites) {
         const active = enabledSuites.filter(suite => suite.activeSurfaces?.mcp !== false);
         const overrides = await this.overridesProvider();
         const wanted = new Map();
@@ -43,11 +51,15 @@ export class McpMountRegistry {
         }
         return diagnostics.filter(diagnostic => diagnostic.reason !== 'unmounted');
     }
-    /** Dispose every live mount; used at plugin teardown. */
+    /** Dispose every live mount after queued reconciliation passes settle. */
     async disposeAll() {
-        for (const [key, live] of [...this.live]) {
-            await this.unmount(key, live);
-        }
+        const run = this.reconcileQueue.then(async () => {
+            for (const [key, live] of [...this.live]) {
+                await this.unmount(key, live);
+            }
+        });
+        this.reconcileQueue = run.then(() => undefined, () => undefined);
+        await run;
     }
     /** Mount one precomputed request (source config merged with overrides). */
     async mountWith(request) {

package/lib/types/index.d.ts

@@ -3,9 +3,10 @@
  *
  * Function plugin (named exports, no default export). It registers one skill
  * provider feeding enabled suites into `ctx.skills`, reconciles enabled
- * suites' `mcp.json` servers into live `dsh-mcp-client` mounts, injects the
- * enabled-suite catalog at session start, registers the `agent_plugins`
- * tool, and mounts the market page's HTTP routes on the web server.
+ * suites' `mcp.json` servers into live `dsh-mcp-client` mounts, and mounts the
+ * market page's HTTP routes on the web server. Skills and MCP tools are
+ * exposed through the host's native model surfaces; this plugin does not
+ * register a redundant suite-inventory model tool.
  *
  * Requires `ctx.skills` (the dsh skill registry). The MCP client package is
  * optional at runtime: without it, suites still load their skills and the

package/lib/types/runtime/host-locale.d.ts

@@ -1,5 +1,5 @@
 /** Host runtime dictionary keys (mirrored for zh and en). */
-export type HostLocaleKey = 'agentDefinitionTitle' | 'agentDefinitionIntro' | 'commandForwardTitle' | 'commandAcknowledged' | 'agentCommandHint' | 'agentPluginsToolDescription' | 'agentPluginsListAction' | 'agentPluginsSuiteId' | 'agentPluginsSourceId' | 'agentPluginsListNote' | 'agentPluginsNotFound';
+export type HostLocaleKey = 'agentDefinitionTitle' | 'agentDefinitionIntro' | 'commandForwardTitle' | 'commandAcknowledged' | 'agentCommandHint';
 export type HostTranslate = (key: HostLocaleKey, params?: Record<string, string>) => string;
 interface ResolvedLocale {
     t: HostTranslate;

package/lib/types/runtime/mcp-mounts.d.ts

@@ -23,12 +23,16 @@ export declare class McpMountRegistry {
     private readonly live;
     private readonly names;
     private overridesProvider;
+    /** Serialize mount and unmount passes so a disable cannot race an in-flight spawn. */
+    private reconcileQueue;
     constructor(ctx: Context, pluginDataRoot: string);
     /** Install the per-suite overrides provider (suiteId -> overrides). */
     setOverridesProvider(provider: () => Promise<Map<string, McpSuiteOverrides>>): void;
-    /** Mount/unmount MCP servers to match the enabled suites exactly. */
+    /** Queue one reconciliation behind any in-flight mount/unmount pass. */
     reconcile(enabledSuites: Suite[]): Promise<McpMountDiagnostic[]>;
-    /** Dispose every live mount; used at plugin teardown. */
+    /** Mount/unmount MCP servers to match the enabled suites exactly. */
+    private reconcileNow;
+    /** Dispose every live mount after queued reconciliation passes settle. */
     disposeAll(): Promise<void>;
     /** Mount one precomputed request (source config merged with overrides). */
     private mountWith;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-agent-plugins-market",
   "description": "The standard way to install Claude Code / Codex / Cursor / Kimi plugin marketplace suites in DeepSeek Harness (DSH) — zero conversion, zero file copying. Skills, MCP servers, hooks and slash commands are injected into your dsh sessions at runtime.",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",

package/lib/context.js

@@ -1,78 +0,0 @@
-import { deriveServerName } from './runtime/mcp-config.js';
-/** Mount the agent_plugins query tool. */
-export function mountSuiteContext(ctx, manager, t) {
-    const disposers = [];
-    ctx.inject(['tools'], toolsCtx => {
-        const tools = toolsCtx;
-        if (typeof tools.tools?.register !== 'function')
-            return;
-        const parameters = {
-            type: 'object',
-            properties: {
-                action: { type: 'string', enum: ['list', 'info'], description: t('agentPluginsListAction') },
-                suiteId: { type: 'string', description: t('agentPluginsSuiteId') },
-                sourceId: { type: 'string', description: t('agentPluginsSourceId') }
-            },
-            required: ['action'],
-            additionalProperties: false
-        };
-        const outputSchema = {
-            type: 'object',
-            properties: {
-                suites: { type: 'array', items: { type: 'object' } },
-                skills: { type: 'array', items: { type: 'object' } },
-                mcpServers: { type: 'array', items: { type: 'object' } },
-                note: { type: 'string' }
-            }
-        };
-        const dispose = tools.tools.register({
-            name: 'agent_plugins',
-            description: t('agentPluginsToolDescription'),
-            parameters,
-            renderIntent: 'generic',
-            output: {
-                schema: outputSchema,
-                render: (_args, value) => {
-                    const text = typeof value === 'string' ? value : JSON.stringify(value, null, 2);
-                    return [{ type: 'text', text }];
-                }
-            },
-            execute: async (args) => {
-                const record = args;
-                const action = record['action'];
-                if (action === 'list')
-                    return listPayload(await manager.enabledUserSuites(), t);
-                if (action === 'info')
-                    return infoPayload(await manager.enabledUserSuites(), record, t);
-                return { suites: [], skills: [], mcpServers: [], note: `unknown action ${JSON.stringify(action)}` };
-            }
-        });
-        disposers.push(dispose);
-    });
-    return () => {
-        for (const dispose of disposers)
-            dispose();
-    };
-}
-function listPayload(suites, t) {
-    return {
-        suites: suites.map(suite => ({
-            id: suite.id,
-            sourceId: suite.sourceId,
-            name: suite.manifest.name,
-            version: suite.manifest.version ?? null,
-            description: suite.manifest.description ?? null,
-            layout: suite.manifest.layout
-        })),
-        skills: suites.flatMap(suite => suite.skills.map(skill => ({ suiteId: suite.id, name: skill.name, description: `[${suite.manifest.name}] ${skill.description}` }))),
-        mcpServers: suites.flatMap(suite => suite.mcp === undefined ? [] : Object.keys(suite.mcp.servers).map(key => ({ suiteId: suite.id, server: key, tools: `mcp__${deriveServerName(suite.id, key)}__*` }))),
-        note: t('agentPluginsListNote')
-    };
-}
-function infoPayload(suites, record, t) {
-    const suiteId = record['suiteId'];
-    const suite = suites.find(entry => entry.id === suiteId);
-    if (suite === undefined)
-        return { suites: [], skills: [], mcpServers: [], note: t('agentPluginsNotFound', { suiteId: String(suiteId) }) };
-    return listPayload([suite], t);
-}

package/lib/types/context.d.ts

@@ -1,14 +0,0 @@
-/**
- * Runtime suite context: the `agent_plugins` query tool.
- *
- * Skills are injected by the native skill catalog (`dsh-tool-skill` renders
- * `ctx.skills` providers into the model's `<available_skills>` catalog), so
- * this module does not inject a duplicate session-start message. The tool
- * exists for facts the catalog does not carry: enabled plugins per
- * dimension, skill names per plugin, and MCP server prefixes.
- */
-import type { Context } from '@deepseek-ai/cordis';
-import type { Catalog } from './application/catalog.js';
-import type { HostTranslate } from './runtime/host-locale.js';
-/** Mount the agent_plugins query tool. */
-export declare function mountSuiteContext(ctx: Context, manager: Catalog, t: HostTranslate): () => void;