@privacyscrubber/mcp-server 2.4.6 → 2.4.7

package/README.md

@@ -485,7 +485,7 @@ Returns a visual dashboard showing your current tier, session request count, act
 *   **Response Example (Free Tier):**
     ```
     ╔══════════════════════════════════════════════════╗
-    ║       PrivacyScrubber MCP Server v2.4.6          ║
+    ║       PrivacyScrubber MCP Server v2.4.7          ║
     ╠══════════════════════════════════════════════════╣
     ║  🔓 Tier: FREE                                   ║
     ║  📊 Session requests: 5                          ║

package/index.js

@@ -43,6 +43,7 @@ if (rawCliArgs.includes('--help') || rawCliArgs.includes('-h') || rawCliArgs.inc
   console.log(`PrivacyScrubber MCP Server v${MCP_VERSION} — Zero-Trust Data Sanitization (ZTDS)`);
   console.log('\nUsage:');
   console.log('  npx @privacyscrubber/mcp-server              Start MCP stdio server');
+  console.log('  npx @privacyscrubber/mcp-server --wrap <cmd> Transparent ZTDS proxy for any 3rd-party MCP server');
   console.log('  npx @privacyscrubber/mcp-server init         Auto-configure Claude, Cursor, Windsurf, Cline');
   console.log('  npx @privacyscrubber/mcp-server uninstall    Remove from IDE configurations');
   console.log('  npx @privacyscrubber/mcp-server trial        Request 7-day B2B TEAMS/SDK evaluation key');
@@ -82,8 +83,9 @@ if (rawCliArgs.includes('--memo') || rawCliArgs.includes('memo')) {
   console.log(generateProcurementMemo({ targetTier: tierArg, format: 'text' }));
   process.exit(0);
 }
-if (rawCliArgs.includes('--hook')) {
+if (rawCliArgs.includes('--hook') || rawCliArgs.includes('--wrap')) {
   await import('./pii-masking-run.js');
+  await new Promise(() => {});
 }
 if (rawCliArgs.some(arg => ['init', 'install', '--install', 'setup', '--setup', 'uninstall', '--uninstall', '--remove'].includes(arg))) {
   const { runInstaller } = await import('./install.js');
@@ -751,11 +753,27 @@ function buildCisoAuditTelemetry(currentTokenMap = {}) {
         trademark: 'ZTDS™ Reg. #182655957 (ILPO Cl 9 & 42)'
     };
 
+    const agenticProtocol = {
+        protocolsSupported: ['MCP-1.0 (stdio/SSE)', 'A2A-1.0 (Agent2Agent)', 'ZTDS-RFC-v1.0'],
+        agentCardUrl: 'https://privacyscrubber.com/.well-known/agent-card.json',
+        ztdsStandardCardUrl: 'https://ztds.ai/.well-known/agent-card.json',
+        regulatorySafeHarbor: [
+            'GDPR-Art-4(5)-Pseudonymization',
+            'GDPR-Art-25-Privacy-by-Design',
+            'GDPR-Art-32-TOMs',
+            'EU-AI-Act-Art-50',
+            'EU-AI-Act-Art-17-EN-18286-QMS',
+            'CNIL-ICO-Agentic-Memory-Compartmentalization',
+            'IL-PPL-Amendment-13-Sec-17'
+        ],
+        zeroCleartextEgress: true
+    };
+
     const statutoryCitations = [
         {
-            statute: 'EU AI Act (Art. 50)',
-            scope: 'AI Transparency & Data Minimization',
-            rule: 'Sanitization runs locally by design; reduces the content sent to external AI models. Informational mapping, not a compliance determination.'
+            statute: 'EU AI Act (Art. 50 & Art. 17 / EN 18286:2026 QMS)',
+            scope: 'AI Transparency, Data Minimization & Harmonized QMS Governance',
+            rule: 'Sanitization runs locally by design; reduces the content sent to external AI models and supports Article 17 Quality Management System (EN 18286:2026) data governance controls. Informational mapping, not a compliance determination.'
         },
         {
             statute: 'GDPR (Art. 4, 25, 28, 32)',
@@ -787,6 +805,7 @@ function buildCisoAuditTelemetry(currentTokenMap = {}) {
         frameworksList: Array.from(frameworksSet),
         statutoryCitations,
         ipHoldings,
+        agenticProtocol,
         multimodalEgress: '0.00 Bytes (Solid Blackout & Burn-in Verified)'
     };
 }
@@ -2489,10 +2508,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
       const charLimit = (isAdvanced && !isAutoElevated && !license.isPro) ? 5000 : 15000;
       if (isAdvanced && !license.isPro) {
-        mcpLog(`${colors.yellowBold}[PrivacyScrubber] Profile '${targetProfile}' active on Free Tier (5,000 char trial quota).${colors.reset}\n${colors.cyan}[Upgrade] Commercial TEAMS ($99/mo flat) & Developer SDK ($299/mo): https://privacyscrubber.com/pricing?tier=teams&utm_source=mcp&utm_medium=profile_quota&utm_campaign=teams_upgrade${colors.reset}\n`);
+        mcpLog(`${colors.yellowBold}[PrivacyScrubber] Profile '${targetProfile}' active on Free Tier (5,000 char trial quota).${colors.reset}\n${colors.cyan}[Upgrade] 7-Day B2B Trial / TEAMS ($99/mo flat) & Developer SDK ($299/mo): https://privacyscrubber.com/pricing?tier=teams&trial=true&profile=${encodeURIComponent(targetProfile)}&utm_source=mcp&utm_medium=profile_quota&utm_campaign=teams_upgrade (or run: npx @privacyscrubber/mcp-server trial)${colors.reset}\n`);
       }
 
