@highflame/policy 2.2.4 → 2.2.6

package/dist/overwatch-defaults.gen.js

@@ -718,164 +718,725 @@ when {
 };
 `;
 const OVERWATCH_PRIVACY_DEFAULTS_CEDAR = `// =============================================================================
-// PII Detection (Default)
+// Structural PII (Tier 1)
 // =============================================================================
-// Blocks personally identifiable information across prompts, tool calls, and
-// file operations using Shield's PII detector context keys.
+// Blocks high-sensitivity identifiers that have a deterministic structure (SSNs, credit cards, IBANs, API keys) using fast regex pattern matching — high precision, low latency, few false positives. One forbid rule per identifier group.
 //
-// Severity tiers:
-//   - Critical: SSN, credit card
-//   - High:     passport, IBAN
-//   - Medium:   email, phone, date of birth
-//   - Low:      IP address (prompt only)
+// Sensitivity tiers and the structural (regex) / contextual (model) type
+// vocabulary are defined canonically in schemas/_shared/pii_taxonomy.json and
+// enforced by tools/lint-templates.
 //
 // Context keys consumed:
-//   - pii_detected: Bool
-//   - pii_types:    Set<String>
-//   - pii_count:    Long
+//   - pii_types: Set<String>  (union of structural lowercase + contextual uppercase types)
 //
-// Compliance:
-//   - PCI DSS 3.4/4.1, GDPR Art. 32, HIPAA §164.312, CCPA §1798.150
-//   - NIST 800-53 SI-4; OWASP LLM06
+// Category:  privacy
+// Namespace: Overwatch
+// =============================================================================
+
+@id("privacy.block-pii-national-id")
+@name("Block national ID numbers (structural)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a national ID (SSN, passport, or driver's license).")
+@severity("high")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: national identifier (SSN, passport, or driver's license) patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("ssn") ||
+        context.pii_types.contains("passport") ||
+        context.pii_types.contains("national_id") ||
+        context.pii_types.contains("drivers_license")
+    )
+};
+
+@id("privacy.block-pii-credit-card")
+@name("Block credit card numbers (structural)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a credit card number.")
+@severity("critical")
+@tags("category:privacy,threat:pii,detection:pattern,compliance:pci-dss,owasp:llm06")
+@reject_message("Content blocked: credit card number patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types && context.pii_types.contains("credit_card")
+};
+
+@id("privacy.block-pii-bank-account")
+@name("Block bank account numbers (structural)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a bank account number (IBAN, SWIFT/BIC, or routing number).")
+@severity("critical")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: bank account (IBAN) number patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("iban") ||
+        context.pii_types.contains("bank_account") ||
+        context.pii_types.contains("swift_bic") ||
+        context.pii_types.contains("aba_routing")
+    )
+};
+
+@id("privacy.block-pii-medical")
+@name("Block medical identifiers (structural)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain medical data (record number, MBI, NPI, or blood type).")
+@severity("medium")
+@tags("category:privacy,threat:pii,detection:pattern,compliance:hipaa,owasp:llm06")
+@reject_message("Content blocked: medical record identifier patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("medical_record") ||
+        context.pii_types.contains("patient_record") ||
+        context.pii_types.contains("medicare_beneficiary_id") ||
+        context.pii_types.contains("npi") ||
+        context.pii_types.contains("medical_term") ||
+        context.pii_types.contains("blood_type")
+    )
+};
+
+@id("privacy.block-pii-tax-id")
+@name("Block tax identifiers (structural)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a tax ID (ITIN, EIN, or PTIN).")
+@severity("high")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: tax identifier (ITIN or EIN) patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("itin") ||
+        context.pii_types.contains("ein") ||
+        context.pii_types.contains("ptin")
+    )
+};
+
+@id("privacy.block-pii-credential")
+@name("Block credentials (structural)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a credential or secret (API key, token, password hash, or private key).")
+@severity("critical")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: credential or API key patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("aws_access_key") ||
+        context.pii_types.contains("api_key") ||
+        context.pii_types.contains("jwt_token") ||
+        context.pii_types.contains("encryption_key") ||
+        context.pii_types.contains("http_basic_auth") ||
+        context.pii_types.contains("gcp_credential") ||
+        context.pii_types.contains("gcp_api_key") ||
+        context.pii_types.contains("gcp_signed_policy") ||
+        context.pii_types.contains("session_cookie") ||
+        context.pii_types.contains("oauth_token") ||
+        context.pii_types.contains("tls_certificate") ||
+        context.pii_types.contains("password_hash") ||
+        context.pii_types.contains("csrf_token")
+    )
+};
+
+@id("privacy.block-pii-crypto")
+@name("Block cryptocurrency addresses (structural)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a cryptocurrency wallet address.")
+@severity("high")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: cryptocurrency wallet address patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("bitcoin_address") ||
+        context.pii_types.contains("ethereum_address")
+    )
+};
+`;
+const OVERWATCH_PRIVACY_PII_MODEL_CEDAR = `// =============================================================================
+// Contextual PII (Tier 2)
+// =============================================================================
+// Blocks the same high-sensitivity identifier groups inferred from surrounding context by the ML PII model — catches unstructured or novel PII the structural patterns miss (higher recall). Requires the pii_model detector.
+//
+// Sensitivity tiers and the structural (regex) / contextual (model) type
+// vocabulary are defined canonically in schemas/_shared/pii_taxonomy.json and
+// enforced by tools/lint-templates.
+//
+// Context keys consumed:
+//   - pii_types: Set<String>  (union of structural lowercase + contextual uppercase types)
 //
 // Category:  privacy
 // Namespace: Overwatch
 // =============================================================================
 
