@dsh-cc/mcp-client 0.5.0

package/lib/tools.js

@@ -0,0 +1,373 @@
+/**
+ * Tool bridge: discovers MCP tools, registers them on the harness ToolRuntime
+ * under deterministic server-qualified public names, and handles re-sync when
+ * the server's tool list changes.
+ *
+ * Naming contract (see the mcp-client Agent Note "Naming invariants"): every MCP tool
+ * has the stable identity `(serverName, rawName)`; the model-facing public name
+ * is `mcp__<serverName>__<rawName>`, normalized to the DeepSeek function-name
+ * constraints. The raw name is only ever sent on the wire (`tools/call`); the
+ * public name is never parsed to recover it.
+ *
+ * @module
+ */
+import { createHash } from 'node:crypto';
+import { ListToolsResultSchema } from '@modelcontextprotocol/sdk/types.js';
+import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js';
+import { z } from 'zod';
+import { assertSupportedJsonSchema } from '@dsh-cc/tools';
+import { DEFAULT_DEFER_TOOL_THRESHOLD, publishListedTool, toolSearchSeam } from "./defer.js";
+export { DEFAULT_DEFER_TOOL_THRESHOLD } from "./defer.js";
+/** The generation representing "nothing registered yet" (or a rolled-back swap). */
+export function emptyToolGeneration() {
+    return { disposers: new Map(), fingerprint: undefined, client: undefined, eagerCount: 0, deferredCount: 0 };
+}
+/**
+ * Deterministic JSON serialization: object keys are sorted recursively while
+ * array order is preserved, so semantically identical JSON payloads with
+ * unstable key order serialize to identical bytes. Primitives go through
+ * `JSON.stringify`; `undefined` (absent optional fields) serializes as `null`.
+ */
+function stableStringify(value) {
+    if (value === undefined)
+        return 'null';
+    if (value === null || typeof value !== 'object')
+        return JSON.stringify(value);
+    if (Array.isArray(value))
+        return `[${value.map(stableStringify).join(',')}]`;
+    const entries = Object.entries(value).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
+    return `{${entries.map(([key, entry]) => `${JSON.stringify(key)}:${stableStringify(entry)}`).join(',')}}`;
+}
+/**
+ * Fingerprint the raw tools/list payload for swap short-circuiting.
+ *
+ * Entries are ordered by public name, then stable-stringified (recursive key
+ * sort, array order preserved) and hashed. The fingerprint covers every field
+ * of the raw entries — including `execution.taskSupport`, which
+ * `createExecutor` bakes into the executor's semantics, and `outputSchema`,
+ * which shapes the registered output schema — so any server-side semantic
+ * change forces a swap. Executor closures are not compared (functions are not
+ * serializable); identical fingerprints on one client generation imply the
+ * rebuilt executors would be behaviorally identical.
+ *
+ * @param serverName - Namespace used to derive each entry's public name for ordering.
+ * @param tools - Raw entries exactly as returned by the server's `tools/list`.
+ * @returns A hex digest that is equal precisely when the payload is semantically unchanged.
+ */
+export function fingerprintTools(serverName, tools) {
+    const rawName = (entry) => {
+        const name = entry?.name;
+        return typeof name === 'string' ? name : '';
+    };
+    const ordered = [...tools].sort((a, b) => {
+        const nameA = publicToolName(serverName, rawName(a));
+        const nameB = publicToolName(serverName, rawName(b));
+        return nameA < nameB ? -1 : nameA > nameB ? 1 : 0;
+    });
+    return createHash('sha256').update(stableStringify(ordered)).digest('hex');
+}
+/**
+ * DeepSeek function-name contract: at most 64 characters. Wire-protocol
+ * constant, not configuration.
+ */
+const MAX_PUBLIC_NAME_LENGTH = 64;
+/** DeepSeek function-name contract: only `[A-Za-z0-9_-]` is allowed. */
+const INVALID_NAME_CHARS = /[^A-Za-z0-9_-]/g;
+/** Hex chars of the SHA-256 identity hash appended on lossy normalization. */
+const HASH_LENGTH = 12;
+/** Raw result record: the bridge owns JSON-value validation after transport. */
+const RawCallToolResultSchema = z.record(z.string(), z.unknown());
+/** List without mutating the SDK's per-page output-validator cache. */
+function listToolsUncached(client, cursor) {
+    return client.request({ method: 'tools/list', ...cursor === undefined ? {} : { params: { cursor } } }, ListToolsResultSchema);
+}
+/** Call without the SDK pre-validating an output schema the bridge may not support. */
+function callToolUncached(client, rawName, args, exec, opts) {
+    return client.request({ method: 'tools/call', params: { name: rawName, arguments: args } }, RawCallToolResultSchema, {
+        signal: exec.signal,
+        timeout: opts.toolCallTimeoutMs,
+    });
+}
+/**
+ * Derive the model-facing public name for one MCP tool.
+ *
+ * Deterministic pure function of `(serverName, rawName)`: the clean case is
+ * `mcp__<serverName>__<rawName>` verbatim. When character replacement or
+ * truncation to the DeepSeek function-name contract (64 chars,
+ * `[A-Za-z0-9_-]`) changes the name, a 12-hex-char SHA-256 hash of the
+ * identity is appended so distinct MCP identities never collapse into the
+ * same public name.
+ *
+ * @param serverName - Stable local namespace from plugin config.
+ * @param rawName - The MCP server's own tool name.
+ * @returns The globally unique, model-facing ToolRuntime name.
+ */
+export function publicToolName(serverName, rawName) {
+    const joined = `mcp__${serverName}__${rawName}`;
+    const normalized = joined.replace(INVALID_NAME_CHARS, '_');
+    if (normalized === joined && normalized.length <= MAX_PUBLIC_NAME_LENGTH)
+        return normalized;
+    const hash = createHash('sha256').update(`${serverName}\0${rawName}`).digest('hex').slice(0, HASH_LENGTH);
+    return `${normalized.slice(0, MAX_PUBLIC_NAME_LENGTH - HASH_LENGTH - 1)}_${hash}`;
+}
+/**
+ * Sync the MCP server's tool list into the harness ToolRuntime.
+ *
+ * Two phases keep the swap safe:
+ *
+ * 1. Fetch: drain uncached `tools/list` pagination and build the full next
+ *    generation of `ToolDefinition`s under public names. Any failure here
+ *    (network error, duplicate raw name in the server's list) rejects and
+ *    leaves the previous generation registered untouched.
+ * 2. Swap: dispose the previous generation, publish the new one. A registry
+ *    conflict here can only mean a foreign registration squats on this
+ *    server's `mcp__<serverName>__` namespace — the partial generation is
+ *    rolled back (zero tools from this server) and logged. Initial strict
+ *    synchronization may propagate the conflict so its parent transaction
+ *    rejects; ordinary clients and later re-syncs return an empty generation.
+ *    Deferred publishing detects the same squat up front (`ctx.tools.get`)
+ *    because `registerDeferred` only reserves the name.
+ *
+ * When the `ctx.toolSearch` seam is mounted and the server lists at least
+ * `deferToolThreshold` tools (default {@link DEFAULT_DEFER_TOOL_THRESHOLD}),
+ * each deferrable tool registers through `registerDeferred` instead: its
+ * definition stays out of the model-visible schema until a ToolSearch hit
+ * activates it. Tools flagged `_meta['anthropic/alwaysLoad']` register eagerly
+ * even on a deferred server. Without the seam the swap is eager at any
+ * threshold.
+ *
+ * Between the phases, a fingerprint of the raw payload decides whether the
+ * swap is needed at all: when the payload is semantically unchanged (key
+ * order may drift; content may not) AND `previous` was produced by the same
+ * client generation, the live registrations are kept and `previous` is
+ * returned unchanged — dispose+register churn (and the request-prefix churn
+ * it risks) is skipped. A new client generation always forces a real swap,
+ * so reconnects never reuse the previous generation's registrations.
+ *
+ * @param client - Connected MCP Client instance used to list and call tools.
+ * @param ctx - Cordis context providing the `tools` service for registration.
+ * @param opts - Bridge options: server namespace and per-call timeout.
+ * @param previous - The prior sync generation; its registrations are disposed
+ *   during the swap phase (only after the fetch phase succeeded and the
+ *   fingerprint check found a real change).
+ * @returns The live generation — `previous` itself on a fingerprint hit,
+ *   otherwise the newly registered one.
+ */
+export async function syncTools(client, ctx, opts, previous) {
+    // Phase 1: fetch and build the next generation without touching the registry.
+    const definitions = new Map();
+    const rawTools = [];
+    let cursor;
+    do {
+        const response = await listToolsUncached(client, cursor);
+        for (const tool of response.tools) {
+            rawTools.push(tool);
+            const publicName = publicToolName(opts.serverName, tool.name);
+            if (definitions.has(publicName)) {
+                throw new Error(`mcp-client(${opts.serverName}): server listed tool "${tool.name}" more than once — invalid tool list`);
+            }
+            definitions.set(publicName, {
+                rawName: tool.name,
+                alwaysLoad: tool?._meta?.['anthropic/alwaysLoad'] === true,
+                definition: {
+                    name: publicName,
+                    description: tool.description ?? '',
+                    parameters: tool.inputSchema,
+                    output: createOutput(tool.name, supportedOutputSchema(tool.outputSchema)),
+                    execute: createExecutor(client, tool.name, tool.execution?.taskSupport === 'required', opts),
+                },
+            });
+        }
+        cursor = response.nextCursor;
+    } while (cursor);
+    // Semantically unchanged payload on the same client generation: keep the
+    // live generation so the registered definitions (and any request prefix
+    // built on them) stay byte-stable. A different client generation never
+    // short-circuits — reconnects must rebuild against their own client.
+    const fingerprint = fingerprintTools(opts.serverName, rawTools);
+    if (previous.client === client && previous.fingerprint === fingerprint) {
+        ctx.logger.debug(`mcp-client(${opts.serverName}): tool list unchanged (fingerprint ${fingerprint.slice(0, 12)}) — keeping ${previous.disposers.size} registered tools`);
+        return previous;
+    }
+    const seam = toolSearchSeam(ctx);
+    const deferServer = seam !== undefined
+        && rawTools.length >= (opts.deferToolThreshold ?? DEFAULT_DEFER_TOOL_THRESHOLD);
+    // Phase 2: swap generations.
+    for (const dispose of previous.disposers.values())
+        dispose();
+    const disposers = new Map();
+    let eagerCount = 0;
+    let deferredCount = 0;
+    try {
+        for (const [publicName, entry] of definitions) {
+            disposers.set(publicName, publishListedTool(ctx, opts, publicName, entry, seam, deferServer));
+            if (deferServer && !entry.alwaysLoad)
+                deferredCount += 1;
+            else
+                eagerCount += 1;
+        }
+    }
+    catch (error) {
+        // A conflict on an `mcp__<serverName>__`-qualified name means a foreign
+        // registration occupies this server's namespace. Roll back so the model
+        // sees either the full generation or none of it — never a partial set.
+        // Deferred disposers unwind both the reservation and any activated
+        // registration, so one loop reclaims everything this sync published.
+        for (const dispose of disposers.values())
+            dispose();
+        ctx.logger.error(`mcp-client(${opts.serverName}): tool registration failed, no tools registered: ${String(error)}`);
+        if (opts.registrationFailure === 'throw')
+            throw error;
+        // No fingerprint: nothing is registered, so the next sync must attempt a
+        // real swap even if the payload is unchanged.
+        return emptyToolGeneration();
+    }
+    return { disposers, fingerprint, client, eagerCount, deferredCount };
+}
+/** Keep a supported advertised schema; unsupported MCP vocabulary falls back to JsonValue. */
+function supportedOutputSchema(candidate) {
+    if (candidate === undefined)
+        return undefined;
+    try {
+        assertSupportedJsonSchema(candidate);
+        return candidate;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Build the canonical result schema and existing Native text projection. */
+function createOutput(rawName, structuredSchema) {
+    return {
+        schema: {
+            type: 'object',
+            properties: {
+                content: { type: 'array', items: {} },
+                structuredContent: structuredSchema ?? {},
+            },
+            required: structuredSchema === undefined ? ['content'] : ['content', 'structuredContent'],
+            additionalProperties: false,
+        },
+        render(_args, value) {
+            const result = value;
+            return [{ type: 'text', text: extractText(result.content, rawName) }];
+        },
+    };
+}
+/**
+ * Run an MCP request, retrying once on a mid-session `UnauthorizedError`.
+ * Between the original attempt and the retry, `onUnauthorized` runs to drop
+ * stale OAuth state and re-establish a token. Only a single retry is attempted
+ * (the spec's "401 自动重试一次"); a second failure propagates to the caller.
+ *
+ * @param request - the MCP request to attempt.
+ * @param onUnauthorized - re-auth hook run before the single retry.
+ * @returns the request result.
+ */
+export async function retryUnauthorizedOnce(request, onUnauthorized) {
+    try {
+        return await request();
+    }
+    catch (error) {
+        if (!isUnauthorized(error) || onUnauthorized === undefined)
+            throw error;
+        await onUnauthorized();
+        return request();
+    }
+}
+/** Whether a thrown error signals an expired/revoked OAuth session. */
+export function isUnauthorized(error) {
+    return error instanceof UnauthorizedError
+        || (error instanceof Error && /unauthorized/i.test(error.message));
+}
+/**
+ * Create an execute function for one MCP tool. The executor closes over the
+ * raw MCP tool name and sends an uncached `tools/call` request with it (never
+ * the public name), with abort signal and timeout, then maps the result to
+ * harness ContentBlocks. Owning the raw request prevents the SDK's internal
+ * per-page schema cache from pre-validating a different contract.
+ *
+ * When the MCP server returns `isError: true`, the executor throws so that
+ * the ToolRuntime's catch path produces an `isError` result for the model.
+ */
+function createExecutor(client, rawName, taskRequired, opts) {
+    return async (args, exec) => {
+        if (taskRequired) {
+            throw new Error(`Tool "${rawName}" requires task-based execution, which this bridge does not support`);
+        }
+        // The agent loop passes `JSON.parse(model_arguments)` which is usually an
+        // object, but can be any JSON value if the model misbehaves (outputs a bare
+        // string/number/null). Fallback to {} lets the MCP server produce a
+        // specific "missing required param" error the model can learn from.
+        const argsObj = (typeof args === 'object' && args !== null ? args : {});
+        const result = await retryUnauthorizedOnce(() => callToolUncached(client, rawName, argsObj, exec, opts), opts.onUnauthorized);
+        // The SDK may return a legacy `toolResult` shape; normalize to content array.
+        if (!Array.isArray(result.content)) {
+            const rendered = 'toolResult' in result
+                ? JSON.stringify(result.toolResult)
+                : '(no output)';
+            const text = typeof rendered === 'string' ? rendered : '(no output)';
+            if (result.isError === true)
+                throw new Error(text);
+            return {
+                content: [{ type: 'text', text }],
+                ...result.structuredContent !== undefined
+                    ? { structuredContent: result.structuredContent }
+                    : {},
+            };
+        }
+        // Trust boundary: the SDK's return type erases to `any[]` due to the
+        // union of CallToolResult | CompatibilityCallToolResult; extractText
+        // validates each element.
+        const content = result.content;
+        const text = extractText(content, rawName);
+        // MCP isError → throw so ToolRuntime produces an isError result for the model.
+        if (result.isError === true) {
+            throw new Error(text);
+        }
+        return {
+            content,
+            ...result.structuredContent !== undefined
+                ? { structuredContent: result.structuredContent }
+                : {},
+        };
+    };
+}
+/**
+ * Extract text from an MCP content array into a single string.
+ * - text blocks: join with '\n'
+ * - image/audio/resource blocks: replaced with a placeholder
+ *
+ * Defensive: fields that the MCP spec declares required (mimeType, text) are
+ * guarded with fallbacks because this is a network trust boundary.
+ */
+function extractText(mcpContent, toolName) {
+    const parts = [];
+    for (const value of mcpContent) {
+        if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+            parts.push('[unsupported content type: unknown]');
+            continue;
+        }
+        const block = value;
+        switch (block.type) {
+            case 'text':
+                if (block.text !== undefined)
+                    parts.push(block.text);
+                break;
+            case 'image':
+                parts.push(`[image: ${block.mimeType ?? 'unknown'}, content discarded]`);
+                break;
+            case 'audio':
+                parts.push(`[audio: ${block.mimeType ?? 'unknown'}, content discarded]`);
+                break;
+            case 'resource':
+            case 'resource_link':
+                parts.push('[resource: content discarded]');
+                break;
+            default:
+                parts.push(`[unsupported content type: ${block.type}]`);
+        }
+    }
+    return parts.join('\n') || `(${toolName} returned no text content)`;
+}
+//# sourceMappingURL=tools.js.map

package/lib/tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}

