agentid-sdk 0.1.16 → 0.1.18

package/dist/{langchain-CmUK7sna.d.mts → langchain-BykeB2WB.d.mts}

@@ -1,3 +1,5 @@
+import { BaseCallbackHandler } from '@langchain/core/callbacks/base';
+
 type CapabilityConfig = {
     shadow_mode: boolean;
     block_pii_leakage: boolean;
@@ -82,7 +84,6 @@ declare class AgentID {
     private pii;
     private localEnforcer;
     private injectionScanner;
-    private requestClientEventIds;
     private recentGuardVerdicts;
     constructor(config: AgentIDConfig);
     private buildClientCapabilities;
@@ -114,17 +115,17 @@ declare class AgentID {
     private wrapCompletion;
     /**
      * LOG: Sends telemetry after execution.
-     * Non-blocking / Fire-and-forget.
+     * Returns a Promise so callers can await persistence when needed.
      */
-    log(params: LogParams, options?: RequestOptions): void;
+    log(params: LogParams, options?: RequestOptions): Promise<void>;
     /**
      * Analytics alias for telemetry logging.
      */
-    analytics(params: LogParams, options?: RequestOptions): void;
+    analytics(params: LogParams, options?: RequestOptions): Promise<void>;
     /**
      * Trace alias for telemetry logging.
      */
-    trace(params: LogParams, options?: RequestOptions): void;
+    trace(params: LogParams, options?: RequestOptions): Promise<void>;
     /**
      * Wrap an OpenAI client once; AgentID will automatically:
      * - run guard() before chat.completions.create
@@ -146,7 +147,8 @@ declare class AgentID {
  * Usage (LangChain):
  * callbacks: [new AgentIDCallbackHandler(agent, { system_id: "..." })]
  */
-declare class AgentIDCallbackHandler {
+declare class AgentIDCallbackHandler extends BaseCallbackHandler {
+    name: string;
     private agent;
     private systemId;
     private apiKeyOverride?;

package/dist/{langchain-CmUK7sna.d.ts → langchain-BykeB2WB.d.ts}

@@ -1,3 +1,5 @@
+import { BaseCallbackHandler } from '@langchain/core/callbacks/base';
+
 type CapabilityConfig = {
     shadow_mode: boolean;
     block_pii_leakage: boolean;
@@ -82,7 +84,6 @@ declare class AgentID {
     private pii;
     private localEnforcer;
     private injectionScanner;
-    private requestClientEventIds;
     private recentGuardVerdicts;
     constructor(config: AgentIDConfig);
     private buildClientCapabilities;
@@ -114,17 +115,17 @@ declare class AgentID {
     private wrapCompletion;
     /**
      * LOG: Sends telemetry after execution.
-     * Non-blocking / Fire-and-forget.
+     * Returns a Promise so callers can await persistence when needed.
      */
-    log(params: LogParams, options?: RequestOptions): void;
+    log(params: LogParams, options?: RequestOptions): Promise<void>;
     /**
      * Analytics alias for telemetry logging.
      */
-    analytics(params: LogParams, options?: RequestOptions): void;
+    analytics(params: LogParams, options?: RequestOptions): Promise<void>;
     /**
      * Trace alias for telemetry logging.
      */
-    trace(params: LogParams, options?: RequestOptions): void;
+    trace(params: LogParams, options?: RequestOptions): Promise<void>;
     /**
      * Wrap an OpenAI client once; AgentID will automatically:
      * - run guard() before chat.completions.create
@@ -146,7 +147,8 @@ declare class AgentID {
  * Usage (LangChain):
  * callbacks: [new AgentIDCallbackHandler(agent, { system_id: "..." })]
  */
-declare class AgentIDCallbackHandler {
+declare class AgentIDCallbackHandler extends BaseCallbackHandler {
+    name: string;
     private agent;
     private systemId;
     private apiKeyOverride?;

package/dist/langchain.d.mts

@@ -1 +1,2 @@
-export { a as AgentIDCallbackHandler } from './langchain-CmUK7sna.mjs';
+import '@langchain/core/callbacks/base';
+export { a as AgentIDCallbackHandler } from './langchain-BykeB2WB.mjs';

package/dist/langchain.d.ts

@@ -1 +1,2 @@
-export { a as AgentIDCallbackHandler } from './langchain-CmUK7sna.js';
+import '@langchain/core/callbacks/base';
+export { a as AgentIDCallbackHandler } from './langchain-BykeB2WB.js';

package/dist/langchain.js

@@ -23,9 +23,68 @@ __export(langchain_exports, {
   AgentIDCallbackHandler: () => AgentIDCallbackHandler
 });
 module.exports = __toCommonJS(langchain_exports);
+var import_base = require("@langchain/core/callbacks/base");
 function safeString(val) {
   return typeof val === "string" ? val : "";
 }
+function callbackDebugEnabled() {
+  try {
+    return typeof process !== "undefined" && process?.env?.AGENTID_DEBUG_CALLBACK === "1";
+  } catch {
+    return false;
+  }
+}
+function logCallbackDebug(message, details) {
+  if (!callbackDebugEnabled()) return;
+  if (details) {
+    console.log(`[AgentID][LC] ${message}`, details);
+    return;
+  }
+  console.log(`[AgentID][LC] ${message}`);
+}
+function extractTextFromContent(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (Array.isArray(content)) {
+    const parts = content.map((item) => {
+      if (typeof item === "string") return item;
+      if (!item || typeof item !== "object") return "";
+      const record = item;
+      if (typeof record.text === "string") return record.text;
+      if (typeof record.content === "string") return record.content;
+      return "";
+    }).filter((part) => part.length > 0);
+    return parts.join("\n");
+  }
+  if (content && typeof content === "object") {
+    const record = content;
+    if (typeof record.text === "string") return record.text;
+    if (typeof record.content === "string") return record.content;
+  }
+  return "";
+}
+function getMessageRole(msg) {
+  if (!msg || typeof msg !== "object") return null;
+  const typed = msg;
+  if (typeof typed.role === "string") return typed.role;
+  if (typeof typed.type === "string") return typed.type;
+  if (typeof typed._getType === "function") {
+    try {
+      const role = typed._getType();
+      if (typeof role === "string") return role;
+    } catch {
+    }
+  }
+  if (typeof typed.getType === "function") {
+    try {
+      const role = typed.getType();
+      if (typeof role === "string") return role;
+    } catch {
+    }
+  }
+  return null;
+}
 function extractPromptFromPrompts(prompts) {
   if (Array.isArray(prompts) && prompts.length > 0) {
     return safeString(prompts[prompts.length - 1]);
@@ -46,7 +105,7 @@ function extractPromptFromMessages(messages) {
   let last = null;
   for (const msg of flat) {
     const typed = msg;
-    const role = typed?.role ?? typed?.type;
+    const role = getMessageRole(msg);
     if (role === "user" || role === "human") {
       last = typed;
     }
@@ -55,7 +114,7 @@ function extractPromptFromMessages(messages) {
     return "";
   }
   const typedLast = last;
-  return safeString(typedLast.content ?? typedLast.text);
+  return extractTextFromContent(typedLast.content ?? typedLast.text);
 }
 function setPromptInPrompts(prompts, sanitizedInput) {
   if (!Array.isArray(prompts) || prompts.length === 0) {
@@ -101,13 +160,33 @@ function setPromptInMessages(messages, sanitizedInput) {
 }
 function extractModel(serialized, kwargs) {
   const kw = (kwargs && typeof kwargs === "object" ? kwargs : null) ?? null;
-  const model = kw?.model ?? kw?.model_name ?? kw?.modelName;
-  if (typeof model === "string" && model) return model;
+  const directModel = kw?.model ?? kw?.model_name ?? kw?.modelName;
+  if (typeof directModel === "string" && directModel) return directModel;
+  const invocationModel = kw?.invocation_params?.model ?? kw?.invocation_params?.model_name ?? kw?.invocation_params?.modelName;
+  if (typeof invocationModel === "string" && invocationModel) return invocationModel;
+  const nestedModel = kw?.options?.model ?? kw?.options?.model_name ?? kw?.options?.modelName ?? kw?.kwargs?.model ?? kw?.kwargs?.model_name ?? kw?.kwargs?.modelName;
+  if (typeof nestedModel === "string" && nestedModel) return nestedModel;
   const ser = (serialized && typeof serialized === "object" ? serialized : null) ?? null;
+  const serKw = (ser?.kwargs && typeof ser.kwargs === "object" ? ser.kwargs : null) ?? null;
+  const serModel = serKw?.model ?? serKw?.model_name ?? serKw?.modelName;
+  if (typeof serModel === "string" && serModel) return serModel;
   const name = ser?.name ?? ser?.id;
   if (typeof name === "string" && name) return name;
   return void 0;
 }
+function extractModelFromOutput(output) {
+  const llmOutput = output?.llmOutput ?? output?.llm_output;
+  const llmModel = llmOutput?.model ?? llmOutput?.model_name ?? llmOutput?.modelName;
+  if (typeof llmModel === "string" && llmModel) return llmModel;
+  const first = output?.generations?.[0]?.[0];
+  const responseMeta = first?.message?.response_metadata ?? first?.message?.responseMetadata;
+  const responseModel = responseMeta?.model_name ?? responseMeta?.model ?? responseMeta?.modelName;
+  if (typeof responseModel === "string" && responseModel) return responseModel;
+  const generationInfo = first?.generation_info ?? first?.generationInfo;
+  const genModel = generationInfo?.model_name ?? generationInfo?.model ?? generationInfo?.modelName;
+  if (typeof genModel === "string" && genModel) return genModel;
+  return void 0;
+}
 function extractOutputText(output) {
   const gens = output?.generations;
   const first = gens?.[0]?.[0];
@@ -117,7 +196,33 @@ function extractOutputText(output) {
 function extractTokenUsage(output) {
   const llmOutput = output?.llmOutput ?? output?.llm_output;
   const usage = llmOutput?.tokenUsage ?? llmOutput?.token_usage ?? llmOutput?.usage ?? void 0;
-  return usage && typeof usage === "object" ? usage : void 0;
+  if (usage && typeof usage === "object") {
+    return usage;
+  }
+  const first = output?.generations?.[0]?.[0];
+  const usageMetadata = first?.message?.usage_metadata;
+  if (usageMetadata && typeof usageMetadata === "object") {
+    return usageMetadata;
+  }
+  const responseTokenUsage = first?.message?.response_metadata?.token_usage ?? first?.message?.response_metadata?.tokenUsage ?? void 0;
+  if (responseTokenUsage && typeof responseTokenUsage === "object") {
+    return responseTokenUsage;
+  }
+  const generationTokenUsage = first?.generation_info?.token_usage ?? first?.generation_info?.tokenUsage ?? void 0;
+  if (generationTokenUsage && typeof generationTokenUsage === "object") {
+    return generationTokenUsage;
+  }
+  return void 0;
+}
+function isUuidLike(value) {
+  return typeof value === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value.trim());
+}
+function createClientEventId() {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID();
+  }
+  const segment = () => Math.floor((1 + Math.random()) * 65536).toString(16).slice(1);
+  return `${segment()}${segment()}-${segment()}-4${segment().slice(1)}-a${segment().slice(1)}-${segment()}${segment()}${segment()}`;
 }
 function readBooleanField(value) {
   return typeof value === "boolean" ? value : null;
@@ -137,8 +242,10 @@ function extractStreamFlag(serialized, extraParams) {
   const kwargs = serializedRecord?.kwargs && typeof serializedRecord.kwargs === "object" ? serializedRecord.kwargs : null;
   return readBooleanField(kwargs?.stream) ?? readBooleanField(kwargs?.streaming) ?? false;
 }
-var AgentIDCallbackHandler = class {
+var AgentIDCallbackHandler = class extends import_base.BaseCallbackHandler {
   constructor(agent, options) {
+    super();
+    this.name = "agentid_callback_handler";
     this.runs = /* @__PURE__ */ new Map();
     this.agent = agent;
     this.systemId = options.system_id;
@@ -172,8 +279,9 @@ var AgentIDCallbackHandler = class {
   async handleLLMStart(serialized, prompts, runId, _parentRunId, extraParams) {
     const input = extractPromptFromPrompts(prompts);
     const id = String(runId ?? "");
+    logCallbackDebug("handleLLMStart", { runId: id, hasInput: input.length > 0 });
     if (!input) {
-      throw new Error("AgentID: No prompt found. Security guard requires string input.");
+      return;
     }
     const stream = extractStreamFlag(serialized, extraParams);
     const sanitizedInput = await this.preflight(input, stream);
@@ -185,34 +293,46 @@ var AgentIDCallbackHandler = class {
         );
       }
     }
+    const requestedClientEventId = isUuidLike(id) ? id.trim() : createClientEventId();
+    const modelName = extractModel(serialized, extraParams);
     const verdict = await this.agent.guard({
       input: sanitizedInput,
       system_id: this.systemId,
+      model: modelName,
+      client_event_id: requestedClientEventId,
       client_capabilities: this.getLangchainCapabilities()
     }, this.requestOptions);
     if (!verdict.allowed) {
       throw new Error(`AgentID: Security Blocked (${verdict.reason ?? "guard_denied"})`);
     }
-    const transformedInput = typeof verdict.transformed_input === "string" && verdict.transformed_input.length > 0 ? verdict.transformed_input : sanitizedInput;
+    const canonicalClientEventId = isUuidLike(verdict.client_event_id) ? verdict.client_event_id.trim() : requestedClientEventId;
+    const guardEventId = typeof verdict.guard_event_id === "string" && verdict.guard_event_id.length > 0 ? verdict.guard_event_id : void 0;
+    let transformedInput = typeof verdict.transformed_input === "string" && verdict.transformed_input.length > 0 ? verdict.transformed_input : sanitizedInput;
     if (transformedInput !== sanitizedInput) {
       const mutated = setPromptInPrompts(prompts, transformedInput);
       if (!mutated) {
-        throw new Error(
-          "AgentID: Guard transformed input could not be applied to LangChain prompt payload."
-        );
+        transformedInput = sanitizedInput;
       }
     }
     this.runs.set(id, {
       input: transformedInput,
       startedAtMs: Date.now(),
-      model: extractModel(serialized, extraParams)
+      model: modelName,
+      clientEventId: canonicalClientEventId,
+      guardEventId
+    });
+    logCallbackDebug("handleLLMStart state_set", {
+      runId: id,
+      clientEventId: canonicalClientEventId,
+      guardEventId: guardEventId ?? null
     });
   }
   async handleChatModelStart(serialized, messages, runId, _parentRunId, extraParams) {
     const input = extractPromptFromMessages(messages);
     const id = String(runId ?? "");
+    logCallbackDebug("handleChatModelStart", { runId: id, hasInput: input.length > 0 });
     if (!input) {
-      throw new Error("AgentID: No user message found. Security guard requires string input.");
+      return;
     }
     const stream = extractStreamFlag(serialized, extraParams);
     const sanitizedInput = await this.preflight(input, stream);
@@ -224,62 +344,100 @@ var AgentIDCallbackHandler = class {
         );
       }
     }
+    const requestedClientEventId = isUuidLike(id) ? id.trim() : createClientEventId();
+    const modelName = extractModel(serialized, extraParams);
     const verdict = await this.agent.guard({
       input: sanitizedInput,
       system_id: this.systemId,
+      model: modelName,
+      client_event_id: requestedClientEventId,
       client_capabilities: this.getLangchainCapabilities()
     }, this.requestOptions);
     if (!verdict.allowed) {
       throw new Error(`AgentID: Security Blocked (${verdict.reason ?? "guard_denied"})`);
     }
-    const transformedInput = typeof verdict.transformed_input === "string" && verdict.transformed_input.length > 0 ? verdict.transformed_input : sanitizedInput;
+    const canonicalClientEventId = isUuidLike(verdict.client_event_id) ? verdict.client_event_id.trim() : requestedClientEventId;
+    const guardEventId = typeof verdict.guard_event_id === "string" && verdict.guard_event_id.length > 0 ? verdict.guard_event_id : void 0;
+    let transformedInput = typeof verdict.transformed_input === "string" && verdict.transformed_input.length > 0 ? verdict.transformed_input : sanitizedInput;
     if (transformedInput !== sanitizedInput) {
       const mutated = setPromptInMessages(messages, transformedInput);
       if (!mutated) {
-        throw new Error(
-          "AgentID: Guard transformed input could not be applied to LangChain message payload."
-        );
+        transformedInput = sanitizedInput;
       }
     }
     this.runs.set(id, {
       input: transformedInput,
       startedAtMs: Date.now(),
-      model: extractModel(serialized, extraParams)
+      model: modelName,
+      clientEventId: canonicalClientEventId,
+      guardEventId
+    });
+    logCallbackDebug("handleChatModelStart state_set", {
+      runId: id,
+      clientEventId: canonicalClientEventId,
+      guardEventId: guardEventId ?? null
     });
   }
   async handleLLMEnd(output, runId) {
     const id = String(runId ?? "");
+    logCallbackDebug("handleLLMEnd", { runId: id });
     const state = this.runs.get(id);
-    if (!state) return;
+    if (!state) {
+      logCallbackDebug("handleLLMEnd missing_state", { runId: id });
+      return;
+    }
     this.runs.delete(id);
     const latency = Date.now() - state.startedAtMs;
     const outText = extractOutputText(output);
     const usage = extractTokenUsage(output);
-    this.agent.log({
+    const metadata = {};
+    if (state.clientEventId) {
+      metadata.client_event_id = state.clientEventId;
+    }
+    if (state.guardEventId) {
+      metadata.guard_event_id = state.guardEventId;
+    }
+    const resolvedModel = state.model ?? extractModelFromOutput(output) ?? "unknown";
+    await this.agent.log({
       system_id: this.systemId,
       input: state.input,
       output: outText,
-      model: state.model ?? "unknown",
+      event_id: state.clientEventId,
+      model: resolvedModel,
       usage,
       latency,
+      metadata: Object.keys(metadata).length > 0 ? metadata : void 0,
       client_capabilities: this.getLangchainCapabilities()
     }, this.requestOptions);
+    logCallbackDebug("handleLLMEnd logged", {
+      runId: id,
+      clientEventId: state.clientEventId ?? null
+    });
   }
   async handleLLMError(err, runId) {
     const id = String(runId ?? "");
+    logCallbackDebug("handleLLMError", { runId: id });
     const state = this.runs.get(id);
     if (state) this.runs.delete(id);
     const message = err && typeof err === "object" && "message" in err ? String(err.message) : String(err ?? "");
-    this.agent.log({
+    const metadata = {
+      error_message: message
+    };
+    if (state?.clientEventId) {
+      metadata.client_event_id = state.clientEventId;
+    }
+    if (state?.guardEventId) {
+      metadata.guard_event_id = state.guardEventId;
+    }
+    await this.agent.log({
       system_id: this.systemId,
       input: state?.input ?? "",
       output: "",
+      event_id: state?.clientEventId,
       model: state?.model ?? "unknown",
       event_type: "error",
       severity: "error",
-      metadata: {
-        error_message: message
-      },
+      metadata,
       client_capabilities: this.getLangchainCapabilities()
     }, this.requestOptions);
   }

package/dist/langchain.mjs

@@ -1,6 +1,6 @@
 import {
   AgentIDCallbackHandler
-} from "./chunk-DXUA5DKG.mjs";
+} from "./chunk-6YR4ECGB.mjs";
 export {
   AgentIDCallbackHandler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentid-sdk",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "AgentID JavaScript/TypeScript SDK for guard, ingest, tracing, and analytics.",
   "license": "MIT",
   "homepage": "https://agentid.ai",
@@ -32,17 +32,21 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts src/langchain.ts --format esm,cjs --dts --clean",
+    "build": "tsup --config tsup.config.ts",
     "prepublishOnly": "npm run build"
   },
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
+    "@langchain/core": "^0.3.0 || ^1.0.0",
     "openai": "^4.0.0 || ^5.0.0 || ^6.0.0",
     "langchain": "^0.1.0"
   },
   "peerDependenciesMeta": {
+    "@langchain/core": {
+      "optional": true
+    },
     "langchain": {
       "optional": true
     }