-// ---------------------------------------------------------------------------
-// Section 1: Critical PII (SSN, credit card)
-// ---------------------------------------------------------------------------
+@id("privacy.block-pii-national-id-model")
+@name("Block national ID numbers (contextual)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a national ID (SSN, passport, or driver's license).")
+@severity("high")
+@tags("category:privacy,threat:pii,detection:ml,owasp:llm06")
+@reject_message("Content blocked: national identifier (SSN, passport, or driver's license) patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types && context.pii_types.contains("NATIONAL_ID")
+};
 
-@id("privacy.block-ssn")
-@name("Block Social Security Numbers")
-@description("Blocks process_prompt, call_tool, read_file, and write_file when pii_types contains \\"ssn\\".")
+@id("privacy.block-pii-credit-card-model")
+@name("Block credit card numbers (contextual)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a credit card number.")
 @severity("critical")
-@tags("category:privacy,threat:pii,detection:pattern,compliance:pci-dss,compliance:gdpr")
-@reject_message("Content blocked: Social Security Number patterns detected.")
+@tags("category:privacy,threat:pii,detection:ml,compliance:pci-dss,owasp:llm06")
+@reject_message("Content blocked: credit card number patterns detected.")
 forbid (
     principal,
     action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("ssn")
+    context has pii_types && context.pii_types.contains("CREDIT_CARD")
 };
 
-@id("privacy.block-credit-card")
-@name("Block credit card numbers")
-@description("Blocks process_prompt, call_tool, read_file, and write_file when pii_types contains \\"credit_card\\".")
+@id("privacy.block-pii-bank-account-model")
+@name("Block bank account numbers (contextual)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a bank account number (IBAN, SWIFT/BIC, or routing number).")
 @severity("critical")
-@tags("category:privacy,threat:pii,detection:pattern,compliance:pci-dss")
-@reject_message("Content blocked: credit card number patterns detected — PCI DSS prohibits raw PAN handling.")
+@tags("category:privacy,threat:pii,detection:ml,owasp:llm06")
+@reject_message("Content blocked: bank account (IBAN) number patterns detected.")
 forbid (
     principal,
     action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("credit_card")
+    context has pii_types && context.pii_types.contains("ACCOUNT_NUMBER")
 };
 