package/lib/transport.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Transport factory: creates the appropriate MCP transport based on the
+ * plugin's resolved config. Stdio spawns a child process (with credential
+ * scrubbing); Streamable HTTP and SSE connect to a URL, optionally through the
+ * credentials-backed OAuth provider.
+ *
+ * @module
+ */
+import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { Context } from '@deepseek-ai/cordis';
+import type { Config } from './index.ts';
+import { CredentialsOAuthClientProvider } from './auth.ts';
+import type { OAuthConfig } from './auth.ts';
+/**
+ * Build the credentials-backed OAuth provider for a network transport.
+ * @param ctx - Cordis context carrying the `credentials` service.
+ * @param serverName - server namespace used to derive credential references.
+ * @param oauth - resolved OAuth configuration.
+ * @returns the MCP SDK `OAuthClientProvider` implementation.
+ */
+export declare function buildAuthProvider(ctx: Context, serverName: string, oauth: OAuthConfig): CredentialsOAuthClientProvider;
+/** Optional transport construction inputs. */
+export interface TransportContext {
+    /** Cordis context used to build the credentials-backed OAuth provider. */
+    ctx?: Context;
+    /** A pre-built OAuth provider; takes precedence over `ctx` for network configs. */
+    authProvider?: CredentialsOAuthClientProvider;
+    /**
+     * Directory for captured stdio stderr (`<serverName>.log`). Tests inject a
+     * tmpdir so e2e cannot touch the developer's `$DSH_HOME`. Omission uses
+     * `$DSH_HOME/mcp-logs` (or `~/.dsh/mcp-logs`).
+     */
+    logDir?: string;
+    /**
+     * Size cap in bytes for stdio stderr log rotation (one `.log.1` backup).
+     * Tests inject a small cap so rotation is observable; `<= 0` disables
+     * rotation. Omission uses `STDIO_LOG_MAX_BYTES` (4 MiB).
+     */
+    maxBytes?: number;
+}
+/**
+ * Create an MCP transport from the resolved plugin config.
+ *
+ * @param config - Resolved plugin config discriminated on `transport`.
+ * @param transportCtx - Optional context, pre-built OAuth provider, and
+ *   stdio log directory; omit to skip OAuth and use the default log dir.
+ * @returns A connected-ready MCP Transport (stdio, Streamable HTTP, or SSE).
+ */
+export declare function createTransport(config: Config, transportCtx?: TransportContext): Transport;
+//# sourceMappingURL=transport.d.ts.map

