@friskai/frisk-js 0.2.10 → 0.3.1

package/dist/index.js

@@ -1141,7 +1141,7 @@ var require_call_credentials = __commonJS((exports) => {
         if (isCurrentOauth2Client(googleCredentials)) {
           getHeaders = googleCredentials.getRequestHeaders(options.service_url);
         } else {
-          getHeaders = new Promise((resolve2, reject) => {
+          getHeaders = new Promise((resolve, reject) => {
             googleCredentials.getRequestMetadata(options.service_url, (err, headers) => {
               if (err) {
                 reject(err);
@@ -1151,7 +1151,7 @@ var require_call_credentials = __commonJS((exports) => {
                 reject(new Error("Headers not set by metadata plugin"));
                 return;
               }
-              resolve2(headers);
+              resolve(headers);
             });
           });
         }
@@ -1206,10 +1206,10 @@ var require_call_credentials = __commonJS((exports) => {
       this.metadataGenerator = metadataGenerator;
     }
     generateMetadata(options) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         this.metadataGenerator(options, (err, metadata) => {
           if (metadata !== undefined) {
-            resolve2(metadata);
+            resolve(metadata);
           } else {
             reject(err);
           }
@@ -1531,14 +1531,14 @@ var require_channel_credentials = __commonJS((exports) => {
     }
     connect(socket) {
       const tlsConnectOptions = Object.assign({ socket }, this.connectionOptions);
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         const tlsSocket = (0, tls_1.connect)(tlsConnectOptions, () => {
           var _a;
           if (((_a = this.connectionOptions.rejectUnauthorized) !== null && _a !== undefined ? _a : true) && !tlsSocket.authorized) {
             reject(tlsSocket.authorizationError);
             return;
           }
-          resolve2({
+          resolve({
             socket: tlsSocket,
             secure: true
           });
@@ -1658,8 +1658,8 @@ var require_channel_credentials = __commonJS((exports) => {
       if (this.hasReceivedUpdates()) {
         return Promise.resolve(this.getLatestSecureContext());
       } else {
-        return new Promise((resolve2) => {
-          this.secureContextWatchers.push(resolve2);
+        return new Promise((resolve) => {
+          this.secureContextWatchers.push(resolve);
         });
       }
     }
@@ -1692,7 +1692,7 @@ var require_channel_credentials = __commonJS((exports) => {
       this.callCredentials = callCredentials;
     }
     connect(socket) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         const secureContext = this.parent.getLatestSecureContext();
         if (!secureContext) {
           reject(new Error("Failed to load credentials"));
@@ -1717,7 +1717,7 @@ var require_channel_credentials = __commonJS((exports) => {
             reject(tlsSocket.authorizationError);
             return;
           }
-          resolve2({
+          resolve({
             socket: tlsSocket,
             secure: true
           });
@@ -5245,7 +5245,7 @@ var require_aspromise = __commonJS((exports, module) => {
     var params = new Array(arguments.length - 1), offset = 0, index = 2, pending = true;
     while (index < arguments.length)
       params[offset++] = arguments[index++];
-    return new Promise(function executor(resolve2, reject) {
+    return new Promise(function executor(resolve, reject) {
       params[offset] = function callback(err) {
         if (pending) {
           pending = false;
@@ -5255,7 +5255,7 @@ var require_aspromise = __commonJS((exports, module) => {
             var params2 = new Array(arguments.length - 1), offset2 = 0;
             while (offset2 < params2.length)
               params2[offset2++] = arguments[offset2];
-            resolve2.apply(null, params2);
+            resolve.apply(null, params2);
           }
         }
       };
@@ -6643,7 +6643,7 @@ var require_path = __commonJS((exports) => {
     }
     return prefix + parts.join("/");
   };
-  path.resolve = function resolve2(originPath, includePath, alreadyNormalized) {
+  path.resolve = function resolve(originPath, includePath, alreadyNormalized) {
     if (!alreadyNormalized)
       includePath = normalize(includePath);
     if (isAbsolute(includePath))
@@ -6956,7 +6956,7 @@ var require_mapfield = __commonJS((exports, module) => {
       keepComments ? this.comment : undefined
     ]);
   };
-  MapField.prototype.resolve = function resolve2() {
+  MapField.prototype.resolve = function resolve() {
     if (this.resolved)
       return this;
     if (types.mapKey[this.keyType] === undefined)
@@ -7029,7 +7029,7 @@ var require_method = __commonJS((exports, module) => {
       this.parsedOptions
     ]);
   };
-  Method.prototype.resolve = function resolve2() {
+  Method.prototype.resolve = function resolve() {
     if (this.resolved)
       return this;
     this.resolvedRequestType = this.parent.lookupType(this.requestType);
@@ -8429,7 +8429,7 @@ var require_field = __commonJS((exports, module) => {
       keepComments ? this.comment : undefined
     ]);
   };
-  Field.prototype.resolve = function resolve2() {
+  Field.prototype.resolve = function resolve() {
     if (this.resolved)
       return this;
     if ((this.typeDefault = types.defaults[this.type]) === undefined) {
@@ -8683,7 +8683,7 @@ var require_object = __commonJS((exports, module) => {
     this.parent = null;
     this.resolved = false;
   };
-  ReflectionObject.prototype.resolve = function resolve2() {
+  ReflectionObject.prototype.resolve = function resolve() {
     if (this.resolved)
       return this;
     if (this.root instanceof Root)
@@ -14234,18 +14234,18 @@ var require_compression_filter = __commonJS((exports) => {
       this.maxRecvMessageLength = maxRecvMessageLength;
     }
     compressMessage(message) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         zlib.deflate(message, (err, output) => {
           if (err) {
             reject(err);
           } else {
-            resolve2(output);
+            resolve(output);
           }
         });
       });
     }
     decompressMessage(message) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         let totalLength = 0;
         const messageParts = [];
         const decompresser = zlib.createInflate();
@@ -14261,7 +14261,7 @@ var require_compression_filter = __commonJS((exports) => {
           }
         });
         decompresser.on("end", () => {
-          resolve2(Buffer.concat(messageParts));
+          resolve(Buffer.concat(messageParts));
         });
         decompresser.write(message);
         decompresser.end();
@@ -14275,18 +14275,18 @@ var require_compression_filter = __commonJS((exports) => {
       this.maxRecvMessageLength = maxRecvMessageLength;
     }
     compressMessage(message) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         zlib.gzip(message, (err, output) => {
           if (err) {
             reject(err);
           } else {
-            resolve2(output);
+            resolve(output);
           }
         });
       });
     }
     decompressMessage(message) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         let totalLength = 0;
         const messageParts = [];
         const decompresser = zlib.createGunzip();
@@ -14302,7 +14302,7 @@ var require_compression_filter = __commonJS((exports) => {
           }
         });
         decompresser.on("end", () => {
-          resolve2(Buffer.concat(messageParts));
+          resolve(Buffer.concat(messageParts));
         });
         decompresser.write(message);
         decompresser.end();
@@ -15556,7 +15556,7 @@ var require_http_proxy = __commonJS((exports) => {
     options.headers = headers;
     const proxyAddressString = (0, subchannel_address_1.subchannelAddressToString)(address);
     trace("Using proxy " + proxyAddressString + " to connect to " + options.path);
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const request = http.request(options);
       request.once("connect", (res, socket, head) => {
         request.removeAllListeners();
@@ -15567,7 +15567,7 @@ var require_http_proxy = __commonJS((exports) => {
             socket.unshift(head);
           }
           trace("Successfully established a plaintext connection to " + options.path + " through proxy " + proxyAddressString);
-          resolve2(socket);
+          resolve(socket);
         } else {
           (0, logging_1.log)(constants_1.LogVerbosity.ERROR, "Failed to connect to " + options.path + " through proxy " + proxyAddressString + " with status " + res.statusCode);
           reject();
@@ -16439,7 +16439,7 @@ var require_transport = __commonJS((exports) => {
       if (secureConnectResult.socket.closed) {
         return Promise.reject("Connection closed before starting HTTP/2 handshake");
       }
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         let remoteName = null;
         let realTarget = this.channelTarget;
@@ -16504,7 +16504,7 @@ var require_transport = __commonJS((exports) => {
           session.removeAllListeners();
           secureConnectResult.socket.removeListener("close", closeHandler);
           secureConnectResult.socket.removeListener("error", errorHandler);
-          resolve2(new Http2Transport(session, address, options, remoteName));
+          resolve(new Http2Transport(session, address, options, remoteName));
           this.session = null;
         });
         session.once("close", closeHandler);
@@ -16518,7 +16518,7 @@ var require_transport = __commonJS((exports) => {
         if (proxiedSocket) {
           return proxiedSocket;
         } else {
-          return new Promise((resolve2, reject) => {
+          return new Promise((resolve, reject) => {
             const closeCallback = () => {
               reject(new Error("Socket closed"));
             };
@@ -16528,7 +16528,7 @@ var require_transport = __commonJS((exports) => {
             const socket = net.connect(address, () => {
               socket.removeListener("close", closeCallback);
               socket.removeListener("error", errorCallback);
-              resolve2(socket);
+              resolve(socket);
             });
             socket.once("close", closeCallback);
             socket.once("error", errorCallback);
@@ -19742,7 +19742,7 @@ var require_server_interceptors = __commonJS((exports) => {
         } else {
           decompresser = zlib.createGunzip();
         }
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve, reject) => {
           let totalLength = 0;
           const messageParts = [];
           decompresser.on("data", (chunk) => {
@@ -19757,7 +19757,7 @@ var require_server_interceptors = __commonJS((exports) => {
             }
           });
           decompresser.on("end", () => {
-            resolve2(Buffer.concat(messageParts));
+            resolve(Buffer.concat(messageParts));
           });
           decompresser.write(messageContents);
           decompresser.end();
@@ -20350,10 +20350,10 @@ var require_server = __commonJS((exports) => {
       bindOneAddress(address, boundPortObject) {
         this.trace("Attempting to bind " + (0, subchannel_address_1.subchannelAddressToString)(address));
         const http2Server = this.createHttp2Server(boundPortObject.credentials);
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve, reject) => {
           const onError = (err) => {
             this.trace("Failed to bind " + (0, subchannel_address_1.subchannelAddressToString)(address) + " with error " + err.message);
-            resolve2({
+            resolve({
               port: "port" in address ? address.port : 1,
               error: err.message
             });
@@ -20381,7 +20381,7 @@ var require_server = __commonJS((exports) => {
             });
             boundPortObject.listeningServers.add(http2Server);
             this.trace("Successfully bound " + (0, subchannel_address_1.subchannelAddressToString)(boundSubchannelAddress));
-            resolve2({
+            resolve({
               port: "port" in boundSubchannelAddress ? boundSubchannelAddress.port : 1
             });
             http2Server.removeListener("error", onError);
@@ -20434,7 +20434,7 @@ var require_server = __commonJS((exports) => {
         }
       }
       resolvePort(port) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve, reject) => {
           let seenResolution = false;
           const resolverListener = (endpointList, attributes, serviceConfig, resolutionNote) => {
             if (seenResolution) {
@@ -20450,7 +20450,7 @@ var require_server = __commonJS((exports) => {
               reject(new Error(`No addresses resolved for port ${port}`));
               return true;
             }
-            resolve2(addressList);
+            resolve(addressList);
             return true;
           };
           const resolver = (0, resolver_1.createResolver)(port, resolverListener, this.options);
@@ -27564,8 +27564,8 @@ var require_promise = __commonJS((exports) => {
     _resolve;
     _reject;
     constructor() {
-      this._promise = new Promise((resolve2, reject) => {
-        this._resolve = resolve2;
+      this._promise = new Promise((resolve, reject) => {
+        this._resolve = resolve;
         this._reject = reject;
       });
     }
@@ -27653,9 +27653,9 @@ var require_exporter = __commonJS((exports) => {
   var api_1 = require_src4();
   var suppress_tracing_1 = require_suppress_tracing();
   function _export(exporter, arg) {
-    return new Promise((resolve2) => {
+    return new Promise((resolve) => {
       api_1.context.with((0, suppress_tracing_1.suppressTracing)(api_1.context.active()), () => {
-        exporter.export(arg, resolve2);
+        exporter.export(arg, resolve);
       });
     });
   }
@@ -28111,22 +28111,22 @@ var require_grpc_exporter_transport = __commonJS((exports) => {
           });
         }
       }
-      return new Promise((resolve2) => {
+      return new Promise((resolve) => {
         const deadline = Date.now() + timeoutMillis;
         if (this._metadata == null) {
-          return resolve2({
+          return resolve({
             error: new Error("metadata was null"),
             status: "failure"
           });
         }
         this._client.export(buffer, this._metadata, { deadline }, (err, response) => {
           if (err) {
-            resolve2({
+            resolve({
               status: "failure",
               error: err
             });
           } else {
-            resolve2({
+            resolve({
               data: response,
               status: "success"
             });
@@ -28469,9 +28469,9 @@ var require_http_exporter_transport = __commonJS((exports) => {
     async send(data, timeoutMillis) {
       const { agent, request } = await this._loadUtils();
       const headers = await this._parameters.headers();
-      return new Promise((resolve2) => {
+      return new Promise((resolve) => {
         (0, http_transport_utils_1.sendWithHttp)(request, this._parameters.url, headers, this._parameters.compression, this._parameters.userAgent, agent, data, (result) => {
-          resolve2(result);
+          resolve(result);
         }, timeoutMillis);
       });
     }
@@ -28520,9 +28520,9 @@ var require_retrying_transport = __commonJS((exports) => {
       this._transport = transport;
     }
     retry(data, timeoutMillis, inMillis) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         setTimeout(() => {
-          this._transport.send(data, timeoutMillis).then(resolve2, reject);
+          this._transport.send(data, timeoutMillis).then(resolve, reject);
         }, inMillis);
       });
     }
@@ -42765,14 +42765,14 @@ var require_BatchSpanProcessorBase = __commonJS((exports) => {
       this._maybeStartTimer();
     }
     _flushAll() {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         const promises = [];
         const count = Math.ceil(this._finishedSpans.length / this._maxExportBatchSize);
         for (let i = 0, j = count;i < j; i++) {
           promises.push(this._flushOneBatch());
         }
         Promise.all(promises).then(() => {
-          resolve2();
+          resolve();
         }).catch(reject);
       });
     }
@@ -42781,7 +42781,7 @@ var require_BatchSpanProcessorBase = __commonJS((exports) => {
       if (this._finishedSpans.length === 0) {
         return Promise.resolve();
       }
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         const timer = setTimeout(() => {
           reject(new Error("Timeout"));
         }, this._exportTimeoutMillis);
@@ -42796,7 +42796,7 @@ var require_BatchSpanProcessorBase = __commonJS((exports) => {
           const doExport = () => this._exporter.export(spans, (result) => {
             clearTimeout(timer);
             if (result.code === core_1.ExportResultCode.SUCCESS) {
-              resolve2();
+              resolve();
             } else {
               reject(result.error ?? new Error("BatchSpanProcessor: span export failed"));
             }
@@ -43056,12 +43056,12 @@ var require_MultiSpanProcessor = __commonJS((exports) => {
       for (const spanProcessor of this._spanProcessors) {
         promises.push(spanProcessor.forceFlush());
       }
-      return new Promise((resolve2) => {
+      return new Promise((resolve) => {
         Promise.all(promises).then(() => {
-          resolve2();
+          resolve();
         }).catch((error) => {
           (0, core_1.globalErrorHandler)(error || new Error("MultiSpanProcessor: forceFlush failed"));
-          resolve2();
+          resolve();
         });
       });
     }
@@ -43087,9 +43087,9 @@ var require_MultiSpanProcessor = __commonJS((exports) => {
       for (const spanProcessor of this._spanProcessors) {
         promises.push(spanProcessor.shutdown());
       }
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         Promise.all(promises).then(() => {
-          resolve2();
+          resolve();
         }, reject);
       });
     }
@@ -43142,32 +43142,32 @@ var require_BasicTracerProvider = __commonJS((exports) => {
     forceFlush() {
       const timeout = this._config.forceFlushTimeoutMillis;
       const promises = this._activeSpanProcessor["_spanProcessors"].map((spanProcessor) => {
-        return new Promise((resolve2) => {
+        return new Promise((resolve) => {
           let state;
           const timeoutInterval = setTimeout(() => {
-            resolve2(new Error(`Span processor did not completed within timeout period of ${timeout} ms`));
+            resolve(new Error(`Span processor did not completed within timeout period of ${timeout} ms`));
             state = ForceFlushState.timeout;
           }, timeout);
           spanProcessor.forceFlush().then(() => {
             clearTimeout(timeoutInterval);
             if (state !== ForceFlushState.timeout) {
               state = ForceFlushState.resolved;
-              resolve2(state);
+              resolve(state);
             }
           }).catch((error) => {
             clearTimeout(timeoutInterval);
             state = ForceFlushState.error;
-            resolve2(error);
+            resolve(error);
           });
         });
       });
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve, reject) => {
         Promise.all(promises).then((results) => {
           const errors = results.filter((result) => result !== ForceFlushState.resolved);
           if (errors.length > 0) {
             reject(errors);
           } else {
-            resolve2();
+            resolve();
           }
         }).catch((error) => reject([error]));
       });
@@ -43595,10 +43595,10 @@ class UnexpectedFriskServerResponseError extends Error {
   }
 }
 
-class ToolCallSpanNotInitializedError extends Error {
-  constructor(message = "Tool call span has not been initialized. Call enter() first.") {
-    super(message);
-    this.name = "ToolCallSpanNotInitializedError";
+class MissingToolPoliciesExtensionError extends FriskError {
+  constructor(options) {
+    super("decide_tool_call requires the tool policies extension. Install and register the @friskai/frisk-js-tool-policies extension; calling frisk.connect() alone is not sufficient.", options);
+    this.name = "MissingToolPoliciesExtensionError";
   }
 }
 
@@ -43940,23 +43940,6 @@ class AccessTokenProvider {
     return this.refreshIntervalId !== null;
   }
 }
-// ../../node_modules/uuid/wrapper.mjs
-var import_dist = __toESM(require_dist(), 1);
-var v1 = import_dist.default.v1;
-var v1ToV6 = import_dist.default.v1ToV6;
-var v3 = import_dist.default.v3;
-var v4 = import_dist.default.v4;
-var v5 = import_dist.default.v5;
-var v6 = import_dist.default.v6;
-var v6ToV1 = import_dist.default.v6ToV1;
-var v7 = import_dist.default.v7;
-var NIL = import_dist.default.NIL;
-var MAX = import_dist.default.MAX;
-var version = import_dist.default.version;
-var validate = import_dist.default.validate;
-var stringify = import_dist.default.stringify;
-var parse = import_dist.default.parse;
-
 // src/env/index.ts
 var FRISK_API_KEY = "FRISK_API_KEY";
 var FRISK_BASE_URL = "FRISK_BASE_URL";
@@ -43993,27 +43976,70 @@ function combineRedactOptions(...options) {
   }
   return false;
 }
-function redactDictionarySimple(data, redactOption) {
+function deleteDotPath(root, path) {
+  const parts = path.split(".").filter((p) => p.length > 0);
+  if (parts.length === 0)
+    return false;
+  let cur = root;
+  for (const key of parts.slice(0, -1)) {
+    if (cur === null || typeof cur !== "object" || Array.isArray(cur))
+      return false;
+    if (!(key in cur))
+      return false;
+    cur = cur[key];
+  }
+  if (cur === null || typeof cur !== "object" || Array.isArray(cur))
+    return false;
+  const last = parts[parts.length - 1];
+  if (!(last in cur))
+    return false;
+  delete cur[last];
+  return true;
+}
+function deepClone(obj) {
+  return JSON.parse(JSON.stringify(obj));
+}
+function redactObject(data, redactOption) {
   if (redactOption === undefined || redactOption === false) {
     return { value: data, redactedPaths: [] };
   }
-  const redactedPaths = [];
-  const result = { ...data };
   if (redactOption === true) {
-    for (const key of Object.keys(result)) {
-      delete result[key];
-      redactedPaths.push(key);
-    }
-  } else if (Array.isArray(redactOption)) {
-    for (const path of redactOption) {
-      if (path in result) {
-        delete result[path];
-        redactedPaths.push(path);
-      }
+    return { value: {}, redactedPaths: ["*"] };
+  }
+  if (!Array.isArray(redactOption) || redactOption.length === 0) {
+    return { value: data, redactedPaths: [] };
+  }
+  const out = deepClone(data);
+  const hits = [];
+  const seen = new Set;
+  for (const rawPath of redactOption) {
+    const path = rawPath.trim();
+    if (path.length === 0)
+      continue;
+    if (deleteDotPath(out, path) && !seen.has(path)) {
+      seen.add(path);
+      hits.push(path);
     }
   }
-  return { value: result, redactedPaths };
+  return { value: out, redactedPaths: hits };
 }
+// ../../node_modules/uuid/wrapper.mjs
+var import_dist = __toESM(require_dist(), 1);
+var v1 = import_dist.default.v1;
+var v1ToV6 = import_dist.default.v1ToV6;
+var v3 = import_dist.default.v3;
+var v4 = import_dist.default.v4;
+var v5 = import_dist.default.v5;
+var v6 = import_dist.default.v6;
+var v6ToV1 = import_dist.default.v6ToV1;
+var v7 = import_dist.default.v7;
+var NIL = import_dist.default.NIL;
+var MAX = import_dist.default.MAX;
+var version = import_dist.default.version;
+var validate = import_dist.default.validate;
+var stringify = import_dist.default.stringify;
+var parse = import_dist.default.parse;
+
 // src/framework-adapter/base-framework-adapter.ts
 class BaseFrameworkAdapter {
   agentFramework = "none";
@@ -44039,10 +44065,10 @@ class BaseFrameworkAdapter {
     };
   }
   toolArgsToDict(toolArgs, options) {
-    return redactDictionarySimple(toolArgs, options?.redact);
+    return redactObject(toolArgs, options?.redact);
   }
   agentStateToDict(agentState, options) {
-    return redactDictionarySimple(agentState, options?.redact);
+    return redactObject(agentState, options?.redact);
   }
   normalizeToolCall(toolCall) {
     return {
@@ -44064,28 +44090,23 @@ var DefaultWrapToolOptions = {
   captureReasoning: true
 };
 
-// src/native-bindings/index.ts
-import { createRequire as createRequire2 } from "module";
-import { dirname, resolve } from "path";
-var require2 = createRequire2(import.meta.url);
-function resolveNativePath() {
-  const injected = process.env.FRISk_NATIVE_BINDINGS_PATH;
-  if (injected)
-    return injected;
-  const pkgJsonPath = require2.resolve("@friskai/frisk-js/package.json");
-  const pkgRoot = dirname(pkgJsonPath);
-  return resolve(pkgRoot, "native/index.cjs");
-}
-var nativeBindings = require2(resolveNativePath());
-var FriskHandle = nativeBindings.FriskHandle;
-var redactDictionary = nativeBindings.redactDictionary;
-
 // src/telemetry/constants.ts
 var TRACER_NAME = "frisk_js_sdk";
 var TRACER_VERSION = "0.1.0";
 var SPAN_NAME_DECIDE_TOOL_CALL = "frisk.tool_call.decide";
 var SPAN_NAME_OBSERVE_TOOL_CALL = "frisk.tool_call.observation";
+var SPAN_NAME_LLM_CALL = "frisk.llm_call";
+var SPAN_NAME_OPERATION = "frisk.operation";
 var SPAN_NAME_FRISK_SESSION = "frisk.session";
+var ATTRIBUTE_NAME_LLM_CALL_SPAN_ID = "frisk.tool_call.llm_call_span_id";
+var ATTRIBUTE_NAME_LLM_CALL_PROMPTS_JSON = "frisk.llm_call.prompts.json";
+var ATTRIBUTE_NAME_LLM_CALL_RESPONSES_JSON = "frisk.llm_call.responses.json";
+var ATTRIBUTE_NAME_LLM_CALL_TOOL_CALLS_JSON = "frisk.llm_call.tool_calls.json";
+var ATTRIBUTE_NAME_MODEL_NAME = "frisk.model.name";
+var ATTRIBUTE_NAME_MODEL_PROVIDER = "frisk.model.provider";
+var ATTRIBUTE_NAME_TOKEN_USAGE_INPUT_TOKENS = "frisk.token_usage.input_tokens";
+var ATTRIBUTE_NAME_TOKEN_USAGE_OUTPUT_TOKENS = "frisk.token_usage.output_tokens";
+var ATTRIBUTE_NAME_TOKEN_USAGE_TOTAL_TOKENS = "frisk.token_usage.total_tokens";
 var ATTRIBUTE_NAME_SESSION_PROMPT = "frisk.session.prompt";
 var ATTRIBUTE_NAME_SESSION_ID = "frisk.session.id";
 var ATTRIBUTE_NAME_REMOTE_SESSION_ID = "frisk.session.remote_id";
@@ -48449,6 +48470,18 @@ var llmReasoningZodShape = {
   [LLM_REASONING_ARG_NAME]: string2().describe(LLM_REASONING_ARG_DESCRIPTION)
 };
 
+// src/core/llm-reasoning/extractLlmReasoning.ts
+function extractLlmReasoning(toolArgs) {
+  if (typeof toolArgs !== "object" || toolArgs === null || Array.isArray(toolArgs)) {
+    return null;
+  }
+  const rawReasoning = toolArgs[LLM_REASONING_ARG_NAME];
+  if (rawReasoning === null || rawReasoning === undefined) {
+    return null;
+  }
+  return String(rawReasoning);
+}
+
 // src/core/llm-reasoning/removeLlmReasoningArg.ts
 function removeLlmReasoningArg(input) {
   if (!(LLM_REASONING_ARG_NAME in input)) {
@@ -48494,136 +48527,186 @@ class SessionRegistry {
   }
 }
 
-// src/core/tool-call-span.ts
+// src/core/spans/frisk-span.ts
 var import_api = __toESM(require_src4(), 1);
 
-// src/core/redaction-options.ts
-function resolveRedactionOptions(options) {
-  return {
-    redactToolArgs: options?.redactToolArgs ?? false,
-    redactAgentState: options?.redactAgentState ?? false
-  };
-}
-
-// src/core/tool-call-span.ts
-class ToolCallSpan {
-  adapter;
-  toolCall;
-  friskToolId;
-  agentState;
-  parent;
-  tracer;
-  redaction;
-  _span = null;
-  _traceContextCarrier = null;
-  sessionId;
-  friskToolVersionId;
+class FriskSpan {
+  _spanName;
+  _attributeFields;
+  _otelSpan;
+  _attributes = {};
+  _ended = false;
   constructor({
-    sessionId,
-    adapter,
-    toolCall,
-    friskToolId,
-    friskToolVersionId,
-    agentState,
-    parent,
     tracer,
-    redact
+    parent,
+    spanName,
+    attributeFields
   }) {
-    this.sessionId = sessionId;
-    this.adapter = adapter;
-    this.toolCall = toolCall;
-    this.friskToolId = friskToolId ?? null;
-    this.friskToolVersionId = friskToolVersionId ?? null;
-    this.agentState = agentState;
-    this.parent = parent;
-    this.tracer = tracer;
-    this.redaction = resolveRedactionOptions(redact);
+    this._spanName = spanName;
+    this._attributeFields = attributeFields;
+    const parentContext = parent ? import_api.trace.setSpan(import_api.context.active(), parent.otelSpan) : import_api.context.active();
+    this._otelSpan = tracer.startSpan(this._spanName, undefined, parentContext);
   }
-  get span() {
-    if (!this._span) {
-      throw new ToolCallSpanNotInitializedError;
-    }
-    return this._span;
+  get otelSpan() {
+    return this._otelSpan;
   }
-  get traceContextCarrier() {
-    return this._traceContextCarrier;
+  get spanId() {
+    return this._otelSpan.spanContext().spanId;
   }
-  run(callback) {
-    this.enter();
-    try {
-      return callback(this);
-    } finally {
-      this.exit();
+  setAttribute(field, value) {
+    this.setAttributesByField({ [field]: value });
+  }
+  getAttribute(field) {
+    return this._attributes[this.constantFor(field)];
+  }
+  end() {
+    if (this._ended) {
+      return;
     }
+    this._ended = true;
+    this._otelSpan.end();
   }
-  async runAsync(callback) {
-    this.enter();
-    try {
-      return await callback(this);
-    } finally {
-      this.exit();
+  setAttributesByField(values) {
+    for (const [field, value] of Object.entries(values)) {
+      const constant = this.constantFor(field);
+      if (value === null || value === undefined) {
+        continue;
+      }
+      this._attributes[constant] = value;
+      this._otelSpan.setAttribute(constant, value);
     }
   }
-  setAttribute(key, value) {
-    this.span.setAttribute(key, value);
+  constantFor(field) {
+    const constant = this._attributeFields[field];
+    if (constant === undefined) {
+      throw new Error(`Unknown attribute '${field}' for ${this.constructor.name}`);
+    }
+    return constant;
   }
-  setAttributes(attributes) {
-    this.span.setAttributes(attributes);
+}
+// src/core/spans/llm-call-span.ts
+var FIELDS = {
+  sessionId: ATTRIBUTE_NAME_SESSION_ID,
+  promptsJson: ATTRIBUTE_NAME_LLM_CALL_PROMPTS_JSON,
+  responsesJson: ATTRIBUTE_NAME_LLM_CALL_RESPONSES_JSON,
+  toolCallsJson: ATTRIBUTE_NAME_LLM_CALL_TOOL_CALLS_JSON,
+  modelName: ATTRIBUTE_NAME_MODEL_NAME,
+  modelProvider: ATTRIBUTE_NAME_MODEL_PROVIDER,
+  inputTokens: ATTRIBUTE_NAME_TOKEN_USAGE_INPUT_TOKENS,
+  outputTokens: ATTRIBUTE_NAME_TOKEN_USAGE_OUTPUT_TOKENS,
+  totalTokens: ATTRIBUTE_NAME_TOKEN_USAGE_TOTAL_TOKENS,
+  errorType: ATTRIBUTE_NAME_ERROR_TYPE,
+  errorMessage: ATTRIBUTE_NAME_ERROR_MESSAGE
+};
+
+class LlmCallSpan extends FriskSpan {
+  constructor(args) {
+    super({ ...args, spanName: SPAN_NAME_LLM_CALL, attributeFields: FIELDS });
   }
-  saveResult(decision) {
-    if (!this.span) {
-      return;
-    }
-    this.setAttributes({
-      [ATTRIBUTE_NAME_DECISION_OUTCOME]: decision.outcome,
-      [ATTRIBUTE_NAME_DECISION_MATCHED_RULE_COUNT]: Number(decision.rulesMatchedCount)
+  setAttributes(values) {
+    this.setAttributesByField(values);
+  }
+}
+// src/core/spans/operation-span.ts
+var FIELDS2 = {
+  sessionId: ATTRIBUTE_NAME_SESSION_ID
+};
+
+class OperationSpan extends FriskSpan {
+  constructor(args) {
+    super({ ...args, spanName: SPAN_NAME_OPERATION, attributeFields: FIELDS2 });
+  }
+  setAttributes(values) {
+    this.setAttributesByField(values);
+  }
+}
+// src/core/spans/session-span.ts
+var FIELDS3 = {
+  sessionId: ATTRIBUTE_NAME_SESSION_ID,
+  remoteSessionId: ATTRIBUTE_NAME_REMOTE_SESSION_ID,
+  prompt: ATTRIBUTE_NAME_SESSION_PROMPT,
+  toolCallCount: ATTRIBUTE_NAME_TOOL_CALL_COUNT,
+  toolCallErrorCount: ATTRIBUTE_NAME_TOOL_CALL_ERROR_COUNT,
+  inputTokens: ATTRIBUTE_NAME_TOKEN_USAGE_INPUT_TOKENS,
+  outputTokens: ATTRIBUTE_NAME_TOKEN_USAGE_OUTPUT_TOKENS,
+  totalTokens: ATTRIBUTE_NAME_TOKEN_USAGE_TOTAL_TOKENS
+};
+
+class SessionSpan extends FriskSpan {
+  constructor(args) {
+    super({
+      ...args,
+      spanName: SPAN_NAME_FRISK_SESSION,
+      attributeFields: FIELDS3
     });
-    if (decision.reason) {
-      this.setAttribute(ATTRIBUTE_NAME_DECISION_REASON, decision.reason);
-    }
   }
-  saveError(error) {
-    if (!this.span) {
-      return;
-    }
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    const errorType = error instanceof Error ? error.constructor.name : typeof error;
-    this.setAttributes({
-      [ATTRIBUTE_NAME_ERROR_TYPE]: errorType,
-      [ATTRIBUTE_NAME_ERROR_MESSAGE]: errorMessage
+  setAttributes(values) {
+    this.setAttributesByField(values);
+  }
+}
+// src/core/spans/tool-call-decision-span.ts
+var FIELDS4 = {
+  sessionId: ATTRIBUTE_NAME_SESSION_ID,
+  toolName: ATTRIBUTE_NAME_TOOL_NAME,
+  toolCallId: ATTRIBUTE_NAME_TOOL_CALL_ID,
+  toolArgsJson: ATTRIBUTE_NAME_TOOL_ARGS_JSON,
+  toolArgsRedactedPathsJson: ATTRIBUTE_NAME_TOOL_ARGS_REDACTED_PATHS_JSON,
+  agentStateJson: ATTRIBUTE_NAME_AGENT_STATE_JSON,
+  agentStateRedactedPathsJson: ATTRIBUTE_NAME_AGENT_STATE_REDACTED_PATHS_JSON,
+  friskToolId: ATTRIBUTE_NAME_FRISK_TOOL_ID,
+  friskToolVersionId: ATTRIBUTE_NAME_FRISK_TOOL_VERSION_ID,
+  llmReasoning: ATTRIBUTE_NAME_LLM_REASONING,
+  decisionOutcome: ATTRIBUTE_NAME_DECISION_OUTCOME,
+  decisionMatchedRuleCount: ATTRIBUTE_NAME_DECISION_MATCHED_RULE_COUNT,
+  decisionReason: ATTRIBUTE_NAME_DECISION_REASON,
+  errorType: ATTRIBUTE_NAME_ERROR_TYPE,
+  errorMessage: ATTRIBUTE_NAME_ERROR_MESSAGE
+};
+
+class ToolCallDecisionSpan extends FriskSpan {
+  constructor(args) {
+    super({
+      ...args,
+      spanName: SPAN_NAME_DECIDE_TOOL_CALL,
+      attributeFields: FIELDS4
     });
   }
-  enter() {
-    const parentContext = this.parent ? import_api.trace.setSpan(import_api.context.active(), this.parent) : import_api.context.active();
-    const redactedToolArgsResult = this.adapter.serializeToolArgs(removeLlmReasoningArg(this.toolCall.args), { redact: this.redaction.redactToolArgs });
-    const redactedAgentStateResult = this.adapter.serializeAgentState(this.agentState, { redact: this.redaction.redactAgentState });
-    this._span = this.tracer.startSpan(SPAN_NAME_DECIDE_TOOL_CALL, {
-      attributes: {
-        [ATTRIBUTE_NAME_SESSION_ID]: this.sessionId,
-        [ATTRIBUTE_NAME_TOOL_NAME]: this.toolCall.name,
-        ...this.friskToolId !== null ? { [ATTRIBUTE_NAME_FRISK_TOOL_ID]: this.friskToolId } : {},
-        ...this.friskToolVersionId !== null ? {
-          [ATTRIBUTE_NAME_FRISK_TOOL_VERSION_ID]: this.friskToolVersionId
-        } : {},
-        [ATTRIBUTE_NAME_TOOL_CALL_ID]: this.toolCall.id,
-        [ATTRIBUTE_NAME_TOOL_ARGS_JSON]: redactedToolArgsResult.value ?? "",
-        [ATTRIBUTE_NAME_TOOL_ARGS_REDACTED_PATHS_JSON]: JSON.stringify(redactedToolArgsResult.redactedPaths),
-        [ATTRIBUTE_NAME_AGENT_STATE_JSON]: redactedAgentStateResult.value ?? "",
-        [ATTRIBUTE_NAME_AGENT_STATE_REDACTED_PATHS_JSON]: JSON.stringify(redactedAgentStateResult.redactedPaths)
-      }
-    }, parentContext);
-    this._traceContextCarrier = {};
-    const spanContext = import_api.trace.setSpan(import_api.context.active(), this.span);
-    import_api.propagation.inject(spanContext, this._traceContextCarrier);
-  }
-  exit() {
-    if (!this.span) {
-      return;
-    }
-    this.span.end();
+  setAttributes(values) {
+    this.setAttributesByField(values);
   }
 }
+// src/core/spans/tool-call-observation-span.ts
+var FIELDS5 = {
+  sessionId: ATTRIBUTE_NAME_SESSION_ID,
+  toolName: ATTRIBUTE_NAME_TOOL_NAME,
+  toolCallId: ATTRIBUTE_NAME_TOOL_CALL_ID,
+  toolArgsJson: ATTRIBUTE_NAME_TOOL_ARGS_JSON,
+  toolArgsRedactedPathsJson: ATTRIBUTE_NAME_TOOL_ARGS_REDACTED_PATHS_JSON,
+  agentStateJson: ATTRIBUTE_NAME_AGENT_STATE_JSON,
+  agentStateRedactedPathsJson: ATTRIBUTE_NAME_AGENT_STATE_REDACTED_PATHS_JSON,
+  toolCallSequenceNumber: ATTRIBUTE_NAME_TOOL_CALL_SEQUENCE_NUMBER,
+  friskToolId: ATTRIBUTE_NAME_FRISK_TOOL_ID,
+  friskToolVersionId: ATTRIBUTE_NAME_FRISK_TOOL_VERSION_ID,
+  llmReasoning: ATTRIBUTE_NAME_LLM_REASONING,
+  isSuccess: ATTRIBUTE_NAME_TOOL_CALL_IS_SUCCESS,
+  isError: ATTRIBUTE_NAME_TOOL_CALL_IS_ERROR,
+  errorMessage: ATTRIBUTE_NAME_ERROR_MESSAGE,
+  errorType: ATTRIBUTE_NAME_ERROR_TYPE,
+  llmCallSpanId: ATTRIBUTE_NAME_LLM_CALL_SPAN_ID
+};
 
+class ToolCallObservationSpan extends FriskSpan {
+  constructor(args) {
+    super({
+      ...args,
+      spanName: SPAN_NAME_OBSERVE_TOOL_CALL,
+      attributeFields: FIELDS5
+    });
+  }
+  setAttributes(values) {
+    this.setAttributesByField(values);
+  }
+}
 // src/core/types.ts
 var DecisionOutcome;
 ((DecisionOutcome2) => {
@@ -48643,9 +48726,13 @@ class FriskSession {
   logger;
   _rootRunId = null;
   _isTracing = false;
+  _agentState = null;
   toolCallSequenceNumber = 0;
   toolCallSequenceGenerator = this.createToolCallSequenceGenerator();
   toolCallErrorCount = 0;
+  tokenUsageInput = 0;
+  tokenUsageOutput = 0;
+  tokenUsageTotal = 0;
   constructor({ frisk, redact, tracer, logging }) {
     const sessionId = this.constructor.generateSessionId();
     this.logger = deriveSdkLogger(logging, {
@@ -48668,33 +48755,67 @@ class FriskSession {
   get rootRunId() {
     return this._rootRunId;
   }
+  createLlmCallSpan({
+    parent
+  } = {}) {
+    const span = new LlmCallSpan({
+      tracer: this.tracer,
+      parent: parent ?? this._rootSpan
+    });
+    span.setAttributes({ sessionId: this.id });
+    return span;
+  }
+  createOperationSpan({
+    parent
+  } = {}) {
+    const span = new OperationSpan({
+      tracer: this.tracer,
+      parent: parent ?? this._rootSpan
+    });
+    span.setAttributes({ sessionId: this.id });
+    return span;
+  }
   async createToolCallSpan({
     name,
-    args: toolArgsInput
+    args: toolArgsInput,
+    agentState,
+    parent
   }) {
     const toolArgs = this.validateToolArgs(toolArgsInput);
+    const llmReasoning = extractLlmReasoning(toolArgs);
     const redactedToolArgsResult = this.frisk.adapter?.serializeToolArgs(removeLlmReasoningArg(toolArgs), { redact: this.redaction.redactToolArgs }) ?? {
       value: "{}",
       redactedPaths: []
     };
-    const sessionSpan = this.rootSpan;
-    const parentContext = sessionSpan ? import_api2.trace.setSpan(import_api2.context.active(), sessionSpan) : import_api2.context.active();
-    const spanAttributes = {
-      [ATTRIBUTE_NAME_SESSION_ID]: this.id,
-      [ATTRIBUTE_NAME_TOOL_NAME]: name,
-      [ATTRIBUTE_NAME_TOOL_ARGS_JSON]: redactedToolArgsResult.value,
-      [ATTRIBUTE_NAME_TOOL_ARGS_REDACTED_PATHS_JSON]: JSON.stringify(redactedToolArgsResult.redactedPaths),
-      [ATTRIBUTE_NAME_TOOL_CALL_SEQUENCE_NUMBER]: this.toolCallSequenceGenerator.next().value
+    const agentStateToUse = agentState ?? this._agentState ?? {};
+    const redactedAgentStateResult = this.frisk.adapter?.serializeAgentState(agentStateToUse, { redact: this.redaction.redactAgentState }) ?? {
+      value: "{}",
+      redactedPaths: []
     };
+    const span = new ToolCallObservationSpan({
+      tracer: this.tracer,
+      parent: parent ?? this._rootSpan
+    });
+    span.setAttributes({
+      sessionId: this.id,
+      toolName: name,
+      toolArgsJson: redactedToolArgsResult.value ?? "{}",
+      toolArgsRedactedPathsJson: JSON.stringify(redactedToolArgsResult.redactedPaths),
+      agentStateJson: redactedAgentStateResult.value ?? "{}",
+      agentStateRedactedPathsJson: JSON.stringify(redactedAgentStateResult.redactedPaths),
+      toolCallSequenceNumber: this.toolCallSequenceGenerator.next().value
+    });
     await this.frisk.toolRegistrationComplete;
     const registeredTool = this.frisk.getRegisteredTool(name);
     if (registeredTool) {
-      spanAttributes[ATTRIBUTE_NAME_FRISK_TOOL_ID] = registeredTool.id;
-      spanAttributes[ATTRIBUTE_NAME_FRISK_TOOL_VERSION_ID] = registeredTool.versionId;
+      span.setAttributes({
+        friskToolId: registeredTool.id,
+        friskToolVersionId: registeredTool.versionId
+      });
+    }
+    if (llmReasoning !== null) {
+      span.setAttributes({ llmReasoning });
     }
-    const span = this.getTracer().startSpan(SPAN_NAME_OBSERVE_TOOL_CALL, {
-      attributes: spanAttributes
-    }, parentContext);
     return span;
   }
   closeToolCallSpan({
@@ -48704,19 +48825,19 @@ class FriskSession {
     status
   }) {
     if (toolCallId) {
-      span.setAttribute(ATTRIBUTE_NAME_TOOL_CALL_ID, toolCallId);
+      span.setAttributes({ toolCallId });
     }
     if (status === "error" /* Error */ || !!err) {
       this.incrementToolCallErrors();
-      span.setAttribute(ATTRIBUTE_NAME_TOOL_CALL_IS_ERROR, true);
-      span.setAttribute(ATTRIBUTE_NAME_TOOL_CALL_IS_SUCCESS, false);
+      span.setAttributes({ isError: true, isSuccess: false });
     } else if (status === "success" /* Success */) {
-      span.setAttribute(ATTRIBUTE_NAME_TOOL_CALL_IS_SUCCESS, true);
-      span.setAttribute(ATTRIBUTE_NAME_TOOL_CALL_IS_ERROR, false);
+      span.setAttributes({ isSuccess: true, isError: false });
     }
-    if (err && err instanceof Error) {
-      span.setAttribute(ATTRIBUTE_NAME_ERROR_MESSAGE, `${err}`);
-      span.setAttribute(ATTRIBUTE_NAME_ERROR_TYPE, `${err.constructor.name}`);
+    if (err instanceof Error) {
+      span.setAttributes({
+        errorMessage: `${err}`,
+        errorType: `${err.constructor.name}`
+      });
     }
     span.end();
   }
@@ -48730,32 +48851,37 @@ class FriskSession {
     agentState
   }) {
     const registeredTool = this.frisk.getRegisteredTool(toolCall.name);
-    const toolCallSpan = new ToolCallSpan({
-      sessionId: this.id,
-      adapter: this.frisk.adapter,
-      toolCall,
-      friskToolId: registeredTool?.id ?? null,
-      friskToolVersionId: registeredTool?.versionId ?? null,
-      agentState,
-      parent: this._rootSpan,
+    const redactedToolArgs = this.frisk.adapter.serializeToolArgs(removeLlmReasoningArg(toolCall.args), { redact: this.redaction.redactToolArgs });
+    const redactedAgentState = this.frisk.adapter.serializeAgentState(agentState, { redact: this.redaction.redactAgentState });
+    const llmReasoning = extractLlmReasoning(toolCall.args);
+    const span = new ToolCallDecisionSpan({
       tracer: this.tracer,
-      redact: this.redaction
+      parent: this._rootSpan
     });
-    const toolArgs = toolCall.args;
-    return toolCallSpan.run((span) => {
+    try {
+      span.setAttributes({
+        sessionId: this.id,
+        toolName: toolCall.name,
+        toolCallId: toolCall.id,
+        toolArgsJson: redactedToolArgs.value ?? "{}",
+        toolArgsRedactedPathsJson: JSON.stringify(redactedToolArgs.redactedPaths),
+        agentStateJson: redactedAgentState.value ?? "{}",
+        agentStateRedactedPathsJson: JSON.stringify(redactedAgentState.redactedPaths),
+        friskToolId: registeredTool?.id,
+        friskToolVersionId: registeredTool?.versionId,
+        llmReasoning: llmReasoning ?? undefined
+      });
+      const spanContext = import_api2.trace.setSpan(import_api2.context.active(), span.otelSpan);
+      const traceContextCarrier = {};
+      import_api2.propagation.inject(spanContext, traceContextCarrier);
       try {
-        if (LLM_REASONING_ARG_NAME in toolArgs) {
-          const llmReasoning = toolArgs[LLM_REASONING_ARG_NAME];
-          span.setAttribute(ATTRIBUTE_NAME_LLM_REASONING, llmReasoning);
-        }
-        const baseToolCallArgs = removeLlmReasoningArg(toolCall.args);
         const coreResult = this.frisk.decideToolCall({
           toolCall: {
             ...toolCall,
-            args: baseToolCallArgs
+            args: removeLlmReasoningArg(toolCall.args)
           },
           agentState,
-          traceContextCarrier: span.traceContextCarrier ?? undefined
+          traceContextCarrier
         });
         const result = {
           outcome: coreResult.outcome,
@@ -48764,7 +48890,11 @@ class FriskSession {
           policyId: coreResult.policyId,
           policyVersionId: coreResult.policyVersionId
         };
-        span.saveResult(result);
+        span.setAttributes({
+          decisionOutcome: result.outcome,
+          decisionMatchedRuleCount: Number(result.rulesMatchedCount),
+          decisionReason: result.reason ?? undefined
+        });
         return result;
       } catch (error) {
         const wrapped = new ToolCallEvaluationError(error);
@@ -48772,14 +48902,19 @@ class FriskSession {
           toolName: toolCall.name,
           toolCallId: toolCall.id
         });
-        span.saveError(wrapped);
+        span.setAttributes({
+          errorType: wrapped.constructor.name,
+          errorMessage: wrapped.message
+        });
         return {
           outcome: "error" /* ERROR */,
           rulesMatchedCount: 0,
           reason: wrapped.message
         };
       }
-    });
+    } finally {
+      span.end();
+    }
   }
   *createToolCallSequenceGenerator() {
     while (true) {
@@ -48795,23 +48930,49 @@ class FriskSession {
   getToolCallErrorCount() {
     return this.toolCallErrorCount;
   }
-  initTracing({ runId, inputs }) {
+  recordTokenUsage({
+    inputTokens = 0,
+    outputTokens = 0,
+    totalTokens = 0
+  }) {
+    this.tokenUsageInput += inputTokens;
+    this.tokenUsageOutput += outputTokens;
+    this.tokenUsageTotal += totalTokens;
+    this._rootSpan?.setAttributes({
+      inputTokens: this.tokenUsageInput,
+      outputTokens: this.tokenUsageOutput,
+      totalTokens: this.tokenUsageTotal
+    });
+  }
+  getTokenUsage() {
+    return {
+      inputTokens: this.tokenUsageInput,
+      outputTokens: this.tokenUsageOutput,
+      totalTokens: this.tokenUsageTotal
+    };
+  }
+  initTracing({ runId, agentState }) {
     this._rootRunId = runId;
     this._isTracing = true;
-    const span = this.tracer.startSpan(SPAN_NAME_FRISK_SESSION);
-    span.setAttribute(ATTRIBUTE_NAME_SESSION_ID, this.id);
-    span.setAttribute(ATTRIBUTE_NAME_REMOTE_SESSION_ID, runId);
-    const userPrompt = this.frisk.adapter.extractPrompt?.(inputs);
+    this._agentState = agentState;
+    const span = new SessionSpan({ tracer: this.tracer });
+    span.setAttributes({ sessionId: this.id, remoteSessionId: runId });
+    const userPrompt = this.frisk.adapter.extractPrompt?.(agentState);
     if (userPrompt) {
-      span.setAttribute(ATTRIBUTE_NAME_SESSION_PROMPT, userPrompt);
+      span.setAttributes({ prompt: userPrompt });
     }
     this.setRootSpan(span);
     return span;
   }
   endTracing() {
     if (this._rootSpan) {
-      this._rootSpan.setAttribute(ATTRIBUTE_NAME_TOOL_CALL_COUNT, this.getToolCallCount());
-      this._rootSpan.setAttribute(ATTRIBUTE_NAME_TOOL_CALL_ERROR_COUNT, this.getToolCallErrorCount());
+      this._rootSpan.setAttributes({
+        toolCallCount: this.getToolCallCount(),
+        toolCallErrorCount: this.getToolCallErrorCount(),
+        inputTokens: this.tokenUsageInput,
+        outputTokens: this.tokenUsageOutput,
+        totalTokens: this.tokenUsageTotal
+      });
       this._rootSpan.end();
     }
     this._isTracing = false;
@@ -48826,6 +48987,14 @@ class FriskSession {
   }
 }
 
+// src/core/redaction-options.ts
+function resolveRedactionOptions(options) {
+  return {
+    redactToolArgs: options?.redactToolArgs ?? false,
+    redactAgentState: options?.redactAgentState ?? false
+  };
+}
+
 // src/core/sdk-attributes/detect-runtime.ts
 function detectRuntime() {
   const g = globalThis;
@@ -48861,12 +49030,12 @@ function detectRuntime() {
 
 // src/core/sdk-attributes/read-sdk-meta.ts
 import { existsSync, readFileSync } from "node:fs";
-import { dirname as dirname2, join } from "node:path";
+import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/generated/sdk-meta.ts
 var SDK_NAME = "@friskai/frisk-js";
-var SDK_VERSION = "0.2.10";
+var SDK_VERSION = "0.3.1";
 
 // src/core/sdk-attributes/read-sdk-meta.ts
 function getSdkMeta() {
@@ -48900,7 +49069,7 @@ function findNearestPackageJson(startDir) {
     if (existsSync(candidate)) {
       return candidate;
     }
-    const parent = dirname2(dir);
+    const parent = dirname(dir);
     if (parent === dir) {
       return null;
     }
@@ -48909,7 +49078,7 @@ function findNearestPackageJson(startDir) {
 }
 function tryReadPackageJson() {
   try {
-    const here = dirname2(fileURLToPath(import.meta.url));
+    const here = dirname(fileURLToPath(import.meta.url));
     const pkgPath = findNearestPackageJson(here);
     if (!pkgPath)
       return null;
@@ -49277,6 +49446,9 @@ class ToolRegistry {
 
 // src/core/frisk.ts
 class Frisk {
+  get toolPoliciesAvailable() {
+    return this.toolPolicies?.available ?? false;
+  }
   get redaction() {
     return this._redaction;
   }
@@ -49284,24 +49456,34 @@ class Frisk {
   apiBaseUrl;
   otlpEndpoint;
   accessTokenProvider;
+  get adapter() {
+    return this._adapter;
+  }
+  get logLevel() {
+    return this._logLevel;
+  }
+  get tracingManager() {
+    if (!this._tracingManager) {
+      throw new FriskNotInitializedError;
+    }
+    return this._tracingManager;
+  }
   initialized = false;
   rootLogger;
   logger;
   _logLevel;
   _adapter;
-  _friskHandle = null;
   _tracingManager = null;
-  _toolRegistry;
+  toolRegistry;
   sdkAttributes;
+  extensions = [];
+  toolPolicies = null;
   wrapToolsCalled = false;
   get toolRegistrationComplete() {
     if (!this.wrapToolsCalled) {
       return Promise.resolve(true);
     }
-    return this._toolRegistry.initialized;
-  }
-  get logLevel() {
-    return this._logLevel;
+    return this.toolRegistry.initialized;
   }
   static async connect(options) {
     const instance = new this(options);
@@ -49315,7 +49497,7 @@ class Frisk {
     this._logLevel = options?.logging?.logLevel;
     this.logger = deriveSdkLogger({
       logger: this.rootLogger,
-      logLevel: this._logLevel
+      logLevel: this.logLevel
     }, {
       component: "FriskCore"
     });
@@ -49335,10 +49517,10 @@ class Frisk {
       baseUrl,
       logging: {
         logger: this.rootLogger,
-        logLevel: this._logLevel
+        logLevel: this.logLevel
       }
     });
-    this._toolRegistry = new ToolRegistry({
+    this.toolRegistry = new ToolRegistry({
       apiBaseUrl: baseUrl,
       getAccessToken: async () => this.accessTokenProvider.getAccessToken(),
       logger: this.logger
@@ -49349,21 +49531,20 @@ class Frisk {
     }
     this.otlpEndpoint = otlpEndpoint;
     this._redaction = resolveRedactionOptions(options?.redact);
+    this.extensions = options?.extensions ?? [];
+    this.mountExtensions();
   }
-  get friskHandle() {
-    if (!this._friskHandle) {
-      throw new FriskNotInitializedError;
+  mountExtensions() {
+    for (const ext of this.extensions) {
+      if ("available" in ext && "decideToolCall" in ext) {
+        this.toolPolicies = ext;
+      }
     }
-    return this._friskHandle;
   }
-  get adapter() {
-    return this._adapter;
-  }
-  get tracingManager() {
-    if (!this._tracingManager) {
-      throw new FriskNotInitializedError;
+  async initializeExtensions() {
+    for (const ext of this.extensions) {
+      await ext.initialize(this);
     }
-    return this._tracingManager;
   }
   async connect() {
     if (!this.initialized) {
@@ -49377,20 +49558,20 @@ class Frisk {
         tracerName: TRACER_NAME,
         tracerVersion: TRACER_VERSION
       });
-      this._friskHandle = new FriskHandle(currentToken, this.apiBaseUrl, this.otlpEndpoint);
       this.accessTokenProvider.addCallback((newToken) => this.updateAccessToken(newToken));
       this.accessTokenProvider.startBackgroundRefresh();
       this.initialized = true;
+      await this.initializeExtensions();
     }
   }
   session(metadata) {
     const session = new FriskSession({
       frisk: this,
-      redact: this._redaction,
+      redact: this.redaction,
       tracer: this.tracingManager.getTracer(),
       logging: {
         logger: this.rootLogger,
-        logLevel: this._logLevel
+        logLevel: this.logLevel
       }
     });
     const registry2 = SessionRegistry.getInstance();
@@ -49398,20 +49579,20 @@ class Frisk {
     return session;
   }
   normalizeToolCall(toolCall) {
-    return this._adapter.normalizeToolCall(toolCall);
+    return this.adapter.normalizeToolCall(toolCall);
   }
   wrapTools(tools, options = DefaultWrapToolOptions) {
     this.wrapToolsCalled = true;
     const toolList = [...tools];
-    const registerToolProperties = toolList.map((tool) => this._adapter.extractRegisterToolProperties?.(tool)).filter((properties) => properties !== null && properties !== undefined);
+    const registerToolProperties = toolList.map((tool) => this.adapter.extractRegisterToolProperties?.(tool)).filter((properties) => properties !== null && properties !== undefined);
     if (registerToolProperties.length > 0) {
-      this._toolRegistry.registerTools({
+      this.toolRegistry.registerTools({
         tools: registerToolProperties,
         sdkAttributes: this.sdkAttributes
       });
     }
-    if (this._adapter.wrapTools) {
-      return this._adapter.wrapTools(toolList, options);
+    if (this.adapter.wrapTools) {
+      return this.adapter.wrapTools(toolList, options);
     }
     return toolList;
   }
@@ -49423,8 +49604,8 @@ class Frisk {
     };
   }
   wrapTool(tool, options = DefaultWrapToolOptions) {
-    if (this._adapter.wrapTool) {
-      return this._adapter.wrapTool(tool, options);
+    if (this.adapter.wrapTool) {
+      return this.adapter.wrapTool(tool, options);
     }
     return tool;
   }
@@ -49433,30 +49614,38 @@ class Frisk {
     return registry2.get(sessionId);
   }
   updateAccessToken(authToken) {
-    this.friskHandle.updateAuthToken(authToken);
+    this.toolPolicies?.updateAccessToken(authToken);
     this.tracingManager.updateAuthToken(authToken);
   }
   getRegisteredTool(toolName) {
-    return this._toolRegistry.getRegisteredTool(toolName);
+    return this.toolRegistry.getRegisteredTool(toolName);
   }
   decideToolCall({
     toolCall,
     agentState,
     traceContextCarrier
   }) {
-    const id = toolCall.id ?? v4();
-    const argsJson = toolCall.args ? JSON.stringify(removeLlmReasoningArg(toolCall.args)) : null;
-    const stateJson = agentState ? JSON.stringify(agentState) : null;
-    const registeredTool = this.getRegisteredTool(toolCall.name);
-    const coreResult = this.friskHandle.process(toolCall.name, registeredTool?.id ?? null, registeredTool?.versionId ?? null, argsJson, stateJson, id, this._redaction, traceContextCarrier);
-    const outcome = coreResult.decision === "allow" ? "allow" /* ALLOW */ : coreResult.decision === "deny" ? "deny" /* DENY */ : coreResult.decision === "escalate" ? "escalate" /* ESCALATE */ : "error" /* ERROR */;
-    return {
-      outcome,
-      rulesMatchedCount: coreResult.rulesMatchedCount,
-      reason: coreResult.reason,
-      policyId: coreResult.policyId,
-      policyVersionId: coreResult.policyVersionId
-    };
+    if (!this.toolPolicies) {
+      throw new MissingToolPoliciesExtensionError;
+    }
+    const toolArgsJson = toolCall.args ? JSON.stringify(toolCall.args) : null;
+    const agentStateJson = agentState ? JSON.stringify(agentState) : null;
+    const redactedArgs = toolCall.args ? redactObject(toolCall.args, this.redaction.redactToolArgs) : { value: {}, redactedPaths: [] };
+    const toolArgsRedactedJson = toolCall.args ? JSON.stringify(redactedArgs.value) : null;
+    const toolArgsRedactedPathsJson = JSON.stringify(redactedArgs.redactedPaths);
+    const redactedState = agentState ? redactObject(agentState, this.redaction.redactAgentState) : { value: {}, redactedPaths: [] };
+    const agentStateRedactedJson = agentState ? JSON.stringify(redactedState.value) : null;
+    const agentStateRedactedPathsJson = JSON.stringify(redactedState.redactedPaths);
+    return this.toolPolicies.decideToolCall({
+      toolCall,
+      toolArgsJson,
+      toolArgsRedactedJson,
+      toolArgsRedactedPathsJson,
+      agentStateJson,
+      agentStateRedactedJson,
+      agentStateRedactedPathsJson,
+      traceContextCarrier
+    });
   }
   async getOrCreateToolApprovalRequest({
     toolCallId,
@@ -49504,29 +49693,33 @@ class Frisk {
     if (this.tracingManager) {
       await this.tracingManager.shutdown();
     }
-    this.friskHandle.shutdown();
+    for (const ext of this.extensions) {
+      ext.shutdown();
+    }
   }
 }
 export {
   requireEnv,
-  redactDictionarySimple,
-  redactDictionary,
   getEnv,
   combineRedactOptions,
   UnexpectedFriskServerResponseError,
-  ToolCallSpan,
+  ToolCallObservationSpan,
+  ToolCallDecisionSpan,
   ToolApprovalStatus,
+  SessionSpan,
   SessionRegistry,
   SessionNotFoundError,
+  OperationSpan,
   MissingOtlpEndpointError,
   MissingFriskSessionContextError,
   MissingBaseURLError,
   MissingAPIKeyError,
+  LlmCallSpan,
   InvalidFriskSessionError,
   InvalidAccessTokenError,
+  FriskSpan,
   FriskSession,
   FriskInvalidAPIKeyError,
-  FriskHandle,
   FriskError,
   FriskBaseURLNotFoundError,
   Frisk,
@@ -49540,5 +49733,5 @@ export {
   AccessTokenProvider
 };
 
-//# debugId=40ACC90B60961E6C64756E2164756E21
+//# debugId=6FCEF90393747D4664756E2164756E21
 //# sourceMappingURL=index.js.map