-// ---------------------------------------------------------------------------
-// Section 2: High PII (passport, IBAN)
-// ---------------------------------------------------------------------------
+@id("privacy.block-pii-medical-model")
+@name("Block medical identifiers (contextual)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain medical data (record number, MBI, NPI, or blood type).")
+@severity("medium")
+@tags("category:privacy,threat:pii,detection:ml,compliance:hipaa,owasp:llm06")
+@reject_message("Content blocked: medical record identifier patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types && context.pii_types.contains("MEDICAL")
+};
+
+@id("privacy.block-pii-credential-model")
+@name("Block credentials (contextual)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a credential or secret (API key, token, password hash, or private key).")
+@severity("critical")
+@tags("category:privacy,threat:pii,detection:ml,owasp:llm06")
+@reject_message("Content blocked: credential or API key patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types && context.pii_types.contains("CREDENTIAL")
+};
+`;
+const OVERWATCH_PRIVACY_ADVANCED_PII_CEDAR = `// =============================================================================
+// Comprehensive PII (Tier 3)
+// =============================================================================
+// Blocks every PII entity type — structural and contextual, sensitive and situational — one forbid rule per group so any individual type can be toggled off. High false-positive surface; opt-in.
+//
+// Sensitivity tiers and the structural (regex) / contextual (model) type
+// vocabulary are defined canonically in schemas/_shared/pii_taxonomy.json and
+// enforced by tools/lint-templates.
+//
+// Context keys consumed:
+//   - pii_types: Set<String>  (union of structural lowercase + contextual uppercase types)
+//
+// Category:  privacy
+// Namespace: Overwatch
+// =============================================================================
 
-@id("privacy.block-passport")
-@name("Block passport numbers")
-@description("Blocks process_prompt, call_tool, read_file, and write_file when pii_types contains \\"passport\\".")
+@id("privacy.block-pii-national-id-all")
+@name("Block national ID numbers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a national ID (SSN, passport, or driver's license).")
 @severity("high")
-@tags("category:privacy,threat:pii,detection:pattern,compliance:gdpr")
-@reject_message("Content blocked: passport number patterns detected.")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: national identifier (SSN, passport, or driver's license) patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("ssn") ||
+        context.pii_types.contains("passport") ||
+        context.pii_types.contains("national_id") ||
+        context.pii_types.contains("drivers_license") ||
+        context.pii_types.contains("NATIONAL_ID")
+    )
+};
+
+@id("privacy.block-pii-credit-card-all")
+@name("Block credit card numbers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a credit card number.")
+@severity("critical")
+@tags("category:privacy,threat:pii,detection:pattern,compliance:pci-dss,owasp:llm06")
+@reject_message("Content blocked: credit card number patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("credit_card") ||
+        context.pii_types.contains("CREDIT_CARD")
+    )
+};
+
+@id("privacy.block-pii-bank-account-all")
+@name("Block bank account numbers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a bank account number (IBAN, SWIFT/BIC, or routing number).")
+@severity("critical")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: bank account (IBAN) number patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("iban") ||
+        context.pii_types.contains("bank_account") ||
+        context.pii_types.contains("swift_bic") ||
+        context.pii_types.contains("aba_routing") ||
+        context.pii_types.contains("ACCOUNT_NUMBER")
+    )
+};
+
+@id("privacy.block-pii-medical-all")
+@name("Block medical identifiers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain medical data (record number, MBI, NPI, or blood type).")
+@severity("medium")
+@tags("category:privacy,threat:pii,detection:pattern,compliance:hipaa,owasp:llm06")
+@reject_message("Content blocked: medical record identifier patterns detected.")
 forbid (
     principal,
     action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("passport")
+    context has pii_types &&
+    (
+        context.pii_types.contains("medical_record") ||
+        context.pii_types.contains("patient_record") ||
+        context.pii_types.contains("medicare_beneficiary_id") ||
+        context.pii_types.contains("npi") ||
+        context.pii_types.contains("medical_term") ||
+        context.pii_types.contains("blood_type") ||
+        context.pii_types.contains("MEDICAL")
+    )
 };
 
-@id("privacy.block-iban")
-@name("Block bank account numbers")
-@description("Blocks process_prompt, call_tool, read_file, and write_file when pii_types contains \\"iban\\".")
+@id("privacy.block-pii-tax-id-all")
+@name("Block tax identifiers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a tax ID (ITIN, EIN, or PTIN).")
 @severity("high")
-@tags("category:privacy,threat:pii,detection:pattern,compliance:gdpr,compliance:pci-dss")
-@reject_message("Content blocked: IBAN / bank account number patterns detected.")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: tax identifier (ITIN or EIN) patterns detected.")
 forbid (
     principal,
     action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("iban")
+    context has pii_types &&
+    (
+        context.pii_types.contains("itin") ||
+        context.pii_types.contains("ein") ||
+        context.pii_types.contains("ptin")
+    )
 };
 