-      const { processedText, wasTruncated } = truncateIfFree(text, license.isPro, charLimit);
+      const { processedText, wasTruncated } = truncateIfFree(text, license.isPro, charLimit, finalProfile);
 
       const { scrubbedText, newTokens } = performSanitization(processedText, finalProfile, currentIgnoreList, currentSession);
       
@@ -2851,10 +2870,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
           const charLimit = (isAdvanced && !license.isPro) ? 5000 : 15000;
           if (isAdvanced && !license.isPro) {
-            mcpLog(`${colors.yellowBold}[PrivacyScrubber] Profile '${targetProfile}' active on Free Tier (5,000 char trial quota).${colors.reset}\n${colors.cyan}[Upgrade] Commercial TEAMS ($99/mo flat) & Developer SDK ($299/mo): https://privacyscrubber.com/pricing?tier=teams&utm_source=mcp&utm_medium=profile_quota&utm_campaign=teams_upgrade${colors.reset}\n`);
+            mcpLog(`${colors.yellowBold}[PrivacyScrubber] Profile '${targetProfile}' active on Free Tier (5,000 char trial quota).${colors.reset}\n${colors.cyan}[Upgrade] 7-Day B2B Trial / TEAMS ($99/mo flat) & Developer SDK ($299/mo): https://privacyscrubber.com/pricing?tier=teams&trial=true&profile=${encodeURIComponent(targetProfile)}&utm_source=mcp&utm_medium=profile_quota&utm_campaign=teams_upgrade (or run: npx @privacyscrubber/mcp-server trial)${colors.reset}\n`);
           }
 
-          const { processedText: processedContent, wasTruncated } = truncateIfFree(content, license.isPro, charLimit);
+          const { processedText: processedContent, wasTruncated } = truncateIfFree(content, license.isPro, charLimit, finalProfile);
 
           const sanitized = performSanitization(processedContent, finalProfile, targetIgnoreList, targetSession);
           const { scrubbedText, newTokens } = sanitized;
@@ -3082,10 +3101,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
       const charLimit = (isAdvanced && !isAutoElevated && !license.isPro) ? 5000 : 15000;
       if (isAdvanced && !license.isPro) {
-        mcpLog(`${colors.yellowBold}[PrivacyScrubber] Profile '${targetProfile}' active on Free Tier (5,000 char trial quota).${colors.reset}\n${colors.cyan}[Upgrade] Commercial TEAMS ($99/mo flat) & Developer SDK ($299/mo): https://privacyscrubber.com/pricing?tier=teams&utm_source=mcp&utm_medium=profile_quota&utm_campaign=teams_upgrade${colors.reset}\n`);
+        mcpLog(`${colors.yellowBold}[PrivacyScrubber] Profile '${targetProfile}' active on Free Tier (5,000 char trial quota).${colors.reset}\n${colors.cyan}[Upgrade] 7-Day B2B Trial / TEAMS ($99/mo flat) & Developer SDK ($299/mo): https://privacyscrubber.com/pricing?tier=teams&trial=true&profile=${encodeURIComponent(targetProfile)}&utm_source=mcp&utm_medium=profile_quota&utm_campaign=teams_upgrade (or run: npx @privacyscrubber/mcp-server trial)${colors.reset}\n`);
       }
 
