mcpower-proxy 0.0.73__py3-none-any.whl → 0.0.77__py3-none-any.whl

ide_tools/common/hooks/types.py

@@ -16,12 +16,12 @@ class OutputFormat:
     allow_exit_code: int
     deny_exit_code: int
     error_exit_code: int
-    
+
     # Output formatter function
     # Args: (hook_type: str, allowed: bool, user_msg: Optional[str], agent_msg: Optional[str]) -> str
     formatter: Callable[[str, bool, Optional[str], Optional[str]], str]
-    
-    
+
+
 @dataclass
 class HookConfig:
     """
@@ -32,4 +32,3 @@ class HookConfig:
     server_name: str  # IDE-specific tool server name
     client_name: str  # IDE-specific client name (e.g. "cursor", "claude-code")
     max_content_length: int  # Maximum content length before skipping API call
-

ide_tools/common/hooks/utils.py

@@ -7,7 +7,8 @@ import re
 from collections import Counter
 from typing import Dict, Any, List, Callable, Optional
 
-from mcpower_shared.mcp_types import create_policy_request, create_policy_response, AgentContext, EnvironmentContext
+from mcpower_shared.mcp_types import create_policy_request, create_policy_response, AgentContext, EnvironmentContext, \
+    ServerRef, ToolRef
 from modules.apis.security_policy import SecurityPolicyClient
 from modules.decision_handler import DecisionHandler
 from modules.logs.audit_trail import AuditTrailLogger
@@ -229,9 +230,14 @@ async def inspect_and_enforce(
         if is_request:
             policy_request = create_policy_request(
                 event_id=event_id,
-                server_name=server_name,
-                server_transport="stdio",
-                tool_name=tool_name,
+                server=ServerRef(
+                    name=server_name,
+                    transport="stdio",
+                    context="ide"
+                ),
+                tool=ToolRef(
+                    name=tool_name
+                ),
                 agent_context=agent_context,
                 env_context=env_context,
                 arguments=content_data
@@ -243,9 +249,14 @@ async def inspect_and_enforce(
         else:
             policy_response = create_policy_response(
                 event_id=event_id,
-                server_name=server_name,
-                server_transport="stdio",
-                tool_name=tool_name,
+                server=ServerRef(
+                    name=server_name,
+                    transport="stdio",
+                    context="ide"
+                ),
+                tool=ToolRef(
+                    name=tool_name
+                ),
                 response_content=safe_json_dumps(content_data),
                 agent_context=agent_context,
                 env_context=env_context
@@ -273,4 +284,3 @@ async def inspect_and_enforce(
     )
 
     return decision
-

ide_tools/cursor/router.py

@@ -68,6 +68,7 @@ def route_cursor_hook(logger: MCPLogger, audit_logger: AuditTrailLogger, stdin_i
                 logger=logger,
                 audit_logger=audit_logger,
                 event_id=event_id,
+                prompt_id=prompt_id,
                 cwd=cwd,
                 server_name=CURSOR_CONFIG.server_name,
                 client_name="cursor",

{mcpower_proxy-0.0.73.dist-info → mcpower_proxy-0.0.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpower-proxy
-Version: 0.0.73
+Version: 0.0.77
 Summary: MCPower Security proxy
 Author-email: MCPower Security <support@mcpower.tech>
 License:                                  Apache License
@@ -216,7 +216,8 @@ Requires-Dist: watchdog>=3.0.0
 Requires-Dist: jsonc-parser>=1.1.5
 Requires-Dist: jsonpath-ng>=1.7.0
 Requires-Dist: pydantic>=2.8.0
-Requires-Dist: mcpower-shared==0.1.3
+Requires-Dist: mcpower-shared==0.1.4
+Requires-Dist: bashlex>=0.18
 Dynamic: license-file
 
 # MCPower Proxy

{mcpower_proxy-0.0.73.dist-info → mcpower_proxy-0.0.77.dist-info}/RECORD

@@ -1,31 +1,32 @@
 main.py,sha256=MahoqxG5euEJwLhosv2OVUkVbTaMkph_je8lgmtc7Z4,3920
 ide_tools/__init__.py,sha256=odLisqEeKVuZupQoeM-uP9WgQseVTYQG0eP2hhwUyAc,250
 ide_tools/router.py,sha256=PbGz1cwUXR3Bcy879W2wgmT4f2uThXiXevpWSxcgKZQ,1538
-ide_tools/common/__init__.py,sha256=ALhDYMw8v9tlYVEVcx3kP-e6c0yEyRQAQYe7sqwHHB4,66
-ide_tools/common/hooks/__init__.py,sha256=px5Ibzn6rlBcprp7RiZwGWnnWJmGITb0ApiXWKbeyRM,62
-ide_tools/common/hooks/init.py,sha256=QH3qhXqOfQj1IzAXRxgDXu2zDnLHJ-_3PFZWq6Zp-TI,4044
-ide_tools/common/hooks/output.py,sha256=xmOGmPLXy4H3A2G2A95WxqIB4qCWbVO9sq-pz2clyzU,1856
-ide_tools/common/hooks/prompt_submit.py,sha256=-3rwH_e_uywAN9PV_IpSAOEeU21DMJ15PyMLlmwWiPA,7325
-ide_tools/common/hooks/read_file.py,sha256=d8p_IpGwgWG9Vn0yd78KPRzoDi3RacmqxiTaFqndBa0,6481
-ide_tools/common/hooks/shell_execution.py,sha256=uneYaiU8YQhzEjishnSW3SZGdU4Ob0hgSgo7TK5InQw,7154
-ide_tools/common/hooks/types.py,sha256=nT_3rZ7J8b70o2FcY1lkYSFI4Z3WfD7oQgUEGSiFIbQ,1036
-ide_tools/common/hooks/utils.py,sha256=R_jKQdG98oQhooMXV_l2xURIvYgi0Y9UwZyGbcx0LuU,9144
+ide_tools/common/__init__.py,sha256=cW2cN5y2l4PHGkkWtYgydrtXtmLU_UipJAf_c0VMTk0,65
+ide_tools/common/hooks/__init__.py,sha256=O-waaJU1OQFxplrLZymSSiIyLDNlGlki6nX-nbJiqz0,61
+ide_tools/common/hooks/init.py,sha256=X0J_rEjU6qjvDaPOh-obzSqfICMsOGc6VxRjcZqLTqQ,4117
+ide_tools/common/hooks/output.py,sha256=FBezJL1S5vzLJWW_cLht4XFLDJvhV_w-UTqCQOLEusE,1879
+ide_tools/common/hooks/prompt_submit.py,sha256=_FysGrlJXcblex-OapWVIv1bedP1IKR2d1cvkINU0uM,4907
+ide_tools/common/hooks/read_file.py,sha256=FBHTxOXrQWlw2qtddAq4gfv5h1g6rTbQ-0uqqL9wXE0,6456
+ide_tools/common/hooks/shell_execution.py,sha256=KbJSGLW__bPso45eAlbV13nnkKYwwd7-KodZ6VyUnS0,9522
+ide_tools/common/hooks/shell_parser_bashlex.py,sha256=ePit2jduHvBYkmEvcslpjCGJ5H-amVEm1We1vVCmMNc,15002
+ide_tools/common/hooks/types.py,sha256=ndisZ8YoasQ3HlVzzyLmpiBCQJs43YPmixbaIIxRpZM,1023
+ide_tools/common/hooks/utils.py,sha256=7Q95IZZG_lShq5Jvw78M7QN5-tVNVeFzLU33qB8boEU,9425
 ide_tools/cursor/__init__.py,sha256=YW_V8m0A0bou0wQW_wy3nt2L_7MaNWeNKYBx-NQkilw,153
 ide_tools/cursor/constants.py,sha256=KMRBRqxRxTdemMoq81TVG6avt3ATtsPo4aJo8XhSctk,1804
 ide_tools/cursor/format.py,sha256=Lh-KH1IlsLL-0B98Bz-ywxpwXL8urK7yPteZGBTPOiY,972
-ide_tools/cursor/router.py,sha256=AmRv1kfDEd3EULSlRjj0BDtedlyqtgFgSBp25iMxJBI,3856
-mcpower_proxy-0.0.73.dist-info/licenses/LICENSE,sha256=U6WUzdnBrbmVxBmY75ikW-KtinwYnowZ7yNb5hECrvY,11337
+ide_tools/cursor/router.py,sha256=GXmXcNSIA9pe1vnmmoYpz0dyC_B7OSpQwOVHIV7YUEI,3893
+mcpower_proxy-0.0.77.dist-info/licenses/LICENSE,sha256=U6WUzdnBrbmVxBmY75ikW-KtinwYnowZ7yNb5hECrvY,11337
 modules/__init__.py,sha256=mJglXQwSRhU-bBv4LXgfu7NfGN9K4BeQWMPApen5rAA,30
 modules/decision_handler.py,sha256=P8isKzf4GIWz9SK-VJPtO8VJEgNp7rAIcVZngnaLHmw,9574
 modules/apis/__init__.py,sha256=Y5WZpKJzHpnRJebk0F80ZRTjR2PpA2LlYLgqI3XlmRo,15
 modules/apis/security_policy.py,sha256=3fljaTpzfh_Nj0-jVvbnCJBL-CZxvqFNWfSlrAawsBc,15103
 modules/logs/__init__.py,sha256=dpboUQjuO02z8K-liCbm2DYkCa-CB_ZDV9WSSjNm7Fs,15
-modules/logs/audit_trail.py,sha256=_jE9A3WG7ooPUphDHpUFnZ6de16ewhdXYV-tV2__zxo,6183
+modules/logs/audit_trail.py,sha256=yoxzvRDI8ldjC-5o9__PkvaAbM33jWbq_8Sm6uKj8o8,6198
 modules/logs/logger.py,sha256=MJS0P8VEzUX-5udzQitznaBPCBAcZJCygUgwaDWSq94,4087
 modules/redaction/__init__.py,sha256=e5NTmp-zonUdzzscih-w_WQ-X8Nvb8CE8b_d6SbrwWg,316
 modules/redaction/constants.py,sha256=xbDSX8n72FuJu6JJ_sbBE0f5OcWuwEwHxBZuK9Xz-TI,1213
-modules/redaction/gitleaks_rules.py,sha256=8dRb4g5OQaHAjx8vpMbxwu06CdDE39aqw9eqLiCDcqY,46411
-modules/redaction/pii_rules.py,sha256=-JhjcCjH5NFeOfQGzTFNdx_-s_0i6tZ-XFxydtkByD0,10019
+modules/redaction/gitleaks_rules.py,sha256=8NHR5kr2XSrPn4c0PsjD0je6p8gmNzq2vI098QUxAx0,46397
+modules/redaction/pii_rules.py,sha256=H7WOIMZZK8mkwdvnBe0J2nPwqzKqGHdUbCSGpxJGT8s,7666
 modules/redaction/redactor.py,sha256=Y3PSxXJSLJZj8gkKZ3OQ7XxoIPUilFk6gY0dbeqfjwE,23352
 modules/ui/__init__.py,sha256=YlW4XfQEGW1ezg3UFU59nHw95LicmlpNPhim5IqSB50,34
 modules/ui/classes.py,sha256=ZvVRdzO_hD4WnpS3_eVa0WCyaooXiYVpHLzQkzBaH6M,1777
@@ -47,13 +48,15 @@ modules/utils/copy.py,sha256=9OJIqWn8PxPZXr3DTt_01jp0YgmPimckab1969WFh0c,1075
 modules/utils/ids.py,sha256=rhhRz7RmFjuJGYLft1erHz7vJII1DRpr3iHxBhhFl1s,5743
 modules/utils/json.py,sha256=OA-JtSBqh9qd1yfm-iyOefNBMH3ITFUdxAkj7O_JZ-Y,4024
 modules/utils/mcp_configs.py,sha256=DZaujZnF9LlPDJHzyepH7fWSt1GTr-FEmShPCqnZ5aI,1829
+modules/utils/platform.py,sha256=Kz1Dh_UkvMbfXqiyZIEj7INYaWE9wT6nM9WIKXM91uM,552
+modules/utils/string.py,sha256=cOuwWReyBwOgjxtTRPq1R6pCpfkgfqVmjdiaDPufIZU,456
 wrapper/__init__.py,sha256=OJUsuWSoN1JqIHq4bSrzuL7ufcYJcwAmYCrJjLH44LM,22
-wrapper/__version__.py,sha256=rCTF1Ssof33lV_ElQ2Jd40DYgONJlHNMKTaVGHBP-go,82
-wrapper/middleware.py,sha256=77mZ30DApRlcX7__JzNFlqwKvR1mBYQg5izHbpZiNnw,29854
+wrapper/__version__.py,sha256=4LwZ6ftjxW5rGtS8e8B6V7iXNQZbgnact3whK05F-gg,82
+wrapper/middleware.py,sha256=rXOIduymDLeJ56AWmpMnRnkf7sCmSz7jADMk-v8lcsw,30232
 wrapper/schema.py,sha256=O-CtKI9eJ4eEnqeUXPCrK7QJAFJrdp_cFbmMyg452Aw,7952
 wrapper/server.py,sha256=zoIW_bqXV9vKZNFtD-ij0X_LtKJEjucda6lQI5mU6qY,3440
-mcpower_proxy-0.0.73.dist-info/METADATA,sha256=XZE3Lk26Hb6MLROM7HbBm9CbJApBPcw-N6U_-3eZyak,15669
-mcpower_proxy-0.0.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcpower_proxy-0.0.73.dist-info/entry_points.txt,sha256=0smL8dxE7ERNz6XEggNaUC3QzKp8mD-v4q5nVEo0MXE,48
-mcpower_proxy-0.0.73.dist-info/top_level.txt,sha256=OcCYMHHqbZq3mP5IZDRGdHUNOsKhT1XVnk_mDF_49Es,31
-mcpower_proxy-0.0.73.dist-info/RECORD,,
+mcpower_proxy-0.0.77.dist-info/METADATA,sha256=qX1CZtp76YNug7gOFHOmdJG4gXn3FvV7P_bHQ9iySV0,15698
+mcpower_proxy-0.0.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcpower_proxy-0.0.77.dist-info/entry_points.txt,sha256=0smL8dxE7ERNz6XEggNaUC3QzKp8mD-v4q5nVEo0MXE,48
+mcpower_proxy-0.0.77.dist-info/top_level.txt,sha256=OcCYMHHqbZq3mP5IZDRGdHUNOsKhT1XVnk_mDF_49Es,31
+mcpower_proxy-0.0.77.dist-info/RECORD,,

modules/logs/audit_trail.py

@@ -53,6 +53,7 @@ class AuditTrailLogger:
             self,
             event_type: str,
             data: Dict[str, Any],
+            *,
             event_id: Optional[str] = None,
             prompt_id: Optional[str] = None,
             user_prompt: Optional[str] = None,
@@ -88,14 +89,14 @@ class AuditTrailLogger:
             if prompt_id:
                 event["prompt_id"] = prompt_id
 
-            # Include user_prompt text if provided (only needed once per prompt_id)
-            if user_prompt:
-                event["user_prompt"] = user_prompt
-
             # Include event_id if provided (for pairing request/response)
             if event_id:
                 event["event_id"] = event_id
 
+            # Include user_prompt text if provided (only needed once per prompt_id)
+            if user_prompt:
+                event["user_prompt"] = user_prompt
+
             # If app_uid not set yet, queue the log
             if self.app_uid is None:
                 self._pending_logs.append(event)

modules/redaction/gitleaks_rules.py

@@ -3,7 +3,7 @@ from typing import Dict, List, Tuple
 
 # This file is auto-generated from Gitleaks rules. Do not edit manually.
 # Source: https://github.com/gitleaks/gitleaks/blob/master/config/gitleaks.toml
-# Generation script: targets/vsc-extension/scripts/update-gitleaks-rules.mjs
+# Generation script: targets/scripts/update-gitleaks-rules.mjs
 
 COMPILED_RULES: List[Tuple[str, re.Pattern, int, List[str]]] = [
     (

modules/redaction/pii_rules.py

@@ -60,15 +60,8 @@ class PIIDetector:
     """Lightweight PII detector using only regex patterns."""
 
     def __init__(self):
-        # URL detector with intelligent boundary detection
-        self.url_detector = URLDetector()
-
         # Compile regex patterns for better performance
         self.patterns = {
-            'EMAIL_ADDRESS': re.compile(
-                r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b',
-                re.IGNORECASE
-            ),
             'CREDIT_CARD': re.compile(
                 r'\b(?:'
                 r'4[0-9]{3}[-\s]?[0-9]{4}[-\s]?[0-9]{4}[-\s]?[0-9]{4}(?:[0-9]{3})?|'  # Visa with formatting
@@ -81,40 +74,6 @@ class PIIDetector:
                 r'6(?:011|5[0-9]{2})[0-9]{12}'  # Discover
                 r')\b'
             ),
-            'IP_ADDRESS': re.compile(
-                r'(?:'
-                # IPv4
-                r'\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}'
-                r'(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b'
-                r'|'
-                # IPv6 - comprehensive pattern
-                r'(?:'
-                # Full IPv6 or with :: compression
-                r'(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|'  # Full: 1:2:3:4:5:6:7:8
-                r'(?:[0-9a-fA-F]{1,4}:){1,7}:|'  # Compressed trailing: 1:: or 1:2:3:4:5:6:7::
-                r'(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|'  # Compressed middle: 1::8 or 1:2:3:4:5:6::8
-                r'(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|'  # 1::7:8 or 1:2:3:4:5::7:8
-                r'(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|'  # 1::6:7:8 or 1:2:3:4::6:7:8
-                r'(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|'  # 1::5:6:7:8 or 1:2:3::5:6:7:8
-                r'(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|'  # 1::4:5:6:7:8 or 1:2::4:5:6:7:8
-                r'[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|'  # 1::3:4:5:6:7:8
-                r':(?:(?::[0-9a-fA-F]{1,4}){1,7}|:)|'  # ::2:3:4:5:6:7:8 or ::
-                # IPv4-mapped IPv6: ::ffff:192.0.2.1
-                r'(?:[0-9a-fA-F]{1,4}:){1,4}:'
-                r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}'
-                r'(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
-                r')'
-                r')',
-                re.IGNORECASE
-            ),
-            # Common crypto addresses
-            'CRYPTO_ADDRESS': re.compile(
-                r'\b(?:'
-                r'[13][a-km-zA-HJ-NP-Z1-9]{25,34}|'  # Bitcoin
-                r'0x[a-fA-F0-9]{40}|'  # Ethereum
-                r'[LM3][a-km-zA-HJ-NP-Z1-9]{26,33}'  # Litecoin
-                r')\b'
-            ),
             # IBAN (International Bank Account Number)
             'IBAN': re.compile(
                 r'\b[A-Z]{2}[0-9]{2}[A-Z0-9]{4}[0-9]{7}([A-Z0-9]?){0,16}\b'
@@ -176,9 +135,6 @@ class PIIDetector:
         """
         matches = []
 
