@lingxiao-office/sdk 1.0.0

package/dist/core/ipc/IPCDrainQueue.d.ts

@@ -0,0 +1,58 @@
+/**
+ * IPCDrainQueue — per-worker IPC 消息异步消费队列
+ *
+ * 解决"一个 worker 的事件风暴拖慢所有 worker 的 IPC 消费"问题：
+ *
+ *   旧路径：child.on('message', msg => handleWorkerMessage(...))
+ *           ↑ Node.js 同步调用所有 listener；handler 内任何同步慢操作（DB 写、复杂 emit）
+ *           都会阻塞当前 child 的 IPC 消费 → 进而反压 worker 端 process.send → 心跳延迟。
+ *
+ *   新路径：child.on('message', msg => queue.push(msg))   // O(1)，立即返回
+ *           queue.scheduleDrain()                          // setImmediate 异步消费
+ *           drain() 内部按批处理，每批让出 event loop 一次。
+ *
+ * 设计要点：
+ *   - 每个 workerId 一个独立队列：A worker 队列堆积不会影响 B worker
+ *   - 有界队列 + 优先级丢弃：背压时丢 heartbeat / progress / event 等 P3，
+ *     但 complete / failed / error 永不丢
+ *   - 批量消费：每次 drain 处理 batchSize 条，让出 event loop，避免长任务
+ *   - O(1) push：仅追加 + 必要时 schedule，不在 hot path 做任何昂贵操作
+ */
+import type { WorkerMessage } from '../WorkerProcessRunner.js';
+export interface IPCDrainQueueOptions {
+    /** 每次 drain 处理的最大消息数，默认 50 */
+    batchSize?: number;
+    /** 单 worker 队列上限（含所有优先级），默认 5000；超过后开始丢 P3 → P2 → P1 */
+    maxQueueSize?: number;
+    /** 消费回调 */
+    consume: (workerId: string, msg: WorkerMessage) => void;
+}
+export declare class IPCDrainQueue {
+    private queues;
+    private readonly batchSize;
+    private readonly maxQueueSize;
+    private readonly consume;
+    private destroyed;
+    constructor(options: IPCDrainQueueOptions);
+    /** O(1) push — 仅追加到 per-worker bucket，必要时 schedule drain */
+    push(workerId: string, msg: WorkerMessage): void;
+    /** 异步分批消费，让出 event loop */
+    private drain;
+    /** 从 p0 → p3 顺序取出第一个非空消息 */
+    private shift;
+    /** 移除某个 worker 的整个队列（worker 退出后调用） */
+    remove(workerId: string): void;
+    /**
+     * 同步排干某 worker 的全部剩余消息（worker 退出时调用）。
+     *
+     * 必要性：进程 'exit' 可能在最后一条 'complete' 被 setImmediate drain 之前触发。
+     * 若此时 remove() 直接清队列，pending 的 complete 被丢弃 → worker:exit 把它当崩溃
+     * 重复恢复重派（Bug5 / complete 丢失）。退出前先同步排干，保证 complete 被处理
+     * （置位 completionReceived），再由调用方 remove 清空队列。
+     */
+    drainAllSync(workerId: string): void;
+    /** 诊断：暴露每个 worker 的队列状态 */
+    private getMetrics;
+    destroy(): void;
+}
+//# sourceMappingURL=IPCDrainQueue.d.ts.map

package/dist/core/ipc/IPCDrainQueue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IPCDrainQueue.d.ts","sourceRoot":"","sources":["../../../src/core/ipc/IPCDrainQueue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG/D,MAAM,WAAW,oBAAoB;IACnC,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW;IACX,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;CACzD;AAgCD,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAkC;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiD;IACzE,OAAO,CAAC,SAAS,CAAS;gBAEd,OAAO,EAAE,oBAAoB;IAMzC,4DAA4D;IAC5D,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI;IAgChD,2BAA2B;IAC3B,OAAO,CAAC,KAAK;IAyBb,4BAA4B;IAC5B,OAAO,CAAC,KAAK;IAQb,sCAAsC;IACtC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQ9B;;;;;;;OAOG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAcpC,2BAA2B;IAC3B,OAAO,CAAC,UAAU;IAclB,OAAO,IAAI,IAAI;CAIhB"}