package/lib/transport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AAK9E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAa5C;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,8BAA8B,CAEtH;AAED,8CAA8C;AAC9C,MAAM,WAAW,gBAAgB;IAC/B,0EAA0E;IAC1E,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,mFAAmF;IACnF,YAAY,CAAC,EAAE,8BAA8B,CAAA;IAC7C;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,gBAAgB,GAAG,SAAS,CA2B1F"}

package/lib/transport.js

@@ -0,0 +1,79 @@
+/**
+ * Transport factory: creates the appropriate MCP transport based on the
+ * plugin's resolved config. Stdio spawns a child process (with credential
+ * scrubbing); Streamable HTTP and SSE connect to a URL, optionally through the
+ * credentials-backed OAuth provider.
+ *
+ * @module
+ */
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
+import { scrubbedParentEnv } from '@deepseek-ai/dsh-subprocess';
+import { CredentialsOAuthClientProvider } from "./auth.js";
+import { attachStdioStderrDrain } from "./stdio-stderr.js";
+/**
+ * The subprocess seam's scrubbed parent env (credential-shaped and stale
+ * `DSH_*` names dropped), plus the spec's explicit env. The MCP SDK owns the
+ * actual spawn, so this transport shares the scrub definition rather than the
+ * spawn path.
+ */
+function buildChildEnv(extra) {
+    return { ...scrubbedParentEnv(), ...extra };
+}
+/**
+ * Build the credentials-backed OAuth provider for a network transport.
+ * @param ctx - Cordis context carrying the `credentials` service.
+ * @param serverName - server namespace used to derive credential references.
+ * @param oauth - resolved OAuth configuration.
+ * @returns the MCP SDK `OAuthClientProvider` implementation.
+ */
+export function buildAuthProvider(ctx, serverName, oauth) {
+    return new CredentialsOAuthClientProvider(ctx, serverName, oauth);
+}
+/**
+ * Create an MCP transport from the resolved plugin config.
+ *
+ * @param config - Resolved plugin config discriminated on `transport`.
+ * @param transportCtx - Optional context, pre-built OAuth provider, and
+ *   stdio log directory; omit to skip OAuth and use the default log dir.
+ * @returns A connected-ready MCP Transport (stdio, Streamable HTTP, or SSE).
+ */
+export function createTransport(config, transportCtx) {
+    switch (config.transport) {
+        case 'stdio': {
+            const transport = new StdioClientTransport({
+                command: config.command,
+                args: config.args,
+                env: buildChildEnv(config.env),
+                cwd: config.cwd,
+                stderr: 'pipe',
+            });
+            attachStdioStderrDrain(transport, config.serverName, transportCtx?.logDir, transportCtx?.maxBytes);
+            return transport;
+        }
+        case 'streamable-http':
+            return new StreamableHTTPClientTransport(new URL(config.url), transportOptions(config, transportCtx));
+        case 'sse':
+            /* oxlint-disable-next-line no-deprecated -- SSE support is a required
+               Claude Code parity surface; the SDK deprecates it only because
+               Streamable HTTP is preferred for new servers. */
+            return new SSEClientTransport(new URL(config.url), transportOptions(config, transportCtx));
+    }
+}
+/** Build the SDK transport options, wiring OAuth when configured. */
+function transportOptions(config, transportCtx) {
+    const opts = {
+        requestInit: { headers: config.headers },
+    };
+    if (config.oauth !== undefined) {
+        const provider = transportCtx?.authProvider
+            ?? (transportCtx?.ctx !== undefined ? buildAuthProvider(transportCtx.ctx, config.serverName, config.oauth) : undefined);
+        if (provider === undefined) {
+            throw new Error(`mcp-client(${config.serverName}): oauth requires the credentials service to be available`);
+        }
+        opts.authProvider = provider;
+    }
+    return opts;
+}
+//# sourceMappingURL=transport.js.map

