@justanothermldude/mcp-exec 1.7.3 → 1.7.5

package/dist/codegen/wrapper-generator.js

@@ -177,8 +177,14 @@ function generateInterface(name, schema, definitions) {
  */
 function sanitizeJsDoc(text) {
     // Escape */ to prevent premature JSDoc comment closure
-    // This handles glob patterns like "src/**/*.ts" in tool descriptions
-    return text.replace(/\*\//g, '* /');
+    // (handles glob patterns like "src/**/*.ts" in tool descriptions)
+    let sanitized = text.replace(/\*\//g, '* /');
+    // Collapse newlines to prevent line-injection into JSDoc blocks
+    sanitized = sanitized.replace(/\r?\n/g, ' ');
+    // Escape @ at word boundaries to prevent JSDoc tag injection from a
+    // malicious tool description (e.g. "@param input.password string").
+    sanitized = sanitized.replace(/(?:^|\s)@([a-zA-Z_]\w*)/g, ' \\@$1');
+    return sanitized;
 }
 /**
  * Generate a recursive Proxy guard that warns on undefined field access on MCP responses.
@@ -203,14 +209,18 @@ function __guardFields(obj, label) {
       }
     });
   }
+  const __safeKeys = new Set(['then', 'toJSON', 'length', 'constructor', 'nodeType', 'valueOf', 'toString', 'inspect']);
+  const __dangerousKeys = new Set(['__proto__', '__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'prototype']);
   return new Proxy(obj, {
     get(target, prop) {
-      if (typeof prop === 'symbol' || prop === 'then' || prop === 'toJSON'
-          || prop === 'length' || prop === 'constructor' || prop === 'nodeType'
-          || prop === 'valueOf' || prop === 'toString' || prop === 'inspect') {
+      if (typeof prop === 'symbol') return target[prop];
+      const propStr = String(prop);
+      if (__dangerousKeys.has(propStr)) {
+        throw new TypeError('Access to "' + propStr + '" is not allowed on ' + label);
+      }
+      if (__safeKeys.has(propStr)) {
         return target[prop];
       }
-      if (prop === '__proto__' || prop === 'prototype') return undefined;
       if (Object.prototype.hasOwnProperty.call(target, prop)) {
         const val = target[prop];
         if (val && typeof val === 'object') {
@@ -271,8 +281,11 @@ export function generateFuzzyProxy(targetVarName, contextName, helpString) {
   get(target, prop) {
     if (typeof prop !== 'string') return undefined;
 
-    // Block prototype pollution vectors
-    if (prop === '__proto__' || prop === 'constructor' || prop === 'prototype') return undefined;
+    // Block prototype pollution vectors with a loud error so callers cannot silently
+    // probe the proxy for __proto__ or prototype indirection.
+    if (prop === '__proto__' || prop === 'constructor' || prop === 'prototype') {
+      throw new TypeError('Access to "' + prop + '" is not allowed on ${safeContextName}');
+    }
 
     // Fast-path: exact match — use hasOwnProperty to avoid prototype chain leaks
     if (Object.prototype.hasOwnProperty.call(target, prop)) return target[prop];

package/dist/index.js

@@ -230,7 +230,12 @@ function compactTypeHint(propSchema) {
     const keys = Object.keys(props);
     if (keys.length === 0)
       return "object";
-    const parts = keys.map((k) => required.includes(k) ? k : k + "?");
+    const PRIM = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean"]);
+    const parts = keys.map((k) => {
+      const sub = props[k]?.type;
+      const sfx = required.includes(k) ? "" : "?";
+      return PRIM.has(sub ?? "") ? `${k}${sfx}:${sub}` : `${k}${sfx}`;
+    });
     return `{${parts.join(", ")}}`;
   }
   if (type === "object") {
@@ -242,7 +247,12 @@ function compactTypeHint(propSchema) {
       const props = items.properties;
       const required = items.required || [];
       const keys = Object.keys(props);
-      const parts = keys.map((k) => required.includes(k) ? k : k + "?");
+      const PRIM = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean"]);
+      const parts = keys.map((k) => {
+        const sub = props[k]?.type;
+        const sfx = required.includes(k) ? "" : "?";
+        return PRIM.has(sub ?? "") ? `${k}${sfx}:${sub}` : `${k}${sfx}`;
+      });
       return `[{${parts.join(", ")}}]`;
     }
     return null;
@@ -488,7 +498,10 @@ function generateInterface(name, schema, definitions) {
 }
 __name(generateInterface, "generateInterface");
 function sanitizeJsDoc(text) {
-  return text.replace(/\*\//g, "* /");
+  let sanitized = text.replace(/\*\//g, "* /");
+  sanitized = sanitized.replace(/\r?\n/g, " ");
+  sanitized = sanitized.replace(/(?:^|\s)@([a-zA-Z_]\w*)/g, " \\@$1");
+  return sanitized;
 }
 __name(sanitizeJsDoc, "sanitizeJsDoc");
 function generateFieldGuard() {
@@ -508,14 +521,18 @@ function __guardFields(obj, label) {
       }
     });
   }
+  const __safeKeys = new Set(['then', 'toJSON', 'length', 'constructor', 'nodeType', 'valueOf', 'toString', 'inspect']);
+  const __dangerousKeys = new Set(['__proto__', '__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'prototype']);
   return new Proxy(obj, {
     get(target, prop) {
-      if (typeof prop === 'symbol' || prop === 'then' || prop === 'toJSON'
-          || prop === 'length' || prop === 'constructor' || prop === 'nodeType'
-          || prop === 'valueOf' || prop === 'toString' || prop === 'inspect') {
+      if (typeof prop === 'symbol') return target[prop];
+      const propStr = String(prop);
+      if (__dangerousKeys.has(propStr)) {
+        throw new TypeError('Access to "' + propStr + '" is not allowed on ' + label);
+      }
+      if (__safeKeys.has(propStr)) {
         return target[prop];
       }
-      if (prop === '__proto__' || prop === 'prototype') return undefined;
       if (Object.prototype.hasOwnProperty.call(target, prop)) {
         const val = target[prop];
         if (val && typeof val === 'object') {
@@ -555,8 +572,11 @@ function generateFuzzyProxy(targetVarName, contextName, helpString) {
   get(target, prop) {
     if (typeof prop !== 'string') return undefined;
 
-    // Block prototype pollution vectors
-    if (prop === '__proto__' || prop === 'constructor' || prop === 'prototype') return undefined;
+    // Block prototype pollution vectors with a loud error so callers cannot silently
+    // probe the proxy for __proto__ or prototype indirection.
+    if (prop === '__proto__' || prop === 'constructor' || prop === 'prototype') {
+      throw new TypeError('Access to "' + prop + '" is not allowed on ${safeContextName}');
+    }
 
     // Fast-path: exact match \u2014 use hasOwnProperty to avoid prototype chain leaks
     if (Object.prototype.hasOwnProperty.call(target, prop)) return target[prop];
@@ -1981,7 +2001,7 @@ __name(createMcpExecServer, "createMcpExecServer");
 // dist/index.js
 import { ServerPool, createConnection, getServerConfig as getServerConfig2, loadServerManifest as loadServerManifest2, cleanupOrphanedProcesses } from "@justanothermldude/meta-mcp-core";
 var APP_NAME = "mcp-exec";
-var VERSION2 = "1.7.3";
+var VERSION2 = "1.7.4";
 var defaultExecutor = null;
 function getDefaultExecutor() {
   if (!defaultExecutor) {

package/dist/tools/tool-catalog.js

@@ -44,7 +44,12 @@ function compactTypeHint(propSchema) {
         const keys = Object.keys(props);
         if (keys.length === 0)
             return 'object';
-        const parts = keys.map(k => required.includes(k) ? k : k + '?');
+        const PRIM = new Set(['string', 'number', 'integer', 'boolean']);
+        const parts = keys.map(k => {
+            const sub = props[k]?.type;
+            const sfx = required.includes(k) ? '' : '?';
+            return PRIM.has(sub ?? '') ? `${k}${sfx}:${sub}` : `${k}${sfx}`;
+        });
         return `{${parts.join(', ')}}`;
     }
     // Freeform object — AI must call get_mcp_tool_schema before using
@@ -58,7 +63,12 @@ function compactTypeHint(propSchema) {
             const props = items.properties;
             const required = items.required || [];
             const keys = Object.keys(props);
-            const parts = keys.map(k => required.includes(k) ? k : k + '?');
+            const PRIM = new Set(['string', 'number', 'integer', 'boolean']);
+            const parts = keys.map(k => {
+                const sub = props[k]?.type;
+                const sfx = required.includes(k) ? '' : '?';
+                return PRIM.has(sub ?? '') ? `${k}${sfx}:${sub}` : `${k}${sfx}`;
+            });
             return `[{${parts.join(', ')}}]`;
         }
         // Simple typed arrays (string[], number[]) — usually obvious

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justanothermldude/mcp-exec",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "MCP execution utilities for sandboxed code execution with OS-level isolation",
   "type": "module",
   "main": "dist/index.js",