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

ide_tools/common/__init__.py

@@ -3,4 +3,3 @@ Common IDE Tools
 
 Shared logic for all IDE integrations.
 """
-

ide_tools/common/hooks/__init__.py

@@ -3,4 +3,3 @@ Common Hook Handlers
 
 Shared hook logic for all IDEs
 """
-

ide_tools/common/hooks/init.py

@@ -33,13 +33,14 @@ def output_init_result(success: bool, message: str):
 
 
 async def handle_init(
-    logger: MCPLogger,
-    audit_logger: AuditTrailLogger,
-    event_id: str,
-    cwd: Optional[str],
-    server_name: str,
-    client_name: str,
-    hooks: Dict[str, Dict[str, str]]
+        logger: MCPLogger,
+        audit_logger: AuditTrailLogger,
+        event_id: str,
+        prompt_id: str,
+        cwd: Optional[str],
+        server_name: str,
+        client_name: str,
+        hooks: Dict[str, Dict[str, str]]
 ) -> None:
     """
     Generic init handler - registers hooks with security API
@@ -48,6 +49,7 @@ async def handle_init(
         logger: Logger instance
         audit_logger: Audit logger instance
         event_id: Event identifier
+        prompt_id: Prompt identifier
         cwd: Current working directory
         server_name: IDE-specific server name (e.g. "cursor_tools_mcp")
         client_name: IDE-specific client name (e.g. "cursor", "claude-code")
@@ -56,19 +58,22 @@ async def handle_init(
     Outputs result and exits with appropriate code.
     """
     session_id = get_session_id()
-    
-    logger.info(f"Init handler started (client={client_name}, event_id={event_id}, cwd={cwd})")
-    
+
+    logger.info(f"Init handler started (client={client_name}, event_id={event_id}, prompt_id={prompt_id}, cwd={cwd})")
+
     try:
         app_uid = read_app_uid(logger, get_project_mcpower_dir(cwd))
         audit_logger.set_app_uid(app_uid)
