@openeryc/pi-coding-agent 0.75.29 → 0.75.32

package/dist/core/hook-runner.d.ts

@@ -0,0 +1,23 @@
+import type { SettingsManager } from "./settings-manager.ts";
+export interface HookConfig {
+    matcher?: string;
+    command: string;
+    timeout?: number;
+}
+export interface PreToolResult {
+    behavior: "allow" | "deny";
+    updatedInput?: unknown;
+    message?: string;
+}
+export interface PostToolResult {
+    additionalContext?: string;
+}
+export declare class HookRunner {
+    private preToolHooks;
+    private postToolHooks;
+    private defaultTimeout;
+    constructor(settingsManager: SettingsManager);
+    runPreToolHooks(toolName: string, input: unknown): Promise<PreToolResult | null>;
+    runPostToolHooks(toolName: string, result: string): Promise<PostToolResult | null>;
+}
+//# sourceMappingURL=hook-runner.d.ts.map

package/dist/core/hook-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-runner.d.ts","sourceRoot":"","sources":["../../src/core/hook-runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,WAAW,UAAU;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC3B;AA6DD,qBAAa,UAAU;IACtB,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAoB;IACzC,OAAO,CAAC,cAAc,CAAS;IAE/B,YAAY,eAAe,EAAE,eAAe,EAO3C;IAEK,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA8BrF;IAEK,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAkBvF;CACD","sourcesContent":["import { spawn } from \"child_process\";\nimport type { SettingsManager } from \"./settings-manager.ts\";\n\nexport interface HookConfig {\n\tmatcher?: string;\n\tcommand: string;\n\ttimeout?: number;\n}\n\nexport interface PreToolResult {\n\tbehavior: \"allow\" | \"deny\";\n\tupdatedInput?: unknown;\n\tmessage?: string;\n}\n\nexport interface PostToolResult {\n\tadditionalContext?: string;\n}\n\nfunction matches(matcher: string | undefined, toolName: string): boolean {\n\tif (!matcher) return true;\n\tif (matcher === \"*\") return true;\n\tif (matcher === toolName) return true;\n\tif (matcher.startsWith(\"*\") && toolName.endsWith(matcher.slice(1))) return true;\n\tif (matcher.endsWith(\"*\") && toolName.startsWith(matcher.slice(0, -1))) return true;\n\ttry {\n\t\treturn new RegExp(matcher).test(toolName);\n\t} catch {\n\t\treturn false;\n\t}\n}\n\nasync function runHook(\n\tcommand: string,\n\tinput: string,\n\ttimeoutMs: number,\n): Promise<{ exitCode: number; stdout: string; stderr: string }> {\n\treturn new Promise((resolve) => {\n\t\tconst proc = spawn(\"sh\", [\"-c\", command], {\n\t\t\tstdio: [\"pipe\", \"pipe\", \"pipe\"],\n\t\t\tenv: process.env,\n\t\t});\n\n\t\tlet stdout = \"\";\n\t\tlet stderr = \"\";\n\n\t\tproc.stdout?.on(\"data\", (d: Buffer) => {\n\t\t\tstdout += d.toString();\n\t\t});\n\t\tproc.stderr?.on(\"data\", (d: Buffer) => {\n\t\t\tstderr += d.toString();\n\t\t});\n\n\t\tconst timer = setTimeout(() => {\n\t\t\tproc.kill();\n\t\t\tresolve({ exitCode: -1, stdout, stderr: `${stderr}\\nHook timed out after ${timeoutMs}ms` });\n\t\t}, timeoutMs);\n\n\t\tproc.on(\"close\", (code) => {\n\t\t\tclearTimeout(timer);\n\t\t\tresolve({ exitCode: code ?? -1, stdout, stderr });\n\t\t});\n\n\t\tproc.stdin?.write(input);\n\t\tproc.stdin?.end();\n\t});\n}\n\nfunction parseJsonResponse(output: string): unknown | undefined {\n\tconst trimmed = output.trim();\n\tif (!trimmed) return undefined;\n\ttry {\n\t\treturn JSON.parse(trimmed);\n\t} catch {\n\t\treturn undefined;\n\t}\n}\n\nexport class HookRunner {\n\tprivate preToolHooks: HookConfig[] = [];\n\tprivate postToolHooks: HookConfig[] = [];\n\tprivate defaultTimeout = 15000;\n\n\tconstructor(settingsManager: SettingsManager) {\n\t\tconst settings = settingsManager.getProjectSettings();\n\t\tconst hooks = (settings as Record<string, unknown>).hooks as\n\t\t\t| { PreToolUse?: HookConfig[]; PostToolUse?: HookConfig[] }\n\t\t\t| undefined;\n\t\tif (hooks?.PreToolUse) this.preToolHooks = hooks.PreToolUse;\n\t\tif (hooks?.PostToolUse) this.postToolHooks = hooks.PostToolUse;\n\t}\n\n\tasync runPreToolHooks(toolName: string, input: unknown): Promise<PreToolResult | null> {\n\t\tfor (const hook of this.preToolHooks) {\n\t\t\tif (!matches(hook.matcher, toolName)) continue;\n\n\t\t\tconst hookInput = JSON.stringify({ tool_name: toolName, input });\n\t\t\tconst result = await runHook(hook.command, hookInput, hook.timeout ?? this.defaultTimeout);\n\n\t\t\tif (result.exitCode === 2) {\n\t\t\t\treturn {\n\t\t\t\t\tbehavior: \"deny\",\n\t\t\t\t\tmessage: result.stderr || result.stdout || `Blocked by hook: ${hook.command}`,\n\t\t\t\t};\n\t\t\t}\n\n\t\t\tif (result.exitCode === 0) {\n\t\t\t\tconst response = parseJsonResponse(result.stdout);\n\t\t\t\tif (response && typeof response === \"object\" && !Array.isArray(response)) {\n\t\t\t\t\tconst r = response as Record<string, unknown>;\n\t\t\t\t\tif (r.continue === false || r.allow === false) {\n\t\t\t\t\t\treturn { behavior: \"deny\", message: r.message as string };\n\t\t\t\t\t}\n\t\t\t\t\tif (r.updatedInput !== undefined) {\n\t\t\t\t\t\treturn { behavior: \"allow\", updatedInput: r.updatedInput };\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// Exit code != 0,2: warn only, continue\n\t\t}\n\t\treturn null;\n\t}\n\n\tasync runPostToolHooks(toolName: string, result: string): Promise<PostToolResult | null> {\n\t\tfor (const hook of this.postToolHooks) {\n\t\t\tif (!matches(hook.matcher, toolName)) continue;\n\n\t\t\tconst hookInput = JSON.stringify({ tool_name: toolName, output: result });\n\t\t\tconst res = await runHook(hook.command, hookInput, hook.timeout ?? this.defaultTimeout);\n\n\t\t\tif (res.exitCode === 0) {\n\t\t\t\tconst response = parseJsonResponse(res.stdout);\n\t\t\t\tif (response && typeof response === \"object\" && !Array.isArray(response)) {\n\t\t\t\t\tconst r = response as Record<string, unknown>;\n\t\t\t\t\tif (r.additionalContext) {\n\t\t\t\t\t\treturn { additionalContext: String(r.additionalContext) };\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n}\n"]}

