@next-open-ai/openbot 0.2.8 → 0.3.2

package/dist/core/mcp/client.d.ts

@@ -0,0 +1,24 @@
+/**
+ * MCP 客户端：连接、list_tools、call_tool、断开。
+ * 支持 stdio（本地进程）与 sse（远程 HTTP）两种传输。
+ */
+import type { McpTool, McpToolCallResult, IMcpTransport } from "./types.js";
+import type { McpServerConfig } from "./types.js";
+export interface McpClientOptions {
+    initTimeoutMs?: number;
+    requestTimeoutMs?: number;
+}
+export declare class McpClient {
+    private transport;
+    private _tools;
+    private _requestId;
+    constructor(configOrTransport: McpServerConfig | IMcpTransport, options?: McpClientOptions);
+    /** 建立连接并完成握手；成功后可使用 listTools / callTool */
+    connect(): Promise<void>;
+    /** 获取工具列表（会缓存；断开重连后需重新 list） */
+    listTools(): Promise<McpTool[]>;
+    /** 调用指定工具 */
+    callTool(name: string, args: Record<string, unknown>): Promise<McpToolCallResult>;
+    close(): Promise<void>;
+    get isConnected(): boolean;
+}

package/dist/core/mcp/client.js

@@ -0,0 +1,70 @@
+/**
+ * MCP 客户端：连接、list_tools、call_tool、断开。
+ * 支持 stdio（本地进程）与 sse（远程 HTTP）两种传输。
+ */
+import { createTransport } from "./transport/index.js";
+export class McpClient {
+    transport;
+    _tools = null;
+    _requestId = 0;
+    constructor(configOrTransport, options = {}) {
+        if (typeof configOrTransport.request === "function" &&
+            typeof configOrTransport.start === "function") {
+            this.transport = configOrTransport;
+        }
+        else {
+            this.transport = createTransport(configOrTransport, {
+                initTimeoutMs: options.initTimeoutMs,
+                requestTimeoutMs: options.requestTimeoutMs,
+            });
+        }
+    }
+    /** 建立连接并完成握手；成功后可使用 listTools / callTool */
+    async connect() {
+        await this.transport.start();
+    }
+    /** 获取工具列表（会缓存；断开重连后需重新 list） */
+    async listTools() {
+        if (this._tools !== null) {
+            return this._tools;
+        }
+        const res = await this.transport.request({
+            jsonrpc: "2.0",
+            id: ++this._requestId,
+            method: "tools/list",
+        });
+        if (res.error) {
+            throw new Error(`MCP tools/list failed: ${res.error.message}`);
+        }
+        const list = res.result?.tools;
+        this._tools = Array.isArray(list) ? list : [];
+        return this._tools;
+    }
+    /** 调用指定工具 */
+    async callTool(name, args) {
+        const res = await this.transport.request({
+            jsonrpc: "2.0",
+            id: ++this._requestId,
+            method: "tools/call",
+            params: { name, arguments: args ?? {} },
+        });
+        if (res.error) {
+            return {
+                content: [{ type: "text", text: `MCP call_tool error: ${res.error.message}` }],
+                isError: true,
+            };
+        }
+        const result = res.result;
+        if (!result || !Array.isArray(result.content)) {
+            return { content: [{ type: "text", text: "Invalid MCP tools/call result" }], isError: true };
+        }
+        return result;
+    }
+    async close() {
+        this._tools = null;
+        await this.transport.close();
+    }
+    get isConnected() {
+        return this.transport.isConnected;
+    }
+}

package/dist/core/mcp/config.d.ts