package/lib/transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAA;AAClG,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAE/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAA;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D;;;;;GAKG;AACH,SAAS,aAAa,CAAC,KAA6B;IAClD,OAAO,EAAE,GAAG,iBAAiB,EAAE,EAAE,GAAG,KAAK,EAAE,CAAA;AAC7C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAY,EAAE,UAAkB,EAAE,KAAkB;IACpF,OAAO,IAAI,8BAA8B,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAA;AACnE,CAAC;AAsBD;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,MAAc,EAAE,YAA+B;IAC7E,QAAQ,MAAM,CAAC,SAAS,EAAE,CAAC;QACzB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,SAAS,GAAG,IAAI,oBAAoB,CAAC;gBACzC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC;gBAC9B,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,MAAM,EAAE,MAAM;aACf,CAAC,CAAA;YACF,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;YAClG,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,KAAK,iBAAiB;YACpB,OAAO,IAAI,6BAA6B,CACtC,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EACnB,gBAAgB,CAAC,MAAM,EAAE,YAAY,CAAC,CAC1B,CAAA;QAChB,KAAK,KAAK;YACR;;+DAEmD;YACnD,OAAO,IAAI,kBAAkB,CAC3B,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EACnB,gBAAgB,CAAC,MAAM,EAAE,YAAY,CAAC,CACvC,CAAA;IACL,CAAC;AACH,CAAC;AAED,qEAAqE;AACrE,SAAS,gBAAgB,CAAC,MAAiE,EAAE,YAA0C;IACrI,MAAM,IAAI,GAAqE;QAC7E,WAAW,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;KACzC,CAAA;IACD,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,YAAY,EAAE,YAAY;eACtC,CAAC,YAAY,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACzH,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,cAAc,MAAM,CAAC,UAAU,2DAA2D,CAAC,CAAA;QAC7G,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAA;IAC9B,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/package.json

