@aiwerk/mcp-bridge 1.6.1 → 1.6.2

package/dist/src/protocol.js

@@ -3,14 +3,23 @@ import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-export const PACKAGE_VERSION = (() => {
-    try {
-        return JSON.parse(readFileSync(join(__dirname, "..", "..", "package.json"), "utf-8")).version;
-    }
-    catch {
-        return "0.0.0";
+function loadPackageVersion() {
+    const candidates = [
+        join(__dirname, "..", "package.json"),
+        join(__dirname, "..", "..", "package.json"),
+        join(__dirname, "..", "..", "..", "package.json"),
+    ];
+    for (const p of candidates) {
+        try {
+            const pkg = JSON.parse(readFileSync(p, "utf-8"));
+            if (pkg.version)
+                return pkg.version;
+        }
+        catch { /* try next candidate */ }
     }
-})();
+    return "0.0.0";
+}
+export const PACKAGE_VERSION = loadPackageVersion();
 export async function initializeProtocol(transport, version) {
     const initRequest = {
         jsonrpc: "2.0",

package/dist/src/standalone-server.d.ts

@@ -13,7 +13,8 @@ export declare class StandaloneServer {
     private directConnections;
     constructor(config: BridgeConfig, logger: Logger);
     private isRouterMode;
-    /** Start stdio mode: read JSON-RPC from stdin, write responses to stdout. */
+    /** Start stdio mode: read JSON-RPC from stdin, write responses to stdout.
+     *  Supports both newline-delimited JSON and LSP Content-Length framing. */
     startStdio(): Promise<void>;
     private processLine;
     private writeResponse;

package/dist/src/standalone-server.js

@@ -27,19 +27,73 @@ export class StandaloneServer {
     isRouterMode() {
         return (this.config.mode ?? "router") === "router";
     }
-    /** Start stdio mode: read JSON-RPC from stdin, write responses to stdout. */
+    /** Start stdio mode: read JSON-RPC from stdin, write responses to stdout.
+     *  Supports both newline-delimited JSON and LSP Content-Length framing. */
     async startStdio() {
         const stdin = process.stdin;
         const stdout = process.stdout;
         stdin.setEncoding("utf8");
         let buffer = "";
+        // LSP framing state
+        let lspContentLength = -1; // -1 means not in LSP mode for current message
+        let lspHeadersDone = false;
         stdin.on("data", (chunk) => {
             buffer += chunk;
-            const lines = buffer.split("\n");
-            buffer = lines.pop() || "";
-            for (const line of lines) {
+            // Process buffer in a loop — it may contain multiple messages
+            let progress = true;
+            while (progress) {
+                progress = false;
+                // If we're reading an LSP body, check if we have enough bytes
+                if (lspContentLength >= 0 && lspHeadersDone) {
+                    if (buffer.length >= lspContentLength) {
+                        const body = buffer.slice(0, lspContentLength);
+                        buffer = buffer.slice(lspContentLength);
+                        lspContentLength = -1;
+                        lspHeadersDone = false;
+                        const trimmed = body.trim();
+                        if (trimmed) {
+                            this.processLine(trimmed, stdout);
+                        }
+                        progress = true;
+                        continue;
+                    }
+                    // Not enough data yet — wait for more
+                    break;
+                }
+                // Look for complete lines to detect framing
+                const newlineIdx = buffer.indexOf("\n");
+                if (newlineIdx === -1)
+                    break;
+                const line = buffer.slice(0, newlineIdx);
                 const trimmed = line.trim();
-                if (!trimmed)
+                // LSP header detection
+                if (lspContentLength >= 0 && !lspHeadersDone) {
+                    // We're reading LSP headers — consume until empty line
+                    buffer = buffer.slice(newlineIdx + 1);
+                    progress = true;
+                    if (trimmed === "") {
+                        // End of headers — next read the body
+                        lspHeadersDone = true;
+                    }
+                    // Ignore other headers (Content-Type, etc.)
+                    continue;
+                }
+                if (trimmed.startsWith("Content-Length:")) {
+                    // Start of LSP-framed message
+                    const lengthStr = trimmed.slice("Content-Length:".length).trim();
+                    const length = parseInt(lengthStr, 10);
+                    if (!isNaN(length) && length > 0) {
+                        lspContentLength = length;
+                        lspHeadersDone = false;
+                        buffer = buffer.slice(newlineIdx + 1);
+                        progress = true;
+                        continue;
+                    }
+                }
+                // Newline-delimited JSON: consume the line
+                buffer = buffer.slice(newlineIdx + 1);
+                progress = true;
+                if (!trimmed || !trimmed.startsWith("{"))
                     continue;
                 this.processLine(trimmed, stdout);
             }
@@ -185,7 +239,8 @@ export class StandaloneServer {
                     jsonrpc: "2.0",
                     id,
                     result: {
-                        content: [{ type: "text", text: JSON.stringify(result) }]
+                        content: [{ type: "text", text: JSON.stringify(result) }],
+                        isError: true
                     }
                 };
             }

package/dist/src/transport-base.d.ts

@@ -54,7 +54,7 @@ export declare abstract class BaseTransport implements McpTransport {
  * @param contextDescription - Human-readable context for error messages (e.g. 'header "Authorization"')
  * @param extraEnv - Additional env vars to check before process.env (e.g. merged child process env)
  */
-export declare function resolveEnvVars(value: string, contextDescription: string, extraEnv?: Record<string, string | undefined>): string;
+export declare function resolveEnvVars(value: string, contextDescription: string, extraEnv?: Record<string, string | undefined>, envFallback?: () => Record<string, string>): string;
 /**
  * Resolve ${VAR} placeholders in all values of a Record<string, string>.
  *
@@ -62,14 +62,14 @@ export declare function resolveEnvVars(value: string, contextDescription: string
  * @param contextPrefix - Prefix for error context (e.g. "header", "env key")
  * @param extraEnv - Additional env vars to check before process.env
  */
-export declare function resolveEnvRecord(record: Record<string, string>, contextPrefix: string, extraEnv?: Record<string, string | undefined>): Record<string, string>;
+export declare function resolveEnvRecord(record: Record<string, string>, contextPrefix: string, extraEnv?: Record<string, string | undefined>, envFallback?: () => Record<string, string>): Record<string, string>;
 /**
  * Resolve ${VAR} placeholders in an array of command arguments.
  *
  * @param args - Array of argument strings with potential ${VAR} placeholders
  * @param extraEnv - Additional env vars to check before process.env
  */
-export declare function resolveArgs(args: string[], extraEnv?: Record<string, string | undefined>): string[];
+export declare function resolveArgs(args: string[], extraEnv?: Record<string, string | undefined>, envFallback?: () => Record<string, string>): string[];
 /**
  * Warn if a URL uses non-TLS HTTP to a remote (non-localhost) host.
  */

package/dist/src/transport-base.js

@@ -117,16 +117,17 @@ export class BaseTransport {
  * @param contextDescription - Human-readable context for error messages (e.g. 'header "Authorization"')
  * @param extraEnv - Additional env vars to check before process.env (e.g. merged child process env)
  */
-export function resolveEnvVars(value, contextDescription, extraEnv) {
+export function resolveEnvVars(value, contextDescription, extraEnv, envFallback) {
     return value.replace(/\$\{(\w+)\}/g, (_, varName) => {
         const resolved = extraEnv?.[varName] ?? process.env[varName];
-        // If resolved is undefined or empty string, try the OpenClaw .env fallback.
-        // This handles the case where dotenv(override:false) didn't overwrite a
-        // pre-existing empty env var in process.env.
+        // If resolved is undefined or empty string, try the env fallback.
+        // Default fallback is loadOpenClawDotEnvFallback (handles the case where
+        // dotenv(override:false) didn't overwrite a pre-existing empty env var).
         if (resolved === undefined || resolved === "") {
-            const fallback = loadOpenClawDotEnvFallback()[varName];
-            if (fallback !== undefined && fallback !== "") {
-                return fallback;
+            const fallbackFn = envFallback ?? loadOpenClawDotEnvFallback;
+            const fallbackVal = fallbackFn()[varName];
+            if (fallbackVal !== undefined && fallbackVal !== "") {
+                return fallbackVal;
             }
         }
         if (resolved === undefined) {
@@ -142,10 +143,10 @@ export function resolveEnvVars(value, contextDescription, extraEnv) {
  * @param contextPrefix - Prefix for error context (e.g. "header", "env key")
  * @param extraEnv - Additional env vars to check before process.env
  */
-export function resolveEnvRecord(record, contextPrefix, extraEnv) {
+export function resolveEnvRecord(record, contextPrefix, extraEnv, envFallback) {
     const resolved = {};
     for (const [key, value] of Object.entries(record)) {
-        resolved[key] = resolveEnvVars(value, `${contextPrefix} "${key}"`, extraEnv);
+        resolved[key] = resolveEnvVars(value, `${contextPrefix} "${key}"`, extraEnv, envFallback);
     }
     return resolved;
 }
@@ -155,8 +156,8 @@ export function resolveEnvRecord(record, contextPrefix, extraEnv) {
  * @param args - Array of argument strings with potential ${VAR} placeholders
  * @param extraEnv - Additional env vars to check before process.env
  */
-export function resolveArgs(args, extraEnv) {
-    return args.map(arg => resolveEnvVars(arg, `arg "${arg}"`, extraEnv));
+export function resolveArgs(args, extraEnv, envFallback) {
+    return args.map(arg => resolveEnvVars(arg, `arg "${arg}"`, extraEnv, envFallback));
 }
 /**
  * Warn if a URL uses non-TLS HTTP to a remote (non-localhost) host.

package/dist/src/types.d.ts

@@ -40,6 +40,7 @@ export interface McpClientConfig {
         minScore?: number;
     };
     maxResultChars?: number;
+    envFallback?: () => Record<string, string>;
     adaptivePromotion?: {
         enabled?: boolean;
         maxPromoted?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwerk/mcp-bridge",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Standalone MCP server that multiplexes multiple MCP servers into one interface",
   "type": "module",
   "main": "./dist/src/index.js",