-      const { processedText: processedContent2, wasTruncated } = truncateIfFree(content, license.isPro, charLimit);
+      const { processedText: processedContent2, wasTruncated } = truncateIfFree(content, license.isPro, charLimit, finalProfile);
 
       const { scrubbedText, newTokens } = performSanitization(processedContent2, finalProfile, targetIgnoreList, targetSession);
       const telemetry = buildCisoAuditTelemetry(newTokens);
@@ -3581,8 +3600,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       const isAdvanced = targetProfile.toLowerCase() !== "general";
       const charLimit = (isAdvanced && !license.isPro) ? 5000 : 15000;
 
-      const { processedText: cleanStdout, wasTruncated: truncOut } = truncateIfFree(stdout, license.isPro, charLimit);
-      const { processedText: cleanStderr, wasTruncated: truncErr } = truncateIfFree(stderr, license.isPro, charLimit);
+      const { processedText: cleanStdout, wasTruncated: truncOut } = truncateIfFree(stdout, license.isPro, charLimit, targetProfile);
+      const { processedText: cleanStderr, wasTruncated: truncErr } = truncateIfFree(stderr, license.isPro, charLimit, targetProfile);
 
       const resCommand = performSanitization(command, targetProfile, targetIgnoreList, targetSession);
       const resStdout = performSanitization(cleanStdout, targetProfile, targetIgnoreList, targetSession);
@@ -3751,7 +3770,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       const isAdvanced = targetProfile.toLowerCase() !== "general";
       const charLimit = (isAdvanced && !license.isPro) ? 5000 : 15000;
 
-      const { processedText, wasTruncated: wasCharTruncated } = truncateIfFree(capped, license.isPro, charLimit);
+      const { processedText, wasTruncated: wasCharTruncated } = truncateIfFree(capped, license.isPro, charLimit, targetProfile);
       const currentSession = getSessionMap(session_id);
       const currentIgnoreList = getSessionIgnoreList(session_id);
       const { scrubbedText, newTokens } = performSanitization(processedText, targetProfile, currentIgnoreList, currentSession);
@@ -3815,7 +3834,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       const isAdvanced = targetProfile.toLowerCase() !== "general";
       const charLimit = (isAdvanced && !license.isPro) ? 5000 : 15000;
 
-      const { processedText, wasTruncated } = truncateIfFree(diffOutput, license.isPro, charLimit);
+      const { processedText, wasTruncated } = truncateIfFree(diffOutput, license.isPro, charLimit, targetProfile);
       const { scrubbedText, newTokens } = performSanitization(processedText, targetProfile, targetIgnoreList, targetSession);
 
       const telemetry = buildCisoAuditTelemetry(newTokens);
@@ -4621,10 +4640,11 @@ export function performSanitization(text, profile, ignoreList = null, customSess
   return { scrubbedText: result.scrubbedText, newTokens };
 }
 