package/dist/core/hook-runner.js

@@ -0,0 +1,116 @@
+import { spawn } from "child_process";
+function matches(matcher, toolName) {
+    if (!matcher)
+        return true;
+    if (matcher === "*")
+        return true;
+    if (matcher === toolName)
+        return true;
+    if (matcher.startsWith("*") && toolName.endsWith(matcher.slice(1)))
+        return true;
+    if (matcher.endsWith("*") && toolName.startsWith(matcher.slice(0, -1)))
+        return true;
+    try {
+        return new RegExp(matcher).test(toolName);
+    }
+    catch {
+        return false;
+    }
+}
+async function runHook(command, input, timeoutMs) {
+    return new Promise((resolve) => {
+        const proc = spawn("sh", ["-c", command], {
+            stdio: ["pipe", "pipe", "pipe"],
+            env: process.env,
+        });
+        let stdout = "";
+        let stderr = "";
+        proc.stdout?.on("data", (d) => {
+            stdout += d.toString();
+        });
+        proc.stderr?.on("data", (d) => {
+            stderr += d.toString();
+        });
+        const timer = setTimeout(() => {
+            proc.kill();
+            resolve({ exitCode: -1, stdout, stderr: `${stderr}\nHook timed out after ${timeoutMs}ms` });
+        }, timeoutMs);
+        proc.on("close", (code) => {
+            clearTimeout(timer);
+            resolve({ exitCode: code ?? -1, stdout, stderr });
+        });
+        proc.stdin?.write(input);
+        proc.stdin?.end();
+    });
+}
+function parseJsonResponse(output) {
+    const trimmed = output.trim();
+    if (!trimmed)
+        return undefined;
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return undefined;
+    }
+}
+export class HookRunner {
+    preToolHooks = [];
+    postToolHooks = [];
+    defaultTimeout = 15000;
+    constructor(settingsManager) {
+        const settings = settingsManager.getProjectSettings();
+        const hooks = settings.hooks;
+        if (hooks?.PreToolUse)
+            this.preToolHooks = hooks.PreToolUse;
+        if (hooks?.PostToolUse)
+            this.postToolHooks = hooks.PostToolUse;
+    }
+    async runPreToolHooks(toolName, input) {
+        for (const hook of this.preToolHooks) {
+            if (!matches(hook.matcher, toolName))
+                continue;
+            const hookInput = JSON.stringify({ tool_name: toolName, input });
+            const result = await runHook(hook.command, hookInput, hook.timeout ?? this.defaultTimeout);
+            if (result.exitCode === 2) {
+                return {
+                    behavior: "deny",
+                    message: result.stderr || result.stdout || `Blocked by hook: ${hook.command}`,
+                };
+            }
+            if (result.exitCode === 0) {
+                const response = parseJsonResponse(result.stdout);
+                if (response && typeof response === "object" && !Array.isArray(response)) {
+                    const r = response;
+                    if (r.continue === false || r.allow === false) {
+                        return { behavior: "deny", message: r.message };
+                    }
+                    if (r.updatedInput !== undefined) {
+                        return { behavior: "allow", updatedInput: r.updatedInput };
+                    }
+                }
+            }
+            // Exit code != 0,2: warn only, continue
+        }
+        return null;
+    }
+    async runPostToolHooks(toolName, result) {
+        for (const hook of this.postToolHooks) {
+            if (!matches(hook.matcher, toolName))
+                continue;
+            const hookInput = JSON.stringify({ tool_name: toolName, output: result });
+            const res = await runHook(hook.command, hookInput, hook.timeout ?? this.defaultTimeout);
+            if (res.exitCode === 0) {
+                const response = parseJsonResponse(res.stdout);
+                if (response && typeof response === "object" && !Array.isArray(response)) {
+                    const r = response;
+                    if (r.additionalContext) {
+                        return { additionalContext: String(r.additionalContext) };
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}
+//# sourceMappingURL=hook-runner.js.map

package/dist/core/hook-runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-runner.js","sourceRoot":"","sources":["../../src/core/hook-runner.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn } from \"child_process\";\nimport type { SettingsManager } from \"./settings-manager.ts\";\n\nexport interface HookConfig {\n\tmatcher?: string;\n\tcommand: string;\n\ttimeout?: number;\n}\n\nexport interface PreToolResult {\n\tbehavior: \"allow\" | \"deny\";\n\tupdatedInput?: unknown;\n\tmessage?: string;\n}\n\nexport interface PostToolResult {\n\tadditionalContext?: string;\n}\n\nfunction matches(matcher: string | undefined, toolName: string): boolean {\n\tif (!matcher) return true;\n\tif (matcher === \"*\") return true;\n\tif (matcher === toolName) return true;\n\tif (matcher.startsWith(\"*\") && toolName.endsWith(matcher.slice(1))) return true;\n\tif (matcher.endsWith(\"*\") && toolName.startsWith(matcher.slice(0, -1))) return true;\n\ttry {\n\t\treturn new RegExp(matcher).test(toolName);\n\t} catch {\n\t\treturn false;\n\t}\n}\n\nasync function runHook(\n\tcommand: string,\n\tinput: string,\n\ttimeoutMs: number,\n): Promise<{ exitCode: number; stdout: string; stderr: string }> {\n\treturn new Promise((resolve) => {\n\t\tconst proc = spawn(\"sh\", [\"-c\", command], {\n\t\t\tstdio: [\"pipe\", \"pipe\", \"pipe\"],\n\t\t\tenv: process.env,\n\t\t});\n\n\t\tlet stdout = \"\";\n\t\tlet stderr = \"\";\n\n\t\tproc.stdout?.on(\"data\", (d: Buffer) => {\n\t\t\tstdout += d.toString();\n\t\t});\n\t\tproc.stderr?.on(\"data\", (d: Buffer) => {\n\t\t\tstderr += d.toString();\n\t\t});\n\n\t\tconst timer = setTimeout(() => {\n\t\t\tproc.kill();\n\t\t\tresolve({ exitCode: -1, stdout, stderr: `${stderr}\\nHook timed out after ${timeoutMs}ms` });\n\t\t}, timeoutMs);\n\n\t\tproc.on(\"close\", (code) => {\n\t\t\tclearTimeout(timer);\n\t\t\tresolve({ exitCode: code ?? -1, stdout, stderr });\n\t\t});\n\n\t\tproc.stdin?.write(input);\n\t\tproc.stdin?.end();\n\t});\n}\n\nfunction parseJsonResponse(output: string): unknown | undefined {\n\tconst trimmed = output.trim();\n\tif (!trimmed) return undefined;\n\ttry {\n\t\treturn JSON.parse(trimmed);\n\t} catch {\n\t\treturn undefined;\n\t}\n}\n\nexport class HookRunner {\n\tprivate preToolHooks: HookConfig[] = [];\n\tprivate postToolHooks: HookConfig[] = [];\n\tprivate defaultTimeout = 15000;\n\n\tconstructor(settingsManager: SettingsManager) {\n\t\tconst settings = settingsManager.getProjectSettings();\n\t\tconst hooks = (settings as Record<string, unknown>).hooks as\n\t\t\t| { PreToolUse?: HookConfig[]; PostToolUse?: HookConfig[] }\n\t\t\t| undefined;\n\t\tif (hooks?.PreToolUse) this.preToolHooks = hooks.PreToolUse;\n\t\tif (hooks?.PostToolUse) this.postToolHooks = hooks.PostToolUse;\n\t}\n\n\tasync runPreToolHooks(toolName: string, input: unknown): Promise<PreToolResult | null> {\n\t\tfor (const hook of this.preToolHooks) {\n\t\t\tif (!matches(hook.matcher, toolName)) continue;\n\n\t\t\tconst hookInput = JSON.stringify({ tool_name: toolName, input });\n\t\t\tconst result = await runHook(hook.command, hookInput, hook.timeout ?? this.defaultTimeout);\n\n\t\t\tif (result.exitCode === 2) {\n\t\t\t\treturn {\n\t\t\t\t\tbehavior: \"deny\",\n\t\t\t\t\tmessage: result.stderr || result.stdout || `Blocked by hook: ${hook.command}`,\n\t\t\t\t};\n\t\t\t}\n\n\t\t\tif (result.exitCode === 0) {\n\t\t\t\tconst response = parseJsonResponse(result.stdout);\n\t\t\t\tif (response && typeof response === \"object\" && !Array.isArray(response)) {\n\t\t\t\t\tconst r = response as Record<string, unknown>;\n\t\t\t\t\tif (r.continue === false || r.allow === false) {\n\t\t\t\t\t\treturn { behavior: \"deny\", message: r.message as string };\n\t\t\t\t\t}\n\t\t\t\t\tif (r.updatedInput !== undefined) {\n\t\t\t\t\t\treturn { behavior: \"allow\", updatedInput: r.updatedInput };\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// Exit code != 0,2: warn only, continue\n\t\t}\n\t\treturn null;\n\t}\n\n\tasync runPostToolHooks(toolName: string, result: string): Promise<PostToolResult | null> {\n\t\tfor (const hook of this.postToolHooks) {\n\t\t\tif (!matches(hook.matcher, toolName)) continue;\n\n\t\t\tconst hookInput = JSON.stringify({ tool_name: toolName, output: result });\n\t\t\tconst res = await runHook(hook.command, hookInput, hook.timeout ?? this.defaultTimeout);\n\n\t\t\tif (res.exitCode === 0) {\n\t\t\t\tconst response = parseJsonResponse(res.stdout);\n\t\t\t\tif (response && typeof response === \"object\" && !Array.isArray(response)) {\n\t\t\t\t\tconst r = response as Record<string, unknown>;\n\t\t\t\t\tif (r.additionalContext) {\n\t\t\t\t\t\treturn { additionalContext: String(r.additionalContext) };\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n}\n"]}

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

@@ -1,18 +1,28 @@
-import type { MCPCallToolResult, MCPListToolsResult, MCPServerConfig } from "./types.ts";
+import type { MCPCallToolResult, MCPResource, MCPServerConfig, MCPToolDefinition } from "./types.ts";
+export type { MCPServerConfig };
 export declare class MCPClient {
     private process;
     private requestId;
-    private pendingRequests;
-    private lineReader;
-    private config;
-    private errorLogs;
-    get errors(): readonly string[];
-    constructor(config: MCPServerConfig);
-    connect(): Promise<void>;
-    private sendRequest;
-    private handleLine;
-    private initialize;
-    listTools(): Promise<MCPListToolsResult>;
+    private pending;
+    private sseEndpoint;
+    connect(config: MCPServerConfig): Promise<void>;
+    private connectStdio;
+    private connectHttp;
+    private readSSEEvent;
+    private send;
+    listTools(): Promise<{
+        tools: MCPToolDefinition[];
+    }>;
+    listResources(): Promise<{
+        resources: MCPResource[];
+    }>;
+    readResource(uri: string): Promise<{
+        contents: Array<{
+            uri: string;
+            mimeType?: string;
+            text?: string;
+        }>;
+    }>;
     callTool(name: string, args: Record<string, unknown>): Promise<MCPCallToolResult>;
     disconnect(): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,iBAAiB,EAIjB,kBAAkB,EAClB,eAAe,EACf,MAAM,YAAY,CAAC;AAMpB,qBAAa,SAAS;IACrB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAA4F;IACnH,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAgB;IAEjC,IAAI,MAAM,IAAI,SAAS,MAAM,EAAE,CAE9B;IAED,YAAY,MAAM,EAAE,eAAe,EAElC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAkD7B;YAEa,WAAW;IAoBzB,OAAO,CAAC,UAAU;YAmBJ,UAAU;IAQlB,SAAS,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAE7C;IAEK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAKtF;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BhC;CACD","sourcesContent":["import { type ChildProcess, spawn } from \"child_process\";\nimport { createInterface, type Interface } from \"readline\";\nimport type {\n\tMCPCallToolResult,\n\tMCPInitializeResult,\n\tMCPJsonRpcRequest,\n\tMCPJsonRpcResponse,\n\tMCPListToolsResult,\n\tMCPServerConfig,\n} from \"./types.ts\";\n\nconst INITIALIZE_REQUEST = \"initialize\";\nconst TOOLS_LIST_REQUEST = \"tools/list\";\nconst TOOLS_CALL_REQUEST = \"tools/call\";\n\nexport class MCPClient {\n\tprivate process: ChildProcess | null = null;\n\tprivate requestId = 0;\n\tprivate pendingRequests = new Map<number, { resolve: (value: unknown) => void; reject: (error: Error) => void }>();\n\tprivate lineReader: Interface | null = null;\n\tprivate config: MCPServerConfig;\n\tprivate errorLogs: string[] = [];\n\n\tget errors(): readonly string[] {\n\t\treturn this.errorLogs;\n\t}\n\n\tconstructor(config: MCPServerConfig) {\n\t\tthis.config = config;\n\t}\n\n\tasync connect(): Promise<void> {\n\t\tconst { command, args = [], env } = this.config;\n\t\tconst childEnv = env ? { ...process.env, ...env } : process.env;\n\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tthis.process = spawn(command, args, {\n\t\t\t\tenv: childEnv,\n\t\t\t\tstdio: [\"pipe\", \"pipe\", \"pipe\"],\n\t\t\t\tshell: false,\n\t\t\t});\n\n\t\t\tconst onError = (error: Error) => {\n\t\t\t\treject(new Error(`Failed to spawn MCP server \"${command}\": ${error.message}`));\n\t\t\t};\n\n\t\t\tthis.process.on(\"error\", onError);\n\t\t\tthis.process.once(\"spawn\", () => {\n\t\t\t\tthis.process!.removeListener(\"error\", onError);\n\t\t\t});\n\n\t\t\tif (!this.process.stdout) {\n\t\t\t\treject(new Error(`MCP server \"${command}\" has no stdout`));\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tthis.lineReader = createInterface({ input: this.process.stdout, crlfDelay: Infinity });\n\n\t\t\tthis.lineReader.on(\"line\", (line: string) => {\n\t\t\t\tthis.handleLine(line);\n\t\t\t});\n\n\t\t\tif (this.process.stderr) {\n\t\t\t\tthis.process.stderr.setEncoding(\"utf-8\");\n\t\t\t\tthis.process.stderr.on(\"data\", (data: string) => {\n\t\t\t\t\tthis.errorLogs.push(data);\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tthis.process.on(\"exit\", (code) => {\n\t\t\t\tconst pendingCopy = new Map(this.pendingRequests);\n\t\t\t\tthis.pendingRequests.clear();\n\t\t\t\tfor (const [, handler] of pendingCopy) {\n\t\t\t\t\thandler.reject(new Error(`MCP server \"${command}\" exited with code ${code}`));\n\t\t\t\t}\n\t\t\t});\n\n\t\t\tthis.initialize()\n\t\t\t\t.then(() => resolve())\n\t\t\t\t.catch(reject);\n\t\t});\n\t}\n\n\tprivate async sendRequest(method: string, params?: Record<string, unknown>): Promise<unknown> {\n\t\tif (!this.process || !this.process.stdin) {\n\t\t\tthrow new Error(`MCP client not connected`);\n\t\t}\n\n\t\tconst id = ++this.requestId;\n\t\tconst request: MCPJsonRpcRequest = {\n\t\t\tjsonrpc: \"2.0\",\n\t\t\tid,\n\t\t\tmethod,\n\t\t\tparams,\n\t\t};\n\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tthis.pendingRequests.set(id, { resolve, reject });\n\t\t\tconst payload = JSON.stringify(request);\n\t\t\tthis.process!.stdin!.write(`${payload}\\n`);\n\t\t});\n\t}\n\n\tprivate handleLine(line: string): void {\n\t\ttry {\n\t\t\tconst response = JSON.parse(line) as MCPJsonRpcResponse;\n\t\t\tif (response.id !== undefined) {\n\t\t\t\tconst request = this.pendingRequests.get(response.id);\n\t\t\t\tif (request) {\n\t\t\t\t\tthis.pendingRequests.delete(response.id);\n\t\t\t\t\tif (response.error) {\n\t\t\t\t\t\trequest.reject(new Error(`MCP error: ${response.error.message} (code ${response.error.code})`));\n\t\t\t\t\t} else {\n\t\t\t\t\t\trequest.resolve(response.result);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch {\n\t\t\t// Ignore non-JSON lines (stderr or informational messages)\n\t\t}\n\t}\n\n\tprivate async initialize(): Promise<MCPInitializeResult> {\n\t\treturn (await this.sendRequest(INITIALIZE_REQUEST, {\n\t\t\tprotocolVersion: \"2024-11-05\",\n\t\t\tcapabilities: {},\n\t\t\tclientInfo: { name: \"pi\", version: \"1.0.0\" },\n\t\t})) as MCPInitializeResult;\n\t}\n\n\tasync listTools(): Promise<MCPListToolsResult> {\n\t\treturn (await this.sendRequest(TOOLS_LIST_REQUEST)) as MCPListToolsResult;\n\t}\n\n\tasync callTool(name: string, args: Record<string, unknown>): Promise<MCPCallToolResult> {\n\t\treturn (await this.sendRequest(TOOLS_CALL_REQUEST, {\n\t\t\tname,\n\t\t\targuments: args,\n\t\t} as unknown as Record<string, unknown>)) as MCPCallToolResult;\n\t}\n\n\tasync disconnect(): Promise<void> {\n\t\tif (this.lineReader) {\n\t\t\tthis.lineReader.close();\n\t\t\tthis.lineReader = null;\n\t\t}\n\t\tif (this.process) {\n\t\t\tconst proc = this.process;\n\t\t\tthis.process = null;\n\t\t\tthis.pendingRequests.clear();\n\t\t\tif (!proc.killed) {\n\t\t\t\tproc.kill();\n\t\t\t\tawait new Promise<void>((resolve) => {\n\t\t\t\t\tconst onExit = () => {\n\t\t\t\t\t\tresolve();\n\t\t\t\t\t};\n\t\t\t\t\tproc.on(\"exit\", onExit);\n\t\t\t\t\tif (proc.exitCode !== null) {\n\t\t\t\t\t\tproc.removeListener(\"exit\", onExit);\n\t\t\t\t\t\tresolve();\n\t\t\t\t\t}\n\t\t\t\t\tsetTimeout(() => {\n\t\t\t\t\t\tproc.removeListener(\"exit\", onExit);\n\t\t\t\t\t\tresolve();\n\t\t\t\t\t}, 3000);\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAErG,YAAY,EAAE,eAAe,EAAE,CAAC;AAWhC,qBAAa,SAAS;IACrB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,WAAW,CAAuB;IAEpC,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAYpD;YAEa,YAAY;YAkDZ,WAAW;YAmEX,YAAY;YA4BZ,IAAI;IA+CZ,SAAS,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,iBAAiB,EAAE,CAAA;KAAE,CAAC,CAEzD;IAEK,aAAa,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CAE3D;IAEK,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAI/G;IAEK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAEtF;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAahC;CACD","sourcesContent":["import { type ChildProcess, spawn } from \"child_process\";\nimport { createInterface } from \"readline\";\nimport type { MCPCallToolResult, MCPResource, MCPServerConfig, MCPToolDefinition } from \"./types.ts\";\n\nexport type { MCPServerConfig };\n\ntype PendingRequest = { resolve: (v: unknown) => void; reject: (e: Error) => void };\n\nfunction resolveTransport(config: MCPServerConfig): \"stdio\" | \"sse\" | \"http\" {\n\tif (config.transport) return config.transport;\n\tif (config.command) return \"stdio\";\n\tif (config.url) return \"sse\";\n\treturn \"stdio\";\n}\n\nexport class MCPClient {\n\tprivate process: ChildProcess | null = null;\n\tprivate requestId = 0;\n\tprivate pending = new Map<number, PendingRequest>();\n\tprivate sseEndpoint: string | null = null;\n\n\tasync connect(config: MCPServerConfig): Promise<void> {\n\t\tconst transport = resolveTransport(config);\n\t\tif (transport === \"stdio\") {\n\t\t\tawait this.connectStdio(config);\n\t\t} else {\n\t\t\tawait this.connectHttp(config, transport);\n\t\t}\n\t\tawait this.send(\"initialize\", {\n\t\t\tprotocolVersion: \"2024-11-05\",\n\t\t\tcapabilities: {},\n\t\t\tclientInfo: { name: \"pi\", version: \"1.0.0\" },\n\t\t});\n\t}\n\n\tprivate async connectStdio(config: MCPServerConfig): Promise<void> {\n\t\tconst { command, args = [], env } = config;\n\t\tif (!command) throw new Error(\"MCP stdio server requires 'command'\");\n\n\t\tconst childEnv = env ? { ...process.env, ...env } : process.env;\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tconst proc = spawn(command, args, { env: childEnv, stdio: [\"pipe\", \"pipe\", \"pipe\"], shell: false });\n\t\t\tthis.process = proc;\n\n\t\t\tconst onError = (error: Error) => {\n\t\t\t\treject(new Error(`Failed to spawn MCP server \"${command}\": ${error.message}`));\n\t\t\t};\n\t\t\tproc.on(\"error\", onError);\n\t\t\tproc.once(\"spawn\", () => proc.removeListener(\"error\", onError));\n\n\t\t\tif (!proc.stdout) {\n\t\t\t\treject(new Error(`MCP server \"${command}\" has no stdout`));\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst rl = createInterface({ input: proc.stdout, crlfDelay: Infinity });\n\t\t\trl.on(\"line\", (line: string) => {\n\t\t\t\ttry {\n\t\t\t\t\tconst res = JSON.parse(line);\n\t\t\t\t\tif (res.id !== undefined) {\n\t\t\t\t\t\tconst handler = this.pending.get(res.id);\n\t\t\t\t\t\tif (!handler) return;\n\t\t\t\t\t\tthis.pending.delete(res.id);\n\t\t\t\t\t\tif (res.error) {\n\t\t\t\t\t\t\thandler.reject(new Error(`MCP error: ${res.error.message}`));\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\thandler.resolve(res.result);\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t} catch {\n\t\t\t\t\t/* non-JSON lines */\n\t\t\t\t}\n\t\t\t});\n\n\t\t\tproc.on(\"exit\", (code) => {\n\t\t\t\tfor (const [, h] of this.pending) {\n\t\t\t\t\th.reject(new Error(`MCP server \"${command}\" exited with code ${code}`));\n\t\t\t\t}\n\t\t\t\tthis.pending.clear();\n\t\t\t});\n\n\t\t\tresolve();\n\t\t});\n\t}\n\n\tprivate async connectHttp(config: MCPServerConfig, transport: \"sse\" | \"http\"): Promise<void> {\n\t\tconst { url, headers = {} } = config;\n\t\tif (!url) throw new Error(\"MCP SSE/HTTP server requires 'url'\");\n\n\t\tif (transport === \"sse\") {\n\t\t\tconst res = await fetch(`${url}/sse`, { headers: { ...headers, Accept: \"text/event-stream\" } });\n\t\t\tif (!res.ok) throw new Error(`SSE connection failed: ${res.status} ${res.statusText}`);\n\n\t\t\tconst reader = res.body!.getReader();\n\t\t\tconst decoder = new TextDecoder();\n\t\t\tlet buffer = \"\";\n\n\t\t\tconst processChunk = async () => {\n\t\t\t\twhile (true) {\n\t\t\t\t\tconst { done, value } = await reader.read();\n\t\t\t\t\tif (done) break;\n\t\t\t\t\tbuffer += decoder.decode(value, { stream: true });\n\n\t\t\t\t\tconst lines = buffer.split(\"\\n\");\n\t\t\t\t\tbuffer = lines.pop() ?? \"\";\n\n\t\t\t\t\tfor (const line of lines) {\n\t\t\t\t\t\tif (line.startsWith(\"data: \")) {\n\t\t\t\t\t\t\tconst data = line.slice(6);\n\t\t\t\t\t\t\tif (data.startsWith(\"{\") && this.sseEndpoint === null) {\n\t\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\t\tconst parsed = JSON.parse(data);\n\t\t\t\t\t\t\t\t\tif (parsed.result) {\n\t\t\t\t\t\t\t\t\t\tconst handler = this.pending.get(parsed.id);\n\t\t\t\t\t\t\t\t\t\tif (handler) {\n\t\t\t\t\t\t\t\t\t\t\tthis.pending.delete(parsed.id);\n\t\t\t\t\t\t\t\t\t\t\tif (parsed.error) {\n\t\t\t\t\t\t\t\t\t\t\t\thandler.reject(new Error(`MCP error: ${parsed.error.message}`));\n\t\t\t\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\t\t\t\thandler.resolve(parsed.result);\n\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t} catch {\n\t\t\t\t\t\t\t\t\t/* skip */\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t} else if (data.startsWith(\"http\")) {\n\t\t\t\t\t\t\t\t// This is the endpoint URL\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t} else if (line.startsWith(\"event: endpoint\")) {\n\t\t\t\t\t\t\t// Next data line will be the endpoint URL\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t};\n\n\t\t\t// Wait for endpoint event\n\t\t\tconst endpointLine = await this.readSSEEvent(reader, decoder);\n\t\t\tif (endpointLine) {\n\t\t\t\tthis.sseEndpoint = endpointLine.startsWith(\"/\") ? new URL(endpointLine, url).href : endpointLine;\n\t\t\t} else {\n\t\t\t\tthis.sseEndpoint = url;\n\t\t\t}\n\n\t\t\t// Start background reader\n\t\t\tprocessChunk().catch(() => {});\n\t\t} else {\n\t\t\t// Streamable HTTP - POST to URL directly, server responds with JSON or upgrades to SSE\n\t\t\tthis.sseEndpoint = url;\n\t\t}\n\t}\n\n\tprivate async readSSEEvent(\n\t\treader: ReadableStreamDefaultReader<Uint8Array>,\n\t\tdecoder: { decode(b?: Uint8Array, o?: { stream?: boolean }): string },\n\t): Promise<string | null> {\n\t\tlet buffer = \"\";\n\t\tconst deadline = Date.now() + 10000;\n\n\t\twhile (Date.now() < deadline) {\n\t\t\tconst { value, done } = await reader.read();\n\t\t\tif (done) break;\n\t\t\tbuffer += decoder.decode(value, { stream: true });\n\n\t\t\tconst lines = buffer.split(\"\\n\");\n\t\t\tbuffer = lines.pop() ?? \"\";\n\n\t\t\tfor (let i = 0; i < lines.length; i++) {\n\t\t\t\tconst line = lines[i];\n\t\t\t\tif (line.startsWith(\"data: \") && lines[i - 1]?.startsWith(\"event: endpoint\")) {\n\t\t\t\t\treturn line.slice(6).trim();\n\t\t\t\t}\n\t\t\t\tif (line.startsWith(\"event: endpoint\") && lines[i + 1]?.startsWith(\"data: \")) {\n\t\t\t\t\treturn lines[i + 1].slice(6).trim();\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n\n\tprivate async send(method: string, params?: Record<string, unknown>): Promise<unknown> {\n\t\tconst id = ++this.requestId;\n\t\tconst body = JSON.stringify({ jsonrpc: \"2.0\", id, method, params });\n\n\t\tif (this.process?.stdin) {\n\t\t\treturn new Promise((resolve, reject) => {\n\t\t\t\tthis.pending.set(id, { resolve, reject });\n\t\t\t\tthis.process!.stdin!.write(`${body}\\n`);\n\t\t\t});\n\t\t}\n\n\t\tif (this.sseEndpoint) {\n\t\t\treturn new Promise((resolve, reject) => {\n\t\t\t\tthis.pending.set(id, { resolve, reject });\n\t\t\t\tfetch(this.sseEndpoint!, {\n\t\t\t\t\tmethod: \"POST\",\n\t\t\t\t\theaders: { \"Content-Type\": \"application/json\" },\n\t\t\t\t\tbody,\n\t\t\t\t})\n\t\t\t\t\t.then(async (res) => {\n\t\t\t\t\t\tconst text = await res.text();\n\t\t\t\t\t\tif (res.headers.get(\"content-type\")?.includes(\"text/event-stream\")) {\n\t\t\t\t\t\t\t// SSE upgrade - response comes via event stream\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t}\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tconst parsed = JSON.parse(text);\n\t\t\t\t\t\t\tconst handler = this.pending.get(id);\n\t\t\t\t\t\t\tif (handler) {\n\t\t\t\t\t\t\t\tthis.pending.delete(id);\n\t\t\t\t\t\t\t\tif (parsed.error) {\n\t\t\t\t\t\t\t\t\thandler.reject(new Error(`MCP error: ${parsed.error.message}`));\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\thandler.resolve(parsed.result);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t} catch {\n\t\t\t\t\t\t\treject(new Error(`Invalid JSON response from MCP server`));\n\t\t\t\t\t\t}\n\t\t\t\t\t})\n\t\t\t\t\t.catch(reject);\n\t\t\t});\n\t\t}\n\n\t\tthrow new Error(\"MCP client not connected\");\n\t}\n\n\tasync listTools(): Promise<{ tools: MCPToolDefinition[] }> {\n\t\treturn (await this.send(\"tools/list\")) as { tools: MCPToolDefinition[] };\n\t}\n\n\tasync listResources(): Promise<{ resources: MCPResource[] }> {\n\t\treturn (await this.send(\"resources/list\")) as { resources: MCPResource[] };\n\t}\n\n\tasync readResource(uri: string): Promise<{ contents: Array<{ uri: string; mimeType?: string; text?: string }> }> {\n\t\treturn (await this.send(\"resources/read\", { uri })) as {\n\t\t\tcontents: Array<{ uri: string; mimeType?: string; text?: string }>;\n\t\t};\n\t}\n\n\tasync callTool(name: string, args: Record<string, unknown>): Promise<MCPCallToolResult> {\n\t\treturn (await this.send(\"tools/call\", { name, arguments: args })) as MCPCallToolResult;\n\t}\n\n\tasync disconnect(): Promise<void> {\n\t\tconst proc = this.process;\n\t\tthis.process = null;\n\t\tthis.pending.clear();\n\t\tthis.sseEndpoint = null;\n\t\tif (proc && !proc.killed) {\n\t\t\tproc.kill();\n\t\t\tawait new Promise<void>((resolve) => {\n\t\t\t\tif (proc.exitCode !== null) return resolve();\n\t\t\t\tproc.on(\"exit\", resolve);\n\t\t\t\tsetTimeout(resolve, 3000);\n\t\t\t});\n\t\t}\n\t}\n}\n"]}

package/dist/core/mcp/client.js

@@ -1,142 +1,240 @@
 import { spawn } from "child_process";
 import { createInterface } from "readline";
-const INITIALIZE_REQUEST = "initialize";
-const TOOLS_LIST_REQUEST = "tools/list";
-const TOOLS_CALL_REQUEST = "tools/call";
+function resolveTransport(config) {
+    if (config.transport)
+        return config.transport;
+    if (config.command)
+        return "stdio";
+    if (config.url)
+        return "sse";
+    return "stdio";
+}
 export class MCPClient {
     process = null;
     requestId = 0;
-    pendingRequests = new Map();
-    lineReader = null;
-    config;
-    errorLogs = [];
-    get errors() {
-        return this.errorLogs;
-    }
-    constructor(config) {
-        this.config = config;
+    pending = new Map();
+    sseEndpoint = null;
+    async connect(config) {
+        const transport = resolveTransport(config);
+        if (transport === "stdio") {
+            await this.connectStdio(config);
+        }
+        else {
+            await this.connectHttp(config, transport);
+        }
+        await this.send("initialize", {
+            protocolVersion: "2024-11-05",
+            capabilities: {},
+            clientInfo: { name: "pi", version: "1.0.0" },
+        });
     }
-    async connect() {
-        const { command, args = [], env } = this.config;
+    async connectStdio(config) {
+        const { command, args = [], env } = config;
+        if (!command)
+            throw new Error("MCP stdio server requires 'command'");
         const childEnv = env ? { ...process.env, ...env } : process.env;
         return new Promise((resolve, reject) => {
-            this.process = spawn(command, args, {
-                env: childEnv,
-                stdio: ["pipe", "pipe", "pipe"],
-                shell: false,
-            });
+            const proc = spawn(command, args, { env: childEnv, stdio: ["pipe", "pipe", "pipe"], shell: false });
+            this.process = proc;
             const onError = (error) => {
                 reject(new Error(`Failed to spawn MCP server "${command}": ${error.message}`));
             };
-            this.process.on("error", onError);
-            this.process.once("spawn", () => {
-                this.process.removeListener("error", onError);
-            });
-            if (!this.process.stdout) {
+            proc.on("error", onError);
+            proc.once("spawn", () => proc.removeListener("error", onError));
+            if (!proc.stdout) {
                 reject(new Error(`MCP server "${command}" has no stdout`));
                 return;
             }
-            this.lineReader = createInterface({ input: this.process.stdout, crlfDelay: Infinity });
-            this.lineReader.on("line", (line) => {
-                this.handleLine(line);
+            const rl = createInterface({ input: proc.stdout, crlfDelay: Infinity });
+            rl.on("line", (line) => {
+                try {
+                    const res = JSON.parse(line);
+                    if (res.id !== undefined) {
+                        const handler = this.pending.get(res.id);
+                        if (!handler)
+                            return;
+                        this.pending.delete(res.id);
+                        if (res.error) {
+                            handler.reject(new Error(`MCP error: ${res.error.message}`));
+                        }
+                        else {
+                            handler.resolve(res.result);
+                        }
+                    }
+                }
+                catch {
+                    /* non-JSON lines */
+                }
             });
-            if (this.process.stderr) {
-                this.process.stderr.setEncoding("utf-8");
-                this.process.stderr.on("data", (data) => {
-                    this.errorLogs.push(data);
-                });
-            }
-            this.process.on("exit", (code) => {
-                const pendingCopy = new Map(this.pendingRequests);
-                this.pendingRequests.clear();
-                for (const [, handler] of pendingCopy) {
-                    handler.reject(new Error(`MCP server "${command}" exited with code ${code}`));
+            proc.on("exit", (code) => {
+                for (const [, h] of this.pending) {
+                    h.reject(new Error(`MCP server "${command}" exited with code ${code}`));
                 }
+                this.pending.clear();
             });
-            this.initialize()
-                .then(() => resolve())
-                .catch(reject);
+            resolve();
         });
     }
-    async sendRequest(method, params) {
-        if (!this.process || !this.process.stdin) {
-            throw new Error(`MCP client not connected`);
-        }
-        const id = ++this.requestId;
-        const request = {
-            jsonrpc: "2.0",
-            id,
-            method,
-            params,
-        };
-        return new Promise((resolve, reject) => {
-            this.pendingRequests.set(id, { resolve, reject });
-            const payload = JSON.stringify(request);
-            this.process.stdin.write(`${payload}\n`);
-        });
-    }
-    handleLine(line) {
-        try {
-            const response = JSON.parse(line);
-            if (response.id !== undefined) {
-                const request = this.pendingRequests.get(response.id);
-                if (request) {
-                    this.pendingRequests.delete(response.id);
-                    if (response.error) {
-                        request.reject(new Error(`MCP error: ${response.error.message} (code ${response.error.code})`));
-                    }
-                    else {
-                        request.resolve(response.result);
+    async connectHttp(config, transport) {
+        const { url, headers = {} } = config;
+        if (!url)
+            throw new Error("MCP SSE/HTTP server requires 'url'");
+        if (transport === "sse") {
+            const res = await fetch(`${url}/sse`, { headers: { ...headers, Accept: "text/event-stream" } });
+            if (!res.ok)
+                throw new Error(`SSE connection failed: ${res.status} ${res.statusText}`);
+            const reader = res.body.getReader();
+            const decoder = new TextDecoder();
+            let buffer = "";
+            const processChunk = async () => {
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done)
+                        break;
+                    buffer += decoder.decode(value, { stream: true });
+                    const lines = buffer.split("\n");
+                    buffer = lines.pop() ?? "";
+                    for (const line of lines) {
+                        if (line.startsWith("data: ")) {
+                            const data = line.slice(6);
+                            if (data.startsWith("{") && this.sseEndpoint === null) {
+                                try {
+                                    const parsed = JSON.parse(data);
+                                    if (parsed.result) {
+                                        const handler = this.pending.get(parsed.id);
+                                        if (handler) {
+                                            this.pending.delete(parsed.id);
+                                            if (parsed.error) {
+                                                handler.reject(new Error(`MCP error: ${parsed.error.message}`));
+                                            }
+                                            else {
+                                                handler.resolve(parsed.result);
+                                            }
+                                        }
+                                    }
+                                }
+                                catch {
+                                    /* skip */
+                                }
+                            }
+                            else if (data.startsWith("http")) {
+                                // This is the endpoint URL
+                            }
+                        }
+                        else if (line.startsWith("event: endpoint")) {
+                            // Next data line will be the endpoint URL
+                        }
                     }
                 }
+            };
+            // Wait for endpoint event
+            const endpointLine = await this.readSSEEvent(reader, decoder);
+            if (endpointLine) {
+                this.sseEndpoint = endpointLine.startsWith("/") ? new URL(endpointLine, url).href : endpointLine;
+            }
+            else {
+                this.sseEndpoint = url;
             }
+            // Start background reader
+            processChunk().catch(() => { });
         }
-        catch {
-            // Ignore non-JSON lines (stderr or informational messages)
+        else {
+            // Streamable HTTP - POST to URL directly, server responds with JSON or upgrades to SSE
+            this.sseEndpoint = url;
         }
     }
-    async initialize() {
-        return (await this.sendRequest(INITIALIZE_REQUEST, {
-            protocolVersion: "2024-11-05",
-            capabilities: {},
-            clientInfo: { name: "pi", version: "1.0.0" },
-        }));
+    async readSSEEvent(reader, decoder) {
+        let buffer = "";
+        const deadline = Date.now() + 10000;
+        while (Date.now() < deadline) {
+            const { value, done } = await reader.read();
+            if (done)
+                break;
+            buffer += decoder.decode(value, { stream: true });
+            const lines = buffer.split("\n");
+            buffer = lines.pop() ?? "";
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
+                if (line.startsWith("data: ") && lines[i - 1]?.startsWith("event: endpoint")) {
+                    return line.slice(6).trim();
+                }
+                if (line.startsWith("event: endpoint") && lines[i + 1]?.startsWith("data: ")) {
+                    return lines[i + 1].slice(6).trim();
+                }
+            }
+        }
+        return null;
+    }
+    async send(method, params) {
+        const id = ++this.requestId;
+        const body = JSON.stringify({ jsonrpc: "2.0", id, method, params });
+        if (this.process?.stdin) {
+            return new Promise((resolve, reject) => {
+                this.pending.set(id, { resolve, reject });
+                this.process.stdin.write(`${body}\n`);
+            });
+        }
+        if (this.sseEndpoint) {
+            return new Promise((resolve, reject) => {
+                this.pending.set(id, { resolve, reject });
+                fetch(this.sseEndpoint, {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json" },
+                    body,
+                })
+                    .then(async (res) => {
+                    const text = await res.text();
+                    if (res.headers.get("content-type")?.includes("text/event-stream")) {
+                        // SSE upgrade - response comes via event stream
+                        return;
+                    }
+                    try {
+                        const parsed = JSON.parse(text);
+                        const handler = this.pending.get(id);
+                        if (handler) {
+                            this.pending.delete(id);
+                            if (parsed.error) {
+                                handler.reject(new Error(`MCP error: ${parsed.error.message}`));
+                            }
+                            else {
+                                handler.resolve(parsed.result);
+                            }
+                        }
+                    }
+                    catch {
+                        reject(new Error(`Invalid JSON response from MCP server`));
+                    }
+                })
+                    .catch(reject);
+            });
+        }
+        throw new Error("MCP client not connected");
     }
     async listTools() {
-        return (await this.sendRequest(TOOLS_LIST_REQUEST));
+        return (await this.send("tools/list"));
+    }
+    async listResources() {
+        return (await this.send("resources/list"));
+    }
+    async readResource(uri) {
+        return (await this.send("resources/read", { uri }));
     }
     async callTool(name, args) {
-        return (await this.sendRequest(TOOLS_CALL_REQUEST, {
-            name,
-            arguments: args,
-        }));
+        return (await this.send("tools/call", { name, arguments: args }));
     }
     async disconnect() {
-        if (this.lineReader) {
-            this.lineReader.close();
-            this.lineReader = null;
-        }
-        if (this.process) {
-            const proc = this.process;
-            this.process = null;
-            this.pendingRequests.clear();
-            if (!proc.killed) {
-                proc.kill();
-                await new Promise((resolve) => {
-                    const onExit = () => {
-                        resolve();
-                    };
-                    proc.on("exit", onExit);
-                    if (proc.exitCode !== null) {
-                        proc.removeListener("exit", onExit);
-                        resolve();
-                    }
-                    setTimeout(() => {
-                        proc.removeListener("exit", onExit);
-                        resolve();
-                    }, 3000);
-                });
-            }
+        const proc = this.process;
+        this.process = null;
+        this.pending.clear();
+        this.sseEndpoint = null;
+        if (proc && !proc.killed) {
+            proc.kill();
+            await new Promise((resolve) => {
+                if (proc.exitCode !== null)
+                    return resolve();
+                proc.on("exit", resolve);
+                setTimeout(resolve, 3000);
+            });
         }
     }
 }