package/dist/core/ipc/IPCDrainQueue.js

@@ -0,0 +1,166 @@
+/**
+ * IPCDrainQueue — per-worker IPC 消息异步消费队列
+ *
+ * 解决"一个 worker 的事件风暴拖慢所有 worker 的 IPC 消费"问题：
+ *
+ *   旧路径：child.on('message', msg => handleWorkerMessage(...))
+ *           ↑ Node.js 同步调用所有 listener；handler 内任何同步慢操作（DB 写、复杂 emit）
+ *           都会阻塞当前 child 的 IPC 消费 → 进而反压 worker 端 process.send → 心跳延迟。
+ *
+ *   新路径：child.on('message', msg => queue.push(msg))   // O(1)，立即返回
+ *           queue.scheduleDrain()                          // setImmediate 异步消费
+ *           drain() 内部按批处理，每批让出 event loop 一次。
+ *
+ * 设计要点：
+ *   - 每个 workerId 一个独立队列：A worker 队列堆积不会影响 B worker
+ *   - 有界队列 + 优先级丢弃：背压时丢 heartbeat / progress / event 等 P3，
+ *     但 complete / failed / error 永不丢
+ *   - 批量消费：每次 drain 处理 batchSize 条，让出 event loop，避免长任务
+ *   - O(1) push：仅追加 + 必要时 schedule，不在 hot path 做任何昂贵操作
+ */
+import { coreLogger } from '../Log.js';
+const P0_TYPES = new Set(['started', 'complete', 'failed', 'error']);
+const P1_TYPES = new Set(['usage', 'bus_message']);
+const P2_TYPES = new Set(['progress']);
+// 'heartbeat' / 'event' 默认 P3（最可丢）
+function classifyPriority(type) {
+    if (P0_TYPES.has(type))
+        return 'p0';
+    if (P1_TYPES.has(type))
+        return 'p1';
+    if (P2_TYPES.has(type))
+        return 'p2';
+    return 'p3';
+}
+export class IPCDrainQueue {
+    queues = new Map();
+    batchSize;
+    maxQueueSize;
+    consume;
+    destroyed = false;
+    constructor(options) {
+        this.batchSize = options.batchSize ?? 50;
+        this.maxQueueSize = options.maxQueueSize ?? 5000;
+        this.consume = options.consume;
+    }
+    /** O(1) push — 仅追加到 per-worker bucket，必要时 schedule drain */
+    push(workerId, msg) {
+        if (this.destroyed)
+            return;
+        let queue = this.queues.get(workerId);
+        if (!queue) {
+            queue = { p0: [], p1: [], p2: [], p3: [], scheduled: false, droppedCount: 0 };
+            this.queues.set(workerId, queue);
+        }
+        const priority = classifyPriority(msg.type);
+        queue[priority].push(msg);
+        // 背压：超过队列上限时按 p3 → p2 → p1 顺序丢弃
+        const total = queue.p0.length + queue.p1.length + queue.p2.length + queue.p3.length;
+        if (total > this.maxQueueSize) {
+            let overflow = total - this.maxQueueSize;
+            for (const tier of ['p3', 'p2', 'p1']) {
+                if (overflow <= 0)
+                    break;
+                const dropped = queue[tier].splice(0, Math.min(queue[tier].length, overflow));
+                overflow -= dropped.length;
+                queue.droppedCount += dropped.length;
+            }
+            if (queue.droppedCount % 100 === 0 || overflow > 0) {
+                coreLogger.warn(`[IPCDrainQueue] worker=${workerId} dropped=${queue.droppedCount} (back-pressure)`);
+            }
+        }
+        if (!queue.scheduled) {
+            queue.scheduled = true;
+            setImmediate(() => this.drain(workerId));
+        }
+    }
+    /** 异步分批消费，让出 event loop */
+    drain(workerId) {
+        const queue = this.queues.get(workerId);
+        if (!queue)
+            return;
+        let processed = 0;
+        while (processed < this.batchSize) {
+            const msg = this.shift(queue);
+            if (!msg)
+                break;
+            try {
+                this.consume(workerId, msg);
+            }
+            catch (err) {
+                coreLogger.error(`[IPCDrainQueue] consume threw for worker=${workerId}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+            processed++;
+        }
+        const remaining = queue.p0.length + queue.p1.length + queue.p2.length + queue.p3.length;
+        if (remaining > 0) {
+            // 还有积压，下一个 tick 继续 drain — 让出 event loop 给其它 worker 和定时器
+            setImmediate(() => this.drain(workerId));
+        }
+        else {
+            queue.scheduled = false;
+        }
+    }
+    /** 从 p0 → p3 顺序取出第一个非空消息 */
+    shift(queue) {
+        if (queue.p0.length)
+            return queue.p0.shift();
+        if (queue.p1.length)
+            return queue.p1.shift();
+        if (queue.p2.length)
+            return queue.p2.shift();
+        if (queue.p3.length)
+            return queue.p3.shift();
+        return undefined;
+    }
+    /** 移除某个 worker 的整个队列（worker 退出后调用） */
+    remove(workerId) {
+        // A6: 防御性 drain-before-clear——即使调用方漏调 drainAllSync,remove 也不丢弃 pending
+        // complete 消息(否则 worker:exit 把丢掉的 complete 当崩溃重复恢复重派,Bug5)。
+        // drainAllSync 在队列已空时为 no-op,故已先 drain 的调用方不会双重消费。
+        this.drainAllSync(workerId);
+        this.queues.delete(workerId);
+    }
+    /**
+     * 同步排干某 worker 的全部剩余消息（worker 退出时调用）。
+     *
+     * 必要性：进程 'exit' 可能在最后一条 'complete' 被 setImmediate drain 之前触发。
+     * 若此时 remove() 直接清队列，pending 的 complete 被丢弃 → worker:exit 把它当崩溃
+     * 重复恢复重派（Bug5 / complete 丢失）。退出前先同步排干，保证 complete 被处理
+     * （置位 completionReceived），再由调用方 remove 清空队列。
+     */
+    drainAllSync(workerId) {
+        const queue = this.queues.get(workerId);
+        if (!queue)
+            return;
+        queue.scheduled = false;
+        let msg;
+        while ((msg = this.shift(queue))) {
+            try {
+                this.consume(workerId, msg);
+            }
+            catch (err) {
+                coreLogger.error(`[IPCDrainQueue] drainAllSync consume threw for worker=${workerId}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
+    }
+    /** 诊断：暴露每个 worker 的队列状态 */
+    getMetrics() {
+        const out = [];
+        for (const [workerId, queue] of this.queues) {
+            const backlog = queue.p0.length + queue.p1.length + queue.p2.length + queue.p3.length;
+            out.push({
+                workerId,
+                backlog,
+                dropped: queue.droppedCount,
+                perTier: { p0: queue.p0.length, p1: queue.p1.length, p2: queue.p2.length, p3: queue.p3.length },
+            });
+        }
+        return out;
+    }
+    destroy() {
+        this.destroyed = true;
+        this.queues.clear();
+    }
+}
+//# sourceMappingURL=IPCDrainQueue.js.map

package/dist/core/ipc/IPCDrainQueue.js.map

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

package/dist/core/mcp-share/McpBundle.d.ts

@@ -0,0 +1,43 @@
+/**
+ * McpBundle — .mcpb 打包/解包核心
+ *
+ * 契约: contract:mcp-share v1 §4.4 §4.5 §5.2
+ *
+ * .mcpb 文件本质为 JSON（McpBundleFile 结构），包含:
+ * - format: 'mcpb'
+ * - format_version: 1
+ * - name / description / author / created_at
+ * - servers: SharedMcpServerConfig[] (脱敏后的 server 列表)
+ */
+import { type SharedMcpServerConfig, type ConflictStrategy, type ImportResult } from './McpShare.js';
+/** .mcpb 文件格式 */
+export interface McpBundleFile {
+    format: 'mcpb';
+    format_version: 1;
+    name: string;
+    description?: string;
+    author?: string;
+    created_at: number;
+    servers: SharedMcpServerConfig[];
+}
+/**
+ * 打包 .mcpb 文件
+ * @param serverIds 要打包的 server ID 列表
+ * @param name Bundle 名称
+ * @param description Bundle 描述
+ * @param author 作者
+ * @returns McpBundleFile JSON
+ */
+export declare function createBundle(serverIds: string[], name?: string, description?: string, author?: string): McpBundleFile;
+/**
+ * 验证 bundle JSON 是否符合 McpBundleFile schema
+ */
+export declare function validateBundle(bundle: unknown): McpBundleFile;
+/**
+ * 从 bundle 导入 servers
+ * @param bundle McpBundleFile JSON 对象
+ * @param serverIdMap ID 重命名映射
+ * @param conflictStrategy 冲突策略
+ */
+export declare function importFromBundle(bundle: McpBundleFile, serverIdMap?: Record<string, string>, conflictStrategy?: ConflictStrategy): ImportResult;
+//# sourceMappingURL=McpBundle.d.ts.map

package/dist/core/mcp-share/McpBundle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"McpBundle.d.ts","sourceRoot":"","sources":["../../../src/core/mcp-share/McpBundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,EAIL,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AAUvB,iBAAiB;AACjB,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,CAAC,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,qBAAqB,EAAE,CAAC;CAClC;AAID;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,EAAE,EACnB,IAAI,CAAC,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,MAAM,GACd,aAAa,CAmCf;AAID;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,aAAa,CA0C7D;AAID;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,gBAAgB,GAAE,gBAAyB,GAC1C,YAAY,CAEd"}

package/dist/core/mcp-share/McpBundle.js

@@ -0,0 +1,100 @@
+/**
+ * McpBundle — .mcpb 打包/解包核心
+ *
+ * 契约: contract:mcp-share v1 §4.4 §4.5 §5.2
+ *
+ * .mcpb 文件本质为 JSON（McpBundleFile 结构），包含:
+ * - format: 'mcpb'
+ * - format_version: 1
+ * - name / description / author / created_at
+ * - servers: SharedMcpServerConfig[] (脱敏后的 server 列表)
+ */
+import { getInstalledMcpServers } from '../MarketplaceService.js';
+import { sanitizeServer, validateImportInput, McpShareError, } from './McpShare.js';
+// ── 常量 ───────────────────────────────────────────────────────────────
+const BUNDLE_FORMAT = 'mcpb';
+const BUNDLE_FORMAT_VERSION = 1;
+const MAX_BUNDLE_SERVERS = 50;
+// ── 打包（导出） ───────────────────────────────────────────────────────
+/**
+ * 打包 .mcpb 文件
+ * @param serverIds 要打包的 server ID 列表
+ * @param name Bundle 名称
+ * @param description Bundle 描述
+ * @param author 作者
+ * @returns McpBundleFile JSON
+ */
+export function createBundle(serverIds, name, description, author) {
+    if (!Array.isArray(serverIds) || serverIds.length === 0) {
+        throw new McpShareError('no_servers_selected', 'At least one server_id is required.');
+    }
+    if (serverIds.length > MAX_BUNDLE_SERVERS) {
+        throw new McpShareError('too_many_servers', `Maximum ${MAX_BUNDLE_SERVERS} servers per bundle.`);
+    }
+    const installed = getInstalledMcpServers();
+    const installedMap = new Map(installed.map((s) => [s.id, s]));
+    const sharedServers = [];
+    for (const id of serverIds) {
+        const server = installedMap.get(id);
+        if (!server) {
+            throw new McpShareError('server_not_found', `Server not found: ${id}`);
+        }
+        sharedServers.push(sanitizeServer(server));
+    }
+    const bundle = {
+        format: BUNDLE_FORMAT,
+        format_version: BUNDLE_FORMAT_VERSION,
+        name: name || 'MCP Bundle',
+        ...(description !== undefined ? { description } : {}),
+        ...(author !== undefined ? { author } : {}),
+        created_at: Date.now(),
+        servers: sharedServers,
+    };
+    return bundle;
+}
+// ── 解包（验证） ───────────────────────────────────────────────────────
+/**
+ * 验证 bundle JSON 是否符合 McpBundleFile schema
+ */
+export function validateBundle(bundle) {
+    if (!bundle || typeof bundle !== 'object') {
+        throw new McpShareError('bundle_format_invalid', 'Invalid .mcpb format.');
+    }
+    const obj = bundle;
+    if (obj.format !== BUNDLE_FORMAT) {
+        throw new McpShareError('bundle_format_invalid', 'Invalid .mcpb format.');
+    }
+    if (obj.format_version !== BUNDLE_FORMAT_VERSION) {
+        throw new McpShareError('bundle_version_unsupported', `Unsupported bundle version: ${obj.format_version}.`);
+    }
+    if (typeof obj.name !== 'string' || obj.name.length === 0) {
+        throw new McpShareError('bundle_format_invalid', 'Invalid .mcpb format.');
+    }
+    if (!Array.isArray(obj.servers)) {
+        throw new McpShareError('bundle_format_invalid', 'Invalid .mcpb format.');
+    }
+    // 验证每个 server 的基本结构
+    for (const server of obj.servers) {
+        if (!server || typeof server !== 'object') {
+            throw new McpShareError('bundle_format_invalid', 'Invalid .mcpb format.');
+        }
+        const s = server;
+        if (typeof s.id !== 'string' ||
+            typeof s.name !== 'string' ||
+            (s.transport !== 'stdio' && s.transport !== 'streamable-http')) {
+            throw new McpShareError('bundle_format_invalid', 'Invalid .mcpb format.');
+        }
+    }
+    return bundle;
+}
+// ── 解包（导入） ───────────────────────────────────────────────────────
+/**
+ * 从 bundle 导入 servers
+ * @param bundle McpBundleFile JSON 对象
+ * @param serverIdMap ID 重命名映射
+ * @param conflictStrategy 冲突策略
+ */
+export function importFromBundle(bundle, serverIdMap, conflictStrategy = 'skip') {
+    return validateImportInput(bundle.servers, serverIdMap, conflictStrategy);
+}
+//# sourceMappingURL=McpBundle.js.map

package/dist/core/mcp-share/McpBundle.js.map

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

package/dist/core/mcp-share/McpShare.d.ts

@@ -0,0 +1,110 @@
+/**
+ * McpShare — MCP 配置分享链接生成/解析/导入核心
+ *
+ * 契约: contract:mcp-share v1
+ *
+ * 安全模型:
+ * - 分享时脱敏 env values → env_keys, header values → header_names
+ * - 移除 origin, installed_at, updated_at
+ * - 导入后含脱敏字段 → enabled=false
+ */
+import type { McpServerConfig } from '../../config.js';
+export declare const SHARE_URL_SCHEME = "lingxiao://mcp/share";
+export declare const SHARE_URL_VERSION_PARAM = "v=1";
+/** 脱敏后的 MCP Server 配置（可安全分享） */
+export interface SharedMcpServerConfig {
+    id: string;
+    name: string;
+    title?: string;
+    description?: string;
+    enabled: boolean;
+    transport: 'stdio' | 'streamable-http';
+    command?: string;
+    args?: string[];
+    env_keys?: string[];
+    cwd?: string | null;
+    url?: string;
+    header_names?: string[];
+    registry?: {
+        source_id?: string;
+        server_name?: string;
+        version?: string;
+    };
+}
+/** 分享链接内部 payload */
+export interface McpSharePayload {
+    v: 1;
+    name?: string;
+    description?: string;
+    created_at: number;
+    servers: SharedMcpServerConfig[];
+}
+/** 冲突策略 */
+export type ConflictStrategy = 'skip' | 'overwrite' | 'rename';
+/** 导入结果 */
+export interface ImportResult {
+    imported: McpServerConfig[];
+    skipped: string[];
+    overwritten: string[];
+    renamed: string[];
+    requires_secrets: string[];
+}
+/** 分享生成结果 */
+export interface ShareResult {
+    share_token: string;
+    share_url: string;
+    payload: McpSharePayload;
+}
+export type McpShareErrorCode = 'no_servers_selected' | 'server_not_found' | 'too_many_servers' | 'payload_too_large' | 'share_token_invalid' | 'share_version_unsupported' | 'bundle_format_invalid' | 'bundle_version_unsupported' | 'invalid_server_id_map' | 'mcp_server_save_failed';
+export declare class McpShareError extends Error {
+    code: McpShareErrorCode;
+    constructor(code: McpShareErrorCode, message: string);
+}
+/**
+ * 将 McpServerConfig 脱敏为 SharedMcpServerConfig
+ * - stdio: env 的值剥离，只保留 env_keys
+ * - streamable-http: headers 的 value 剥离，只保留 header_names
+ * - 移除 origin, installed_at, updated_at
+ */
+export declare function sanitizeServer(server: McpServerConfig): SharedMcpServerConfig;
+/**
+ * 将 SharedMcpServerConfig 还原为 McpServerConfig
+ * - 含脱敏字段（env_keys 或 header_names 非空）→ enabled=false
+ * - origin 设为空对象 {}, installed_at/updated_at 设为当前时间
+ */
+export declare function restoreServer(shared: SharedMcpServerConfig, idOverride?: string): McpServerConfig;
+/**
+ * 生成分享链接
+ * @param serverIds 要分享的 server ID 列表
+ * @param name 分享名称
+ * @param description 分享描述
+ * @returns share_token + share_url + payload
+ */
+export declare function generateShareLink(serverIds: string[], name?: string, description?: string): ShareResult;
+/**
+ * 解析分享 token，返回 McpSharePayload
+ * @param shareToken base64url 编码的 McpSharePayload
+ */
+export declare function parseShareToken(shareToken: string): McpSharePayload;
+/**
+ * 核心导入逻辑（可被 McpBundle 复用）
+ * @param servers 脱敏后的 server 列表
+ * @param serverIdMap ID 重命名映射
+ * @param conflictStrategy 冲突策略
+ */
+export declare function validateImportInput(servers: SharedMcpServerConfig[], serverIdMap?: Record<string, string>, conflictStrategy?: ConflictStrategy): ImportResult;
+/**
+ * 从分享 payload 导入 servers
+ * @param payload 解析后的 McpSharePayload
+ * @param serverIdMap ID 重命名映射
+ * @param conflictStrategy 冲突策略
+ */
+export declare function importFromPayload(payload: McpSharePayload, serverIdMap?: Record<string, string>, conflictStrategy?: ConflictStrategy): ImportResult;
+/**
+ * 从分享 token 导入
+ * @param shareToken base64url 编码的分享 token
+ * @param serverIdMap ID 重命名映射
+ * @param conflictStrategy 冲突策略
+ */
+export declare function importFromShareToken(shareToken: string, serverIdMap?: Record<string, string>, conflictStrategy?: ConflictStrategy): ImportResult;
+//# sourceMappingURL=McpShare.d.ts.map

package/dist/core/mcp-share/McpShare.d.ts.map

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