@@ -0,0 +1,22 @@
+/**
+ * MCP 配置解析与校验。
+ * 从 getOrCreateSession 的 options.mcpServers 中取出并规范化，支持 stdio 与 sse。
+ */
+import type { McpServerConfig, McpServerConfigStdio, McpServerConfigSse } from "./types.js";
+/**
+ * 从会话选项里解析出本会话启用的 MCP 服务器配置列表。
+ * 支持 stdio（本地进程）与 sse（远程 HTTP）。
+ */
+export declare function resolveMcpServersForSession(mcpServers: McpServerConfig[] | undefined): McpServerConfig[];
+/**
+ * 为 stdio 配置生成缓存键（用于 Operator 复用同一进程连接）
+ */
+export declare function stdioConfigKey(config: McpServerConfigStdio): string;
+/**
+ * 为 sse 配置生成缓存键
+ */
+export declare function sseConfigKey(config: McpServerConfigSse): string;
+/**
+ * 任意 MCP 配置的缓存键
+ */
+export declare function mcpConfigKey(config: McpServerConfig): string;

package/dist/core/mcp/config.js

@@ -0,0 +1,69 @@
+/**
+ * MCP 配置解析与校验。
+ * 从 getOrCreateSession 的 options.mcpServers 中取出并规范化，支持 stdio 与 sse。
+ */
+/**
+ * 从会话选项里解析出本会话启用的 MCP 服务器配置列表。
+ * 支持 stdio（本地进程）与 sse（远程 HTTP）。
+ */
+export function resolveMcpServersForSession(mcpServers) {
+    if (!Array.isArray(mcpServers) || mcpServers.length === 0) {
+        return [];
+    }
+    const result = [];
+    for (const s of mcpServers) {
+        if (!s || typeof s !== "object")
+            continue;
+        if (s.transport === "stdio") {
+            if (typeof s.command !== "string" || !s.command.trim()) {
+                console.warn("[mcp] 跳过无效 stdio 配置：缺少或无效 command");
+                continue;
+            }
+            result.push({
+                transport: "stdio",
+                command: s.command.trim(),
+                args: Array.isArray(s.args) ? s.args : undefined,
+                env: s.env && typeof s.env === "object" ? s.env : undefined,
+            });
+        }
+        else if (s.transport === "sse") {
+            const url = s.url?.trim();
+            if (!url) {
+                console.warn("[mcp] 跳过无效 sse 配置：缺少或无效 url");
+                continue;
+            }
+            result.push({
+                transport: "sse",
+                url,
+                headers: s.headers && typeof s.headers === "object" ? s.headers : undefined,
+            });
+        }
+        else {
+            console.warn("[mcp] 未知 transport:", s.transport);
+        }
+    }
+    return result;
+}
+/**
+ * 为 stdio 配置生成缓存键（用于 Operator 复用同一进程连接）
+ */
+export function stdioConfigKey(config) {
+    const args = (config.args ?? []).join(" ");
+    const envStr = config.env ? JSON.stringify(config.env) : "";
+    return `stdio:${config.command}\0${args}\0${envStr}`;
+}
+/**
+ * 为 sse 配置生成缓存键
+ */
+export function sseConfigKey(config) {
+    const headersStr = config.headers ? JSON.stringify(config.headers) : "";
+    return `sse:${config.url}\0${headersStr}`;
+}
+/**
+ * 任意 MCP 配置的缓存键
+ */
+export function mcpConfigKey(config) {
+    if (config.transport === "stdio")
+        return stdioConfigKey(config);
+    return sseConfigKey(config);
+}

package/dist/core/mcp/index.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Core MCP 模块：为 SessionAgent 提供 MCP Tools 能力（Client 端）。
+ * 配置在创建 Session 时通过 options.mcpServers 传入，与 Skill 类似。
+ */
+import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
+import type { McpServerConfig } from "./types.js";
+export type { McpServerConfig, McpServerConfigStdio, McpServerConfigSse, McpTool } from "./types.js";
+export { resolveMcpServersForSession, stdioConfigKey, sseConfigKey, mcpConfigKey } from "./config.js";
+export { McpClient } from "./client.js";
+export { getMcpToolDefinitions, shutdownMcpClients } from "./operator.js";
+export { mcpToolToToolDefinition, mcpToolsToToolDefinitions } from "./adapter.js";
+/**
+ * 根据会话选项中的 mcpServers 配置，返回该会话可用的 MCP 工具（ToolDefinition 数组）。
+ * 在 AgentManager.getOrCreateSession 中调用，并入 customTools。
+ */
+export declare function createMcpToolsForSession(options: {
+    mcpServers?: McpServerConfig[];
+}): Promise<ToolDefinition[]>;