-// ---------------------------------------------------------------------------
-// Section 3: Medium PII (contact info)
-// ---------------------------------------------------------------------------
+@id("privacy.block-pii-credential-all")
+@name("Block credentials (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a credential or secret (API key, token, password hash, or private key).")
+@severity("critical")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: credential or API key patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("aws_access_key") ||
+        context.pii_types.contains("api_key") ||
+        context.pii_types.contains("jwt_token") ||
+        context.pii_types.contains("encryption_key") ||
+        context.pii_types.contains("http_basic_auth") ||
+        context.pii_types.contains("gcp_credential") ||
+        context.pii_types.contains("gcp_api_key") ||
+        context.pii_types.contains("gcp_signed_policy") ||
+        context.pii_types.contains("session_cookie") ||
+        context.pii_types.contains("oauth_token") ||
+        context.pii_types.contains("tls_certificate") ||
+        context.pii_types.contains("password_hash") ||
+        context.pii_types.contains("csrf_token") ||
+        context.pii_types.contains("CREDENTIAL")
+    )
+};
 
-@id("privacy.block-email")
-@name("Block email addresses")
-@description("Blocks process_prompt and call_tool when pii_types contains \\"email\\".")
+@id("privacy.block-pii-crypto-all")
+@name("Block cryptocurrency addresses (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a cryptocurrency wallet address.")
+@severity("high")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: cryptocurrency wallet address patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("bitcoin_address") ||
+        context.pii_types.contains("ethereum_address")
+    )
+};
+
+@id("privacy.block-pii-names-all")
+@name("Block personal names (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a personal name.")
+@severity("low")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: personal name patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("person_name") ||
+        context.pii_types.contains("PERSON")
+    )
+};
+
+@id("privacy.block-pii-email-all")
+@name("Block email addresses (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain an email address.")
 @severity("medium")
-@tags("category:privacy,threat:pii,detection:pattern,compliance:gdpr")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
 @reject_message("Content blocked: email address patterns detected.")
 forbid (
     principal,
-    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool"],
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("email")
+    context has pii_types &&
+    (
+        context.pii_types.contains("email") ||
+        context.pii_types.contains("EMAIL_ADDRESS")
+    )
 };
 
-@id("privacy.block-phone")
-@name("Block phone numbers")
-@description("Blocks process_prompt and call_tool when pii_types contains \\"phone\\".")
+@id("privacy.block-pii-phone-all")
+@name("Block phone numbers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a phone number.")
 @severity("medium")
-@tags("category:privacy,threat:pii,detection:pattern,compliance:gdpr")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
 @reject_message("Content blocked: phone number patterns detected.")
 forbid (
     principal,
-    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool"],
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("phone")
+    context has pii_types &&
+    (
+        context.pii_types.contains("phone") ||
+        context.pii_types.contains("PHONE_NUMBER")
+    )
 };
 
-@id("privacy.block-dob")
-@name("Block dates of birth")
-@description("Blocks process_prompt and call_tool when pii_types contains \\"date_of_birth\\".")
+@id("privacy.block-pii-datetime-all")
+@name("Block dates and times (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a date or time (date of birth, timestamp, or card expiry).")
 @severity("medium")
-@tags("category:privacy,threat:pii,detection:pattern,compliance:hipaa")
-@reject_message("Content blocked: date of birth patterns detected.")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: date or time patterns detected.")
 forbid (
     principal,
-    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool"],
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("date_of_birth")
+    context has pii_types &&
+    (
+        context.pii_types.contains("date_of_birth") ||
+        context.pii_types.contains("date_time") ||
+        context.pii_types.contains("time") ||
+        context.pii_types.contains("card_expiry") ||
+        context.pii_types.contains("DATE_TIME")
+    )
 };
 
-// ---------------------------------------------------------------------------
-// Section 4: Low PII (IP addresses, prompts only)
-// ---------------------------------------------------------------------------
+@id("privacy.block-pii-url-all")
+@name("Block URLs (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a URL.")
+@severity("low")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: URL patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("url") ||
+        context.pii_types.contains("URL")
+    )
+};
 
-@id("privacy.block-ip-address")
-@name("Block IP addresses in prompts")
-@description("Blocks process_prompt when pii_types contains \\"ip_address\\".")
+@id("privacy.block-pii-location-all")
+@name("Block locations (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a location (street address, postal code, or military address).")
 @severity("low")