-        # Extract URLs using URLDetector
-        matches.extend(self.url_detector.extract(text))
-
         # Extract other PII using regex patterns
         for entity_type, pattern in self.patterns.items():
             for match in pattern.finditer(text):
@@ -212,11 +168,7 @@ class PIIDetector:
         """Calculate confidence score based on entity type and matched text."""
         # Base confidence scores
         base_scores = {
-            'EMAIL_ADDRESS': 0.95,
             'CREDIT_CARD': 0.85,  # Will be 0.99 after Luhn validation
-            'IP_ADDRESS': 0.90,
-            'URL': 0.80,
-            'CRYPTO_ADDRESS': 0.95,
             'IBAN': 0.85,  # Will be 0.99 after MOD-97 validation
         }
 

modules/utils/platform.py

@@ -0,0 +1,23 @@
+"""Platform detection utilities"""
+import sys
+from typing import Optional, Literal
+
+
+def get_client_os() -> Optional[Literal["macos", "windows", "linux"]]:
+    """
+    Fetch Python's sys.platform and convert to standardized OS names.
+    
+    Returns:
+        "macos", "windows", "linux", or None if platform is unknown
+    """
+    platform = sys.platform
+    
+    if platform == "darwin":
+        return "macos"
+    elif platform == "win32":
+        return "windows"
+    elif platform == "linux":
+        return "linux"
+    else:
+        return None
+