-export function truncateIfFree(text, isPro, charLimit = 15000) {
+export function truncateIfFree(text, isPro, charLimit = 15000, profile = 'general') {
   if (!isPro && text.length > charLimit) {
-    mcpLog(`${colors.yellowBold}[PrivacyScrubber] Input truncated to ${charLimit.toLocaleString()} characters (Free Tier Limit).${colors.reset}\n${colors.cyan}[Upgrade] Set PRIVACYSCRUBBER_KEY to your PRO/TEAMS/SDK license key for unlimited throughput: https://privacyscrubber.com/pricing?tier=teams&utm_source=mcp&utm_medium=truncation&utm_campaign=teams_upgrade${colors.reset}\n`);
-    const upsellNotice = `\n\n[PrivacyScrubber Free Tier: Payload truncated to ${charLimit.toLocaleString()} chars. Upgrade to PRO ($15/mo or $110 Lifetime) or Developer SDK ($299/mo) for unlimited payload processing: https://privacyscrubber.com/pricing?tier=teams&utm_source=mcp&utm_medium=truncation&utm_campaign=teams_upgrade]`;
+    const safeProf = encodeURIComponent(String(profile || 'general').toLowerCase());
+    mcpLog(`${colors.yellowBold}[PrivacyScrubber] Input truncated to ${charLimit.toLocaleString()} characters (Free Tier Limit for profile '${profile || 'general'}').${colors.reset}\n${colors.cyan}[Upgrade] Set PRIVACYSCRUBBER_KEY to your PRO/TEAMS/SDK license key or start a 7-day B2B trial ('npx @privacyscrubber/mcp-server trial'): https://privacyscrubber.com/pricing?tier=teams&trial=true&profile=${safeProf}&utm_source=mcp&utm_medium=truncation&utm_campaign=teams_upgrade${colors.reset}\n`);
+    const upsellNotice = `\n\n[PrivacyScrubber Free Tier: Payload truncated to ${charLimit.toLocaleString()} chars (${profile || 'general'}). Upgrade to PRO ($15/mo or $110 LT), TEAMS ($99/mo flat) or Developer SDK ($299/mo): https://privacyscrubber.com/pricing?tier=teams&trial=true&profile=${safeProf}&utm_source=mcp&utm_medium=truncation&utm_campaign=teams_upgrade | CLI Trial: npx @privacyscrubber/mcp-server trial]`;
     return { processedText: text.substring(0, charLimit), wasTruncated: true, upsellNotice, charLimit };
   }
   return { processedText: text, wasTruncated: false, upsellNotice: "", charLimit };

package/install.js

@@ -496,7 +496,7 @@ Options:
     console.log(`[SUMMARY] ${options.remove ? 'Cleaned' : 'Configured'} ${configuredCount} AI client(s) successfully.`);
     if (!options.remove) {
       console.log('Next step: Restart your AI IDE or Claude Desktop to activate PrivacyScrubber.');
-      console.log('\x1b[36m💼 B2B 7-Day Free Trial (TEAMS/SDK): npx @privacyscrubber/mcp-server trial\x1b[0m');
+      console.log('\x1b[36m💼 B2B 7-Day Free Trial (TEAMS $99/mo · SDK $299/mo): npx @privacyscrubber/mcp-server trial  |  https://privacyscrubber.com/pricing/?tier=teams&trial=true&utm_source=mcp_install\x1b[0m');
       console.log('\x1b[36m📋 Generate CISO Procurement Memo:   npx @privacyscrubber/mcp-server memo\x1b[0m');
       console.log('\x1b[33m⭐ Enjoying zero-trust privacy? Star the repo on GitHub: https://github.com/moxno/privacyscrubber-mcp\x1b[0m');
       console.log('\x1b[90m   One-click CLI: gh repo star moxno/privacyscrubber-mcp && gh repo star moxno/ztds.ai\x1b[0m');

package/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": "0.3",
   "name": "privacyscrubber/pii-masking-mcp",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "description": "CISO-Approved Zero-Trust PII & Secrets Redaction MCP Server for Cursor, Windsurf, and Claude Desktop. Prevent API leaks and comply with HIPAA/SOC 2 locally.",
   "author": {
     "name": "PrivacyScrubber",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@privacyscrubber/mcp-server",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "mcpName": "io.github.moxno/privacyscrubber-mcp",
   "description": "CISO-Approved Zero-Trust PII & Secrets Redaction MCP Server for Cursor, Windsurf, and Claude Desktop. Prevent API leaks and comply with HIPAA/SOC 2 locally.",
   "main": "index.js",

package/pii-masking-run.js

@@ -27,7 +27,7 @@ const cmdIndex = args.indexOf("--");
 
 if (args.includes("--version") || args.includes("-v")) {
   const pkgPath = path.resolve(__dirname, './package.json');
-  let version = '2.4.6';
+  let version = '2.4.7';
   try { version = JSON.parse(fs.readFileSync(pkgPath, 'utf8')).version; } catch (_) {}
   console.log(`ps-guard / pii-masking-run v${version} (PrivacyScrubber MCP)`);
   process.exit(0);
@@ -36,6 +36,7 @@ if (args.includes("--version") || args.includes("-v")) {
 const isDiffMode = args.includes("--diff");
 const isRulesMode = args.includes("--rules");
 const isHookMode = args.includes("--hook");
+const isWrapMode = args.includes("--wrap");
 const isJsonMode = args.includes("--json");
 const isRestoreMode = args.includes("--restore") || args.includes("--unscrub");
 let tokenMapInput = null;
@@ -48,19 +49,44 @@ const payloadIdx = args.indexOf("--payload");
 if (payloadIdx !== -1 && args[payloadIdx + 1]) {
   hookPayloadArg = args[payloadIdx + 1];
 }
-const hasCommand = cmdIndex !== -1 && args.slice(cmdIndex + 1).length > 0;
+
+let wrapCommandArgs = [];
+if (isWrapMode) {
+  if (cmdIndex !== -1 && args.slice(cmdIndex + 1).length > 0) {
+    wrapCommandArgs = args.slice(cmdIndex + 1);
+  } else {
+    const wrapIdx = args.indexOf("--wrap");
+    const afterWrap = args.slice(wrapIdx + 1);
+    for (let i = 0; i < afterWrap.length; i++) {
+      const a = afterWrap[i];
+      if ((a === "--profile" || a === "--key" || a === "--token-map") && afterWrap[i + 1]) {
+        i++;
+        continue;
+      }
+      if (a === "--quiet" || a === "-q" || a === "--verbose" || a === "--json") {
+        continue;
+      }
+      wrapCommandArgs = afterWrap.slice(i);
+      break;
+    }
+  }
+}
+
+const hasCommand = (cmdIndex !== -1 && args.slice(cmdIndex + 1).length > 0) || wrapCommandArgs.length > 0;
 const hasStdin = !process.stdin.isTTY;
 
-if (args.includes("-h") || args.includes("--help") || (!hasCommand && !isDiffMode && !isRulesMode && !isHookMode && !isRestoreMode && !hasStdin)) {
+if (args.includes("-h") || args.includes("--help") || (!hasCommand && !isDiffMode && !isRulesMode && !isHookMode && !isWrapMode && !isRestoreMode && !hasStdin)) {
   console.log("PrivacyScrubber CLI & Agentic Guard: ps-guard / pii-masking-run");
   console.log("\nUsage:");
   console.log("  npx ps-guard [options] -- <command> [args...]");
+  console.log("  npx ps-guard --wrap [options] [--] <mcp-server-cmd> [args...]");
   console.log("  cat <file> | npx ps-guard [options]");
   console.log("  npx ps-guard --diff [--staged] [options]");
   console.log("  npx ps-guard --restore --token-map <file|json> [options]");
   console.log("  npx ps-guard --rules [targets]");
   console.log("  npx ps-guard --hook               (Claude Code & Cursor IDE PreToolUse / beforeReadFile hook)");
   console.log("\nOptions:");
+  console.log("  --wrap            Transparent JSON-RPC 2.0 stdio proxy for any 3rd-party MCP server");
   console.log("  --profile <name>  Specify detection profile (e.g. General, Dev, Medical, Legal, HR)");
   console.log("  --key <licKey>    PrivacyScrubber PRO License Key");
   console.log("  --json            Output structured JSON (scrubbedText, tokenMap, count, telemetry)");
@@ -75,6 +101,7 @@ if (args.includes("-h") || args.includes("--help") || (!hasCommand && !isDiffMod
   console.log("  -h, --help        Show this help screen");
   console.log("\nExamples:");
   console.log("  npx ps-guard -- cat database-dump.sql");
+  console.log("  npx ps-guard --wrap -- npx -y @modelcontextprotocol/server-postgres postgresql://localhost/mydb");
   console.log("  npx ps-guard --profile dev -- npm test");
   console.log("  cat .env | npx ps-guard --profile dev --json");
   console.log("  cat ai_reply.txt | npx ps-guard --restore --token-map map.json");
@@ -425,11 +452,27 @@ function buildCisoAuditTelemetry(currentTokenMap = {}) {
     trademark: 'ZTDS™ Reg. #182655957 (ILPO Cl 9 & 42)'
   };
 
+  const agenticProtocol = {
+    protocolsSupported: ['MCP-1.0 (stdio/SSE)', 'A2A-1.0 (Agent2Agent)', 'ZTDS-RFC-v1.0'],
+    agentCardUrl: 'https://privacyscrubber.com/.well-known/agent-card.json',
+    ztdsStandardCardUrl: 'https://ztds.ai/.well-known/agent-card.json',
+    regulatorySafeHarbor: [
+      'GDPR-Art-4(5)-Pseudonymization',
+      'GDPR-Art-25-Privacy-by-Design',
+      'GDPR-Art-32-TOMs',
+      'EU-AI-Act-Art-50',
+      'EU-AI-Act-Art-17-EN-18286-QMS',
+      'CNIL-ICO-Agentic-Memory-Compartmentalization',
+      'IL-PPL-Amendment-13-Sec-17'
+    ],
+    zeroCleartextEgress: true
+  };
+
   const statutoryCitations = [
     {
-      statute: 'EU AI Act (Art. 50)',
-      scope: 'AI Transparency & Data Minimization',
-      rule: 'Sanitization runs locally by design; reduces the content sent to external AI models. Informational mapping, not a compliance determination.'
+      statute: 'EU AI Act (Art. 50 & Art. 17 / EN 18286:2026 QMS)',
+      scope: 'AI Transparency, Data Minimization & Harmonized QMS Governance',
+      rule: 'Sanitization runs locally by design; reduces the content sent to external AI models and supports Article 17 Quality Management System (EN 18286:2026) data governance controls. Informational mapping, not a compliance determination.'
     },
     {
       statute: 'GDPR (Art. 4, 25, 28, 32)',
@@ -461,6 +504,7 @@ function buildCisoAuditTelemetry(currentTokenMap = {}) {
     frameworksList: Array.from(frameworksSet),
     statutoryCitations,
     ipHoldings,
+    agenticProtocol,
     multimodalEgress: '0.00 Bytes (Solid Blackout & Burn-in Verified)'
   };
 }
@@ -775,8 +819,183 @@ if (isDiffMode) {
   }
 }
 
-// Mode 3: Stdin Stream Mode (pipe)
-if (hasStdin && !hasCommand && !isRestoreMode && !isDiffMode && !isRulesMode) {
+// Mode 2.5: Transparent MCP JSON-RPC 2.0 Stdio Proxy Wrapper (--wrap)
+if (isWrapMode) {
+  if (wrapCommandArgs.length === 0) {
+    console.error('Error: --wrap requires an upstream MCP server command (e.g. npx ps-guard --wrap -- npx -y @modelcontextprotocol/server-postgres ...)');
+    process.exit(1);
+  }
+
+  const SKIP_SANITIZE_KEYS = new Set([
+    'jsonrpc', 'id', 'method', 'type', 'mimeType', 'uri', 'name', 'role',
+    'protocolVersion', 'cursor', 'nextCursor', 'isError', 'version'
+  ]);
+
+  const deepDetokenizeParams = (node, depth = 0) => {
+    if (depth > 20 || node === null || node === undefined) return node;
+    if (typeof node === 'string') {
+      if (Object.keys(localSessionMap).length === 0) return node;
+      const res = PrivacyScrubberCore.unscrubText(node, localSessionMap);
+      return (res && typeof res.restoredText === 'string') ? res.restoredText : node;
+    }
+    if (Array.isArray(node)) {
+      return node.map(item => deepDetokenizeParams(item, depth + 1));
+    }
+    if (typeof node === 'object') {
+      const out = {};
+      for (const [k, v] of Object.entries(node)) {
+        if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;
+        out[k] = deepDetokenizeParams(v, depth + 1);
+      }
+      return out;
+    }
+    return node;
+  };
+
+  const deepSanitizeResult = (node, keyName = '', depth = 0) => {
+    if (depth > 20 || node === null || node === undefined) return node;
+    if (typeof node === 'string') {
+      if (SKIP_SANITIZE_KEYS.has(keyName) || node.length < 4) return node;
+      return performSanitization(node);
+    }
+    if (Array.isArray(node)) {
+      return node.map(item => deepSanitizeResult(item, keyName, depth + 1));
+    }
+    if (typeof node === 'object') {
+      const out = {};
+      for (const [k, v] of Object.entries(node)) {
+        if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;
+        if (k === 'inputSchema' || k === 'outputSchema' || k === 'capabilities' || k === 'serverInfo' || k === '_meta') {
+          out[k] = v;
+        } else {
+          out[k] = deepSanitizeResult(v, k, depth + 1);
+        }
+      }
+      return out;
+    }
+    return node;
+  };
+
+  const zeroizeSessionMap = () => {
+    for (const k of Object.keys(localSessionMap)) {
+      localSessionMap[k] = '';
+      delete localSessionMap[k];
+    }
+  };
+
+  const [cmdBin, ...cmdRest] = wrapCommandArgs;
+  const child = spawn(cmdBin, cmdRest, {
+    stdio: ['pipe', 'pipe', 'pipe'],
+    shell: process.platform === 'win32'
+  });
+
+  // Intercept client -> upstream MCP server (JSON-RPC requests on stdin)
+  const rlClientIn = readline.createInterface({
+    input: process.stdin,
+    terminal: false
+  });
+
+  rlClientIn.on('line', (line) => {
+    if (!child.stdin || child.stdin.destroyed) return;
+    const trimmed = line.trim();
+    if (!trimmed.startsWith('{')) {
+      child.stdin.write(line + '\n');
+      return;
+    }
+    try {
+      const msg = JSON.parse(trimmed);
+      if (msg && typeof msg === 'object' && msg.params && (msg.method === 'tools/call' || msg.method === 'prompts/get' || msg.method === 'resources/read' || msg.method === 'sampling/createMessage')) {
+        msg.params = deepDetokenizeParams(msg.params);
+        child.stdin.write(JSON.stringify(msg) + '\n');
+        return;
+      }
+    } catch (_) {}
+    child.stdin.write(line + '\n');
+  });
+
+  rlClientIn.on('close', () => {
+    if (child.stdin && !child.stdin.destroyed) {
+      child.stdin.end();
+    }
+  });
+
+  // Intercept upstream MCP server -> client (JSON-RPC responses/notifications on stdout)
+  const rlUpstreamOut = readline.createInterface({
+    input: child.stdout,
+    terminal: false
+  });
+
+  rlUpstreamOut.on('line', (line) => {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith('{')) {
+      process.stdout.write(performSanitization(line) + '\n');
+      return;
+    }
+    try {
+      const msg = JSON.parse(trimmed);
+      if (msg && typeof msg === 'object') {
+        if (msg.result && typeof msg.result === 'object') {
+          const isSchemaListing = Array.isArray(msg.result.tools) || Array.isArray(msg.result.prompts) || Array.isArray(msg.result.resourceTemplates) || Boolean(msg.result.protocolVersion);
+          if (!isSchemaListing) {
+            msg.result = deepSanitizeResult(msg.result);
+            const receipt = buildPsr2Receipt(localSessionMap);
+            const telemetry = buildCisoAuditTelemetry(localSessionMap);
+            msg.result._meta = Object.assign({}, msg.result._meta || {}, {
+              ztds_receipt: {
+                version: receipt.version,
+                timestamp: receipt.timestamp,
+                manifestSha256: receipt.manifestSha256,
+                receiptSha256: receipt.receiptSha256,
+                entityCounts: receipt.entityCounts,
+                tokensTotal: receipt.tokensTotal,
+                riskLevel: telemetry.riskLevel,
+                regulatorySafeHarbor: telemetry.agenticProtocol ? telemetry.agenticProtocol.regulatorySafeHarbor : [],
+                zero_cleartext_egress: true
+              }
+            });
+          }
+        } else if (msg.params && typeof msg.params === 'object') {
+          msg.params = deepSanitizeResult(msg.params);
+        }
+        process.stdout.write(JSON.stringify(msg) + '\n');
+        return;
+      }
+    } catch (_) {}
+    process.stdout.write(performSanitization(line) + '\n');
+  });
+
+  const rlUpstreamErr = readline.createInterface({
+    input: child.stderr,
+    terminal: false
+  });
+
+  rlUpstreamErr.on('line', (line) => {
+    process.stderr.write(performSanitization(line) + '\n');
+  });
+
+  const handleSignal = (sig) => {
+    zeroizeSessionMap();
+    if (!child.killed) {
+      try { child.kill(sig); } catch (_) {}
+    }
+  };
+  process.on('SIGINT', () => handleSignal('SIGINT'));
+  process.on('SIGTERM', () => handleSignal('SIGTERM'));
+  process.on('exit', zeroizeSessionMap);
+
+  child.on('close', (code) => {
+    emitProofFeedback();
+    zeroizeSessionMap();
+    process.exit(code || 0);
+  });
+
+  child.on('error', (err) => {
+    zeroizeSessionMap();
+    console.error(`Error spawning wrapped MCP server: ${err.message}`);
+    process.exit(1);
+  });
+} else if (hasStdin && !hasCommand && !isRestoreMode && !isDiffMode && !isRulesMode) {
+  // Mode 3: Stdin Stream Mode (pipe)
   if (isJsonMode) {
     let rawInput = '';
     process.stdin.setEncoding('utf8');