-@tags("category:privacy,threat:pii,detection:pattern,surface:process-prompt")
-@reject_message("Prompt blocked: IP address patterns detected.")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: street address or location patterns detected.")
 forbid (
     principal,
-    action == Overwatch::Action::"process_prompt",
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("street_address") ||
+        context.pii_types.contains("zip_code") ||
+        context.pii_types.contains("military_address") ||
+        context.pii_types.contains("LOCATION")
+    )
+};
+
+@id("privacy.block-pii-organization-all")
+@name("Block organization names (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain an organization name.")
+@severity("low")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: organization name patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("organization") ||
+        context.pii_types.contains("ORGANIZATION")
+    )
+};
+
+@id("privacy.block-pii-occupation-all")
+@name("Block occupations (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain an occupation.")
+@severity("low")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: occupation patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("occupation") ||
+        context.pii_types.contains("OCCUPATION")
+    )
+};
+
+@id("privacy.block-pii-username-all")
+@name("Block usernames (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a username.")
+@severity("low")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: username patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("username") ||
+        context.pii_types.contains("USERNAME")
+    )
+};
+
+@id("privacy.block-pii-employee-customer-id-all")
+@name("Block employee or customer IDs (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain an employee or customer ID.")
+@severity("medium")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: employee or customer identifier patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
     resource
 )
 when {
-    context has pii_types && context.pii_types.contains("ip_address")
+    context has pii_types &&
+    (
+        context.pii_types.contains("employee_id") ||
+        context.pii_types.contains("customer_id") ||
+        context.pii_types.contains("EMPLOYEE_ID") ||
+        context.pii_types.contains("CUSTOMER_ID")
+    )
+};
+
+@id("privacy.block-pii-device-id-all")
+@name("Block device and network identifiers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a device or network identifier (IP, MAC, IMEI, or UUID).")
+@severity("medium")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: device or network identifier patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("device_id") ||
+        context.pii_types.contains("ip_address") ||
+        context.pii_types.contains("ipv6_address") ||
+        context.pii_types.contains("imei") ||
+        context.pii_types.contains("device_serial") ||
+        context.pii_types.contains("mac_address") ||
+        context.pii_types.contains("user_agent") ||
+        context.pii_types.contains("serial_number") ||
+        context.pii_types.contains("uuid") ||
+        context.pii_types.contains("DEVICE_ID")
+    )
+};
+
+@id("privacy.block-pii-vehicle-all")
+@name("Block vehicle identifiers (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a vehicle identifier (VIN or license plate).")
+@severity("medium")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: vehicle identifier (VIN or plate) patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("vin") ||
+        context.pii_types.contains("license_plate") ||
+        context.pii_types.contains("VEHICLE_IDENTIFIER")
+    )
+};
+
+@id("privacy.block-pii-financial-all")
+@name("Block financial amounts (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a financial amount or transaction ID.")
+@severity("medium")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: salary or financial amount patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("salary") ||
+        context.pii_types.contains("financial_amount") ||
+        context.pii_types.contains("transaction_id") ||
+        context.pii_types.contains("FINANCIAL")
+    )
+};
+
+@id("privacy.block-pii-sensitive-attribute-all")
+@name("Block sensitive attributes (comprehensive)")
+@description("Blocks prompts, tool calls, and file reads/writes that contain a sensitive personal attribute (ethnicity, religion, age, etc.).")
+@severity("high")
+@tags("category:privacy,threat:pii,detection:pattern,owasp:llm06")
+@reject_message("Content blocked: sensitive attribute (ethnicity, religion, etc.) patterns detected.")
+forbid (
+    principal,
+    action in [Overwatch::Action::"process_prompt", Overwatch::Action::"call_tool", Overwatch::Action::"read_file", Overwatch::Action::"write_file"],
+    resource
+)
+when {
+    context has pii_types &&
+    (
+        context.pii_types.contains("ethnicity") ||
+        context.pii_types.contains("religion") ||
+        context.pii_types.contains("sexual_orientation") ||
+        context.pii_types.contains("political_affiliation") ||
+        context.pii_types.contains("nationality") ||
+        context.pii_types.contains("age") ||
+        context.pii_types.contains("gender") ||
+        context.pii_types.contains("marital_status") ||
+        context.pii_types.contains("education_level") ||
+        context.pii_types.contains("employment_status") ||
+        context.pii_types.contains("SENSITIVE_ATTRIBUTE")
+    )
 };
 `;
 const OVERWATCH_TOOLS_MCP_SERVER_ALLOWLIST_CEDAR = `// =============================================================================
