dsh-agent-plugins-market 0.8.3 → 0.9.0

package/lib/application/mcp/mcp-config.js

@@ -24,6 +24,7 @@ import { DEFAULT_STARTUP_TIMEOUT_MS, DEFAULT_TOOL_CALL_TIMEOUT_MS } from './mcp-
 import { resolveCwd } from '../../catalog/validate.js';
 import { qualifiedSuiteId, suiteDataDir } from '../../catalog/paths.js';
 import { applyOverride } from './mcp-overrides.js';
+import { isUserMcpSuite } from './mcp-direct-config.js';
 import { PLUGIN_ROOT_VARIABLES, PLUGIN_DATA_VARIABLES } from '../../model/layouts.js';
 /** The max length the bridge accepts for a serverName. */
 const SERVER_NAME_MAX = 32;
@@ -236,7 +237,7 @@ async function toResolvedMount(suite, serverKey, server, pluginDataRoot, resolve
             return { failure: missingFailure(serverKey, missing) };
         const sseConfig = {
             transport: 'sse',
-            serverName: deriveServerName(suite.id, serverKey),
+            serverName: deriveServerName(suite, serverKey),
             url: url.value,
             headers: headers.values,
             ...(server.auth === undefined ? {} : { auth: mapAuth(server.auth) }),
@@ -246,7 +247,7 @@ async function toResolvedMount(suite, serverKey, server, pluginDataRoot, resolve
         return { request: { suiteId: qualifiedSuiteId(suite.sourceId, suite.id), serverKey, config: sseConfig } };
     }
     const expand = expander(suite, dataDir, resolver, portable);
-    const serverName = deriveServerName(suite.id, serverKey);
+    const serverName = deriveServerName(suite, serverKey);
     if (server.type === 'stdio') {
         const args = await expand.all(server.args ?? []);
         const env = await expand.map(server.env ?? {});
@@ -413,7 +414,9 @@ function sanitizeToken(raw) {
     return cleaned === '' ? 'server' : cleaned;
 }
 /**
- * Derive a bridge serverName from the suite and server ids:
+ * Derive the bridge serverName of one suite server.
+ *
+ * A package's servers are namespaced under their suite:
  * `${suiteId}__${serverKey}` sanitized, clamped to 32 chars with a
  * deterministic 12-hex suffix when the join exceeds the budget.
  *
@@ -421,11 +424,16 @@ function sanitizeToken(raw) {
  * suite/server pair are the same server for the model, so the second mount
  * is skipped with a `duplicate-mount` diagnostic instead of registering a
  * shadow copy under a mangled name.
+ *
+ * The user's own declaration file is the exception. Its servers are the
+ * user's, not a package's, so each mounts under its own server key alone —
+ * the model reads `mcp__<serverKey>__<tool>`, the same name that declaration
+ * carries in every other MCP client.
  */
-export function deriveServerName(suiteId, serverKey) {
-    const candidate = `${sanitizeToken(suiteId)}__${sanitizeToken(serverKey)}`;
+export function deriveServerName(suite, serverKey) {
+    const candidate = isUserMcpSuite(suite) ? sanitizeToken(serverKey) : `${sanitizeToken(suite.id)}__${sanitizeToken(serverKey)}`;
     if (candidate.length <= SERVER_NAME_MAX)
         return candidate;
-    const hash = createHash('sha256').update(`${suiteId}\u0000${serverKey}`).digest('hex').slice(0, 12);
+    const hash = createHash('sha256').update(`${suite.id}\u0000${serverKey}`).digest('hex').slice(0, 12);
     return `${candidate.slice(0, SERVER_NAME_MAX - 13)}-${hash}`;
 }

package/lib/application/mcp/mcp-direct-config.js

@@ -4,6 +4,17 @@ import { MCP_SCHEMA_ID, validateMcpJson } from '../../catalog/validate.js';
 import { effectiveSurfaces } from '../../model/types.js';
 export const USER_MCP_SOURCE = '@user-mcp';
 export const USER_MCP_SUITE = 'user-mcp';
+/**
+ * Whether one suite is the user's own declaration file rather than a package.
+ *
+ * These servers are local data the user authored, so they are also the one
+ * suite whose servers own the top-level MCP namespace: they mount under their
+ * own server key instead of a suite-namespaced one (see `deriveServerName` in
+ * `mcp-config.ts`).
+ */
+export function isUserMcpSuite(suite) {
+    return suite.sourceId === USER_MCP_SOURCE && suite.id === USER_MCP_SUITE;
+}
 /**
  * Load the user's own MCP declaration file.
  *

package/lib/application/mcp/mcp-redaction.js

@@ -1,4 +1,5 @@
 /** Redact secret-shaped MCP configuration before it crosses a status/detail boundary. */
+import { REDACTED_VALUE } from '../../contracts/mcp.js';
 /**
  * Secret-shaped key matcher. This is a heuristic, not a security boundary: it
  * exists so a token cannot leak into a status response, a detail preview, or a
@@ -63,7 +64,7 @@ export function redactUrl(raw) {
         const [name = '', value = ''] = splitOnce(part, '=');
         if (hasPlaceholder(value))
             return `${name}=${value}`;
-        return isSensitiveKey(name) ? `${name}=[redacted]` : `${name}=${value}`;
+        return isSensitiveKey(name) ? `${name}=${REDACTED_VALUE}` : `${name}=${value}`;
     })
         .join('&');
     return safeQuery === '' ? base : `${base}?${safeQuery}`;
@@ -87,7 +88,7 @@ function redactArgs(values) {
     return values.map(value => {
         if (redactNext) {
             redactNext = false;
-            return '[redacted]';
+            return REDACTED_VALUE;
         }
         if (typeof value !== 'string')
             return value;
@@ -99,7 +100,7 @@ function redactArgs(values) {
             redactNext = true;
             return value;
         }
-        return `${value.slice(0, equals + 1)}[redacted]`;
+        return `${value.slice(0, equals + 1)}${REDACTED_VALUE}`;
     });
 }
 function redactValue(value, key = '') {
@@ -109,7 +110,7 @@ function redactValue(value, key = '') {
     if (isSensitiveKey(key)) {
         if (typeof value === 'string' && hasPlaceholder(value))
             return value;
-        return '[redacted]';
+        return REDACTED_VALUE;
     }
     if (key === 'url' && typeof value === 'string')
         return redactUrl(value);

package/lib/application/mcp/mcp-status.js

@@ -1,6 +1,19 @@
 import { credentialRefsInServer, effectiveMcpServers, deriveServerName } from './mcp-config.js';
 import { redactMcpConfig, redactUrl } from './mcp-redaction.js';
 import { qualifiedSuiteId } from '../../catalog/paths.js';
+/**
+ * Whether one effective configuration supplies its own Authorization header.
+ *
+ * Such a server authenticates with that header: the browser authorization a
+ * re-authorize would restart is not the path it uses, so the action is not
+ * offered for it.
+ */
+export function declaresAuthHeader(config) {
+    const headers = config?.['headers'];
+    if (typeof headers !== 'object' || headers === null)
+        return false;
+    return Object.keys(headers).some(name => name.toLowerCase() === 'authorization');
+}
 /** Build status rows from discovered plugin MCP definitions and observed tool names. */
 export function buildMcpStatus(suites, diagnostics, observed, overrides = new Map()) {
     const entries = [];
@@ -11,9 +24,10 @@ export function buildMcpStatus(suites, diagnostics, observed, overrides = new Ma
         if (suite.mcp === undefined)
             continue;
         for (const [serverKey, server] of Object.entries(suite.mcp.servers)) {
-            // Server names and every status key are source-qualified: two sources
-            // may ship the same suite id, and the inventory must not conflate them.
-            const serverName = deriveServerName(suite.id, serverKey);
+            // Every status key is source-qualified: two sources may ship the same
+            // suite id, and the inventory must not conflate them. The derived
+            // serverName itself is shared by design — see `deriveServerName`.
+            const serverName = deriveServerName(suite, serverKey);
             knownServerNames.add(serverName);
             knownDefinitions.set(serverName, { suite, serverKey, server });
         }
@@ -27,7 +41,7 @@ export function buildMcpStatus(suites, diagnostics, observed, overrides = new Ma
             continue;
         const suiteKey = qualifiedSuiteId(suite.sourceId, suite.id);
         for (const { serverKey, server: effective, override, enabled, credentialRefs: refs, policy } of effectiveMcpServers(suite, overrides.get(suiteKey))) {
-            const serverName = deriveServerName(suite.id, serverKey);
+            const serverName = deriveServerName(suite, serverKey);
             const tools = observedByServer.get(serverName) ?? [];
             claimedServers.add(serverName);
             const diagnostic = diagnosticsByKey.get(`${suiteKey}\u0000${serverKey}`);

package/lib/application/mcp-service.js

@@ -15,7 +15,7 @@ import { loadLspServers, saveLspServers } from './lsp/lsp-direct-config.js';
 import { addUserMcpServer, loadUserMcpSuite, USER_MCP_SOURCE, USER_MCP_SUITE } from './mcp/mcp-direct-config.js';
 import { applyOverride, loadSuiteOverrides, mergeOverridePatch, parseMcpPolicyPatch, saveSuiteOverrides, withoutPolicyFields } from './mcp/mcp-overrides.js';
 import { redactMcpConfig, redactMcpOverrides } from './mcp/mcp-redaction.js';
-import { buildMcpStatus } from './mcp/mcp-status.js';
+import { buildMcpStatus, declaresAuthHeader } from './mcp/mcp-status.js';
 import { resolveRegion } from './regions.js';
 import { applyLspOverrides, lspConfig, restoreRedactedConfig, saveLspOverride, validateServerLsp, validateServerMcp } from './server-config.js';
 /** The host compatibility client mounts servers without a startup timeout or tool filters. */
@@ -52,6 +52,7 @@ export class McpService {
                     (entry.kind === 'plugin' || entry.managed === true) &&
                     (entry.transport === 'sse' || entry.transport === 'streamable-http') &&
                     auth?.enabled !== false &&
+                    !declaresAuthHeader(entry.config) &&
                     !['disabled', 'foreign', 'orphaned'].includes(entry.state);
         }
         return payload;

package/lib/application/server-config.js

@@ -4,6 +4,7 @@ import { MCP_SCHEMA_ID, validateAgainstSchema, validateMcpJson } from '../catalo
 import { parseLspServers } from '../catalog/lsp-spec.js';
 import { qualifiedSuiteId } from '../catalog/paths.js';
 import { redactMcpConfig } from './mcp/mcp-redaction.js';
+import { REDACTED_VALUE } from '../contracts/mcp.js';
 /**
  * The errors the closed-set package shape produces. A user-owned service does
  * not obey that shape, and the per-transport checks still require what it needs.
@@ -24,7 +25,7 @@ export class McpConfigError extends Error {
 }
 /** Restore only unchanged redacted leaves, rejecting invented masked values. */
 export function restoreRedactedConfig(input, original, redacted = redactMcpConfig(original)) {
-    if (typeof input === 'string' && input.includes('[redacted]')) {
+    if (typeof input === 'string' && input.includes(REDACTED_VALUE)) {
         if (input !== redacted)
             throw new Error('masked values must remain unchanged or be replaced');
         return original;

package/lib/contracts/mcp.js

@@ -1 +1,7 @@
-export {};
+/**
+ * What a secret-shaped value reads as once it crosses a status or editor
+ * boundary. The client compares against it to tell a hidden literal from a
+ * value it may show, so the placeholder is one shared constant rather than a
+ * string literal on each side.
+ */
+export const REDACTED_VALUE = '[redacted]';

package/lib/runtime/agents/subagent-catalog.js

@@ -100,9 +100,11 @@ export function renderCatalogText(entries, update) {
         '<system-reminder>',
         update ? CATALOG_UPDATED : CATALOG_INTRO,
         CATALOG_WHEN_TO_DELEGATE,
+        '',
         '<available_subagents>',
         ...lines,
         '</available_subagents>',
+        '',
         CATALOG_PROMPT,
         CATALOG_USAGE,
         '</system-reminder>'

package/lib/types/application/mcp/mcp-config.d.ts

@@ -125,7 +125,9 @@ export declare function resolveMcpPolicy(declared: McpServerPolicy, override: Mc
 /** Find external credential references used by one MCP server definition. */
 export declare function credentialRefsInServer(server: McpServer): string[];
 /**
- * Derive a bridge serverName from the suite and server ids:
+ * Derive the bridge serverName of one suite server.
+ *
+ * A package's servers are namespaced under their suite:
  * `${suiteId}__${serverKey}` sanitized, clamped to 32 chars with a
  * deterministic 12-hex suffix when the join exceeds the budget.
  *
@@ -133,5 +135,10 @@ export declare function credentialRefsInServer(server: McpServer): string[];
  * suite/server pair are the same server for the model, so the second mount
  * is skipped with a `duplicate-mount` diagnostic instead of registering a
  * shadow copy under a mangled name.
+ *
+ * The user's own declaration file is the exception. Its servers are the
+ * user's, not a package's, so each mounts under its own server key alone —
+ * the model reads `mcp__<serverKey>__<tool>`, the same name that declaration
+ * carries in every other MCP client.
  */
-export declare function deriveServerName(suiteId: string, serverKey: string): string;
+export declare function deriveServerName(suite: Pick<Suite, 'sourceId' | 'id'>, serverKey: string): string;

package/lib/types/application/mcp/mcp-direct-config.d.ts

@@ -1,6 +1,15 @@
 import { type McpSuiteConfig, type Suite } from '../../model/types.js';
 export declare const USER_MCP_SOURCE = "@user-mcp";
 export declare const USER_MCP_SUITE = "user-mcp";
+/**
+ * Whether one suite is the user's own declaration file rather than a package.
+ *
+ * These servers are local data the user authored, so they are also the one
+ * suite whose servers own the top-level MCP namespace: they mount under their
+ * own server key instead of a suite-namespaced one (see `deriveServerName` in
+ * `mcp-config.ts`).
+ */
+export declare function isUserMcpSuite(suite: Pick<Suite, 'sourceId' | 'id'>): boolean;
 /**
  * Load the user's own MCP declaration file.
  *

package/lib/types/application/mcp/mcp-redaction.d.ts

@@ -1,4 +1,3 @@
-/** Redact secret-shaped MCP configuration before it crosses a status/detail boundary. */
 export declare function redactMcpConfig(value: unknown): unknown;
 export declare function redactMcpOverrides(value: Record<string, Record<string, unknown>>): Record<string, Record<string, unknown>>;
 /** Whether one map key is treated as secret-shaped. */

package/lib/types/application/mcp/mcp-status.d.ts

@@ -12,5 +12,13 @@ export interface McpDiagnostic {
     causes?: string[];
     credentialRefs?: string[];
 }
+/**
+ * Whether one effective configuration supplies its own Authorization header.
+ *
+ * Such a server authenticates with that header: the browser authorization a
+ * re-authorize would restart is not the path it uses, so the action is not
+ * offered for it.
+ */
+export declare function declaresAuthHeader(config: Record<string, unknown> | undefined): boolean;
 /** Build status rows from discovered plugin MCP definitions and observed tool names. */
 export declare function buildMcpStatus(suites: Suite[], diagnostics: McpDiagnostic[], observed: readonly McpToolSnapshot[], overrides?: Map<string, McpSuiteOverrides>): McpStatusPayload;

package/lib/types/contracts/mcp.d.ts

@@ -8,6 +8,13 @@
 import type { McpStatusCode } from './mcp-status.js';
 /** The MCP mount backend the market uses for suite servers. */
 export type McpBackend = 'builtin' | 'host';
+/**
+ * What a secret-shaped value reads as once it crosses a status or editor
+ * boundary. The client compares against it to tell a hidden literal from a
+ * value it may show, so the placeholder is one shared constant rather than a
+ * string literal on each side.
+ */
+export declare const REDACTED_VALUE = "[redacted]";
 /** One MCP mount failure as the registries record it for the status surface. */
 export interface McpMountDiagnostic {
     suiteId: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-agent-plugins-market",
   "description": "One-stop skills, subagent, MCP and LSP manager inside DeepSeek Harness (DSH), compatible with Claude Code, Codex, Cursor, Kimi and other agent plugin layouts.",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -75,17 +75,17 @@
   ],
   "peerDependencies": {
     "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-attachment": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-hooks-claude-code": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-mcp-client": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-skill": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-subprocess": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-timeout": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-util-code-language": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-util-workspace-path": "^0.1.7-rc.2"
+    "@deepseek-ai/dsh-attachment": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-credentials": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-hooks-claude-code": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-mcp-client": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-skill": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-subprocess": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-timeout": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-tools": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-util-code-language": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-util-workspace-path": "^0.2.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-hooks-claude-code": {
@@ -99,11 +99,11 @@
     }
   },
   "dependencies": {
-    "@deepseek-ai/dsh-atomic-write": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-home-paths": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-lsp": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-lsp-stdio": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-tool-lsp": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-atomic-write": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-home-paths": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-lsp": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-lsp-stdio": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-tool-lsp": "^0.2.0-rc.2",
     "@deepseek-ai/schemastery": "^3.18.4",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "ajv": "^8.17.1",
@@ -121,22 +121,22 @@
     "@codemirror/view": "^6.43.12",
     "@deepseek-ai/cordis": "~4.0.4",
     "@deepseek-ai/cosmokit": "^1.8.5",
-    "@deepseek-ai/dsh-attachment": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-store": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-credentials": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-hooks-claude-code": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-mcp-client": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-skill": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-subprocess": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-timeout": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-tools": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-util-code-language": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-util-workspace-path": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-store": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-hooks-claude-code": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-mcp-client": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-skill": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-subprocess": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-timeout": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-tools": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-util-code-language": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-util-workspace-path": "0.2.0-rc.2",
     "@eslint/js": "^10.0.1",
     "@shikijs/langs": "^4.4.3",
     "@tsdown/css": "^0.22.14",