-        
-        audit_logger.log_event("mcpower_start", {
-            "wrapper_version": __version__,
-            "wrapped_server_name": server_name,
-            "client": client_name
-        })
-        
+
+        audit_logger.log_event(
+            "mcpower_start",
+            {
+                "wrapper_version": __version__,
+                "wrapped_server_name": server_name,
+                "client": client_name
+            }
+        )
+
         try:
             tools = [
                 ToolRef(
@@ -78,7 +83,7 @@ async def handle_init(
                 )
                 for hook_info in hooks.values()
             ]
-            
+
             init_request = InitRequest(
                 environment=EnvironmentContext(
                     session_id=session_id,
@@ -98,7 +103,7 @@ async def handle_init(
                 ),
                 tools=tools
             )
-            
+
             async with SecurityPolicyClient(
                     session_id=session_id,
                     logger=logger,
@@ -106,20 +111,19 @@ async def handle_init(
                     app_id=app_uid
             ) as client:
                 await client.init_tools(init_request, event_id=event_id)
-            
+
             logger.info(f"Hooks registered successfully for {client_name}")
-            
+
             # Success - output result and exit
             output_init_result(True, f"{client_name.title()} hooks registered successfully")
             sys.exit(0)
-            
+
         except Exception as e:
             logger.error(f"API initialization failed: {e}")
             output_init_result(False, f"Error: {str(e)}")
             sys.exit(1)
-    
+
     except Exception as e:
         logger.error(f"Unexpected error in init handler: {e}", exc_info=True)
         output_init_result(False, f"Initialization failed: {str(e)}")
         sys.exit(1)
-

ide_tools/common/hooks/output.py

@@ -10,12 +10,12 @@ from .types import OutputFormat
 
 
 def output_result(
-    logger: MCPLogger,
-    output_format: OutputFormat,
-    hook_type: str,
-    allowed: bool,
-    user_message: Optional[str] = None,
-    agent_message: Optional[str] = None
+        logger: MCPLogger,
+        output_format: OutputFormat,
+        hook_type: str,
+        allowed: bool,
+        user_message: Optional[str] = None,
+        agent_message: Optional[str] = None
 ) -> None:
     """
     Output hook result in IDE-specific format and exit with appropriate code
@@ -30,20 +30,20 @@ def output_result(
     """
     # Format output using IDE-specific formatter
     formatted_output = output_format.formatter(hook_type, allowed, user_message, agent_message)
-    
+
     logger.info(f"Hook output ({hook_type}, allowed={allowed}): {formatted_output}")
     print(formatted_output, flush=True)
-    
+
     # Exit with appropriate code
     exit_code = output_format.allow_exit_code if allowed else output_format.deny_exit_code
     sys.exit(exit_code)
 
 
 def output_error(
-    logger: MCPLogger,
-    output_format: OutputFormat,
-    hook_type: str,
-    error_message: str
+        logger: MCPLogger,
+        output_format: OutputFormat,
+        hook_type: str,
+        error_message: str
 ) -> None:
     """
     Output error and exit with error code
@@ -55,10 +55,9 @@ def output_error(
         error_message: Error message
     """
     logger.error(f"Hook error: {error_message}")
-    
+
     # Output as deny/block with error message
     formatted_output = output_format.formatter(hook_type, False, error_message, error_message)
     print(formatted_output, flush=True)
-    
-    sys.exit(output_format.error_exit_code)
 
+    sys.exit(output_format.error_exit_code)

ide_tools/common/hooks/prompt_submit.py

@@ -8,10 +8,10 @@ from modules.logs.audit_trail import AuditTrailLogger
 from modules.logs.logger import MCPLogger
 from modules.redaction import redact
 from modules.utils.ids import get_session_id, read_app_uid, get_project_mcpower_dir
+from modules.utils.string import truncate_at
 from .output import output_result, output_error
 from .types import HookConfig
-from .utils import create_validator, extract_redaction_patterns, build_sensitive_data_types, \
-    process_attachments_for_redaction, inspect_and_enforce
+from .utils import create_validator, extract_redaction_patterns, process_attachments_for_redaction, inspect_and_enforce
 
 
 async def handle_prompt_submit(
@@ -46,7 +46,6 @@ async def handle_prompt_submit(
     audit_logger.set_app_uid(app_uid)
 
     try:
-        # Validate input
         try:
             validator = create_validator(
                 required_fields={"prompt": str},
@@ -60,17 +59,17 @@ async def handle_prompt_submit(
             output_error(logger, config.output_format, "continue", str(e))
             return
 
-        # Check for redactions in prompt
         redacted_prompt = redact(prompt)
-        # Log audit event
+
         audit_logger.log_event(
             "prompt_submission",
             {
                 "server": config.server_name,
                 "tool": tool_name,
-                "params": {"prompt": f"{redacted_prompt[:20]}...", "attachments_count": len(attachments)}
+                "params": {"prompt": truncate_at(redacted_prompt, 100), "attachments_count": len(attachments)}
             },
-            event_id=event_id
+            event_id=event_id,
+            prompt_id=prompt_id
         )
 
         prompt_patterns = extract_redaction_patterns(redacted_prompt)
@@ -83,60 +82,12 @@ async def handle_prompt_submit(
 
         has_any_redactions = bool(prompt_patterns) or len(files_with_redactions) > 0
 
-        # If no redactions found, allow immediately without API call
-        if not has_any_redactions:
-            logger.info("No sensitive data found in prompt or attachments - allowing without API call")
-
-            audit_logger.log_event(
-                "prompt_submission_forwarded",
-                {
-                    "server": config.server_name,
-                    "tool": tool_name,
-                    "params": {"redactions_found": has_any_redactions}
-                },
-                event_id=event_id
-            )
-
-            output_result(logger, config.output_format, "continue", True)
-            return
-
-        logger.info(f"Found redactions in prompt or {len(files_with_redactions)} file(s) - calling API for inspection")
-
-        # Build explicit content_data structure showing security risk
         content_data: Dict[str, Any] = {
-            "security_alert": "Sensitive data detected in user prompt submission"
+            "prompt": redacted_prompt,
+            "is_redacted": has_any_redactions,
+            "redacted_files": files_with_redactions,
         }
 
-        # Add prompt analysis if sensitive data found in prompt text
-        if prompt_patterns:
-            sensitive_data_types = build_sensitive_data_types(prompt_patterns, "prompt text")
-
-            total_prompt_items = sum(prompt_patterns.values())
-            content_data["user_prompt_analysis"] = {
-                "contains_sensitive_data": True,
-                "sensitive_data_types": sensitive_data_types,
-                "risk_summary": f"Prompt contains {total_prompt_items} sensitive data item(s) across {len(prompt_patterns)} type(s)"
-            }
-
-        # Add file analysis if sensitive data found in attachments
-        if files_with_redactions:
-            total_file_items = sum(
-                sum(f["sensitive_data_types"][dt]["occurrences"] for dt in f["sensitive_data_types"])
-                for f in files_with_redactions
-            )
-            content_data["attached_files_with_secrets_or_pii"] = files_with_redactions
-            content_data["files_summary"] = \
-                f"{len(files_with_redactions)} file(s) contain {total_file_items} sensitive data item(s)"
-
-        # Calculate overall risk level
-        total_sensitive_items = sum(prompt_patterns.values()) if prompt_patterns else 0
-        if files_with_redactions:
-            total_sensitive_items += sum(
-                sum(f["sensitive_data_types"][dt]["occurrences"] for dt in f["sensitive_data_types"])
-                for f in files_with_redactions
-            )
-        content_data["overall_summary"] = f"Total: {total_sensitive_items} sensitive data item(s) detected"
-
         # Call security API and enforce decision
         try:
             decision = await inspect_and_enforce(
@@ -154,7 +105,6 @@ async def handle_prompt_submit(
                 client_name=config.client_name
             )
 
-            # Log audit event for forwarding
             audit_logger.log_event(
                 "prompt_submission_forwarded",
                 {
@@ -162,13 +112,13 @@ async def handle_prompt_submit(
                     "tool": tool_name,
                     "params": {"redactions_found": has_any_redactions}
                 },
-                event_id=event_id
+                event_id=event_id,
+                prompt_id=prompt_id
             )
 
-            # Output success
             reasons = decision.get("reasons", [])
-            agent_message = "Prompt submission approved: " + "; ".join(
-                reasons) if reasons else "Prompt submission approved by security policy"
+            agent_message = "Prompt submission approved: {0}".format("; ".join(
+                reasons)) if reasons else "Prompt submission approved by security policy"
             output_result(logger, config.output_format, "continue", True,
                           "Prompt approved", agent_message)
 

ide_tools/common/hooks/read_file.py

@@ -37,13 +37,13 @@ async def handle_read_file(
         tool_name: IDE-specific tool name (e.g., "beforeReadFile", "PreToolUse")
     """
     session_id = get_session_id()
-    logger.info(f"Read file handler started (client={config.client_name}, prompt_id={prompt_id}, event_id={event_id}, cwd={cwd})")
+    logger.info(
+        f"Read file handler started (client={config.client_name}, prompt_id={prompt_id}, event_id={event_id}, cwd={cwd})")
 
     app_uid = read_app_uid(logger, get_project_mcpower_dir(cwd))
     audit_logger.set_app_uid(app_uid)
 
     try:
-        # Validate input
         try:
             validator = create_validator(
                 required_fields={"file_path": str, "content": str},
@@ -58,7 +58,6 @@ async def handle_read_file(
             output_error(logger, config.output_format, "permission", str(e))
             return
 
-        # Log audit event
         audit_logger.log_event(
             "agent_request",
             {
@@ -66,7 +65,8 @@ async def handle_read_file(
                 "tool": tool_name,
                 "params": {"file_path": file_path, "attachments_count": len(attachments)}
             },
-            event_id=event_id
+            event_id=event_id,
+            prompt_id=prompt_id
         )
 
         # Check content length - skip API if too large
@@ -85,7 +85,8 @@ async def handle_read_file(
                         "content_too_large": True
                     }
                 },
-                event_id=event_id
+                event_id=event_id,
+                prompt_id=prompt_id
             )
 
             output_result(logger, config.output_format, "permission", True)
@@ -93,11 +94,11 @@ async def handle_read_file(
 
         # Redact the main content
         redacted_content = redact(provided_content)
-        
+
         # Process attachments for redaction status
         files_with_redactions = process_attachments_for_redaction(attachments, logger)
         files_with_redactions_paths = {f["file_path"] for f in files_with_redactions}
-        
+
         # Build attachments info with redaction status
         attachments_info = []
         for attachment in attachments:
@@ -107,10 +108,10 @@ async def handle_read_file(
                     "file_path": att_path,
                     "has_redactions": att_path in files_with_redactions_paths
                 })
-        
+
         logger.info(f"Processed file and {len(attachments)} attachment(s), found redactions in "
                     f"{len(files_with_redactions)} attachment(s)")
-        
+
         # Build content_data with file_path, redacted content, and attachments
         content_data = {
             "file_path": file_path,
@@ -136,7 +137,6 @@ async def handle_read_file(
                 client_name=config.client_name
             )
 
-            # Log audit event for forwarding
             audit_logger.log_event(
                 "agent_request_forwarded",
                 {
@@ -147,12 +147,13 @@ async def handle_read_file(
                         "content_length": len(provided_content),
                         "attachments_with_redactions": len(files_with_redactions)}
                 },
-                event_id=event_id
+                event_id=event_id,
+                prompt_id=prompt_id
             )
 
-            # Output success
             reasons = decision.get("reasons", [])
-            agent_message = "File read approved: " + "; ".join(reasons) if reasons else "File read approved by security policy"
+            agent_message = "File read approved: " + "; ".join(
+                reasons) if reasons else "File read approved by security policy"
             output_result(logger, config.output_format, "permission", True, "File read approved", agent_message)
 
         except Exception as e:
@@ -167,4 +168,3 @@ async def handle_read_file(
     except Exception as e:
         logger.error(f"Unexpected error in read file handler: {e}", exc_info=True)
         output_error(logger, config.output_format, "permission", f"Unexpected error: {str(e)}")
-