@@ -1059,17 +1620,17 @@ permit (
     resource in Overwatch::Project::"support-project"
 );
 `;
-const OVERWATCH_AGENT_IDENTITY_AGENT_GUARDRAILS_CEDAR = `// =============================================================================
+const OVERWATCH_AGENT_IDENTITY_CLAUDE_BLOCK_INJECTION_CEDAR = `// =============================================================================
 // Agent-Specific Guardrails
 // =============================================================================
 // Per-agent security policies applied based on the agent identity. Different
-// agents have different risk profiles — these template rules cover Claude
-// (injection focus) and Cursor (PII focus); customize the agent IDs for
-// your deployment.
+// agents have different risk profiles — this template rule covers Claude
+// (injection focus); customize the agent IDs for your deployment. PII is
+// handled uniformly by the canonical privacy.* templates (defaults/pii*.cedar),
+// not per-agent.
 //
 // Context keys consumed:
 //   - detected_threats:  Set<String>
-//   - threat_categories: Set<String>
 //
 // Category:  agent-identity
 // Namespace: Overwatch
@@ -1089,21 +1650,6 @@ forbid (
 when {
     context has detected_threats && context.detected_threats.contains("prompt_injection")
 };
-
-@id("agent-identity.cursor-block-pii")
-@name("Block PII on Cursor agent")
-@description("Blocks process_prompt for the Cursor agent when threat_categories contains \\"pii\\".")
-@severity("critical")
-@tags("category:agent-identity,threat:pii,scope:per-agent,detection:rule,surface:process-prompt,compliance:gdpr")
-@reject_message("Prompt blocked: PII detected for the Cursor agent — prevents leakage through code agent prompts.")
-forbid (
-    principal == Overwatch::Agent::"cursor",
-    action == Overwatch::Action::"process_prompt",
-    resource
-)
-when {
-    context has threat_categories && context.threat_categories.contains("pii")
-};
 `;
 // =============================================================================
 // CATEGORIES
@@ -1202,12 +1748,30 @@ export const OVERWATCH_TEMPLATES = [
     },
     {
         id: 'privacy.defaults',
-        name: 'PII Detection',
-        description: 'Block credit card numbers, SSNs, passport numbers, IBANs, email/phone/DOB, and IP addresses across actions.',
+        name: 'Structural PII',
+        description: 'Block well-formatted sensitive identifiers — SSNs, credit cards, IBANs, API keys — via fast deterministic pattern matching. High precision, low latency, few false positives; use as the always-on baseline.',
         category: 'privacy',
         cedarText: OVERWATCH_PRIVACY_DEFAULTS_CEDAR,
         severity: 'critical',
-        tags: ['category:privacy', 'threat:pii', 'compliance:pci-dss', 'compliance:gdpr', 'compliance:hipaa'],
+        tags: ['category:privacy', 'threat:pii', 'detection:pattern', 'compliance:pci-dss', 'compliance:hipaa'],
+    },
+    {
+        id: 'privacy.pii-model',
+        name: 'Contextual PII',
+        description: 'Block the same sensitive identifiers when the ML model infers them from surrounding context — catches unstructured or novel PII the structural patterns miss. Higher recall; requires the pii_model detector.',
+        category: 'privacy',
+        cedarText: OVERWATCH_PRIVACY_PII_MODEL_CEDAR,
+        severity: 'critical',
+        tags: ['category:privacy', 'threat:pii', 'detection:ml', 'compliance:pci-dss', 'compliance:hipaa'],
+    },
+    {
+        id: 'privacy.advanced-pii',
+        name: 'Comprehensive PII',
+        description: 'Block every PII type — structural and contextual, sensitive and situational. Situational entities (names, locations, dates, etc.) are real PII but appear in ordinary text, so this tier flags often; one forbid rule per entity lets you disable the ones you don\'t need. Opt-in for strict environments.',
+        category: 'privacy',
+        cedarText: OVERWATCH_PRIVACY_ADVANCED_PII_CEDAR,
+        severity: 'critical',
+        tags: ['category:privacy', 'threat:pii', 'detection:pattern', 'compliance:pci-dss', 'compliance:hipaa'],
     },
     {
         id: 'tools.mcp-server-allowlist',
@@ -1255,13 +1819,13 @@ export const OVERWATCH_TEMPLATES = [
         tags: ['category:organization', 'scope:per-tool', 'posture:deny-default'],
     },
     {
-        id: 'agent-identity.agent-guardrails',
+        id: 'agent-identity.claude-block-injection',
         name: 'Agent-Specific Guardrails',
-        description: 'Per-agent security guardrails — injection blocking for Claude, PII blocking for Cursor. Customize agent IDs for your deployment.',
+        description: 'Per-agent security guardrails — injection blocking for the Claude agent. Customize agent IDs for your deployment. PII is handled by the privacy.* templates.',
         category: 'agent-identity',
-        cedarText: OVERWATCH_AGENT_IDENTITY_AGENT_GUARDRAILS_CEDAR,
+        cedarText: OVERWATCH_AGENT_IDENTITY_CLAUDE_BLOCK_INJECTION_CEDAR,
         severity: 'critical',
-        tags: ['category:agent-identity', 'scope:per-agent', 'threat:injection', 'threat:pii'],
+        tags: ['category:agent-identity', 'scope:per-agent', 'threat:injection'],
     },
 ];
 // =============================================================================