package/dist/core/mcp/index.js

@@ -0,0 +1,20 @@
+/**
+ * Core MCP 模块：为 SessionAgent 提供 MCP Tools 能力（Client 端）。
+ * 配置在创建 Session 时通过 options.mcpServers 传入，与 Skill 类似。
+ */
+import { resolveMcpServersForSession } from "./config.js";
+import { getMcpToolDefinitions } from "./operator.js";
+export { resolveMcpServersForSession, stdioConfigKey, sseConfigKey, mcpConfigKey } from "./config.js";
+export { McpClient } from "./client.js";
+export { getMcpToolDefinitions, shutdownMcpClients } from "./operator.js";
+export { mcpToolToToolDefinition, mcpToolsToToolDefinitions } from "./adapter.js";
+/**
+ * 根据会话选项中的 mcpServers 配置，返回该会话可用的 MCP 工具（ToolDefinition 数组）。
+ * 在 AgentManager.getOrCreateSession 中调用，并入 customTools。
+ */
+export async function createMcpToolsForSession(options) {
+    const configs = resolveMcpServersForSession(options.mcpServers);
+    if (configs.length === 0)
+        return [];
+    return getMcpToolDefinitions(configs);
+}

package/dist/core/mcp/operator.d.ts

@@ -0,0 +1,15 @@
+/**
+ * MCP Operator：管理 MCP 客户端生命周期，按配置为会话提供 ToolDefinition 列表。
+ * 支持 stdio（本地）与 sse（远程）两种传输。
+ */
+import type { McpServerConfig } from "./types.js";
+import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
+/**
+ * 为给定 MCP 服务器配置列表获取或创建客户端，并返回其工具对应的 ToolDefinition 数组。
+ * 连接失败或 list_tools 失败的 server 会被跳过并打日志，不阻塞整体。
+ */
+export declare function getMcpToolDefinitions(serverConfigs: McpServerConfig[]): Promise<ToolDefinition[]>;
+/**
+ * 关闭并移除所有缓存的 MCP 客户端（进程退出或显式清理时调用）。
+ */
+export declare function shutdownMcpClients(): Promise<void>;

package/dist/core/mcp/operator.js

@@ -0,0 +1,72 @@
+/**
+ * MCP Operator：管理 MCP 客户端生命周期，按配置为会话提供 ToolDefinition 列表。
+ * 支持 stdio（本地）与 sse（远程）两种传输。
+ */
+import { mcpConfigKey } from "./config.js";
+import { McpClient } from "./client.js";
+import { mcpToolsToToolDefinitions } from "./adapter.js";
+/** 按配置键缓存的客户端 */
+const clientCache = new Map();
+function configLabel(config) {
+    if (config.transport === "stdio")
+        return config.command;
+    return config.url;
+}
+/**
+ * 为给定 MCP 服务器配置列表获取或创建客户端，并返回其工具对应的 ToolDefinition 数组。
+ * 连接失败或 list_tools 失败的 server 会被跳过并打日志，不阻塞整体。
+ */
+export async function getMcpToolDefinitions(serverConfigs) {
+    const allTools = [];
+    for (let i = 0; i < serverConfigs.length; i++) {
+        const config = serverConfigs[i];
+        const key = mcpConfigKey(config);
+        let client = clientCache.get(key);
+        if (!client) {
+            client = new McpClient(config);
+            try {
+                await client.connect();
+                clientCache.set(key, client);
+            }
+            catch (err) {
+                console.warn(`[mcp] 连接失败 (${configLabel(config)}):`, err instanceof Error ? err.message : err);
+                continue;
+            }
+        }
+        if (!client.isConnected) {
+            clientCache.delete(key);
+            try {
+                await client.close();
+            }
+            catch { }
+            const newClient = new McpClient(config);
+            try {
+                await newClient.connect();
+                clientCache.set(key, newClient);
+                client = newClient;
+            }
+            catch (err) {
+                console.warn(`[mcp] 重连失败 (${configLabel(config)}):`, err instanceof Error ? err.message : err);
+                continue;
+            }
+        }
+        try {
+            const tools = await client.listTools();
+            const serverId = `mcp${i}`;
+            const definitions = mcpToolsToToolDefinitions(tools, client, serverId);
+            allTools.push(...definitions);
+        }
+        catch (err) {
+            console.warn(`[mcp] list_tools 失败 (${configLabel(config)}):`, err instanceof Error ? err.message : err);
+        }
+    }
+    return allTools;
+}
+/**
+ * 关闭并移除所有缓存的 MCP 客户端（进程退出或显式清理时调用）。
+ */
+export async function shutdownMcpClients() {
+    const closeAll = Array.from(clientCache.values()).map((c) => c.close().catch(() => { }));
+    clientCache.clear();
+    await Promise.all(closeAll);
+}

