@wrongstack/mcp 1.0.26 → 1.0.28

package/dist/client.d.ts

@@ -26,7 +26,15 @@ export declare class MCPClient {
      * (stdio child exit, `close()`) so callers don't hang forever.
      */
     private readonly pending;
-    private rxBuffer;
+    /**
+     * The unterminated tail of stdout, as the chunks it arrived in; joined only
+     * when its newline arrives. Kept as one string (`+=` then `indexOf`), every
+     * chunk flattened and re-scanned everything buffered so far — O(n²) for a
+     * multi-MiB tools/call result.
+     */
+    private rxParts;
+    private get rxBuffer();
+    private set rxBuffer(value);
     private rxBufferBytes;
     /**
      * Incremental UTF-8 decoder for the stdio rx path. A pipe read boundary can

package/dist/index.js

@@ -45,7 +45,9 @@ function parseMcpBearerChallenge(header, resource) {
   const resourceMetadata = challengeParameter(parameters, "resource_metadata");
   if (resourceMetadata) {
     const metadataUrl = validateMetadataUrl(resourceMetadata);
-    if (metadataUrl) challenge.resourceMetadataUrl = metadataUrl;
+    if (metadataUrl && isSameHost(metadataUrl, resource)) {
+      challenge.resourceMetadataUrl = metadataUrl;
+    }
   }
   const scope = challengeParameter(parameters, "scope");
   if (scope) {
@@ -194,6 +196,13 @@ function validateMetadataUrl(value) {
     return void 0;
   }
 }
+function isSameHost(candidate, resource) {
+  try {
+    return unbracket(new URL(candidate).hostname).toLowerCase() === unbracket(new URL(resource).hostname).toLowerCase();
+  } catch {
+    return false;
+  }
+}
 function record(value, label2) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     throw new Error(`MCP ${label2} must be an object`);
@@ -1543,27 +1552,8 @@ var SSEReader = class {
     };
   }
   feed(chunk) {
-    if (chunk.length > SSE_READER_MAX_BUFFER) {
-      throw new ToolError({
-        message: `SSE: chunk size ${chunk.length} exceeds max buffer ${SSE_READER_MAX_BUFFER} \u2014 refusing to accumulate`,
-        code: "TOOL_EXECUTION_FAILED",
-        toolName: "mcp_transport_sse_reader",
-        context: { phase: "feed", chunkLength: chunk.length, maxBuffer: SSE_READER_MAX_BUFFER }
-      });
-    }
+    const carried = this.buffer.length;
     this.buffer += chunk;
-    if (this.buffer.length > SSE_READER_MAX_BUFFER) {
-      throw new ToolError({
-        message: `SSE: pending line exceeds ${SSE_READER_MAX_BUFFER} bytes \u2014 upstream is not framing events`,
-        code: "TOOL_EXECUTION_FAILED",
-        toolName: "mcp_transport_sse_reader",
-        context: {
-          phase: "feed",
-          bufferLength: this.buffer.length,
-          maxBuffer: SSE_READER_MAX_BUFFER
-        }
-      });
-    }
     let start = 0;
     let idx = this.buffer.indexOf("\n", start);
     while (idx !== -1) {
@@ -1574,6 +1564,25 @@ var SSEReader = class {
       idx = this.buffer.indexOf("\n", start);
     }
     if (start > 0) this.buffer = this.buffer.slice(start);
+    if (this.buffer.length <= SSE_READER_MAX_BUFFER) return;
+    if (start >= carried) {
+      throw new ToolError({
+        message: `SSE: chunk size ${chunk.length} exceeds max buffer ${SSE_READER_MAX_BUFFER} \u2014 refusing to accumulate`,
+        code: "TOOL_EXECUTION_FAILED",
+        toolName: "mcp_transport_sse_reader",
+        context: { phase: "feed", chunkLength: chunk.length, maxBuffer: SSE_READER_MAX_BUFFER }
+      });
+    }
+    throw new ToolError({
+      message: `SSE: pending line exceeds ${SSE_READER_MAX_BUFFER} bytes \u2014 upstream is not framing events`,
+      code: "TOOL_EXECUTION_FAILED",
+      toolName: "mcp_transport_sse_reader",
+      context: {
+        phase: "feed",
+        bufferLength: this.buffer.length,
+        maxBuffer: SSE_READER_MAX_BUFFER
+      }
+    });
   }
   processLine(line) {
     if (line === "") {
@@ -1649,6 +1658,7 @@ import * as https2 from "node:https";
 import { ConfigError as ConfigError2 } from "@wrongstack/core/types";
 
 // src/elicitation.ts
+import { sanitizeTerminalText } from "@wrongstack/core/utils";
 var ELICITATION_MAX_WAIT_MS = 10 * 6e4;
 var MAX_FIELDS = 32;
 var MAX_MESSAGE_CHARS = 4e3;
@@ -1659,6 +1669,13 @@ function isRecord(v) {
 function optionalString3(v) {
   return typeof v === "string" && v.trim() ? v : void 0;
 }
+function displayText(v) {
+  return sanitizeTerminalText(v);
+}
+function optionalDisplayString(v) {
+  const text = optionalString3(v);
+  return text === void 0 ? void 0 : optionalString3(displayText(text));
+}
 function optionalNumber(v) {
   return typeof v === "number" && Number.isFinite(v) ? v : void 0;
 }
@@ -1672,7 +1689,7 @@ function parseOptions(schema) {
     const names = Array.isArray(schema["enumNames"]) ? schema["enumNames"] : [];
     return values.map((value, i) => ({
       value,
-      label: typeof names[i] === "string" && names[i] ? names[i] : value
+      label: displayText(typeof names[i] === "string" && names[i] ? names[i] : value)
     }));
   }
   const titled = Array.isArray(schema["oneOf"]) ? schema["oneOf"] : Array.isArray(schema["anyOf"]) ? schema["anyOf"] : void 0;
@@ -1682,7 +1699,7 @@ function parseOptions(schema) {
     if (!isRecord(entry) || typeof entry["const"] !== "string") return void 0;
     options.push({
       value: entry["const"],
-      label: optionalString3(entry["title"]) ?? entry["const"]
+      label: optionalDisplayString(entry["title"]) ?? displayText(entry["const"])
     });
   }
   return options;
@@ -1691,8 +1708,8 @@ function parseField(name, schema, required) {
   if (!isRecord(schema)) return { ok: false, error: `property "${name}" is not a schema object` };
   const base = {
     name,
-    title: optionalString3(schema["title"]),
-    description: optionalString3(schema["description"]),
+    title: optionalDisplayString(schema["title"]),
+    description: optionalDisplayString(schema["description"]),
     required
   };
   const type = schema["type"];
@@ -1789,7 +1806,7 @@ function parseUrlElicitation(params) {
     ok: true,
     value: {
       mode: "url",
-      message: message.slice(0, MAX_MESSAGE_CHARS),
+      message: displayText(message).slice(0, MAX_MESSAGE_CHARS),
       url: url.href,
       elicitationId
     }
@@ -1822,10 +1839,10 @@ function parseElicitationParams(params) {
     if (!parsed.ok) return parsed;
     fields.push(parsed.value);
   }
-  return { ok: true, value: { message: message.slice(0, MAX_MESSAGE_CHARS), fields } };
+  return { ok: true, value: { message: displayText(message).slice(0, MAX_MESSAGE_CHARS), fields } };
 }
 function label(field) {
-  return field.title ?? field.name;
+  return field.title ?? displayText(field.name);
 }
 function checkValue(field, raw) {
   const name = label(field);
@@ -1884,7 +1901,7 @@ function validateElicitationContent(fields, content) {
       out[field.name] = [];
       continue;
     }
-    if (raw === void 0 || raw === null || raw === "" || Array.isArray(raw) && raw.length === 0) {
+    if (raw === void 0 || raw === null || Array.isArray(raw) && raw.length === 0) {
       if (field.required) return { ok: false, error: `${label(field)} is required` };
       continue;
     }
@@ -2191,6 +2208,14 @@ if (!pinnedAgentsCleanupRegistered) {
     pinnedAgents.clear();
   });
 }
+function urlOriginForLog(raw) {
+  try {
+    const url = new URL(raw);
+    return `${url.protocol}//${url.host}`;
+  } catch {
+    return "<invalid url>";
+  }
+}
 function makeAbortError(method) {
   const err = new Error(`MCP request "${method}" aborted by client`);
   err.name = "AbortError";
@@ -2262,15 +2287,16 @@ var BaseHTTPTransport = class {
     this.requestTimeout = opts.requestTimeoutMs ?? 6e4;
     if (opts.tls) {
       if (opts.tls.rejectUnauthorized === false) {
+        const where = urlOriginForLog(this.url);
         if (!isTlsUnsafeAllowed()) {
           throw new ConfigError2({
-            message: `[mcp:${transportName}] TLS verification disabled \u2014 set WRONGSTACK_UNSAFE_MCP_TLS=1 to allow. Rejecting insecure configuration for ${this.url}.`,
+            message: `[mcp:${transportName}] TLS verification disabled \u2014 set WRONGSTACK_UNSAFE_MCP_TLS=1 to allow. Rejecting insecure configuration for ${where}.`,
             code: "CONFIG_INVALID",
-            context: { field: "tls.rejectUnauthorized", transportName, url: this.url }
+            context: { field: "tls.rejectUnauthorized", transportName, url: where }
           });
         }
         console.error(
-          `[mcp:${transportName}] \u26A0\uFE0F TLS verification DISABLED for ${this.url}. Network attacks are possible \u2014 only use on localhost.`
+          `[mcp:${transportName}] \u26A0\uFE0F TLS verification DISABLED for ${where}. Network attacks are possible \u2014 only use on localhost.`
         );
       }
       this.tlsAgent = new https2.Agent({
@@ -3581,7 +3607,19 @@ var MCPClient = class _MCPClient {
    * (stdio child exit, `close()`) so callers don't hang forever.
    */
   pending = /* @__PURE__ */ new Map();
-  rxBuffer = "";
+  /**
+   * The unterminated tail of stdout, as the chunks it arrived in; joined only
+   * when its newline arrives. Kept as one string (`+=` then `indexOf`), every
+   * chunk flattened and re-scanned everything buffered so far — O(n²) for a
+   * multi-MiB tools/call result.
+   */
+  rxParts = [];
+  get rxBuffer() {
+    return this.rxParts.join("");
+  }
+  set rxBuffer(value) {
+    this.rxParts = value ? [value] : [];
+  }
   rxBufferBytes = 0;
   /**
    * Incremental UTF-8 decoder for the stdio rx path. A pipe read boundary can
@@ -4063,11 +4101,10 @@ var MCPClient = class _MCPClient {
     }
   }
   onData(s) {
-    this.rxBuffer += s;
     this.rxBufferBytes += Buffer.byteLength(s, "utf8");
     if (this.rxBufferBytes > _MCPClient.MAX_RX_BUFFER_BYTES) {
       const truncated = this.rxBufferBytes;
-      this.rxBuffer = "";
+      this.rxParts = [];
       this.rxBufferBytes = 0;
       this.failPending(
         `MCP "${this.opts.name}" rx buffer overflow (${truncated} bytes without a newline) \u2014 closing connection`
@@ -4076,17 +4113,22 @@ var MCPClient = class _MCPClient {
       return;
     }
     let start = 0;
-    let idx = this.rxBuffer.indexOf("\n");
+    let idx = s.indexOf("\n");
+    if (idx === -1) {
+      this.rxParts.push(s);
+      return;
+    }
     while (idx !== -1) {
-      const line = this.rxBuffer.slice(start, idx).trim();
+      const head = this.rxParts.length > 0 ? this.rxParts.join("") : "";
+      this.rxParts = [];
+      const line = (head + s.slice(start, idx)).trim();
       start = idx + 1;
       if (line) this.onLine(line);
-      idx = this.rxBuffer.indexOf("\n", start);
-    }
-    if (start > 0) {
-      this.rxBufferBytes -= Buffer.byteLength(this.rxBuffer.slice(0, start), "utf8");
-      this.rxBuffer = this.rxBuffer.slice(start);
+      idx = s.indexOf("\n", start);
     }
+    const tail = s.slice(start);
+    this.rxBufferBytes = Buffer.byteLength(tail, "utf8");
+    if (tail) this.rxParts.push(tail);
   }
   onLine(line) {
     let msg;
@@ -4424,6 +4466,7 @@ function requireIdentity(value, label2) {
 // src/elicitation-form.ts
 import { randomUUID } from "node:crypto";
 import { hostname } from "node:os";
+import { sanitizeTerminalText as sanitizeTerminalText2 } from "@wrongstack/core/utils";
 var MAX_ATTEMPTS = 3;
 var CONFIRM_QUESTION = "confirm";
 var URL_QUESTION = "url";
@@ -4456,7 +4499,8 @@ function describe(field) {
 function toQuestion(field, index) {
   const base = {
     id: questionId(index),
-    prompt: field.title ?? field.name,
+    // Titles arrive sanitized from the parser; a bare field name does not.
+    prompt: field.title ?? sanitizeTerminalText2(field.name),
     description: describe(field),
     required: field.required
   };
@@ -4572,8 +4616,12 @@ function toUserInputRequest(request3, problem) {
 function answerValue(field, answer) {
   if (!answer || answer.delegated) return void 0;
   switch (field.kind) {
-    case "string":
-      return answer.text?.trim() ? answer.text : void 0;
+    case "string": {
+      const text = answer.text;
+      if (text === void 0) return void 0;
+      if (!text.trim() && !field.required) return void 0;
+      return text;
+    }
     case "number":
     case "integer":
       return answer.text?.trim() || void 0;
@@ -4660,8 +4708,14 @@ async function readConfig(path2) {
 async function writeConfig(path2, cfg) {
   const raw = JSON.stringify(cfg, null, 2);
   const tmp = `${path2}.${process.pid}.${randomBytes3(6).toString("hex")}.tmp`;
-  await fs.writeFile(tmp, raw, "utf8");
+  let mode = 384;
+  try {
+    mode = (await fs.stat(path2)).mode & 511;
+  } catch {
+  }
   try {
+    await fs.writeFile(tmp, raw, { encoding: "utf8", mode });
+    await fs.chmod(tmp, mode);
     await fs.rename(tmp, path2);
   } catch (err) {
     await fs.rm(tmp, { force: true });
@@ -4733,6 +4787,10 @@ function buildConfig(input, base) {
   if (allowedTools !== void 0) cfg.allowedTools = allowedTools;
   const permission = input.permission ?? base?.permission;
   if (permission !== void 0) cfg.permission = permission;
+  const startupTimeoutMs = input.startupTimeoutMs ?? base?.startupTimeoutMs;
+  if (startupTimeoutMs !== void 0) cfg.startupTimeoutMs = startupTimeoutMs;
+  const requestTimeoutMs = input.requestTimeoutMs ?? base?.requestTimeoutMs;
+  if (requestTimeoutMs !== void 0) cfg.requestTimeoutMs = requestTimeoutMs;
   const allowPrivateNetworks = input.allowPrivateNetworks ?? base?.allowPrivateNetworks;
   if (allowPrivateNetworks !== void 0) cfg.allowPrivateNetworks = allowPrivateNetworks;
   const enabled = input.enabled ?? base?.enabled;
@@ -5091,52 +5149,59 @@ function healthStateFor(connectionState, operations, enabled = true) {
 function evaluateHealthThresholds(operations, thresholds) {
   if (!thresholds) return [];
   const checks = [];
-  if (thresholds.connectionLatencyP95Ms !== void 0 && operations.connectionSamples.length > 0) {
+  const connectionP95 = thresholds.connectionLatencyP95Ms;
+  if (isUsableThreshold(connectionP95) && operations.connectionSamples.length > 0) {
     const value = percentile(
       [...operations.connectionSamples].sort((a, b) => a - b),
       0.95
     );
     checks.push({
       name: "connection-latency-p95",
-      passed: value <= thresholds.connectionLatencyP95Ms,
+      passed: value <= connectionP95,
       value,
-      threshold: thresholds.connectionLatencyP95Ms
+      threshold: connectionP95
     });
   }
-  if (thresholds.discoveryLatencyP95Ms !== void 0 && operations.discoverySamples.length > 0) {
+  const discoveryP95 = thresholds.discoveryLatencyP95Ms;
+  if (isUsableThreshold(discoveryP95) && operations.discoverySamples.length > 0) {
     const value = percentile(
       [...operations.discoverySamples].sort((a, b) => a - b),
       0.95
     );
     checks.push({
       name: "discovery-latency-p95",
-      passed: value <= thresholds.discoveryLatencyP95Ms,
+      passed: value <= discoveryP95,
       value,
-      threshold: thresholds.discoveryLatencyP95Ms
+      threshold: discoveryP95
     });
   }
-  if (thresholds.callLatencyP95Ms !== void 0 && operations.callSamples.length > 0) {
+  const callP95 = thresholds.callLatencyP95Ms;
+  if (isUsableThreshold(callP95) && operations.callSamples.length > 0) {
     const value = percentile(
       [...operations.callSamples].sort((a, b) => a - b),
       0.95
     );
     checks.push({
       name: "call-latency-p95",
-      passed: value <= thresholds.callLatencyP95Ms,
+      passed: value <= callP95,
       value,
-      threshold: thresholds.callLatencyP95Ms
+      threshold: callP95
     });
   }
-  if (thresholds.inFlightCalls !== void 0) {
+  const inFlight = thresholds.inFlightCalls;
+  if (isUsableThreshold(inFlight)) {
     checks.push({
       name: "in-flight-calls",
-      passed: operations.peakInFlightCalls <= thresholds.inFlightCalls,
+      passed: operations.peakInFlightCalls <= inFlight,
       value: operations.peakInFlightCalls,
-      threshold: thresholds.inFlightCalls
+      threshold: inFlight
     });
   }
   return checks;
 }
+function isUsableThreshold(value) {
+  return typeof value === "number" && Number.isFinite(value);
+}
 function applyHealthThresholds(state, checks) {
   if (state !== "healthy") return state;
   return checks.some((c) => !c.passed) ? "degraded" : "healthy";
@@ -5648,7 +5713,8 @@ async function attemptConnectSlot(ctx, slot) {
         slot.reconnectPending = false;
         ctx.events.emit("mcp.server.disconnected", {
           name: slot.cfg.name,
-          reason: err instanceof Error ? err.message : "unknown"
+          reason: err instanceof Error ? err.message : "unknown",
+          terminal: true
         });
         return;
       }
@@ -5869,7 +5935,8 @@ function scheduleRegistryReconnect({
     );
     events.emit("mcp.server.disconnected", {
       name: slot.cfg.name,
-      reason: `reconnect-exhausted:${slot.reconnectCycles}`
+      reason: `reconnect-exhausted:${slot.reconnectCycles}`,
+      terminal: true
     });
     return;
   }
@@ -6861,6 +6928,7 @@ function serveStdio(server, opts = {}) {
   let bufferBytes = 0;
   let closed = false;
   let bufferTooLarge = false;
+  const decoder = new TextDecoder();
   let writeChain = Promise.resolve();
   const inFlightHandlers = /* @__PURE__ */ new Set();
   const writeLine = (s) => {
@@ -6883,7 +6951,7 @@ function serveStdio(server, opts = {}) {
   };
   const onData = (chunk) => {
     if (bufferTooLarge) return;
-    const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    const text = typeof chunk === "string" ? chunk : decoder.decode(chunk, { stream: true });
     buffer += text;
     bufferBytes += Buffer.byteLength(text, "utf8");
     if (bufferBytes > HTTP_BODY_CAP) {
@@ -7174,8 +7242,8 @@ var MCPVaultTokenStore = class {
   async readFile() {
     let raw;
     try {
-      const stat2 = await fs3.stat(this.filePath);
-      if (stat2.size > MAX_STORE_BYTES) throw new Error("MCP token store exceeds size limit");
+      const stat3 = await fs3.stat(this.filePath);
+      if (stat3.size > MAX_STORE_BYTES) throw new Error("MCP token store exceeds size limit");
       raw = await fs3.readFile(this.filePath, "utf8");
     } catch (error) {
       if (error.code === "ENOENT") return emptyFile();

package/dist/manage.d.ts

@@ -17,6 +17,10 @@ export interface McpServerInput {
     bearerTokenEnv?: string | undefined;
     allowedTools?: string[] | undefined;
     permission?: Permission | undefined;
+    /** Connect/startup timeout in ms. Defaults to 10s when omitted. */
+    startupTimeoutMs?: number | undefined;
+    /** Per-request JSON-RPC timeout in ms. Defaults to 60s when omitted. */
+    requestTimeoutMs?: number | undefined;
     /** Lazy connect — spawn the process only on first tool call (see config). */
     lazy?: boolean | undefined;
     /** Env var names to forward from parent process at spawn time. */

package/dist/transport-base.d.ts

@@ -51,6 +51,11 @@ export interface HttpTransportOptions {
  * Abort error whose `name` is `'AbortError'` so the core executor's
  * classifyToolError maps it to FATAL / not-retryable (user cancellation).
  */
+/**
+ * `scheme://host:port` of a server URL, for log lines. The path and query can
+ * hold an expanded `${SECRET}` (config-env), and userinfo is a credential.
+ */
+export declare function urlOriginForLog(raw: string): string;
 export declare function makeAbortError(method: string): Error;
 /** Advance a JSON-RPC number id without leaving JavaScript's safe-integer range. */
 export declare function nextJsonRpcId(id: number): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/mcp",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "license": "MIT",
   "description": "WrongStack Model Context Protocol client and registry: stdio, SSE, and streamable HTTP transports.",
   "repository": {
@@ -26,7 +26,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@wrongstack/core": "1.0.26",
+    "@wrongstack/core": "1.0.28",
     "undici": "^8.10.2"
   },
   "devDependencies": {