agentid-sdk 0.1.40 → 0.1.42

package/dist/index.js

@@ -33,12 +33,15 @@ __export(index_exports, {
   createAgentIdTelemetryContext: () => createAgentIdTelemetryContext,
   createAgentIdWorkflowTrail: () => createAgentIdWorkflowTrail,
   getInjectionScanner: () => getInjectionScanner,
+  protectChatState: () => protectChatState,
   protectMessageHistory: () => protectMessageHistory,
   scanWithRegex: () => scanWithRegex
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/adapters.ts
+var MAX_GUARD_ATTACHMENTS = 4;
+var MAX_PROMPT_CONTEXT_CHARS = 64e3;
 function getLastUserMessage(req) {
   const messages = req?.messages;
   if (!Array.isArray(messages)) return null;
@@ -118,31 +121,79 @@ function normalizeImageAttachment(part) {
     content_base64: imageUrl
   };
 }
-var OpenAIAdapter = class {
-  extractInput(req) {
-    const lastUser = getLastUserMessage(req);
-    if (!lastUser) return null;
-    const content = lastUser.content;
-    if (typeof content === "string") return content;
-    if (Array.isArray(content)) {
-      const parts = [];
-      for (const part of content) {
-        if (part && typeof part === "object" && typeof part.text === "string") {
-          parts.push(part.text);
-        }
+function truncatePromptContext(value) {
+  if (value.length <= MAX_PROMPT_CONTEXT_CHARS) {
+    return value;
+  }
+  const headChars = Math.floor((MAX_PROMPT_CONTEXT_CHARS - 32) / 2);
+  const tailChars = MAX_PROMPT_CONTEXT_CHARS - headChars - 32;
+  return `${value.slice(0, headChars)}
+[...TRUNCATED CONTEXT...]
+${value.slice(-tailChars)}`;
+}
+function formatPromptContextRole(role) {
+  return typeof role === "string" && role.trim().length > 0 ? role.trim() : "message";
+}
+function extractTextParts(content) {
+  if (typeof content === "string" && content.length > 0) {
+    return [content];
+  }
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  const parts = [];
+  for (const part of content) {
+    if (!part || typeof part !== "object") {
+      continue;
+    }
+    if (typeof part.text === "string") {
+      const text = part.text;
+      if (text.length > 0) {
+        parts.push(text);
       }
-      return parts.length ? parts.join("") : null;
     }
-    return null;
   }
-  extractAttachments(req) {
-    const lastUser = getLastUserMessage(req);
-    if (!lastUser) return [];
-    const content = lastUser?.content;
+  return parts;
+}
+function extractAttachmentPlaceholders(content) {
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  const placeholders = [];
+  for (const part of content) {
+    if (!part || typeof part !== "object") {
+      continue;
+    }
+    const typedPart = part;
+    if (typedPart.type === "file") {
+      placeholders.push(
+        `[attachment:${normalizeFilename(typedPart.file?.filename, "attachment.bin")}]`
+      );
+      continue;
+    }
+    if (typedPart.type === "image_url") {
+      const imageUrl = typedPart.image_url?.url;
+      placeholders.push(
+        imageUrl?.startsWith("data:") ? "[attachment:image]" : "[attachment:image_url]"
+      );
+    }
+  }
+  return placeholders;
+}
+function collectUserAttachments(req) {
+  const messages = req?.messages;
+  if (!Array.isArray(messages)) {
+    return [];
+  }
+  const attachments = [];
+  for (const message of messages) {
+    if (!message || typeof message !== "object" || message.role !== "user") {
+      continue;
+    }
+    const content = message.content;
     if (!Array.isArray(content)) {
-      return [];
+      continue;
     }
-    const attachments = [];
     for (const part of content) {
       if (!part || typeof part !== "object") {
         continue;
@@ -161,7 +212,57 @@ var OpenAIAdapter = class {
         }
       }
     }
-    return attachments;
+  }
+  return attachments.slice(-MAX_GUARD_ATTACHMENTS);
+}
+function serializeOpenAIPromptContext(req) {
+  const messages = req?.messages;
+  if (!Array.isArray(messages)) {
+    return null;
+  }
+  const entries = [];
+  for (const message of messages) {
+    if (!message || typeof message !== "object") {
+      continue;
+    }
+    const role = formatPromptContextRole(message.role);
+    const content = message.content;
+    const fragments = [
+      ...extractTextParts(content),
+      ...extractAttachmentPlaceholders(content)
+    ].filter((fragment) => fragment.length > 0);
+    if (fragments.length === 0) {
+      continue;
+    }
+    entries.push(`[${role}] ${fragments.join("\n")}`);
+  }
+  if (entries.length === 0) {
+    return null;
+  }
+  return truncatePromptContext(entries.join("\n\n"));
+}
+var OpenAIAdapter = class {
+  extractInput(req) {
+    const lastUser = getLastUserMessage(req);
+    if (!lastUser) return null;
+    const content = lastUser.content;
+    if (typeof content === "string") return content;
+    if (Array.isArray(content)) {
+      const parts = [];
+      for (const part of content) {
+        if (part && typeof part === "object" && typeof part.text === "string") {
+          parts.push(part.text);
+        }
+      }
+      return parts.length ? parts.join("") : null;
+    }
+    return null;
+  }
+  extractAttachments(req) {
+    return collectUserAttachments(req);
+  }
+  extractPromptContext(req) {
+    return serializeOpenAIPromptContext(req);
   }
   getModelName(req, res) {
     const model = res?.model ?? req?.model ?? "unknown";
@@ -182,7 +283,7 @@ var OpenAIAdapter = class {
 
 // src/sdk-version.ts
 var FALLBACK_SDK_VERSION = "js-0.0.0-dev";
-var AGENTID_SDK_VERSION_HEADER = "js-0.1.40".trim().length > 0 ? "js-0.1.40" : FALLBACK_SDK_VERSION;
+var AGENTID_SDK_VERSION_HEADER = "js-0.1.42".trim().length > 0 ? "js-0.1.42" : FALLBACK_SDK_VERSION;
 
 // src/pii-national-identifiers.ts
 var MAX_CANDIDATES_PER_RULE = 256;
@@ -1050,49 +1151,49 @@ function detectNationalIdentifiers(text, options = {}) {
 var SDK_SECRET_PATTERN_DEFINITIONS = [
   {
     id: "openai_api_key",
-    placeholderType: "OPENAI_API_KEY",
+    placeholderType: "SECRET",
     patternSource: "\\bsk-(?:proj-)?[A-Za-z0-9_-]{20,}\\b",
     flags: "iu",
     prefilterTerms: ["sk-", "proj-", "openai"]
   },
   {
     id: "aws_access_key",
-    placeholderType: "AWS_ACCESS_KEY",
+    placeholderType: "SECRET",
     patternSource: "\\b(?:AKIA|ASIA)[A-Z0-9]{16}\\b",
     flags: "iu",
     prefilterTerms: ["akia", "asia", "aws"]
   },
   {
     id: "github_token",
-    placeholderType: "GITHUB_TOKEN",
+    placeholderType: "SECRET",
     patternSource: "\\b(?:gh[pousr]_[A-Za-z0-9]{24,255}|github_pat_[A-Za-z0-9_]{20,255})\\b",
     flags: "iu",
     prefilterTerms: ["ghp_", "gho_", "ghu_", "ghs_", "ghr_", "github_pat_"]
   },
   {
     id: "slack_token",
-    placeholderType: "SLACK_TOKEN",
+    placeholderType: "SECRET",
     patternSource: "\\bxox(?:a|b|p|r|s)-[A-Za-z0-9-]{10,200}\\b",
     flags: "iu",
     prefilterTerms: ["xoxa-", "xoxb-", "xoxp-", "xoxr-", "xoxs-", "slack"]
   },
   {
     id: "slack_webhook_url",
-    placeholderType: "SLACK_WEBHOOK_URL",
+    placeholderType: "SECRET",
     patternSource: "https:\\/\\/hooks\\.slack\\.com\\/services\\/[A-Za-z0-9/_-]{20,}",
     flags: "iu",
     prefilterTerms: ["hooks.slack.com/services", "slack"]
   },
   {
     id: "discord_webhook_url",
-    placeholderType: "DISCORD_WEBHOOK_URL",
+    placeholderType: "SECRET",
     patternSource: "https:\\/\\/discord(?:app)?\\.com\\/api\\/webhooks\\/\\d+\\/[A-Za-z0-9_-]{16,}",
     flags: "iu",
     prefilterTerms: ["discord.com/api/webhooks", "discordapp.com/api/webhooks", "discord"]
   },
   {
     id: "stripe_secret_key",
-    placeholderType: "STRIPE_SECRET_KEY",
+    placeholderType: "SECRET",
     patternSource: "\\b(?:sk|pk|ak|rk)_(?:live|test)_[A-Za-z0-9]+\\b",
     flags: "iu",
     prefilterTerms: [
@@ -1109,49 +1210,49 @@ var SDK_SECRET_PATTERN_DEFINITIONS = [
   },
   {
     id: "google_api_key",
-    placeholderType: "GOOGLE_API_KEY",
+    placeholderType: "SECRET",
     patternSource: "\\bAIza[0-9A-Za-z_-]{35}\\b",
     flags: "iu",
     prefilterTerms: ["aiza", "google"]
   },
   {
     id: "anthropic_api_key",
-    placeholderType: "ANTHROPIC_API_KEY",
+    placeholderType: "SECRET",
     patternSource: "\\bsk-ant-(?:api\\d{2}-)?[A-Za-z0-9_-]{20,}\\b",
     flags: "iu",
     prefilterTerms: ["sk-ant-", "anthropic"]
   },
   {
     id: "evm_private_key",
-    placeholderType: "EVM_PRIVATE_KEY",
+    placeholderType: "SECRET",
     patternSource: "\\b0x[a-fA-F0-9]{64}\\b",
     flags: "iu",
     prefilterTerms: ["0x", "ethereum", "evm", "private key"]
   },
   {
     id: "jwt_token",
-    placeholderType: "JWT_TOKEN",
+    placeholderType: "SECRET",
     patternSource: "\\beyJ[A-Za-z0-9_-]{6,}\\.[A-Za-z0-9_-]{8,}\\.[A-Za-z0-9_-]{8,}\\b",
     flags: "iu",
     prefilterTerms: ["eyj", "jwt", "bearer"]
   },
   {
     id: "bearer_token",
-    placeholderType: "BEARER_TOKEN",
+    placeholderType: "SECRET",
     patternSource: "\\bauthorization\\b\\s*[:=]\\s*bearer\\s+[A-Za-z0-9._~+\\/-]{16,}|\\bbearer\\s+[A-Za-z0-9._~+\\/-]{24,}",
     flags: "iu",
     prefilterTerms: ["authorization", "bearer"]
   },
   {
     id: "api_key_header",
-    placeholderType: "API_KEY_HEADER",
+    placeholderType: "SECRET",
     patternSource: "\\bx[-_]?api[-_]?key\\b\\s*[:=]\\s*[A-Za-z0-9._~+\\/-]{16,}",
     flags: "iu",
     prefilterTerms: ["x-api-key", "api-key", "x_api_key", "api_key"]
   },
   {
     id: "credential_assignment",
-    placeholderType: "CREDENTIAL_ASSIGNMENT",
+    placeholderType: "SECRET",
     patternSource: `(?:\\b|["'])(?:api(?:[_-]?|\\s+)key|access(?:[_-]?|\\s+)token|auth(?:[_-]?|\\s+)token|client(?:[_-]?|\\s+)secret|private(?:[_-]?|\\s+)key)(?:\\b|["'])\\s*(?::|=|=>)\\s*(?:"[A-Za-z0-9._~+\\/=:-]{16,}"|'[A-Za-z0-9._~+\\/=:-]{16,}'|[A-Za-z0-9._~+\\/=:-]{16,})`,
     flags: "iu",
     prefilterTerms: [
@@ -1167,28 +1268,28 @@ var SDK_SECRET_PATTERN_DEFINITIONS = [
   },
   {
     id: "password_assignment",
-    placeholderType: "PASSWORD_ASSIGNMENT",
+    placeholderType: "PASSWORD",
     patternSource: `(?:\\b|["'])(?:password|passwd|pwd|heslo)(?:\\b|["'])\\s*(?:(?::|=|=>)|(?:is|are|was|were|je)\\b)?\\s*(?:"[A-Za-z0-9._~!@#$%^&*+=\\/-]{8,}"|'[A-Za-z0-9._~!@#$%^&*+=\\/-]{8,}'|[A-Za-z0-9._~!@#$%^&*+=\\/-]{8,})`,
     flags: "iu",
     prefilterTerms: ["password", "passwd", "pwd", "heslo"]
   },
   {
     id: "private_key_material",
-    placeholderType: "PRIVATE_KEY_MATERIAL",
+    placeholderType: "SECRET",
     patternSource: "-----BEGIN (?:(?:RSA |EC |OPENSSH |DSA )?PRIVATE KEY|PGP PRIVATE KEY BLOCK|CERTIFICATE)-----[\\s\\S]{20,12000}(?:-----END (?:(?:RSA |EC |OPENSSH |DSA )?PRIVATE KEY|PGP PRIVATE KEY BLOCK|CERTIFICATE)-----|$)",
     flags: "iu",
     prefilterTerms: ["begin private key", "begin pgp private key block", "private key"]
   },
   {
     id: "azure_connection_string",
-    placeholderType: "AZURE_CONNECTION_STRING",
+    placeholderType: "SECRET",
     patternSource: "\\bDefaultEndpointsProtocol=https;AccountName=[A-Za-z0-9.-]{3,};AccountKey=[A-Za-z0-9+/=]{20,}(?:;EndpointSuffix=[A-Za-z0-9.-]+)?\\b",
     flags: "iu",
     prefilterTerms: ["defaultendpointsprotocol", "accountname", "accountkey", "azure"]
   },
   {
     id: "azure_sas_token",
-    placeholderType: "AZURE_SAS_TOKEN",
+    placeholderType: "SECRET",
     patternSource: "\\bsv=[^\\s&]{2,}&[^\\s]{0,200}\\bsig=[A-Za-z0-9%/+_-]{16,}",
     flags: "iu",
     prefilterTerms: ["sv=", "sig=", "accountkey", "azure"]
@@ -1251,19 +1352,70 @@ function rangesOverlap(left, right) {
   return left.start < right.end && right.start < left.end;
 }
 function detectionPriority(type) {
-  if (/^(?:OPENAI_API_KEY|AWS_ACCESS_KEY|GITHUB_TOKEN|SLACK_TOKEN|SLACK_WEBHOOK_URL|DISCORD_WEBHOOK_URL|STRIPE_SECRET_KEY|GOOGLE_API_KEY|ANTHROPIC_API_KEY|EVM_PRIVATE_KEY|JWT_TOKEN|BEARER_TOKEN|API_KEY_HEADER|AZURE_CONNECTION_STRING|AZURE_SAS_TOKEN)$/u.test(
-    type
-  )) {
+  const normalizedType = toPlaceholderType(type);
+  if (normalizedType === "SECRET") {
     return 100;
   }
-  if (/^(?:CREDENTIAL_ASSIGNMENT|PASSWORD_ASSIGNMENT|PRIVATE_KEY_MATERIAL|ENV_SECRET_ASSIGNMENT)$/u.test(type)) {
+  if (normalizedType === "PASSWORD") {
+    return 90;
+  }
+  if (/^(?:CREDENTIAL_ASSIGNMENT|PRIVATE_KEY_MATERIAL|ENV_SECRET_ASSIGNMENT)$/u.test(
+    normalizedType
+  )) {
     return 80;
   }
-  if (type === "PERSON_NAME" || type === "PERSON") {
+  if (normalizedType === "PERSON_NAME" || normalizedType === "PERSON") {
     return 10;
   }
   return 50;
 }
+function isPasswordPlaceholderType(type) {
+  return /^(?:PASSWORD_ASSIGNMENT|BASIC_AUTH_PASSWORD)$/u.test(type);
+}
+function isGenericSecretPlaceholderType(type) {
+  return /^(?:OPENAI_API_KEY|AWS_ACCESS_KEY|GITHUB_TOKEN|SLACK_TOKEN|SLACK_WEBHOOK_URL|DISCORD_WEBHOOK_URL|STRIPE_SECRET_KEY|GOOGLE_API_KEY|ANTHROPIC_API_KEY|EVM_PRIVATE_KEY|JWT_TOKEN|BEARER_TOKEN|API_KEY_HEADER|CREDENTIAL_ASSIGNMENT|PRIVATE_KEY_MATERIAL|ENV_SECRET_ASSIGNMENT|AZURE_CONNECTION_STRING|AZURE_SAS_TOKEN|DISCORD_WEBHOOK_TOKEN)$/u.test(
+    type
+  );
+}
+function toPlaceholderType(type) {
+  const normalized = String(type ?? "").trim().toUpperCase();
+  if (isPasswordPlaceholderType(normalized)) {
+    return "PASSWORD";
+  }
+  if (isGenericSecretPlaceholderType(normalized)) {
+    return "SECRET";
+  }
+  return normalized || "PII";
+}
+function trimLeadingAddressContext(value) {
+  const trimmed = value.replace(
+    /^(?:(?:na\s+)?adrese|(?:se\s+)?(?:s[ií]dlem|bydli[sš]t[ěe]m|bytem|adresa(?:\s+bydli[sš]t[ěe])?))\s*[:,-]?\s*/iu,
+    ""
+  );
+  if (!trimmed || trimmed === value) {
+    return { text: value, offset: 0 };
+  }
+  return {
+    text: trimmed,
+    offset: value.indexOf(trimmed)
+  };
+}
+function normalizeDetection(detection) {
+  if (detection.type !== "ADDRESS") {
+    return detection;
+  }
+  const trimmed = trimLeadingAddressContext(detection.text);
+  if (trimmed.offset <= 0 || trimmed.text === detection.text) {
+    return detection;
+  }
+  const start = detection.start + trimmed.offset;
+  return {
+    ...detection,
+    start,
+    end: start + trimmed.text.length,
+    text: trimmed.text
+  };
+}
 var PHONE_CONTEXT_KEYWORDS = [
   "tel",
   "phone",
@@ -1378,6 +1530,19 @@ var PERSON_NAME_STOPWORDS = /* @__PURE__ */ new Set([
   "security",
   "instructions",
   "instruction",
+  "authorized",
+  "audit",
+  "article",
+  "compliance",
+  "global",
+  "governance",
+  "charter",
+  "initialization",
+  "sequence",
+  "prefix",
+  "prefixes",
+  "priority",
+  "violation",
   "google",
   "form",
   "forms",
@@ -1452,6 +1617,21 @@ var TECHNICAL_CONTEXT_SYMBOL_REGEX = /:\/\/|`|\{|\}|\[|\]|\(|\)|;|\$|=>|::|\/\//
 var NAME_LABEL_QUESTION_CONTEXT_REGEX = /\b(?:jak(?:e|y|a|ou)|kter(?:e|y|a|ou)|co|what|which|whose|wie|welch(?:e|er|es|en|em)?|quel(?:le|s|les)?|que|cual(?:es)?|wat|welke|jaki|jakie|jaka)\b[\s\S]{0,80}\b(?:jmeno|prijmeni|name|names|namen|nom|nombre|nome|naam|imie|nazwisko|meno)\b[\s\S]{0,96}\b(?:napsal\p{L}*|napsan\p{L}*|psal\p{L}*|pouzil\p{L}*|pouzili\p{L}*|write|wrote|written|type|typed|enter(?:ed)?|use(?:d)?|say|said|geschrieben|getippt|eingetragen|ecrit|escrib\p{L}*|scritt\p{L}*)\b/iu;
 var NAME_VALUE_ASSIGNMENT_BEFORE_CANDIDATE_REGEX = /(?:[:=]|=>|-|\b(?:is|was|je|jsou|jmenuje|called|named|ist|sind|lautet|est|es)\b)\s*$/iu;
 var BIRTH_NUMBER_CONTEXT_RE = /\b(?:rodn[eé]\s*(?:č[ií]slo|cislo)|r\.?\s*c\.?|birth\s+number)\b[^0-9]{0,80}(\d{6}(?:\/?\d{3,4})?)\b/giu;
+var ADDRESS_HOUSE_NUMBER_PATTERN = String.raw`\d{1,5}(?:\/\d{1,5}[A-Za-z]?)?[A-Za-z]?`;
+var ADDRESS_POSTAL_CODE_PATTERN = String.raw`(?:\d{3}\s?\d{2}|\d{5})`;
+var ADDRESS_STREET_LABEL_PATTERN = String.raw`(?:ulici|ulice|ul\.?|street|st\.?|road|rd\.?|avenue|ave\.?|n[aá]m[eě]st[ií]|t[řr][íi]da|alej|n[aá]b[řr]ež[ií])`;
+var ADDRESS_WITH_ANCHOR_RE = new RegExp(
+  String.raw`\b(?:bydl[ií]m\s+na|bydlim\s+na|bytem|bydli[sš]t[eě]|adresa|na\s+ulici|v\s+ulici|doru[cč]ovac[ií]\s+adresa|koresponden[cč]n[ií]\s+adresa|faktura[cč]n[ií]\s+adresa|se\s+s[ií]dlem|z[ií]ju\s+v|ziju\s+v|zjiu\s+v)\b[\s,:-]{0,12}((?:(?:${ADDRESS_STREET_LABEL_PATTERN})\s+)?(?:\p{L}[\p{L}'’-]{2,}\s+){0,4}${ADDRESS_HOUSE_NUMBER_PATTERN}(?:(?:,\s*|\s+)(?:${ADDRESS_POSTAL_CODE_PATTERN}))?(?:(?:,\s*|\s+)(?:v|ve)\s+)?(?:(?:,\s*|\s+)(?:\p{L}[\p{L}'’-]{2,})(?:\s+\p{L}[\p{L}'’-]{2,}){0,2})?)`,
+  "giu"
+);
+var ADDRESS_CITY_NUMBER_WITH_ANCHOR_RE = new RegExp(
+  String.raw`\b(?:z[ií]ju\s+v|ziju\s+v|zjiu\s+v|v\s+obci|v\s+katastru\s+obce)\b[\s,:-]{0,12}((?:\p{L}[\p{L}'’-]{2,})(?:\s+\p{L}[\p{L}'’-]{2,}){0,2}\s+${ADDRESS_HOUSE_NUMBER_PATTERN})`,
+  "giu"
+);
+var ADDRESS_STANDALONE_RE = new RegExp(
+  String.raw`\b((?:(?:${ADDRESS_STREET_LABEL_PATTERN})\s+)?(?:\p{L}[\p{L}'’-]{2,}\s+){0,4}${ADDRESS_HOUSE_NUMBER_PATTERN}(?:,\s*|\s+)(?:${ADDRESS_POSTAL_CODE_PATTERN})(?:,\s*|\s+)(?:\p{L}[\p{L}'’-]{2,}(?:\s+\p{L}[\p{L}'’-]{2,}){0,2}))`,
+  "gu"
+);
 function hasPhoneContext(text, matchStartIndex, windowSize = 50) {
   const start = Math.max(0, matchStartIndex - windowSize);
   const windowLower = text.slice(start, matchStartIndex).toLowerCase();
@@ -1503,6 +1683,26 @@ function isLikelyPersonNameCandidate(candidate, contextWindow) {
   }
   return true;
 }
+function isLikelyAddressCandidate(candidate) {
+  if (!/\d/u.test(candidate)) {
+    return false;
+  }
+  const normalized = normalizePersonWord(candidate);
+  const words = candidate.trim().split(/\s+/).filter(Boolean);
+  if (words.length < 2) {
+    return false;
+  }
+  const numberIndex = words.findIndex((word) => /\d/u.test(word));
+  if (numberIndex <= 0) {
+    return false;
+  }
+  const letterWordRe = /^\p{L}[\p{L}'’-]*$/u;
+  const beforeCount = words.slice(0, numberIndex).filter((word) => letterWordRe.test(word)).length;
+  const afterCount = words.slice(numberIndex + 1).filter((word) => letterWordRe.test(word)).length;
+  return /\b(?:ulici|ulice|ul\.|street|road|avenue|namesti|trida|alej|nabrezi)\b/iu.test(
+    normalized
+  ) || /\b\d{3}\s?\d{2}\b|\b\d{5}\b/u.test(candidate) || beforeCount >= 1 && afterCount >= 1;
+}
 var PIIManager = class {
   /**
    * Reversible local-first masking using <TYPE_INDEX> placeholders.
@@ -1583,13 +1783,55 @@ var PIIManager = class {
         });
         for (const match of nationalIdMatches) {
           if (match.start < 0 || match.end <= match.start) continue;
+          const detectionType = match.type === "address_postal" ? "ADDRESS" : match.type === "birth_number" ? "BIRTH_NUMBER" : "NATIONAL_ID";
           detections.push({
             start: match.start,
             end: match.end,
-            type: "NATIONAL_ID",
+            type: detectionType,
             text: text.slice(match.start, match.end)
           });
         }
+        ADDRESS_WITH_ANCHOR_RE.lastIndex = 0;
+        for (const match of text.matchAll(ADDRESS_WITH_ANCHOR_RE)) {
+          if (match.index == null) continue;
+          const value = match[1] ?? "";
+          if (!value || !isLikelyAddressCandidate(value)) continue;
+          const localIndex = match[0].lastIndexOf(value);
+          const start = match.index + Math.max(0, localIndex);
+          detections.push({
+            start,
+            end: start + value.length,
+            type: "ADDRESS",
+            text: value
+          });
+        }
+        ADDRESS_CITY_NUMBER_WITH_ANCHOR_RE.lastIndex = 0;
+        for (const match of text.matchAll(ADDRESS_CITY_NUMBER_WITH_ANCHOR_RE)) {
+          if (match.index == null) continue;
+          const value = match[1] ?? "";
+          if (!value || !isLikelyAddressCandidate(value)) continue;
+          const localIndex = match[0].lastIndexOf(value);
+          const start = match.index + Math.max(0, localIndex);
+          detections.push({
+            start,
+            end: start + value.length,
+            type: "ADDRESS",
+            text: value
+          });
+        }
+        ADDRESS_STANDALONE_RE.lastIndex = 0;
+        for (const match of text.matchAll(ADDRESS_STANDALONE_RE)) {
+          if (match.index == null) continue;
+          const value = match[1] ?? match[0];
+          if (!value || !isLikelyAddressCandidate(value)) continue;
+          const start = match.index;
+          detections.push({
+            start,
+            end: start + value.length,
+            type: "ADDRESS",
+            text: value
+          });
+        }
       }
       if (resolvedOptions.secrets) {
         BASIC_AUTH_PASSWORD_RE.lastIndex = 0;
@@ -1639,13 +1881,17 @@ var PIIManager = class {
           }
         }
       }
-      const kept = normalizeDetections(text, detections);
+      const kept = normalizeDetections(
+        text,
+        detections.map((detection) => normalizeDetection(detection))
+      );
       if (!kept.length) return { maskedText: text, mapping: {} };
       const counters = {};
       const mapping = {};
       const replacements = kept.map((d) => {
-        counters[d.type] = (counters[d.type] ?? 0) + 1;
-        const placeholder = `<${d.type}_${counters[d.type]}>`;
+        const placeholderType = toPlaceholderType(d.type);
+        counters[placeholderType] = (counters[placeholderType] ?? 0) + 1;
+        const placeholder = `<${placeholderType}_${counters[placeholderType]}>`;
         mapping[placeholder] = d.text;
         return { ...d, placeholder };
       });
@@ -2156,7 +2402,6 @@ var MAX_ANALYSIS_WINDOW = 8192;
 var WINDOW_SLICE_SIZE = 4e3;
 var WORD_BOUNDARY_SCAN = 120;
 var AI_TIMEOUT_MS = 2e3;
-var TELEMETRY_SNIPPET_LIMIT = 4e3;
 var AI_OPENAI_MODEL = "gpt-4o-mini";
 var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var EN_STOPWORDS = /* @__PURE__ */ new Set([
@@ -2341,143 +2586,6 @@ function getOpenAiApiKey() {
   }
   return key.trim();
 }
-async function sha256Hex(text) {
-  const data = new TextEncoder().encode(text ?? "");
-  const subtle = globalThis.crypto?.subtle;
-  if (subtle?.digest) {
-    const buf = await subtle.digest("SHA-256", data);
-    return Array.from(new Uint8Array(buf)).map((b) => b.toString(16).padStart(2, "0")).join("");
-  }
-  return sha256HexFallback(data);
-}
-function sha256HexFallback(data) {
-  const K = [
-    1116352408,
-    1899447441,
-    3049323471,
-    3921009573,
-    961987163,
-    1508970993,
-    2453635748,
-    2870763221,
-    3624381080,
-    310598401,
-    607225278,
-    1426881987,
-    1925078388,
-    2162078206,
-    2614888103,
-    3248222580,
-    3835390401,
-    4022224774,
-    264347078,
-    604807628,
-    770255983,
-    1249150122,
-    1555081692,
-    1996064986,
-    2554220882,
-    2821834349,
-    2952996808,
-    3210313671,
-    3336571891,
-    3584528711,
-    113926993,
-    338241895,
-    666307205,
-    773529912,
-    1294757372,
-    1396182291,
-    1695183700,
-    1986661051,
-    2177026350,
-    2456956037,
-    2730485921,
-    2820302411,
-    3259730800,
-    3345764771,
-    3516065817,
-    3600352804,
-    4094571909,
-    275423344,
-    430227734,
-    506948616,
-    659060556,
-    883997877,
-    958139571,
-    1322822218,
-    1537002063,
-    1747873779,
-    1955562222,
-    2024104815,
-    2227730452,
-    2361852424,
-    2428436474,
-    2756734187,
-    3204031479,
-    3329325298
-  ];
-  const H = [
-    1779033703,
-    3144134277,
-    1013904242,
-    2773480762,
-    1359893119,
-    2600822924,
-    528734635,
-    1541459225
-  ];
-  const length = data.length;
-  const bitLengthHi = Math.floor(length * 8 / 4294967296);
-  const bitLengthLo = length * 8 >>> 0;
-  const paddedLength = length + 9 + 63 >> 6 << 6 >>> 0;
-  const padded = new Uint8Array(paddedLength);
-  padded.set(data);
-  padded[length] = 128;
-  const view = new DataView(padded.buffer);
-  view.setUint32(paddedLength - 8, bitLengthHi, false);
-  view.setUint32(paddedLength - 4, bitLengthLo, false);
-  const w = new Uint32Array(64);
-  for (let offset = 0; offset < paddedLength; offset += 64) {
-    for (let i = 0; i < 16; i += 1) {
-      w[i] = view.getUint32(offset + i * 4, false);
-    }
-    for (let i = 16; i < 64; i += 1) {
-      const s0 = rightRotate(w[i - 15], 7) ^ rightRotate(w[i - 15], 18) ^ w[i - 15] >>> 3;
-      const s1 = rightRotate(w[i - 2], 17) ^ rightRotate(w[i - 2], 19) ^ w[i - 2] >>> 10;
-      w[i] = (w[i - 16] + s0 >>> 0) + (w[i - 7] + s1 >>> 0) >>> 0;
-    }
-    let [a, b, c, d, e, f, g, h] = H;
-    for (let i = 0; i < 64; i += 1) {
-      const S1 = rightRotate(e, 6) ^ rightRotate(e, 11) ^ rightRotate(e, 25);
-      const ch = e & f ^ ~e & g;
-      const temp1 = ((h + S1 >>> 0) + (ch + K[i] >>> 0) >>> 0) + w[i] >>> 0;
-      const S0 = rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22);
-      const maj = a & b ^ a & c ^ b & c;
-      const temp2 = S0 + maj >>> 0;
-      h = g;
-      g = f;
-      f = e;
-      e = d + temp1 >>> 0;
-      d = c;
-      c = b;
-      b = a;
-      a = temp1 + temp2 >>> 0;
-    }
-    H[0] = H[0] + a >>> 0;
-    H[1] = H[1] + b >>> 0;
-    H[2] = H[2] + c >>> 0;
-    H[3] = H[3] + d >>> 0;
-    H[4] = H[4] + e >>> 0;
-    H[5] = H[5] + f >>> 0;
-    H[6] = H[6] + g >>> 0;
-    H[7] = H[7] + h >>> 0;
-  }
-  return H.map((value) => value.toString(16).padStart(8, "0")).join("");
-}
-function rightRotate(value, shift) {
-  return value >>> shift | value << 32 - shift;
-}
 function safeJsonParse(raw) {
   try {
     return JSON.parse(raw);
@@ -2553,22 +2661,11 @@ async function runAICheck(anonymizedWindow) {
     clearTimeout(timeout);
   }
 }
-function truncateSnippet(value) {
-  if (!value) {
-    return "";
-  }
-  if (value.length <= TELEMETRY_SNIPPET_LIMIT) {
-    return value;
-  }
-  return value.slice(0, TELEMETRY_SNIPPET_LIMIT);
-}
 async function reportSecurityEvent(options) {
   if (typeof fetch !== "function") {
     return;
   }
-  const snippet = truncateSnippet(options.snippet);
-  const snippetHash = snippet ? await sha256Hex(snippet) : "";
-  const inputValue = options.storePii ? snippet : snippetHash;
+  const inputValue = "[REDACTED]";
   const eventId = createEventId(options.eventId ?? options.clientEventId);
   const metadata = {
     ...options.telemetryMetadata ?? {},
@@ -2578,13 +2675,9 @@ async function reportSecurityEvent(options) {
     language: options.language,
     ai_scan_status: options.aiStatus ?? null,
     reason: options.reason ?? null,
-    client_event_id: eventId
+    client_event_id: eventId,
+    transformed_input: "[REDACTED]"
   };
-  if (options.storePii) {
-    metadata.snippet = snippet;
-  } else {
-    metadata.snippet_hash = snippetHash;
-  }
   const payload = {
     event_id: eventId,
     system_id: options.systemId,
@@ -2748,7 +2841,7 @@ var GUARD_MAX_ATTEMPTS = 3;
 var GUARD_RETRY_DELAYS_MS = [250, 500];
 var INGEST_MAX_ATTEMPTS = 3;
 var INGEST_RETRY_DELAYS_MS = [250, 500];
-var GUARD_VERDICT_CACHE_TTL_MS = 0;
+var GUARD_VERDICT_CACHE_TTL_MS = 1500;
 var MAX_INGEST_TEXT_CHARS = 32e3;
 var OPENAI_TELEMETRY_FIELD = "agentid_telemetry";
 function normalizeBaseUrl3(baseUrl) {
@@ -2864,8 +2957,8 @@ function isInfrastructureGuardReason(reason) {
   if (!reason) return false;
   return reason === "system_failure" || reason === "system_failure_db_unavailable" || reason === "logging_failed" || reason === "server_error" || reason === "guard_unreachable" || reason === "api_key_pepper_missing" || reason === "encryption_key_missing";
 }
-function isGuardFailureEligibleForLocalFallback(reason) {
-  return reason === "network_error_strict_mode" || reason === "server_error" || isInfrastructureGuardReason(reason);
+function isFailOpenGuardBypassReason(reason) {
+  return reason === "timeout_fallback" || reason === "guard_unreachable" || reason === "system_failure_fail_open";
 }
 function isFailCloseIngestReason(reason) {
   if (!reason) return false;
@@ -2900,6 +2993,14 @@ function sanitizeIngestText(value) {
   const text = typeof value === "string" ? value : String(value ?? "");
   return text.slice(0, MAX_INGEST_TEXT_CHARS);
 }
+function getZeroRetentionInput(rawInput, candidateInput) {
+  const raw = typeof rawInput === "string" ? rawInput : "";
+  const candidate = typeof candidateInput === "string" ? candidateInput : "";
+  if (candidate.length > 0 && candidate !== raw) {
+    return candidate;
+  }
+  return "[REDACTED]";
+}
 function normalizeExpectedLanguages(value) {
   if (!Array.isArray(value)) {
     return void 0;
@@ -3575,6 +3676,29 @@ function textContainsMappingPlaceholder(text, mapping) {
   }
   return Object.keys(mapping).some((placeholder) => placeholder.length > 0 && text.includes(placeholder));
 }
+function isSecretPlaceholder(placeholder) {
+  const normalized = placeholder.replace(/[<>]/g, "").replace(/_\d+$/u, "").toUpperCase();
+  return normalized.includes("PASSWORD") || normalized.includes("SECRET") || normalized.includes("TOKEN") || normalized.includes("API_KEY") || normalized.includes("CREDENTIAL") || normalized.includes("PRIVATE_KEY");
+}
+function getMaskingTelemetryFromMapping(mapping) {
+  const placeholders = Object.keys(mapping ?? {}).filter((placeholder) => placeholder.length > 0);
+  return {
+    piiApplied: placeholders.some((placeholder) => !isSecretPlaceholder(placeholder)),
+    secretApplied: placeholders.some(isSecretPlaceholder)
+  };
+}
+function normalizePiiMapping(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const entries = Object.entries(value).filter(
+    ([placeholder, replacement]) => placeholder.length > 0 && typeof replacement === "string"
+  );
+  if (entries.length === 0) {
+    return void 0;
+  }
+  return Object.fromEntries(entries);
+}
 var SecurityBlockError = class extends Error {
   constructor(reason = "guard_denied") {
     super(`AgentID: Security Blocked (${reason})`);
@@ -3596,6 +3720,7 @@ var AgentID = class {
   constructor(config = {}) {
     this.injectionScanner = getInjectionScanner();
     this.recentGuardVerdicts = /* @__PURE__ */ new Map();
+    this.pendingGuardRequests = /* @__PURE__ */ new Map();
     this.apiKey = resolveConfiguredApiKey(config.apiKey);
     this.baseUrl = normalizeBaseUrl3(config.baseUrl ?? "https://app.getagentid.com/api/v1");
     this.configuredPiiMasking = typeof config.piiMasking === "boolean" ? config.piiMasking : null;
@@ -3651,16 +3776,18 @@ var AgentID = class {
   getEffectiveSecretMaskingForConfig(capabilityConfig) {
     return this.resolveEffectiveSecretMasking(capabilityConfig);
   }
-  buildClientCapabilities(framework = "js_sdk", hasFeedbackHandler = false, capabilityConfig) {
+  buildClientCapabilities(framework = "js_sdk", hasFeedbackHandler = false, capabilityConfig, appliedMasking) {
+    const piiMaskingEnabled = typeof appliedMasking?.piiApplied === "boolean" ? appliedMasking.piiApplied : this.resolveEffectivePiiMasking(
+      capabilityConfig ?? this.getCachedCapabilityConfig()
+    );
+    const secretMaskingEnabled = typeof appliedMasking?.secretApplied === "boolean" ? appliedMasking.secretApplied : this.resolveEffectiveSecretMasking(
+      capabilityConfig ?? this.getCachedCapabilityConfig()
+    );
     return {
       capabilities: {
         has_feedback_handler: hasFeedbackHandler,
-        pii_masking_enabled: this.resolveEffectivePiiMasking(
-          capabilityConfig ?? this.getCachedCapabilityConfig()
-        ),
-        secret_masking_enabled: this.resolveEffectiveSecretMasking(
-          capabilityConfig ?? this.getCachedCapabilityConfig()
-        ),
+        pii_masking_enabled: piiMaskingEnabled,
+        secret_masking_enabled: secretMaskingEnabled,
         framework
       }
     };
@@ -3686,13 +3813,15 @@ var AgentID = class {
     }
     return createEventId2();
   }
-  buildGuardCacheKey(params) {
-    if (!params.system_id || !params.input) {
+  buildGuardCacheKey(params, apiKey) {
+    const cacheInputSource = typeof params.prompt_context === "string" && params.prompt_context.trim().length > 0 ? params.prompt_context : params.input;
+    if (!params.system_id || !cacheInputSource) {
       return null;
     }
     const userId = params.user_id?.trim() ?? "";
-    const normalizedInput = params.input.slice(0, 2048);
-    return `${params.system_id}|${userId}|${normalizedInput.length}|${normalizedInput}`;
+    const normalizedInput = cacheInputSource.trim().replace(/\s+/g, " ").slice(0, 2048);
+    const keyPrefix = apiKey?.slice(0, 24) ?? "";
+    return `${keyPrefix}|${params.system_id}|${userId}|${normalizedInput.length}|${normalizedInput}`;
   }
   readCachedGuardVerdict(cacheKey) {
     if (!cacheKey) return null;
@@ -3705,7 +3834,7 @@ var AgentID = class {
     return cached.verdict;
   }
   cacheGuardVerdict(cacheKey, verdict) {
-    if (!cacheKey || !verdict.allowed || GUARD_VERDICT_CACHE_TTL_MS <= 0) {
+    if (!cacheKey || GUARD_VERDICT_CACHE_TTL_MS <= 0) {
       return;
     }
     this.recentGuardVerdicts.set(cacheKey, {
@@ -3754,20 +3883,7 @@ var AgentID = class {
     return config.strict_security_mode || config.failure_mode === "fail_close";
   }
   buildFailOpenGuardVerdict(reason, input, options) {
-    const capabilityConfig = this.getCachedCapabilityConfig(options);
-    const shouldMaskPii = capabilityConfig.block_pii_leakage || this.resolveEffectivePiiMasking(capabilityConfig);
-    const shouldMaskSecrets = capabilityConfig.block_secret_leakage === true || this.resolveEffectiveSecretMasking(capabilityConfig);
     const response = { allowed: true, reason };
-    if (input && (shouldMaskPii || shouldMaskSecrets)) {
-      const masked = this.pii.anonymize(input, {
-        pii: shouldMaskPii,
-        secrets: shouldMaskSecrets
-      });
-      if (masked.maskedText !== input) {
-        response.transformed_input = masked.maskedText;
-        response.detected_pii = Object.keys(masked.mapping).length > 0;
-      }
-    }
     return response;
   }
   maybeRaiseStrictIngestDependencyError(params) {
@@ -3796,6 +3912,43 @@ var AgentID = class {
     }
     return config.block_on_heuristic;
   }
+  buildInlineAttachmentPromptScanInput(attachments, maxChars = 6e3) {
+    if (!Array.isArray(attachments) || attachments.length === 0) {
+      return "";
+    }
+    const text = attachments.slice(0, 4).map((attachment) => {
+      const attachmentText = typeof attachment?.text === "string" ? attachment.text.trim() : "";
+      if (!attachmentText) {
+        return "";
+      }
+      const filename = typeof attachment.filename === "string" && attachment.filename.trim().length > 0 ? attachment.filename.trim() : "attachment";
+      return `[Attachment: ${filename}]
+${attachmentText}`;
+    }).filter(Boolean).join("\n\n");
+    if (!text || text.length <= maxChars) {
+      return text;
+    }
+    const headBudget = Math.max(256, Math.floor(maxChars * 0.55));
+    const tailBudget = Math.max(128, maxChars - headBudget - 16);
+    return `${text.slice(0, headBudget)}
+
+[...]
+
+${text.slice(-tailBudget)}`;
+  }
+  buildPromptInjectionScanInput(params) {
+    const source = typeof params.promptContext === "string" && params.promptContext.trim().length > 0 ? params.promptContext : params.input;
+    const attachmentInput = this.buildInlineAttachmentPromptScanInput(params.attachments);
+    if (!source) {
+      return attachmentInput;
+    }
+    if (!attachmentInput) {
+      return source;
+    }
+    return `${source}
+
+${attachmentInput}`;
+  }
   async refreshCapabilityConfigBeforeClientControl(params) {
     const refreshed = await this.getCapabilityConfigWithTelemetry(true, params.options);
     return {
@@ -3805,9 +3958,14 @@ var AgentID = class {
   }
   async applyLocalPolicyChecks(params) {
     const localScanStartedAt = Date.now();
-    if (params.runPromptInjectionCheck && params.input && this.shouldRunLocalInjectionScan(params.capabilityConfig)) {
+    const promptScanInput = this.buildPromptInjectionScanInput({
+      input: params.input,
+      promptContext: params.promptContext,
+      capabilityConfig: params.capabilityConfig
+    });
+    if (params.runPromptInjectionCheck && promptScanInput && this.shouldRunLocalInjectionScan(params.capabilityConfig)) {
       await this.injectionScanner.scan({
-        prompt: params.input,
+        prompt: promptScanInput,
         apiKey: params.apiKey,
         baseUrl: this.baseUrl,
         aiScanEnabled: this.aiScanEnabled,
@@ -3834,6 +3992,9 @@ var AgentID = class {
       });
       const sdkLocalScanMs = Math.max(0, Date.now() - localScanStartedAt);
       for (const event of enforced.events) {
+        if (event.violationType === "PII_LEAKAGE_STRICT" && event.actionTaken === "REDACTED") {
+          continue;
+        }
         this.logSecurityPolicyViolation({
           systemId: params.systemId,
           violationType: event.violationType,
@@ -3845,7 +4006,9 @@ var AgentID = class {
         });
       }
       return {
-        sanitizedInput: enforced.sanitizedInput,
+        sanitizedInput: enforced.events.some(
+          (event) => event.violationType === "PII_LEAKAGE_STRICT" && event.actionTaken === "REDACTED"
+        ) ? params.input : enforced.sanitizedInput,
         sdkLocalScanMs
       };
     } catch (error) {
@@ -3881,22 +4044,6 @@ var AgentID = class {
       sdkConfigFetchMs = refreshed.sdkConfigFetchMs;
     }
     if (!this.clientFastFail) {
-      const effectivePiiMasking2 = this.resolveEffectivePiiMasking(capabilityConfig);
-      const effectiveSecretMasking2 = this.resolveEffectiveSecretMasking(capabilityConfig);
-      if (!capabilityConfig.block_pii_leakage && effectivePiiMasking2 || !capabilityConfig.block_secret_leakage && effectiveSecretMasking2) {
-        const masked = this.pii.anonymize(sanitizedInput, {
-          pii: !capabilityConfig.block_pii_leakage && effectivePiiMasking2,
-          secrets: !capabilityConfig.block_secret_leakage && effectiveSecretMasking2
-        });
-        return {
-          sanitizedInput: masked.maskedText,
-          capabilityConfig,
-          sdkConfigFetchMs,
-          sdkLocalScanMs,
-          piiMapping: masked.mapping,
-          shouldDeanonymize: Object.keys(masked.mapping).length > 0
-        };
-      }
       return {
         sanitizedInput,
         capabilityConfig,
@@ -3913,6 +4060,7 @@ var AgentID = class {
     sdkConfigFetchMs = refreshedConfig.sdkConfigFetchMs;
     const enforced = await this.applyLocalPolicyChecks({
       input: params.input,
+      promptContext: params.promptContext,
       systemId: params.systemId,
       stream: params.stream,
       capabilityConfig,
@@ -3924,22 +4072,6 @@ var AgentID = class {
     });
     sanitizedInput = enforced.sanitizedInput;
     sdkLocalScanMs = enforced.sdkLocalScanMs;
-    const effectivePiiMasking = this.resolveEffectivePiiMasking(capabilityConfig);
-    const effectiveSecretMasking = this.resolveEffectiveSecretMasking(capabilityConfig);
-    if (!capabilityConfig.block_pii_leakage && effectivePiiMasking || !capabilityConfig.block_secret_leakage && effectiveSecretMasking) {
-      const masked = this.pii.anonymize(sanitizedInput, {
-        pii: !capabilityConfig.block_pii_leakage && effectivePiiMasking,
-        secrets: !capabilityConfig.block_secret_leakage && effectiveSecretMasking
-      });
-      return {
-        sanitizedInput: masked.maskedText,
-        capabilityConfig,
-        sdkConfigFetchMs,
-        sdkLocalScanMs,
-        piiMapping: masked.mapping,
-        shouldDeanonymize: Object.keys(masked.mapping).length > 0
-      };
-    }
     return {
       sanitizedInput,
       capabilityConfig,
@@ -3960,6 +4092,7 @@ var AgentID = class {
     });
     const enforced = await this.applyLocalPolicyChecks({
       input: params.input,
+      promptContext: params.promptContext,
       systemId: params.systemId,
       stream: params.stream,
       capabilityConfig: refreshedConfig.capabilityConfig,
@@ -3976,77 +4109,71 @@ var AgentID = class {
       sdkLocalScanMs: enforced.sdkLocalScanMs
     };
   }
+  async runLocalPromptInjectionFallback(params, options) {
+    const effectiveApiKey = this.resolveApiKey(options?.apiKey);
+    const resolvedConfig = params.capabilityConfig && typeof params.sdkConfigFetchMs === "number" ? {
+      capabilityConfig: params.capabilityConfig,
+      sdkConfigFetchMs: params.sdkConfigFetchMs
+    } : await this.getCapabilityConfigWithTelemetry(false, options);
+    const refreshedConfig = await this.refreshCapabilityConfigBeforeClientControl({
+      capabilityConfig: resolvedConfig.capabilityConfig,
+      sdkConfigFetchMs: resolvedConfig.sdkConfigFetchMs,
+      options
+    });
+    const localScanStartedAt = Date.now();
+    const promptScanInput = this.buildPromptInjectionScanInput({
+      input: params.input,
+      promptContext: params.promptContext,
+      capabilityConfig: refreshedConfig.capabilityConfig,
+      attachments: params.attachments
+    });
+    if (promptScanInput && this.shouldRunLocalInjectionScan(refreshedConfig.capabilityConfig)) {
+      await this.injectionScanner.scan({
+        prompt: promptScanInput,
+        apiKey: effectiveApiKey,
+        baseUrl: this.baseUrl,
+        aiScanEnabled: this.aiScanEnabled,
+        storePii: this.storePii,
+        piiManager: this.pii,
+        source: "js_sdk",
+        systemId: params.systemId,
+        eventId: params.clientEventId,
+        clientEventId: params.clientEventId,
+        telemetryMetadata: mergeTelemetryContexts(
+          params.telemetryMetadata,
+          buildSdkTimingMetadata({
+            sdkConfigFetchMs: refreshedConfig.sdkConfigFetchMs,
+            sdkConfigVersion: refreshedConfig.capabilityConfig.version
+          })
+        )
+      });
+    }
+    return {
+      capabilityConfig: refreshedConfig.capabilityConfig,
+      sdkConfigFetchMs: refreshedConfig.sdkConfigFetchMs,
+      sdkLocalScanMs: Math.max(0, Date.now() - localScanStartedAt)
+    };
+  }
   async scanPromptInjection(input, options) {
     if (!input) {
       return;
     }
-    const initialConfig = await this.getCapabilityConfigWithTelemetry(
-      false,
+    await this.runLocalPromptInjectionFallback(
+      {
+        input,
+        attachments: options?.attachments,
+        systemId: options?.systemId,
+        clientEventId: options?.clientEventId
+      },
       options
     );
-    const refreshedConfig = await this.refreshCapabilityConfigBeforeClientControl({
-      capabilityConfig: initialConfig.capabilityConfig,
-      sdkConfigFetchMs: initialConfig.sdkConfigFetchMs,
-      options
-    });
-    if (!this.shouldRunLocalInjectionScan(refreshedConfig.capabilityConfig)) {
-      return;
-    }
-    const effectiveApiKey = this.resolveApiKey(options?.apiKey);
-    await this.injectionScanner.scan({
-      prompt: input,
-      apiKey: effectiveApiKey,
-      baseUrl: this.baseUrl,
-      aiScanEnabled: this.aiScanEnabled,
-      storePii: this.storePii,
-      piiManager: this.pii,
-      source: "js_sdk",
-      systemId: options?.systemId,
-      eventId: options?.clientEventId,
-      clientEventId: options?.clientEventId,
-      telemetryMetadata: buildSdkTimingMetadata({
-        sdkConfigFetchMs: refreshedConfig.sdkConfigFetchMs,
-        sdkConfigVersion: refreshedConfig.capabilityConfig.version
-      })
-    });
   }
-  withMaskedOpenAIRequest(req, maskedText, options) {
+  withMaskedOpenAIRequest(req, maskedText) {
     const messages = Array.isArray(req?.messages) ? req.messages : null;
     if (!messages) {
       return req;
     }
-    const newMessages = messages.map((message2) => {
-      if (!message2 || typeof message2 !== "object") {
-        return message2;
-      }
-      const typedMessage = message2;
-      const currentContent2 = typedMessage.content;
-      if (typeof currentContent2 === "string") {
-        return {
-          ...typedMessage,
-          content: this.pii.anonymize(currentContent2, options).maskedText
-        };
-      }
-      if (Array.isArray(currentContent2)) {
-        return {
-          ...typedMessage,
-          content: currentContent2.map((part) => {
-            if (!part || typeof part !== "object") {
-              return part;
-            }
-            const typedPart = part;
-            if (typeof typedPart.text !== "string") {
-              return part;
-            }
-            return {
-              ...typedPart,
-              text: this.pii.anonymize(typedPart.text, options).maskedText
-            };
-          })
-        };
-      }
-      return message2;
-    });
+    const newMessages = messages.map((message2) => message2);
     let lastUserIdx = null;
     for (let i = 0; i < newMessages.length; i += 1) {
       const msg = newMessages[i];
@@ -4080,7 +4207,7 @@ var AgentID = class {
           text: maskedText
         });
       }
-      nextContent = textReplaced ? preservedParts : [{ type: "text", text: maskedText }, ...currentContent];
+      nextContent = textReplaced ? preservedParts : maskedText.length > 0 ? [{ type: "text", text: maskedText }, ...currentContent] : currentContent;
     }
     newMessages[lastUserIdx] = {
       ...message,
@@ -4097,7 +4224,7 @@ var AgentID = class {
   logSecurityPolicyViolation(params) {
     this.log({
       system_id: params.systemId,
-      input: "[REDACTED_SAMPLE]",
+      input: "[REDACTED]",
       output: "",
       model: "agentid.policy.enforcer",
       event_type: "security_policy_violation",
@@ -4108,7 +4235,7 @@ var AgentID = class {
         severity: "high",
         system_id: params.systemId,
         violation_type: params.violationType,
-        input_snippet: "[REDACTED_SAMPLE]",
+        input_snippet: "[REDACTED]",
         action_taken: params.actionTaken,
         ...buildSdkTimingMetadata({
           sdkConfigFetchMs: params.sdkConfigFetchMs,
@@ -4121,17 +4248,19 @@ var AgentID = class {
     }, { apiKey: params.apiKey });
   }
   logGuardFallback(params) {
+    const retainedInput = getZeroRetentionInput(params.guardParams.input, void 0);
     this.log(
       {
         system_id: params.guardParams.system_id,
         user_id: params.guardParams.user_id,
-        input: params.guardParams.input,
+        input: retainedInput,
         output: "",
         model: params.guardParams.model ?? "unknown",
         event_type: "security_alert",
         severity: "warning",
         metadata: {
           ...params.guardParams.metadata ?? {},
+          transformed_input: retainedInput,
           source: "guard",
           status: params.status,
           guard_reason: params.reason,
@@ -4203,98 +4332,122 @@ var AgentID = class {
       ...params,
       client_capabilities: params.client_capabilities ?? this.buildClientCapabilities()
     };
-    const guardCacheKey = this.buildGuardCacheKey(payload);
+    const guardCacheKey = this.buildGuardCacheKey(payload, effectiveApiKey);
     const cachedVerdict = this.readCachedGuardVerdict(guardCacheKey);
     if (cachedVerdict) {
       return withGuardLatency(cachedVerdict);
     }
-    const correlationId = createCorrelationId(payload.client_event_id);
-    let lastStatusCode = null;
-    let lastAbort = false;
-    let lastError = null;
-    for (let attempt = 0; attempt < GUARD_MAX_ATTEMPTS; attempt += 1) {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), this.guardTimeoutMs);
-      try {
-        const res = await fetch(`${this.baseUrl}/guard`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            "x-agentid-api-key": effectiveApiKey,
-            "X-AgentID-SDK-Version": AGENTID_SDK_VERSION_HEADER,
-            "x-correlation-id": correlationId
-          },
-          body: JSON.stringify(payload),
-          signal: controller.signal
-        });
-        lastStatusCode = res.status;
-        const responseBody = await safeReadJson2(res);
-        if (responseBody && typeof responseBody.allowed === "boolean") {
-          const rawVerdict = responseBody;
-          const transparency = coerceTransparencyMetadata(rawVerdict.transparency);
-          const verdict = {
-            ...rawVerdict,
-            ...transparency ? { transparency } : {}
-          };
-          const infrastructureFailure = verdict.allowed === false && (isInfrastructureGuardReason(verdict.reason) || !verdict.reason && res.status >= 500);
-          if (infrastructureFailure) {
-            if (attempt < GUARD_MAX_ATTEMPTS - 1) {
-              await waitForRetry(attempt);
-              continue;
-            }
-            if (effectiveStrictMode) {
+    const pendingGuardRequest = guardCacheKey ? this.pendingGuardRequests.get(guardCacheKey) : void 0;
+    if (pendingGuardRequest) {
+      return withGuardLatency(await pendingGuardRequest.promise);
+    }
+    const executeGuardRequest = async () => {
+      const correlationId = createCorrelationId(payload.client_event_id);
+      let lastStatusCode = null;
+      let lastAbort = false;
+      let lastError = null;
+      for (let attempt = 0; attempt < GUARD_MAX_ATTEMPTS; attempt += 1) {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), this.guardTimeoutMs);
+        try {
+          const res = await fetch(`${this.baseUrl}/guard`, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              "x-agentid-api-key": effectiveApiKey,
+              "X-AgentID-SDK-Version": AGENTID_SDK_VERSION_HEADER,
+              "x-correlation-id": correlationId
+            },
+            body: JSON.stringify(payload),
+            signal: controller.signal
+          });
+          lastStatusCode = res.status;
+          const responseBody = await safeReadJson2(res);
+          if (responseBody && typeof responseBody.allowed === "boolean") {
+            const rawVerdict = responseBody;
+            const transparency = coerceTransparencyMetadata(rawVerdict.transparency);
+            const verdict = {
+              ...rawVerdict,
+              ...transparency ? { transparency } : {}
+            };
+            const infrastructureFailure = verdict.allowed === false && (isInfrastructureGuardReason(verdict.reason) || !verdict.reason && res.status >= 500);
+            if (infrastructureFailure) {
+              if (attempt < GUARD_MAX_ATTEMPTS - 1) {
+                await waitForRetry(attempt);
+                continue;
+              }
+              if (effectiveStrictMode) {
+                console.warn(
+                  `[AgentID] Guard API infrastructure failure in strict mode (${verdict.reason ?? `http_${res.status}`}). Blocking request.`
+                );
+                return withGuardLatency({
+                  allowed: false,
+                  reason: verdict.reason ?? "network_error_strict_mode"
+                });
+              }
               console.warn(
-                `[AgentID] Guard API infrastructure failure in strict mode (${verdict.reason ?? `http_${res.status}`}). Blocking request.`
+                `[AgentID] Guard API infrastructure fallback in fail-open mode (${verdict.reason ?? `http_${res.status}`}).`
               );
-              return withGuardLatency({
-                allowed: false,
-                reason: verdict.reason ?? "network_error_strict_mode"
+              this.logGuardFallback({
+                reason: verdict.reason ?? `http_${res.status}`,
+                status: "upstream_error",
+                guardParams: params,
+                apiKey: effectiveApiKey
               });
+              return withGuardLatency(
+                this.buildFailOpenGuardVerdict(
+                  "system_failure_fail_open",
+                  params.input,
+                  { apiKey: effectiveApiKey }
+                )
+              );
             }
-            console.warn(
-              `[AgentID] Guard API infrastructure fallback in fail-open mode (${verdict.reason ?? `http_${res.status}`}).`
-            );
+            this.cacheGuardVerdict(guardCacheKey, verdict);
+            return withGuardLatency(verdict);
+          }
+          if (!res.ok) {
+            if (res.status >= 500 && attempt < GUARD_MAX_ATTEMPTS - 1) {
+              await waitForRetry(attempt);
+              continue;
+            }
+            throw new Error(`API Error ${res.status}`);
+          }
+          throw new Error("Invalid guard response");
+        } catch (error) {
+          lastError = error;
+          const isAbortError2 = Boolean(
+            error && typeof error === "object" && error.name === "AbortError"
+          );
+          lastAbort = isAbortError2;
+          if (attempt < GUARD_MAX_ATTEMPTS - 1) {
+            await waitForRetry(attempt);
+            continue;
+          }
+          if (isAbortError2) {
+            const timeoutMessage = "AgentID API Warning: Connection timeout exceeded.";
+            console.warn(timeoutMessage);
             this.logGuardFallback({
-              reason: verdict.reason ?? `http_${res.status}`,
-              status: "upstream_error",
+              reason: "timeout_fallback",
+              status: "latency_timeout",
               guardParams: params,
               apiKey: effectiveApiKey
             });
+            if (effectiveStrictMode) {
+              return withGuardLatency({ allowed: false, reason: "network_error_strict_mode" });
+            }
             return withGuardLatency(
-              this.buildFailOpenGuardVerdict(
-                "system_failure_fail_open",
-                params.input,
-                { apiKey: effectiveApiKey }
-              )
+              this.buildFailOpenGuardVerdict("timeout_fallback", params.input, {
+                apiKey: effectiveApiKey
+              })
             );
           }
-          this.cacheGuardVerdict(guardCacheKey, verdict);
-          return withGuardLatency(verdict);
-        }
-        if (!res.ok) {
-          if (res.status >= 500 && attempt < GUARD_MAX_ATTEMPTS - 1) {
-            await waitForRetry(attempt);
-            continue;
-          }
-          throw new Error(`API Error ${res.status}`);
-        }
-        throw new Error("Invalid guard response");
-      } catch (error) {
-        lastError = error;
-        const isAbortError2 = Boolean(
-          error && typeof error === "object" && error.name === "AbortError"
-        );
-        lastAbort = isAbortError2;
-        if (attempt < GUARD_MAX_ATTEMPTS - 1) {
-          await waitForRetry(attempt);
-          continue;
-        }
-        if (isAbortError2) {
-          const timeoutMessage = "AgentID API Warning: Connection timeout exceeded.";
-          console.warn(timeoutMessage);
+          console.warn(
+            effectiveStrictMode ? "[AgentID] Guard check failed (Strict mode active):" : "[AgentID] Guard check failed (Fail-Open active):",
+            error
+          );
           this.logGuardFallback({
-            reason: "timeout_fallback",
-            status: "latency_timeout",
+            reason: "guard_unreachable",
+            status: "guard_unreachable",
             guardParams: params,
             apiKey: effectiveApiKey
           });
@@ -4302,67 +4455,62 @@ var AgentID = class {
             return withGuardLatency({ allowed: false, reason: "network_error_strict_mode" });
           }
           return withGuardLatency(
-            this.buildFailOpenGuardVerdict("timeout_fallback", params.input, {
+            this.buildFailOpenGuardVerdict("guard_unreachable", params.input, {
               apiKey: effectiveApiKey
             })
           );
+        } finally {
+          clearTimeout(timeoutId);
         }
-        console.warn(
-          effectiveStrictMode ? "[AgentID] Guard check failed (Strict mode active):" : "[AgentID] Guard check failed (Fail-Open active):",
-          error
-        );
-        this.logGuardFallback({
-          reason: "guard_unreachable",
-          status: "guard_unreachable",
-          guardParams: params,
-          apiKey: effectiveApiKey
-        });
+      }
+      if (lastAbort) {
         if (effectiveStrictMode) {
           return withGuardLatency({ allowed: false, reason: "network_error_strict_mode" });
         }
         return withGuardLatency(
-          this.buildFailOpenGuardVerdict("guard_unreachable", params.input, {
+          this.buildFailOpenGuardVerdict("timeout_fallback", params.input, {
             apiKey: effectiveApiKey
           })
         );
-      } finally {
-        clearTimeout(timeoutId);
       }
-    }
-    if (lastAbort) {
+      if (typeof lastStatusCode === "number" && lastStatusCode >= 500) {
+        if (effectiveStrictMode) {
+          return withGuardLatency({ allowed: false, reason: "server_error" });
+        }
+        return withGuardLatency(
+          this.buildFailOpenGuardVerdict(
+            "system_failure_fail_open",
+            params.input,
+            { apiKey: effectiveApiKey }
+          )
+        );
+      }
+      console.warn(
+        effectiveStrictMode ? "[AgentID] Guard check failed (Strict mode active):" : "[AgentID] Guard check failed (Fail-Open active):",
+        lastError
+      );
       if (effectiveStrictMode) {
         return withGuardLatency({ allowed: false, reason: "network_error_strict_mode" });
       }
       return withGuardLatency(
-        this.buildFailOpenGuardVerdict("timeout_fallback", params.input, {
+        this.buildFailOpenGuardVerdict("guard_unreachable", params.input, {
           apiKey: effectiveApiKey
         })
       );
+    };
+    if (!guardCacheKey) {
+      return executeGuardRequest();
     }
-    if (typeof lastStatusCode === "number" && lastStatusCode >= 500) {
-      if (effectiveStrictMode) {
-        return withGuardLatency({ allowed: false, reason: "server_error" });
+    const promise = executeGuardRequest();
+    this.pendingGuardRequests.set(guardCacheKey, { promise });
+    try {
+      return await promise;
+    } finally {
+      const pending = this.pendingGuardRequests.get(guardCacheKey);
+      if (pending?.promise === promise) {
+        this.pendingGuardRequests.delete(guardCacheKey);
       }
-      return withGuardLatency(
-        this.buildFailOpenGuardVerdict(
-          "system_failure_fail_open",
-          params.input,
-          { apiKey: effectiveApiKey }
-        )
-      );
-    }
-    console.warn(
-      effectiveStrictMode ? "[AgentID] Guard check failed (Strict mode active):" : "[AgentID] Guard check failed (Fail-Open active):",
-      lastError
-    );
-    if (effectiveStrictMode) {
-      return withGuardLatency({ allowed: false, reason: "network_error_strict_mode" });
     }
-    return withGuardLatency(
-      this.buildFailOpenGuardVerdict("guard_unreachable", params.input, {
-        apiKey: effectiveApiKey
-      })
-    );
   }
   async sendIngest(params, options, internal) {
     const ingestStartedAt = Date.now();
@@ -4606,11 +4754,12 @@ var AgentID = class {
         completion,
         options?.piiMapping
       );
+      const transformedOutput = options?.deanonymizeForClient === true && options.piiMapping ? this.pii.deanonymize(completion, options.piiMapping) : masked.maskedText;
       return {
         mode: "static",
         rawOutput: completion,
-        transformedOutput: masked.maskedText,
-        outputMasked: masked.maskedText !== completion || placeholderOutputMasked
+        transformedOutput,
+        outputMasked: transformedOutput !== completion || placeholderOutputMasked
       };
     }
     if (!isAsyncIterable(completion)) {
@@ -4620,11 +4769,12 @@ var AgentID = class {
         asText,
         options?.piiMapping
       );
+      const transformedOutput = options?.deanonymizeForClient === true && options.piiMapping ? this.pii.deanonymize(asText, options.piiMapping) : masked.maskedText;
       return {
         mode: "static",
         rawOutput: asText,
-        transformedOutput: masked.maskedText,
-        outputMasked: masked.maskedText !== asText || placeholderOutputMasked
+        transformedOutput,
+        outputMasked: transformedOutput !== asText || placeholderOutputMasked
       };
     }
     const source = completion;
@@ -4819,6 +4969,7 @@ var AgentID = class {
    */
   wrapOpenAI(openai, options) {
     const systemId = options.system_id;
+    const deanonymizeOutputForClient = options.deanonymizeOutputForClient === true || options.deanonymize_output_for_client === true;
     const expectedLanguages = normalizeExpectedLanguages(
       options.expected_languages ?? options.expectedLanguages
     );
@@ -4859,38 +5010,48 @@ var AgentID = class {
                 const stream = adapter.isStream(providerReq);
                 let capabilityConfig = this.getCachedCapabilityConfig(requestOptions);
                 const userText = adapter.extractInput(providerReq);
-                const requestAttachments = adapter.extractAttachments(providerReq);
+                const rawPromptContext = adapter.extractPromptContext(providerReq);
+                let requestAttachments = adapter.extractAttachments(providerReq);
                 const hasGuardContent = userText !== null || requestAttachments.length > 0;
                 let maskedText = userText ?? "";
                 let maskedReq = providerReq;
                 let createArgs = providerReq === rawReq ? normalizedCreateArgs : [{ ...providerReq }, ...normalizedCreateArgs.slice(1)];
                 let mapping = {};
+                let clientInputMaskingTelemetry = {
+                  piiApplied: false,
+                  secretApplied: false
+                };
                 let sdkConfigFetchMs = 0;
                 let sdkLocalScanMs = 0;
-                let providerMaskingOptions;
                 if (hasGuardContent) {
                   const prepared = await this.prepareInputForDispatch({
                     input: userText ?? "",
+                    promptContext: rawPromptContext ?? void 0,
                     systemId,
                     stream,
                     clientEventId,
                     telemetryMetadata
                   }, requestOptions);
                   capabilityConfig = prepared.capabilityConfig;
-                  providerMaskingOptions = {
-                    pii: !capabilityConfig.block_pii_leakage && this.resolveEffectivePiiMasking(capabilityConfig),
-                    secrets: !capabilityConfig.block_secret_leakage && this.resolveEffectiveSecretMasking(capabilityConfig)
-                  };
                   maskedText = prepared.sanitizedInput;
-                  mapping = prepared.piiMapping ?? {};
+                  const preparedPiiMapping = normalizePiiMapping(prepared.piiMapping);
+                  const preparedMaskingTelemetry = getMaskingTelemetryFromMapping(
+                    preparedPiiMapping
+                  );
+                  clientInputMaskingTelemetry = {
+                    piiApplied: preparedMaskingTelemetry.piiApplied || maskedText !== (userText ?? ""),
+                    secretApplied: preparedMaskingTelemetry.secretApplied
+                  };
+                  mapping = preparedPiiMapping ?? {};
                   sdkConfigFetchMs = prepared.sdkConfigFetchMs ?? 0;
                   sdkLocalScanMs = prepared.sdkLocalScanMs ?? 0;
-                  if (maskedText !== (userText ?? "")) {
+                  const shouldProtectRequestHistory = maskedText !== (userText ?? "");
+                  if (shouldProtectRequestHistory) {
                     maskedReq = this.withMaskedOpenAIRequest(
                       providerReq,
-                      maskedText,
-                      providerMaskingOptions
+                      maskedText
                     );
+                    requestAttachments = adapter.extractAttachments(maskedReq);
                     const nextCreateArgs = [...createArgs];
                     nextCreateArgs[0] = maskedReq;
                     createArgs = nextCreateArgs;
@@ -4901,8 +5062,16 @@ var AgentID = class {
                     "AgentID: No user message or supported inline attachment found. Security guard requires prompt content."
                   );
                 }
+                const promptContextForGuard = adapter.extractPromptContext(maskedReq) ?? rawPromptContext ?? void 0;
+                const clientCapabilities = this.buildClientCapabilities(
+                  "openai",
+                  false,
+                  capabilityConfig,
+                  clientInputMaskingTelemetry
+                );
                 const verdict = await this.guard({
                   input: maskedText,
+                  prompt_context: promptContextForGuard,
                   system_id: systemId,
                   model: adapter.getModelName(maskedReq),
                   user_id: options.user_id,
@@ -4911,63 +5080,54 @@ var AgentID = class {
                   request_identity: options.request_identity,
                   metadata: telemetryMetadata,
                   attachments: requestAttachments,
-                  client_capabilities: this.buildClientCapabilities(
-                    "openai",
-                    false,
-                    capabilityConfig
-                  )
+                  client_capabilities: clientCapabilities
                 }, requestOptions);
                 let localFallbackApplied = false;
                 let localFallbackReason = null;
                 if (!verdict.allowed) {
-                  if (effectiveStrictMode && isGuardFailureEligibleForLocalFallback(verdict.reason)) {
-                    localFallbackApplied = true;
-                    localFallbackReason = verdict.reason ?? "guard_unreachable";
-                    if (sdkLocalScanMs === 0) {
-                      const fallback = await this.applyLocalPolicyChecks({
-                        input: maskedText,
-                        systemId,
-                        stream,
-                        capabilityConfig,
-                        apiKey: effectiveApiKey,
-                        clientEventId,
-                        sdkConfigFetchMs,
-                        telemetryMetadata,
-                        runPromptInjectionCheck: true
-                      });
-                      maskedText = fallback.sanitizedInput;
-                      sdkLocalScanMs = fallback.sdkLocalScanMs;
-                    }
-                  } else {
-                    await this.logPromptPreflightStep(
-                      {
-                        system_id: systemId,
-                        user_id: options.user_id,
-                        request_identity: options.request_identity,
-                        input: maskedText,
-                        telemetry: telemetryMetadata,
-                        verdict,
-                        guard_event_id: verdict.guard_event_id ?? null,
-                        guard_latency_ms: typeof verdict.guard_latency_ms === "number" && Number.isFinite(verdict.guard_latency_ms) ? Math.max(0, Math.trunc(verdict.guard_latency_ms)) : Math.max(0, Date.now() - pipelineStartedAt),
-                        preflight_for_client_event_id: typeof verdict.client_event_id === "string" && isUuidLike2(verdict.client_event_id) ? verdict.client_event_id : clientEventId,
-                        client_capabilities: this.buildClientCapabilities(
-                          "openai",
-                          false,
-                          capabilityConfig
-                        ),
-                        runtime_surface: "openai_sdk_guard"
-                      },
-                      requestOptions
-                    );
-                    throw new SecurityBlockError(verdict.reason ?? "guard_denied");
-                  }
+                  await this.logPromptPreflightStep(
+                    {
+                      system_id: systemId,
+                      user_id: options.user_id,
+                      request_identity: options.request_identity,
+                      input: getZeroRetentionInput(userText ?? "", maskedText),
+                      telemetry: telemetryMetadata,
+                      verdict,
+                      guard_event_id: verdict.guard_event_id ?? null,
+                      guard_latency_ms: typeof verdict.guard_latency_ms === "number" && Number.isFinite(verdict.guard_latency_ms) ? Math.max(0, Math.trunc(verdict.guard_latency_ms)) : Math.max(0, Date.now() - pipelineStartedAt),
+                      preflight_for_client_event_id: typeof verdict.client_event_id === "string" && isUuidLike2(verdict.client_event_id) ? verdict.client_event_id : clientEventId,
+                      client_capabilities: clientCapabilities,
+                      runtime_surface: "openai_sdk_guard"
+                    },
+                    requestOptions
+                  );
+                  throw new SecurityBlockError(verdict.reason ?? "guard_denied");
+                }
+                if (isFailOpenGuardBypassReason(verdict.reason)) {
+                  const fallback = await this.runLocalPromptInjectionFallback(
+                    {
+                      input: userText ?? "",
+                      promptContext: rawPromptContext ?? void 0,
+                      attachments: requestAttachments,
+                      systemId,
+                      clientEventId,
+                      capabilityConfig,
+                      sdkConfigFetchMs,
+                      telemetryMetadata
+                    },
+                    requestOptions
+                  );
+                  capabilityConfig = fallback.capabilityConfig;
+                  sdkConfigFetchMs = fallback.sdkConfigFetchMs;
+                  sdkLocalScanMs += fallback.sdkLocalScanMs;
+                  localFallbackApplied = true;
+                  localFallbackReason = verdict.reason ?? null;
                 }
                 const currentRequestInput = adapter.extractInput(maskedReq) ?? "";
-                if (maskedText !== currentRequestInput || providerMaskingOptions?.pii === true || providerMaskingOptions?.secrets === true) {
+                if (maskedText !== currentRequestInput) {
                   maskedReq = this.withMaskedOpenAIRequest(
                     providerReq,
-                    maskedText,
-                    providerMaskingOptions
+                    maskedText
                   );
                   const nextCreateArgs = [...createArgs];
                   nextCreateArgs[0] = maskedReq;
@@ -4990,29 +5150,29 @@ var AgentID = class {
                   maskedText = transformedInput;
                   maskedReq = this.withMaskedOpenAIRequest(
                     providerReq,
-                    transformedInput,
-                    providerMaskingOptions
+                    transformedInput
                   );
                   const nextCreateArgs = [...createArgs];
                   nextCreateArgs[0] = maskedReq;
                   createArgs = nextCreateArgs;
                 }
+                const shouldDeanonymizeForClient = deanonymizeOutputForClient && !isShadowMode && Object.keys(mapping).length > 0;
+                const retainedInputForLogs = getZeroRetentionInput(
+                  userText ?? "",
+                  maskedText
+                );
                 await this.logPromptPreflightStep(
                   {
                     system_id: systemId,
                     user_id: options.user_id,
                     request_identity: options.request_identity,
-                    input: maskedText,
+                    input: retainedInputForLogs,
                     telemetry: telemetryMetadata,
                     verdict,
                     guard_event_id: guardEventId,
                     guard_latency_ms: guardLatencyMs,
                     preflight_for_client_event_id: canonicalClientEventId,
-                    client_capabilities: this.buildClientCapabilities(
-                      "openai",
-                      false,
-                      capabilityConfig
-                    ),
+                    client_capabilities: clientCapabilities,
                     local_fallback_applied: localFallbackApplied,
                     local_fallback_reason: localFallbackReason,
                     runtime_surface: "openai_sdk_guard"
@@ -5030,12 +5190,13 @@ var AgentID = class {
                     })(),
                     {
                       piiMapping: mapping,
-                      deanonymizeForClient: false,
-                      maskForClient: !isShadowMode
+                      deanonymizeForClient: shouldDeanonymizeForClient,
+                      maskForClient: !isShadowMode && !shouldDeanonymizeForClient
                     }
                   );
                   if (maskedText && wrappedCompletion.mode === "stream") {
                     void wrappedCompletion.done.then(async (result) => {
+                      const effectiveInputMaskingTelemetry = getMaskingTelemetryFromMapping(mapping);
                       const modelLatencyMs2 = Math.max(0, Date.now() - modelStartedAt2);
                       const totalPipelineLatencyMs2 = Math.max(0, Date.now() - pipelineStartedAt);
                       const outputForLog = result.transformedOutput;
@@ -5044,7 +5205,7 @@ var AgentID = class {
                         system_id: systemId,
                         user_id: options.user_id,
                         request_identity: options.request_identity,
-                        input: maskedText,
+                        input: retainedInputForLogs,
                         output: outputForLog,
                         model: adapter.getModelName(maskedReq),
                         usage: result.usage,
@@ -5053,9 +5214,17 @@ var AgentID = class {
                         metadata: mergeTelemetryContexts(
                           telemetryMetadata,
                           {
-                            transformed_input: maskedText,
+                            transformed_input: retainedInputForLogs,
                             transformed_output: result.transformedOutput,
                             output_masked: result.outputMasked,
+                            client_side_pii_masking_applied: clientInputMaskingTelemetry.piiApplied,
+                            client_side_secret_masking_applied: clientInputMaskingTelemetry.secretApplied,
+                            server_side_pii_masking_applied: effectiveInputMaskingTelemetry.piiApplied && !clientInputMaskingTelemetry.piiApplied,
+                            server_side_secret_masking_applied: effectiveInputMaskingTelemetry.secretApplied && !clientInputMaskingTelemetry.secretApplied,
+                            effective_pii_masking_applied: effectiveInputMaskingTelemetry.piiApplied,
+                            effective_secret_masking_applied: effectiveInputMaskingTelemetry.secretApplied,
+                            effective_input_was_transformed: retainedInputForLogs !== "[REDACTED]",
+                            effective_output_was_transformed: result.outputMasked,
                             shadow_mode: isShadowMode,
                             simulated_decision: verdict.simulated_decision ?? null,
                             simulated_output_decision: isShadowMode && result.outputMasked ? "masked" : "allowed",
@@ -5076,11 +5245,7 @@ var AgentID = class {
                             sdkConfigVersion: capabilityConfig.version
                           })
                         ),
-                        client_capabilities: this.buildClientCapabilities(
-                          "openai",
-                          false,
-                          capabilityConfig
-                        )
+                        client_capabilities: clientCapabilities
                       }, requestOptions);
                       if (!ingestResult.ok) {
                         this.maybeRaiseStrictIngestDependencyError({
@@ -5105,6 +5270,7 @@ var AgentID = class {
                 const modelLatencyMs = Math.max(0, Date.now() - modelStartedAt);
                 const totalPipelineLatencyMs = Math.max(0, Date.now() - pipelineStartedAt);
                 if (maskedText) {
+                  const effectiveInputMaskingTelemetry = getMaskingTelemetryFromMapping(mapping);
                   const output = adapter.extractOutput(res);
                   const wrappedCompletion = this.wrapCompletion(output, {
                     piiMapping: mapping,
@@ -5118,7 +5284,7 @@ var AgentID = class {
                     system_id: systemId,
                     user_id: options.user_id,
                     request_identity: options.request_identity,
-                    input: maskedText,
+                    input: retainedInputForLogs,
                     output: outputForLog,
                     model,
                     usage,
@@ -5127,9 +5293,17 @@ var AgentID = class {
                     metadata: mergeTelemetryContexts(
                       telemetryMetadata,
                       {
-                        transformed_input: maskedText,
+                        transformed_input: retainedInputForLogs,
                         transformed_output: wrappedCompletion.transformedOutput,
                         output_masked: wrappedCompletion.outputMasked,
+                        client_side_pii_masking_applied: clientInputMaskingTelemetry.piiApplied,
+                        client_side_secret_masking_applied: clientInputMaskingTelemetry.secretApplied,
+                        server_side_pii_masking_applied: effectiveInputMaskingTelemetry.piiApplied && !clientInputMaskingTelemetry.piiApplied,
+                        server_side_secret_masking_applied: effectiveInputMaskingTelemetry.secretApplied && !clientInputMaskingTelemetry.secretApplied,
+                        effective_pii_masking_applied: effectiveInputMaskingTelemetry.piiApplied,
+                        effective_secret_masking_applied: effectiveInputMaskingTelemetry.secretApplied,
+                        effective_input_was_transformed: retainedInputForLogs !== "[REDACTED]",
+                        effective_output_was_transformed: wrappedCompletion.outputMasked,
                         shadow_mode: isShadowMode,
                         simulated_decision: verdict.simulated_decision ?? null,
                         simulated_output_decision: isShadowMode && wrappedCompletion.outputMasked ? "masked" : "allowed",
@@ -5150,11 +5324,7 @@ var AgentID = class {
                         sdkConfigVersion: capabilityConfig.version
                       })
                     ),
-                    client_capabilities: this.buildClientCapabilities(
-                      "openai",
-                      false,
-                      capabilityConfig
-                    )
+                    client_capabilities: clientCapabilities
                   }, requestOptions);
                   if (!ingestResult.ok) {
                     this.maybeRaiseStrictIngestDependencyError({
@@ -5168,7 +5338,7 @@ var AgentID = class {
                 }
                 if (!isShadowMode && maskedText) {
                   const output = adapter.extractOutput(res);
-                  const maskedOutput = this.wrapCompletion(output, {
+                  const clientFacingOutput = shouldDeanonymizeForClient ? this.pii.deanonymize(String(output ?? ""), mapping) : this.wrapCompletion(output, {
                     piiMapping: mapping,
                     deanonymizeForClient: false
                   }).transformedOutput;
@@ -5177,10 +5347,10 @@ var AgentID = class {
                       for (const choice of res.choices) {
                         const typedChoice = choice;
                         if (typedChoice?.message && typeof typedChoice.message.content === "string") {
-                          typedChoice.message.content = maskedOutput;
+                          typedChoice.message.content = clientFacingOutput;
                         }
                         if (typedChoice?.delta && typeof typedChoice.delta.content === "string") {
-                          typedChoice.delta.content = maskedOutput;
+                          typedChoice.delta.content = clientFacingOutput;
                         }
                       }
                     }
@@ -5365,13 +5535,15 @@ function protectMessageHistory(messages, options = { pii: true, secrets: true })
   const piiManager = new PIIManager();
   let textPartsCount = 0;
   let transformedTextPartsCount = 0;
+  const placeholderMapping = {};
   const protectString = (value) => {
     textPartsCount += 1;
-    const masked = piiManager.anonymize(value, options).maskedText;
-    if (masked !== value) {
+    const masked = piiManager.anonymize(value, options);
+    Object.assign(placeholderMapping, masked.mapping);
+    if (masked.maskedText !== value) {
       transformedTextPartsCount += 1;
     }
-    return masked;
+    return masked.maskedText;
   };
   const visit = (value, key) => {
     if (typeof value === "string") {
@@ -5403,7 +5575,31 @@ function protectMessageHistory(messages, options = { pii: true, secrets: true })
     messages: protectedMessages,
     transformed: protectedMessages !== messages,
     textPartsCount,
-    transformedTextPartsCount
+    transformedTextPartsCount,
+    placeholderMapping
+  };
+}
+function protectChatState(messages, options = {}) {
+  const transcript = {
+    ui: options.transcript?.ui ?? "masked",
+    provider: options.transcript?.provider ?? "masked",
+    persistence: options.transcript?.persistence ?? "masked"
+  };
+  const protectedHistory = protectMessageHistory(messages, {
+    pii: options.pii ?? true,
+    secrets: options.secrets ?? true
+  });
+  const maskedMessages = protectedHistory.messages;
+  return {
+    rawMessages: messages,
+    uiMessages: transcript.ui === "masked" ? maskedMessages : messages,
+    providerMessages: transcript.provider === "masked" ? maskedMessages : messages,
+    persistenceMessages: transcript.persistence === "masked" ? maskedMessages : messages,
+    transformed: protectedHistory.transformed,
+    textPartsCount: protectedHistory.textPartsCount,
+    transformedTextPartsCount: protectedHistory.transformedTextPartsCount,
+    placeholderMapping: protectedHistory.placeholderMapping,
+    transcript
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
@@ -5421,6 +5617,7 @@ function protectMessageHistory(messages, options = { pii: true, secrets: true })
   createAgentIdTelemetryContext,
   createAgentIdWorkflowTrail,
   getInjectionScanner,
+  protectChatState,
   protectMessageHistory,
   scanWithRegex
 });