package/dist/core/mcp/transport/index.d.ts

@@ -0,0 +1,11 @@
+import type { McpServerConfig, IMcpTransport } from "../types.js";
+export interface TransportOptions {
+    initTimeoutMs?: number;
+    requestTimeoutMs?: number;
+}
+/**
+ * 根据配置创建对应的传输层实例。
+ */
+export declare function createTransport(config: McpServerConfig, options?: TransportOptions): IMcpTransport;
+export { StdioTransport } from "./stdio.js";
+export { SseTransport } from "./sse.js";

package/dist/core/mcp/transport/index.js

@@ -0,0 +1,16 @@
+import { StdioTransport } from "./stdio.js";
+import { SseTransport } from "./sse.js";
+/**
+ * 根据配置创建对应的传输层实例。
+ */
+export function createTransport(config, options) {
+    if (config.transport === "stdio") {
+        return new StdioTransport(config, options);
+    }
+    if (config.transport === "sse") {
+        return new SseTransport(config, options);
+    }
+    throw new Error(`Unsupported MCP transport: ${config.transport}`);
+}
+export { StdioTransport } from "./stdio.js";
+export { SseTransport } from "./sse.js";

package/dist/core/mcp/transport/sse.d.ts

@@ -0,0 +1,20 @@
+/**
+ * MCP SSE/HTTP 传输：通过 HTTP POST 向远程 URL 发送 JSON-RPC 请求，响应在 response body。
+ */
+import type { McpServerConfigSse } from "../types.js";
+import type { JsonRpcRequest, JsonRpcResponse } from "../types.js";
+export interface SseTransportOptions {
+    initTimeoutMs?: number;
+    requestTimeoutMs?: number;
+}
+export declare class SseTransport {
+    private config;
+    private initTimeoutMs;
+    private requestTimeoutMs;
+    private _connected;
+    constructor(config: McpServerConfigSse, options?: SseTransportOptions);
+    start(): Promise<void>;
+    request(req: JsonRpcRequest, timeoutMs?: number): Promise<JsonRpcResponse>;
+    close(): Promise<void>;
+    get isConnected(): boolean;
+}

package/dist/core/mcp/transport/sse.js