modules/utils/string.py

@@ -0,0 +1,17 @@
+"""String utility functions"""
+
+
+def truncate_at(text: str, max_length: int) -> str:
+    """
+    Truncate string at max_length, appending '...' only if truncated.
+    
+    Args:
+        text: String to truncate
+        max_length: Maximum length before truncation
+        
+    Returns:
+        Truncated string with '...' suffix if truncated, original if not
+    """
+    if len(text) <= max_length:
+        return text
+    return f"{text[:max_length]}..."

wrapper/__version__.py

@@ -3,4 +3,4 @@
 Wrapper MCP Server Version
 """
 
-__version__ = "0.0.73"
+__version__ = "0.0.77"

wrapper/middleware.py

@@ -28,6 +28,8 @@ from modules.utils.copy import safe_copy
 from modules.utils.ids import generate_event_id, get_session_id, read_app_uid, get_project_mcpower_dir
 from modules.utils.json import safe_json_dumps, to_dict
 from modules.utils.mcp_configs import extract_wrapped_server_info
+from modules.utils.platform import get_client_os
+from modules.utils.string import truncate_at
 from wrapper.schema import merge_input_schema_with_existing
 
 
@@ -173,7 +175,7 @@ class SecurityMiddleware(Middleware):
     async def secure_elicitation_handler(self, message, response_type, params, context):
         # FIXME: elicitation message, params, and context should be redacted before logging
         self.logger.info(f"secure_elicitation_handler: "
-                         f"message={str(message)[:100]}..., response_type={response_type},"
+                         f"message={truncate_at(str(message), 100)}, response_type={response_type},"
                          f"params={params}, context={context}")
 
         mock_context = MockContext(
@@ -203,7 +205,7 @@ class SecurityMiddleware(Middleware):
 
     async def secure_log_handler(self, log_message):
         # FIXME: log_message should be redacted before logging,
-        self.logger.info(f"secure_log_handler: {str(log_message)[:100]}...")
+        self.logger.info(f"secure_log_handler: {truncate_at(str(log_message), 100)}")
         # FIXME: log_message should be reviewed with policy before forwarding
 
         # Handle case where log_message.data is a string instead of dict
@@ -568,9 +570,13 @@ class SecurityMiddleware(Middleware):
             base_dict = await self._build_baseline_policy_dict(event_id, context, wrapper_args, tool_args)
             policy_request = create_policy_request(
                 event_id=event_id,
-                server_name=base_dict["server"]["name"],
-                server_transport=base_dict["server"]["transport"],
-                tool_name=base_dict["tool"]["name"] or base_dict["tool"]["method"],
+                server=ServerRef(
+                    name=base_dict["server"]["name"],
+                    transport=base_dict["server"]["transport"]
+                ),
+                tool=ToolRef(
+                    name=base_dict["tool"]["name"] or base_dict["tool"]["method"]
+                ),
                 agent_context=base_dict["agent_context"],
                 env_context=base_dict["environment_context"],
                 arguments=tool_args,
@@ -596,9 +602,13 @@ class SecurityMiddleware(Middleware):
             base_dict = await self._build_baseline_policy_dict(event_id, context, wrapper_args, tool_args)
             policy_response = create_policy_response(
                 event_id=event_id,
-                server_name=base_dict["server"]["name"],
-                server_transport=base_dict["server"]["transport"],
-                tool_name=base_dict["tool"]["name"] or base_dict["tool"]["method"],
+                server=ServerRef(
+                    name=base_dict["server"]["name"],
+                    transport=base_dict["server"]["transport"]
+                ),
+                tool=ToolRef(
+                    name=base_dict["tool"]["name"] or base_dict["tool"]["method"]
+                ),
                 response_content=safe_json_dumps(result),
                 agent_context=base_dict["agent_context"],
                 env_context=base_dict["environment_context"],
@@ -646,7 +656,9 @@ class SecurityMiddleware(Middleware):
                     "current_files": wrapper_args.get('__wrapper_currentFiles')
                 },
                 client=self.wrapper_server_name,
-                client_version=self.wrapper_server_version
+                client_version=self.wrapper_server_version,
+                client_os=get_client_os(),
+                app_id=self.app_id,
             )
         }