converse-mcp-server 2.20.7 → 2.20.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse-mcp-server",
-  "version": "2.20.7",
+  "version": "2.20.9",
   "description": "Converse MCP Server - Converse with other LLMs with chat and consensus tools",
   "type": "module",
   "main": "src/index.js",

package/src/providers/copilot.js

@@ -12,10 +12,7 @@
  * - Requires GitHub CLI authenticated (gh auth login) with active Copilot subscription
  */
 
-import { createRequire } from 'module';
-import { readFileSync, writeFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
+import { register } from 'node:module';
 import { debugLog, debugError } from '../utils/console.js';
 import { ProviderError, ErrorCodes, StopReasons } from './interface.js';
 
@@ -295,68 +292,27 @@ function isCopilotSDKAvailable() {
 }
 
 /**
- * Patch vscode-jsonrpc's package.json to add ESM-compatible exports.
- * The @github/copilot-sdk imports "vscode-jsonrpc/node" (extensionless) and
- * "vscode-jsonrpc/node.js" (with extension). Without an exports map, Node.js
- * strict ESM resolution fails on both forms. Adding an exports field once
- * also requires "./node.js" since exports blocks unlisted subpaths.
- * Runs once, skips silently on failure (e.g. read-only node_modules).
+ * Register a module resolution hook to fix the extensionless
+ * "vscode-jsonrpc/node" import in @github/copilot-sdk >=0.1.29.
+ * The SDK's session.js imports "vscode-jsonrpc/node" without a .js extension,
+ * which fails under Node.js strict ESM resolution. The hook rewrites it to
+ * "vscode-jsonrpc/node.js". Runs once, works regardless of package manager.
  */
-let _jsonrpcPatched = false;
-function ensureVscodeJsonrpcExports() {
-  if (_jsonrpcPatched) return;
-  _jsonrpcPatched = true;
-
-  try {
-    const sdkUrl = import.meta.resolve('@github/copilot-sdk');
-    const sdkDir = dirname(fileURLToPath(sdkUrl));
-    const sdkRequire = createRequire(join(sdkDir, '_resolve.js'));
-
-    let pkgJsonPath;
-    try {
-      pkgJsonPath = sdkRequire.resolve('vscode-jsonrpc/package.json');
-    } catch {
-      const mainPath = sdkRequire.resolve('vscode-jsonrpc');
-      let dir = dirname(mainPath);
-      for (let i = 0; i < 5; i++) {
-        const candidate = join(dir, 'package.json');
-        try {
-          const p = JSON.parse(readFileSync(candidate, 'utf-8'));
-          if (p.name === 'vscode-jsonrpc') {
-            pkgJsonPath = candidate;
-            break;
-          }
-        } catch { /* continue */ }
-        dir = dirname(dir);
-      }
-    }
-
-    if (!pkgJsonPath) return;
-
-    const pkg = JSON.parse(readFileSync(pkgJsonPath, 'utf-8'));
-    if (pkg.exports && pkg.exports['./node'] && pkg.exports['./node.js']) {
-      return;
-    }
-
-    pkg.exports = {
-      '.': pkg.main || './lib/node/main.js',
-      './node': './node.js',
-      './node.js': './node.js',
-      './browser': './browser.js',
-      './browser.js': './browser.js',
-    };
-    writeFileSync(pkgJsonPath, JSON.stringify(pkg, null, '\t') + '\n');
-    debugLog('[Copilot SDK] Patched vscode-jsonrpc exports for ESM compatibility');
-  } catch (err) {
-    debugLog('[Copilot SDK] Could not patch vscode-jsonrpc: %s', err.message);
-  }
+let _hookRegistered = false;
+function ensureJsonrpcResolveHook() {
+  if (_hookRegistered) return;
+  _hookRegistered = true;
+  register(`data:text/javascript,${encodeURIComponent(
+    'export function resolve(s,c,n){' +
+    'return s==="vscode-jsonrpc/node"?n("vscode-jsonrpc/node.js",c):n(s,c);}',
+  )}`);
 }
 
 /**
  * Dynamically import Copilot SDK (lazy loading)
  */
 async function getCopilotSDK() {
-  ensureVscodeJsonrpcExports();
+  ensureJsonrpcResolveHook();
   try {
     const { CopilotClient } = await import('@github/copilot-sdk');
     return CopilotClient;
@@ -717,10 +673,12 @@ async function* createStreamingGenerator(client, prompt, options, signal, config
     let done = false;
     let streamError = null;
     let usageData = null;
+    let receivedDeltas = false;
 
     const unsubscribe = session.on((event) => {
       switch (event.type) {
       case 'assistant.message_delta':
+        receivedDeltas = true;
         eventQueue.push({
           type: 'delta',
           data: { textDelta: event.data.deltaContent },
@@ -728,8 +686,8 @@ async function* createStreamingGenerator(client, prompt, options, signal, config
         break;
 
       case 'assistant.message':
-        // Final complete message — use as fallback if deltas were coalesced
-        if (event.data.content) {
+        // Final complete message — only use if no streaming deltas were received
+        if (!receivedDeltas && event.data.content) {
           eventQueue.push({
             type: 'delta',
             data: { textDelta: event.data.content },