@@ -0,0 +1,82 @@
+/**
+ * MCP SSE/HTTP 传输：通过 HTTP POST 向远程 URL 发送 JSON-RPC 请求，响应在 response body。
+ */
+const MCP_PROTOCOL_VERSION = "2024-11-05";
+export class SseTransport {
+    config;
+    initTimeoutMs;
+    requestTimeoutMs;
+    _connected = false;
+    constructor(config, options = {}) {
+        this.config = config;
+        this.initTimeoutMs = options.initTimeoutMs ?? 15_000;
+        this.requestTimeoutMs = options.requestTimeoutMs ?? 30_000;
+    }
+    async start() {
+        if (this._connected)
+            return;
+        const url = (this.config.url ?? "").trim();
+        if (!url)
+            throw new Error("MCP SSE url is required");
+        const initResult = await this.request({
+            jsonrpc: "2.0",
+            id: 1,
+            method: "initialize",
+            params: {
+                protocolVersion: MCP_PROTOCOL_VERSION,
+                capabilities: {},
+                clientInfo: { name: "openbot", version: "0.1.0" },
+            },
+        }, this.initTimeoutMs);
+        if (initResult.error) {
+            throw new Error(`MCP initialize failed: ${initResult.error.message}`);
+        }
+        await this.request({ jsonrpc: "2.0", id: 2, method: "notifications/initialized" }, this.requestTimeoutMs).catch(() => ({}));
+        this._connected = true;
+    }
+    request(req, timeoutMs) {
+        const url = (this.config.url ?? "").trim();
+        if (!url) {
+            return Promise.reject(new Error("MCP SSE url is required"));
+        }
+        const t = timeoutMs ?? this.requestTimeoutMs;
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), t);
+        const headers = {
+            "Content-Type": "application/json",
+            Accept: "application/json",
+            ...this.config.headers,
+        };
+        return fetch(url, {
+            method: "POST",
+            headers,
+            body: JSON.stringify(req),
+            signal: controller.signal,
+        })
+            .then(async (res) => {
+            clearTimeout(timeoutId);
+            if (!res.ok) {
+                const text = await res.text();
+                throw new Error(`MCP HTTP ${res.status}: ${text.slice(0, 200)}`);
+            }
+            const json = (await res.json());
+            if (!json || json.jsonrpc !== "2.0") {
+                throw new Error("Invalid MCP response");
+            }
+            return json;
+        })
+            .catch((err) => {
+            clearTimeout(timeoutId);
+            if (err.name === "AbortError") {
+                throw new Error(`MCP request timeout (${t}ms)`);
+            }
+            throw err;
+        });
+    }
+    async close() {
+        this._connected = false;
+    }
+    get isConnected() {
+        return this._connected;
+    }
+}

package/dist/core/mcp/transport/stdio.d.ts

@@ -0,0 +1,32 @@
+/**
+ * MCP stdio 传输：子进程 + 标准输入/输出上的 Newline-delimited JSON-RPC。
+ */
+import type { McpServerConfigStdio } from "../types.js";
+import type { JsonRpcRequest, JsonRpcResponse } from "../types.js";
+export interface StdioTransportOptions {
+    /** 初始化超时（毫秒） */
+    initTimeoutMs?: number;
+    /** 单次请求超时（毫秒） */
+    requestTimeoutMs?: number;
+}
+export declare class StdioTransport {
+    private process;
+    private config;
+    private initTimeoutMs;
+    private requestTimeoutMs;
+    private nextId;
+    private pending;
+    private buffer;
+    constructor(config: McpServerConfigStdio, options?: StdioTransportOptions);
+    /** 启动子进程并完成 MCP initialize 握手 */
+    start(): Promise<void>;
+    private flushLines;
+    private rejectAll;
+    private initialize;
+    private sendNotification;
+    /** 发送 JSON-RPC 请求并等待响应 */
+    request(req: JsonRpcRequest, timeoutMs?: number): Promise<JsonRpcResponse>;
+    /** 关闭子进程 */
+    close(): Promise<void>;
+    get isConnected(): boolean;
+}

package/dist/core/mcp/transport/stdio.js