@@ -0,0 +1,62 @@
+{
+  "name": "@dsh-cc/mcp-client",
+  "description": "MCP client bridge: connects to MCP servers and registers their tools on ctx.tools",
+  "version": "0.5.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dsh-cc/dsh-cc.git",
+    "directory": "packages/mcp/mcp-client"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./invariant": {
+      "types": "./lib/invariant.d.ts",
+      "default": "./lib/invariant.js"
+    },
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib"
+  ],
+  "license": "Apache-2.0",
+  "peerDependencies": {
+    "@deepseek-ai/dsh-credentials": ">=0.1.1-rc.2",
+    "@deepseek-ai/dsh-invariants": ">=0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": ">=0.1.1-rc.2",
+    "@deepseek-ai/dsh-skill": ">=0.1.1-rc.2",
+    "@deepseek-ai/dsh-subprocess": ">=0.1.1-rc.2",
+    "@deepseek-ai/dsh-timeout": ">=0.1.1-rc.2",
+    "@deepseek-ai/cordis": ">=0.1.1-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "@dsh-cc/tools": "^0.5.0"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "1.29.0",
+    "zod": "^4.4.3"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-credentials": "link:../../../../deepseek-harness/packages/credentials/credentials",
+    "@deepseek-ai/dsh-credentials-local": "link:../../../../deepseek-harness/packages/credentials/credentials-local",
+    "@deepseek-ai/dsh-invariants": "link:../../../../deepseek-harness/packages/runtime-diagnostics/invariants",
+    "@deepseek-ai/dsh-llm": "link:../../../../deepseek-harness/packages/llm/llm",
+    "@deepseek-ai/dsh-skill": "link:../../../../deepseek-harness/packages/skill/skill",
+    "@deepseek-ai/dsh-subprocess": "link:../../../../deepseek-harness/packages/subprocess/subprocess",
+    "@deepseek-ai/dsh-timeout": "link:../../../../deepseek-harness/packages/util/timeout",
+    "@modelcontextprotocol/server-everything": "^2026.7.4",
+    "@modelcontextprotocol/server-filesystem": "^2026.7.4",
+    "@deepseek-ai/cordis": "link:../../../../deepseek-harness/vendor/cordis",
+    "@deepseek-ai/schemastery": "link:../../../../deepseek-harness/vendor/schemastery",
+    "@deepseek-ai/cordis-plugin-loader": "link:../../../../deepseek-harness/vendor/loader",
+    "@deepseek-ai/dsh-system-prompt": "link:../../../../deepseek-harness/packages/core/system-prompt",
+    "@dsh-cc/tools": "^0.5.0",
+    "@dsh-cc/tool-search": "^0.5.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}