@@ -1421,16 +1985,46 @@ export const OVERWATCH_TEMPLATES_JSON = `{
     },
     {
       "id": "privacy.defaults",
-      "name": "PII Detection",
-      "description": "Block credit card numbers, SSNs, passport numbers, IBANs, email/phone/DOB, and IP addresses across actions.",
+      "name": "Structural PII",
+      "description": "Block well-formatted sensitive identifiers — SSNs, credit cards, IBANs, API keys — via fast deterministic pattern matching. High precision, low latency, few false positives; use as the always-on baseline.",
       "category": "privacy",
       "file": "defaults/pii.cedar",
       "severity": "critical",
       "tags": [
         "category:privacy",
         "threat:pii",
+        "detection:pattern",
+        "compliance:pci-dss",
+        "compliance:hipaa"
+      ]
+    },
+    {
+      "id": "privacy.pii-model",
+      "name": "Contextual PII",
+      "description": "Block the same sensitive identifiers when the ML model infers them from surrounding context — catches unstructured or novel PII the structural patterns miss. Higher recall; requires the pii_model detector.",
+      "category": "privacy",
+      "file": "defaults/pii_model.cedar",
+      "severity": "critical",
+      "tags": [
+        "category:privacy",
+        "threat:pii",
+        "detection:ml",
+        "compliance:pci-dss",
+        "compliance:hipaa"
+      ]
+    },
+    {
+      "id": "privacy.advanced-pii",
+      "name": "Comprehensive PII",
+      "description": "Block every PII type — structural and contextual, sensitive and situational. Situational entities (names, locations, dates, etc.) are real PII but appear in ordinary text, so this tier flags often; one forbid rule per entity lets you disable the ones you don't need. Opt-in for strict environments.",
+      "category": "privacy",
+      "file": "defaults/pii_advanced.cedar",
+      "severity": "critical",
+      "tags": [
+        "category:privacy",
+        "threat:pii",
+        "detection:pattern",
         "compliance:pci-dss",
-        "compliance:gdpr",
         "compliance:hipaa"
       ]
     },
@@ -1496,18 +2090,13 @@ export const OVERWATCH_TEMPLATES_JSON = `{
       ]
     },
     {
-      "id": "agent-identity.agent-guardrails",
+      "id": "agent-identity.claude-block-injection",
       "name": "Agent-Specific Guardrails",
-      "description": "Per-agent security guardrails — injection blocking for Claude, PII blocking for Cursor. Customize agent IDs for your deployment.",
+      "description": "Per-agent security guardrails — injection blocking for the Claude agent. Customize agent IDs for your deployment. PII is handled by the privacy.* templates.",
       "category": "agent-identity",
       "file": "agent_guardrails.cedar",
       "severity": "critical",
-      "tags": [
-        "category:agent-identity",
-        "scope:per-agent",
-        "threat:injection",
-        "threat:pii"
-      ]
+      "tags": ["category:agent-identity", "scope:per-agent", "threat:injection"]
     }
   ]
 }