@@ -0,0 +1,132 @@
+/**
+ * MCP stdio 传输：子进程 + 标准输入/输出上的 Newline-delimited JSON-RPC。
+ */
+import { spawn } from "node:child_process";
+const MCP_PROTOCOL_VERSION = "2024-11-05";
+export class StdioTransport {
+    process = null;
+    config;
+    initTimeoutMs;
+    requestTimeoutMs;
+    nextId = 1;
+    pending = new Map();
+    buffer = "";
+    constructor(config, options = {}) {
+        this.config = config;
+        this.initTimeoutMs = options.initTimeoutMs ?? 10_000;
+        this.requestTimeoutMs = options.requestTimeoutMs ?? 30_000;
+    }
+    /** 启动子进程并完成 MCP initialize 握手 */
+    async start() {
+        if (this.process) {
+            return;
+        }
+        const env = { ...process.env, ...this.config.env };
+        this.process = spawn(this.config.command, this.config.args ?? [], {
+            env,
+            stdio: ["pipe", "pipe", "pipe"],
+        });
+        const child = this.process;
+        child.stdout?.on("data", (chunk) => {
+            this.buffer += chunk.toString("utf-8");
+            this.flushLines();
+        });
+        child.stderr?.on("data", (data) => {
+            const msg = data.toString("utf-8").trim();
+            if (msg)
+                console.warn("[mcp stdio stderr]", msg);
+        });
+        child.on("error", (err) => {
+            this.rejectAll(new Error(`MCP process error: ${err.message}`));
+        });
+        child.on("exit", (code, signal) => {
+            this.rejectAll(new Error(`MCP process exited: code=${code} signal=${signal}`));
+            this.process = null;
+        });
+        await this.initialize();
+    }
+    flushLines() {
+        const lines = this.buffer.split("\n");
+        this.buffer = lines.pop() ?? "";
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            try {
+                const msg = JSON.parse(trimmed);
+                if ("id" in msg && msg.id !== undefined) {
+                    const pending = this.pending.get(msg.id);
+                    if (pending) {
+                        clearTimeout(pending.timer);
+                        this.pending.delete(msg.id);
+                        if (msg.error) {
+                            pending.reject(new Error(msg.error.message));
+                        }
+                        else {
+                            pending.resolve(msg);
+                        }
+                    }
+                }
+            }
+            catch {
+                // 忽略非 JSON 行
+            }
+        }
+    }
+    rejectAll(err) {
+        for (const [, { reject, timer }] of this.pending) {
+            clearTimeout(timer);
+            reject(err);
+        }
+        this.pending.clear();
+    }
+    async initialize() {
+        const initResult = await this.request({
+            jsonrpc: "2.0",
+            id: this.nextId++,
+            method: "initialize",
+            params: {
+                protocolVersion: MCP_PROTOCOL_VERSION,
+                capabilities: {},
+                clientInfo: { name: "openbot", version: "0.1.0" },
+            },
+        }, this.initTimeoutMs);
+        if (initResult.error) {
+            throw new Error(`MCP initialize failed: ${initResult.error.message}`);
+        }
+        this.sendNotification({ jsonrpc: "2.0", method: "notifications/initialized" });
+    }
+    sendNotification(msg) {
+        if (!this.process?.stdin?.writable)
+            return;
+        this.process.stdin.write(JSON.stringify(msg) + "\n", "utf-8");
+    }
+    /** 发送 JSON-RPC 请求并等待响应 */
+    request(req, timeoutMs) {
+        return new Promise((resolve, reject) => {
+            if (!this.process?.stdin?.writable) {
+                reject(new Error("MCP transport not connected"));
+                return;
+            }
+            const t = timeoutMs ?? this.requestTimeoutMs;
+            const timer = setTimeout(() => {
+                if (this.pending.delete(req.id)) {
+                    reject(new Error(`MCP request timeout (${t}ms)`));
+                }
+            }, t);
+            this.pending.set(req.id, { resolve, reject, timer });
+            this.process.stdin.write(JSON.stringify(req) + "\n", "utf-8");
+        });
+    }
+    /** 关闭子进程 */
+    async close() {
+        if (this.process) {
+            this.rejectAll(new Error("MCP transport closed"));
+            this.process.kill("SIGTERM");
+            this.process = null;
+        }
+    }
+    get isConnected() {
+        return this.process != null && this.process.stdin?.writable === true;
+    }
+}