@glassflow-ai/rius 0.6.0 → 0.7.0

package/README.md

@@ -247,7 +247,9 @@ Traces are posted to `<endpoint>/v1/traces`.
 completions, tool arguments) is attached to spans. It defaults to
 `true`. Set it to `false`, or supply a `mask` function, if your spans
 must not carry raw content. Both apply to span attributes and to the
-attributes of span events and links. With `captureContent: false` the
+attributes of span events and links, including the `metadata.*` copies the
+Vercel AI SDK transform makes of attributes it does not translate: a
+`metadata.<key>` is content exactly when `<key>` is. With `captureContent: false` the
 message and stacktrace of a recorded exception are stripped as well,
 since provider errors routinely echo the request back; the exception
 event and its `exception.type` are kept, so failures stay visible.

package/dist/index.cjs

@@ -373,7 +373,7 @@ function kindAttributes(kind) {
   if (operation !== void 0) attributes[GEN_AI_OPERATION_NAME] = operation;
   return attributes;
 }
-var TRACER_NAME, SERVICE_INSTANCE_ID, OPENINFERENCE_SPAN_KIND, INPUT_VALUE, OUTPUT_VALUE, SESSION_ID, USER_ID, WORKSPACE_ROUTE, GEN_AI_OPERATION_NAME, GEN_AI_PROVIDER_NAME, GEN_AI_REQUEST_MODEL, GEN_AI_REQUEST_REASONING_LEVEL, GEN_AI_RESPONSE_MODEL, GEN_AI_USAGE_INPUT_TOKENS, GEN_AI_USAGE_OUTPUT_TOKENS, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, GEN_AI_USAGE_CACHE_WRITE_INPUT_TOKENS, GEN_AI_USAGE_REASONING_OUTPUT_TOKENS, GEN_AI_INPUT_MESSAGES, GEN_AI_OUTPUT_MESSAGES, GEN_AI_RESPONSE_FINISH_REASONS, GEN_AI_TOOL_NAME, GEN_AI_TOOL_DEFINITIONS, GEN_AI_REQUEST_PREFIX, MCP_RESULT_TYPE, GEN_AI_FIRST_TOKEN_EVENT, SpanKind, OPERATION_BY_KIND, CONTENT_ATTRIBUTES, LLM_INVOCATION_PARAMETERS, INVOCATION_PARAMETERS_CONTENT_MEMBERS, CONTENT_ATTRIBUTE_PREFIXES, CONTENT_ATTRIBUTE_SUFFIXES, GLASSFLOW_SPAN_PENDING, PENDING_IDENTITY_ATTRIBUTES, PENDING_IDENTITY_PREFIXES;
+var TRACER_NAME, SERVICE_INSTANCE_ID, OPENINFERENCE_SPAN_KIND, INPUT_VALUE, OUTPUT_VALUE, SESSION_ID, USER_ID, WORKSPACE_ROUTE, GEN_AI_OPERATION_NAME, GEN_AI_PROVIDER_NAME, GEN_AI_REQUEST_MODEL, GEN_AI_REQUEST_REASONING_LEVEL, GEN_AI_RESPONSE_MODEL, GEN_AI_USAGE_INPUT_TOKENS, GEN_AI_USAGE_OUTPUT_TOKENS, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, GEN_AI_USAGE_CACHE_WRITE_INPUT_TOKENS, GEN_AI_USAGE_REASONING_OUTPUT_TOKENS, GEN_AI_INPUT_MESSAGES, GEN_AI_OUTPUT_MESSAGES, GEN_AI_RESPONSE_FINISH_REASONS, GEN_AI_TOOL_NAME, GEN_AI_TOOL_DEFINITIONS, GEN_AI_REQUEST_PREFIX, MCP_METHOD_NAME, MCP_METHOD_TOOLS_CALL, MCP_PROTOCOL_VERSION, ERROR_TYPE, ERROR_TYPE_TOOL_ERROR, MCP_RESULT_TYPE, GEN_AI_FIRST_TOKEN_EVENT, SpanKind, OPERATION_BY_KIND, CONTENT_ATTRIBUTES, LLM_INVOCATION_PARAMETERS, INVOCATION_PARAMETERS_CONTENT_MEMBERS, CONTENT_ATTRIBUTE_PREFIXES, CONTENT_ATTRIBUTE_SUFFIXES, GLASSFLOW_SPAN_PENDING, PENDING_IDENTITY_ATTRIBUTES, PENDING_IDENTITY_PREFIXES;
 var init_semconv = __esm({
   "src/semconv.ts"() {
     "use strict";
@@ -402,6 +402,11 @@ var init_semconv = __esm({
     GEN_AI_TOOL_NAME = "gen_ai.tool.name";
     GEN_AI_TOOL_DEFINITIONS = "gen_ai.tool.definitions";
     GEN_AI_REQUEST_PREFIX = "gen_ai.request.";
+    MCP_METHOD_NAME = "mcp.method.name";
+    MCP_METHOD_TOOLS_CALL = "tools/call";
+    MCP_PROTOCOL_VERSION = "mcp.protocol.version";
+    ERROR_TYPE = "error.type";
+    ERROR_TYPE_TOOL_ERROR = "tool_error";
     MCP_RESULT_TYPE = "mcp.result_type";
     GEN_AI_FIRST_TOKEN_EVENT = "gen_ai.first_token";
     SpanKind = /* @__PURE__ */ ((SpanKind2) => {
@@ -503,6 +508,11 @@ var init_semconv = __esm({
       GEN_AI_OPERATION_NAME,
       GEN_AI_PROVIDER_NAME,
       GEN_AI_TOOL_NAME,
+      // Protocol identity, not content: a still-running MCP call must be
+      // distinguishable from a local tool in the live view — the one place
+      // setting the marker at creation pays off.
+      MCP_METHOD_NAME,
+      MCP_PROTOCOL_VERSION,
       // Identity, not content: a pending span must be groupable into its
       // session while still running, that is the live view's whole point.
       SESSION_ID,
@@ -531,6 +541,9 @@ function renderable(raw, value) {
   if (raw instanceof ArrayBuffer) return `<ArrayBuffer ${raw.byteLength} bytes>`;
   return value;
 }
+function asRecord(value) {
+  return typeof value === "object" && value !== null ? value : void 0;
+}
 function toAttributeValue(value) {
   if (typeof value === "string") return truncate(value);
   if (typeof value === "number" || typeof value === "boolean") return value;
@@ -603,7 +616,10 @@ function creationAttributes(options) {
   return attributes;
 }
 function startSpan(name, options = {}) {
-  const span = getTracer().startSpan(name, { attributes: creationAttributes(options) });
+  const span = getTracer().startSpan(name, {
+    kind: options.otelKind,
+    attributes: creationAttributes(options)
+  });
   return configure(new Observation(span), options);
 }
 function startAsCurrentSpan(name, optionsOrFn, maybeFn) {
@@ -613,11 +629,12 @@ function startAsCurrentSpan(name, optionsOrFn, maybeFn) {
     creationAttributes(options),
     options.userId,
     (span) => configure(new Observation(span), options),
-    fn
+    fn,
+    options.otelKind
   );
 }
-function runActive(name, attributes, userId, makeHandle, fn) {
-  const run = () => getTracer().startActiveSpan(name, { attributes }, async (span) => {
+function runActive(name, attributes, userId, makeHandle, fn, otelKind) {
+  const run = () => getTracer().startActiveSpan(name, { kind: otelKind, attributes }, async (span) => {
     const handle = makeHandle(span);
     try {
       return await fn(handle);
@@ -711,27 +728,25 @@ __export(instrumentationMcp_exports, {
   instrumentMcpClient: () => instrumentMcpClient
 });
 function serializeResult(result) {
-  if (typeof result !== "object" || result === null) return toAttributeValue(result);
-  const record = result;
+  const record = asRecord(result);
+  if (record === void 0) return toAttributeValue(result);
   const structured = record.structured_content ?? record.structuredContent;
   if (structured !== void 0 && structured !== null) return toAttributeValue(structured);
   const content = record.content;
   if (Array.isArray(content)) {
-    const texts = content.map(
-      (block) => typeof block === "object" && block !== null ? block.text : void 0
-    ).filter((text) => typeof text === "string");
+    const texts = content.map((block) => asRecord(block)?.text).filter((text) => typeof text === "string");
     if (texts.length === 1) return truncate(texts[0]);
     if (texts.length > 1) return toAttributeValue(texts);
   }
   return toAttributeValue(result);
 }
 function resultIsError(result) {
-  if (typeof result !== "object" || result === null) return false;
-  const record = result;
-  return Boolean(record.is_error ?? record.isError);
+  const record = asRecord(result);
+  return Boolean(record?.is_error ?? record?.isError);
 }
 function recordResult(observation, result) {
-  const resultType = typeof result === "object" && result !== null ? result.result_type ?? result.resultType : void 0;
+  const record = asRecord(result);
+  const resultType = record?.result_type ?? record?.resultType;
   if (resultType === INPUT_REQUIRED) {
     observation.setAttribute(MCP_RESULT_TYPE, INPUT_REQUIRED);
     return;
@@ -742,8 +757,24 @@ function recordResult(observation, result) {
       code: import_api3.SpanStatusCode.ERROR,
       message: "tool returned an error result"
     });
+    observation.setAttribute(ERROR_TYPE, ERROR_TYPE_TOOL_ERROR);
   }
 }
+function errorType(error) {
+  return error instanceof Error ? error.name : typeof error;
+}
+function negotiatedProtocolVersion(client) {
+  const version = asRecord(asRecord(client)?.transport)?.protocolVersion;
+  return typeof version === "string" ? version : void 0;
+}
+function callAttributes(toolName, protocolVersion) {
+  const attributes = {
+    [GEN_AI_TOOL_NAME]: toolName,
+    [MCP_METHOD_NAME]: MCP_METHOD_TOOLS_CALL
+  };
+  if (protocolVersion !== void 0) attributes[MCP_PROTOCOL_VERSION] = protocolVersion;
+  return attributes;
+}
 function instrumentMcpClient(ClientClass) {
   const current = ClientClass.prototype.callTool;
   const alreadyWrapped = current.riusOriginal;
@@ -756,15 +787,23 @@ function instrumentMcpClient(ClientClass) {
   const instrumented = function instrumentedCallTool(params, ...rest) {
     return startAsCurrentSpan(
       `execute_tool ${params.name}`,
-      // Tool name at CREATION: pending snapshots are built at start, so an
-      // attribute set inside the callback never reaches them.
       {
         kind: "TOOL" /* TOOL */,
+        // The OTel SpanKind FIELD (orthogonal to our taxonomy attribute above):
+        // a remote tool call is CLIENT under both the MCP and the GenAI
+        // execute-tool conventions.
+        otelKind: import_api3.SpanKind.CLIENT,
         input: params.arguments,
-        attributes: { [GEN_AI_TOOL_NAME]: params.name }
+        attributes: callAttributes(params.name, negotiatedProtocolVersion(this))
       },
       async (observation) => {
-        const result = await original.call(this, params, ...rest);
+        let result;
+        try {
+          result = await original.call(this, params, ...rest);
+        } catch (error) {
+          observation.setAttribute(ERROR_TYPE, errorType(error));
+          throw error;
+        }
         recordResult(observation, result);
         return result;
       }
@@ -1034,7 +1073,8 @@ var init_instrumentation = __esm({
 function isContentKey(key) {
   if (CONTENT_ATTRIBUTES.has(key)) return true;
   if (CONTENT_ATTRIBUTE_PREFIXES.some((p) => key.startsWith(p))) return true;
-  return CONTENT_ATTRIBUTE_SUFFIXES.some((s) => key.endsWith(s));
+  if (CONTENT_ATTRIBUTE_SUFFIXES.some((s) => key.endsWith(s))) return true;
+  return key.startsWith(METADATA_PREFIX) && isContentKey(key.slice(METADATA_PREFIX.length));
 }
 function redactInvocationParameters(value) {
   if (typeof value !== "string") return void 0;
@@ -1054,7 +1094,7 @@ function redactInvocationParameters(value) {
   for (const member of INVOCATION_PARAMETERS_CONTENT_MEMBERS) delete bag[member];
   return JSON.stringify(bag);
 }
-var import_api4, EXCEPTION_EVENT_NAME, EXCEPTION_CONTENT_KEYS, STATUS_DESCRIPTION_KEY, MaskingSpanExporter;
+var import_api4, METADATA_PREFIX, EXCEPTION_EVENT_NAME, EXCEPTION_CONTENT_KEYS, STATUS_DESCRIPTION_KEY, MaskingSpanExporter;
 var init_masking = __esm({
   "src/masking.ts"() {
     "use strict";
@@ -1062,6 +1102,7 @@ var init_masking = __esm({
     import_api4 = require("@opentelemetry/api");
     init_semconv();
     init_serde();
+    METADATA_PREFIX = "metadata.";
     EXCEPTION_EVENT_NAME = "exception";
     EXCEPTION_CONTENT_KEYS = ["exception.message", "exception.stacktrace"];
     STATUS_DESCRIPTION_KEY = "status.description";
@@ -1833,7 +1874,7 @@ init_session();
 init_user();
 init_spans();
 init_workspace();
-var VERSION = "0.6.0";
+var VERSION = "0.7.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Generation,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Tracer, Span } from '@opentelemetry/api';
+import { Tracer, Span, SpanKind as SpanKind$1 } from '@opentelemetry/api';
 import { SpanExporter } from '@opentelemetry/sdk-trace-base';
 
 /** Redacts content attribute values at export. Receives the key when it accepts one. */
@@ -171,6 +171,13 @@ declare enum SpanKind {
 /** Options for {@link startSpan} and {@link startAsCurrentSpan}. */
 interface SpanOptions {
     kind?: SpanKind;
+    /**
+     * The OpenTelemetry `SpanKind` FIELD (INTERNAL, CLIENT, …), orthogonal to
+     * `kind` above, which is our taxonomy attribute. Conventions set it per
+     * operation — a remote tool call is CLIENT — so it is opt-in here and left
+     * at the tracer's default (INTERNAL) otherwise.
+     */
+    otelKind?: SpanKind$1;
     input?: unknown;
     /**
      * End-user identity (`user.id`). Sugar for `withUser`: set on this span at
@@ -441,6 +448,6 @@ declare function withSession<T>(sessionId: string, fn: (sessionId: string) => T)
  */
 declare function withUser<T>(userId: string, fn: (userId: string) => T): T;
 
-declare const VERSION = "0.6.0";
+declare const VERSION = "0.7.0";
 
 export { Generation, type GenerationBody, type GenerationOptions, type InitOptions, type Mask, Observation, type ObserveOptions, RiusClient, type RiusOptions, type SpanBody, SpanKind, type SpanOptions, VERSION, type WorkspaceExporterFactory, getTracer, init, observe, registerWorkspace, startAsCurrentGeneration, startAsCurrentSpan, startGeneration, startSpan, withSession, withUser, withWorkspace };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Tracer, Span } from '@opentelemetry/api';
+import { Tracer, Span, SpanKind as SpanKind$1 } from '@opentelemetry/api';
 import { SpanExporter } from '@opentelemetry/sdk-trace-base';
 
 /** Redacts content attribute values at export. Receives the key when it accepts one. */
@@ -171,6 +171,13 @@ declare enum SpanKind {
 /** Options for {@link startSpan} and {@link startAsCurrentSpan}. */
 interface SpanOptions {
     kind?: SpanKind;
+    /**
+     * The OpenTelemetry `SpanKind` FIELD (INTERNAL, CLIENT, …), orthogonal to
+     * `kind` above, which is our taxonomy attribute. Conventions set it per
+     * operation — a remote tool call is CLIENT — so it is opt-in here and left
+     * at the tracer's default (INTERNAL) otherwise.
+     */
+    otelKind?: SpanKind$1;
     input?: unknown;
     /**
      * End-user identity (`user.id`). Sugar for `withUser`: set on this span at
@@ -441,6 +448,6 @@ declare function withSession<T>(sessionId: string, fn: (sessionId: string) => T)
  */
 declare function withUser<T>(userId: string, fn: (userId: string) => T): T;
 
-declare const VERSION = "0.6.0";
+declare const VERSION = "0.7.0";
 
 export { Generation, type GenerationBody, type GenerationOptions, type InitOptions, type Mask, Observation, type ObserveOptions, RiusClient, type RiusOptions, type SpanBody, SpanKind, type SpanOptions, VERSION, type WorkspaceExporterFactory, getTracer, init, observe, registerWorkspace, startAsCurrentGeneration, startAsCurrentSpan, startGeneration, startSpan, withSession, withUser, withWorkspace };

package/dist/index.js

@@ -360,7 +360,7 @@ function kindAttributes(kind) {
   if (operation !== void 0) attributes[GEN_AI_OPERATION_NAME] = operation;
   return attributes;
 }
-var TRACER_NAME, SERVICE_INSTANCE_ID, OPENINFERENCE_SPAN_KIND, INPUT_VALUE, OUTPUT_VALUE, SESSION_ID, USER_ID, WORKSPACE_ROUTE, GEN_AI_OPERATION_NAME, GEN_AI_PROVIDER_NAME, GEN_AI_REQUEST_MODEL, GEN_AI_REQUEST_REASONING_LEVEL, GEN_AI_RESPONSE_MODEL, GEN_AI_USAGE_INPUT_TOKENS, GEN_AI_USAGE_OUTPUT_TOKENS, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, GEN_AI_USAGE_CACHE_WRITE_INPUT_TOKENS, GEN_AI_USAGE_REASONING_OUTPUT_TOKENS, GEN_AI_INPUT_MESSAGES, GEN_AI_OUTPUT_MESSAGES, GEN_AI_RESPONSE_FINISH_REASONS, GEN_AI_TOOL_NAME, GEN_AI_TOOL_DEFINITIONS, GEN_AI_REQUEST_PREFIX, MCP_RESULT_TYPE, GEN_AI_FIRST_TOKEN_EVENT, SpanKind, OPERATION_BY_KIND, CONTENT_ATTRIBUTES, LLM_INVOCATION_PARAMETERS, INVOCATION_PARAMETERS_CONTENT_MEMBERS, CONTENT_ATTRIBUTE_PREFIXES, CONTENT_ATTRIBUTE_SUFFIXES, GLASSFLOW_SPAN_PENDING, PENDING_IDENTITY_ATTRIBUTES, PENDING_IDENTITY_PREFIXES;
+var TRACER_NAME, SERVICE_INSTANCE_ID, OPENINFERENCE_SPAN_KIND, INPUT_VALUE, OUTPUT_VALUE, SESSION_ID, USER_ID, WORKSPACE_ROUTE, GEN_AI_OPERATION_NAME, GEN_AI_PROVIDER_NAME, GEN_AI_REQUEST_MODEL, GEN_AI_REQUEST_REASONING_LEVEL, GEN_AI_RESPONSE_MODEL, GEN_AI_USAGE_INPUT_TOKENS, GEN_AI_USAGE_OUTPUT_TOKENS, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, GEN_AI_USAGE_CACHE_WRITE_INPUT_TOKENS, GEN_AI_USAGE_REASONING_OUTPUT_TOKENS, GEN_AI_INPUT_MESSAGES, GEN_AI_OUTPUT_MESSAGES, GEN_AI_RESPONSE_FINISH_REASONS, GEN_AI_TOOL_NAME, GEN_AI_TOOL_DEFINITIONS, GEN_AI_REQUEST_PREFIX, MCP_METHOD_NAME, MCP_METHOD_TOOLS_CALL, MCP_PROTOCOL_VERSION, ERROR_TYPE, ERROR_TYPE_TOOL_ERROR, MCP_RESULT_TYPE, GEN_AI_FIRST_TOKEN_EVENT, SpanKind, OPERATION_BY_KIND, CONTENT_ATTRIBUTES, LLM_INVOCATION_PARAMETERS, INVOCATION_PARAMETERS_CONTENT_MEMBERS, CONTENT_ATTRIBUTE_PREFIXES, CONTENT_ATTRIBUTE_SUFFIXES, GLASSFLOW_SPAN_PENDING, PENDING_IDENTITY_ATTRIBUTES, PENDING_IDENTITY_PREFIXES;
 var init_semconv = __esm({
   "src/semconv.ts"() {
     "use strict";
@@ -389,6 +389,11 @@ var init_semconv = __esm({
     GEN_AI_TOOL_NAME = "gen_ai.tool.name";
     GEN_AI_TOOL_DEFINITIONS = "gen_ai.tool.definitions";
     GEN_AI_REQUEST_PREFIX = "gen_ai.request.";
+    MCP_METHOD_NAME = "mcp.method.name";
+    MCP_METHOD_TOOLS_CALL = "tools/call";
+    MCP_PROTOCOL_VERSION = "mcp.protocol.version";
+    ERROR_TYPE = "error.type";
+    ERROR_TYPE_TOOL_ERROR = "tool_error";
     MCP_RESULT_TYPE = "mcp.result_type";
     GEN_AI_FIRST_TOKEN_EVENT = "gen_ai.first_token";
     SpanKind = /* @__PURE__ */ ((SpanKind2) => {
@@ -490,6 +495,11 @@ var init_semconv = __esm({
       GEN_AI_OPERATION_NAME,
       GEN_AI_PROVIDER_NAME,
       GEN_AI_TOOL_NAME,
+      // Protocol identity, not content: a still-running MCP call must be
+      // distinguishable from a local tool in the live view — the one place
+      // setting the marker at creation pays off.
+      MCP_METHOD_NAME,
+      MCP_PROTOCOL_VERSION,
       // Identity, not content: a pending span must be groupable into its
       // session while still running, that is the live view's whole point.
       SESSION_ID,
@@ -518,6 +528,9 @@ function renderable(raw, value) {
   if (raw instanceof ArrayBuffer) return `<ArrayBuffer ${raw.byteLength} bytes>`;
   return value;
 }
+function asRecord(value) {
+  return typeof value === "object" && value !== null ? value : void 0;
+}
 function toAttributeValue(value) {
   if (typeof value === "string") return truncate(value);
   if (typeof value === "number" || typeof value === "boolean") return value;
@@ -591,7 +604,10 @@ function creationAttributes(options) {
   return attributes;
 }
 function startSpan(name, options = {}) {
-  const span = getTracer().startSpan(name, { attributes: creationAttributes(options) });
+  const span = getTracer().startSpan(name, {
+    kind: options.otelKind,
+    attributes: creationAttributes(options)
+  });
   return configure(new Observation(span), options);
 }
 function startAsCurrentSpan(name, optionsOrFn, maybeFn) {
@@ -601,11 +617,12 @@ function startAsCurrentSpan(name, optionsOrFn, maybeFn) {
     creationAttributes(options),
     options.userId,
     (span) => configure(new Observation(span), options),
-    fn
+    fn,
+    options.otelKind
   );
 }
-function runActive(name, attributes, userId, makeHandle, fn) {
-  const run = () => getTracer().startActiveSpan(name, { attributes }, async (span) => {
+function runActive(name, attributes, userId, makeHandle, fn, otelKind) {
+  const run = () => getTracer().startActiveSpan(name, { kind: otelKind, attributes }, async (span) => {
     const handle = makeHandle(span);
     try {
       return await fn(handle);
@@ -697,29 +714,27 @@ var instrumentationMcp_exports = {};
 __export(instrumentationMcp_exports, {
   instrumentMcpClient: () => instrumentMcpClient
 });
-import { SpanStatusCode as SpanStatusCode2 } from "@opentelemetry/api";
+import { SpanKind as OtelSpanKind, SpanStatusCode as SpanStatusCode2 } from "@opentelemetry/api";
 function serializeResult(result) {
-  if (typeof result !== "object" || result === null) return toAttributeValue(result);
-  const record = result;
+  const record = asRecord(result);
+  if (record === void 0) return toAttributeValue(result);
   const structured = record.structured_content ?? record.structuredContent;
   if (structured !== void 0 && structured !== null) return toAttributeValue(structured);
   const content = record.content;
   if (Array.isArray(content)) {
-    const texts = content.map(
-      (block) => typeof block === "object" && block !== null ? block.text : void 0
-    ).filter((text) => typeof text === "string");
+    const texts = content.map((block) => asRecord(block)?.text).filter((text) => typeof text === "string");
     if (texts.length === 1) return truncate(texts[0]);
     if (texts.length > 1) return toAttributeValue(texts);
   }
   return toAttributeValue(result);
 }
 function resultIsError(result) {
-  if (typeof result !== "object" || result === null) return false;
-  const record = result;
-  return Boolean(record.is_error ?? record.isError);
+  const record = asRecord(result);
+  return Boolean(record?.is_error ?? record?.isError);
 }
 function recordResult(observation, result) {
-  const resultType = typeof result === "object" && result !== null ? result.result_type ?? result.resultType : void 0;
+  const record = asRecord(result);
+  const resultType = record?.result_type ?? record?.resultType;
   if (resultType === INPUT_REQUIRED) {
     observation.setAttribute(MCP_RESULT_TYPE, INPUT_REQUIRED);
     return;
@@ -730,8 +745,24 @@ function recordResult(observation, result) {
       code: SpanStatusCode2.ERROR,
       message: "tool returned an error result"
     });
+    observation.setAttribute(ERROR_TYPE, ERROR_TYPE_TOOL_ERROR);
   }
 }
+function errorType(error) {
+  return error instanceof Error ? error.name : typeof error;
+}
+function negotiatedProtocolVersion(client) {
+  const version = asRecord(asRecord(client)?.transport)?.protocolVersion;
+  return typeof version === "string" ? version : void 0;
+}
+function callAttributes(toolName, protocolVersion) {
+  const attributes = {
+    [GEN_AI_TOOL_NAME]: toolName,
+    [MCP_METHOD_NAME]: MCP_METHOD_TOOLS_CALL
+  };
+  if (protocolVersion !== void 0) attributes[MCP_PROTOCOL_VERSION] = protocolVersion;
+  return attributes;
+}
 function instrumentMcpClient(ClientClass) {
   const current = ClientClass.prototype.callTool;
   const alreadyWrapped = current.riusOriginal;
@@ -744,15 +775,23 @@ function instrumentMcpClient(ClientClass) {
   const instrumented = function instrumentedCallTool(params, ...rest) {
     return startAsCurrentSpan(
       `execute_tool ${params.name}`,
-      // Tool name at CREATION: pending snapshots are built at start, so an
-      // attribute set inside the callback never reaches them.
       {
         kind: "TOOL" /* TOOL */,
+        // The OTel SpanKind FIELD (orthogonal to our taxonomy attribute above):
+        // a remote tool call is CLIENT under both the MCP and the GenAI
+        // execute-tool conventions.
+        otelKind: OtelSpanKind.CLIENT,
         input: params.arguments,
-        attributes: { [GEN_AI_TOOL_NAME]: params.name }
+        attributes: callAttributes(params.name, negotiatedProtocolVersion(this))
       },
       async (observation) => {
-        const result = await original.call(this, params, ...rest);
+        let result;
+        try {
+          result = await original.call(this, params, ...rest);
+        } catch (error) {
+          observation.setAttribute(ERROR_TYPE, errorType(error));
+          throw error;
+        }
         recordResult(observation, result);
         return result;
       }
@@ -1022,7 +1061,8 @@ import { SpanStatusCode as SpanStatusCode3 } from "@opentelemetry/api";
 function isContentKey(key) {
   if (CONTENT_ATTRIBUTES.has(key)) return true;
   if (CONTENT_ATTRIBUTE_PREFIXES.some((p) => key.startsWith(p))) return true;
-  return CONTENT_ATTRIBUTE_SUFFIXES.some((s) => key.endsWith(s));
+  if (CONTENT_ATTRIBUTE_SUFFIXES.some((s) => key.endsWith(s))) return true;
+  return key.startsWith(METADATA_PREFIX) && isContentKey(key.slice(METADATA_PREFIX.length));
 }
 function redactInvocationParameters(value) {
   if (typeof value !== "string") return void 0;
@@ -1042,13 +1082,14 @@ function redactInvocationParameters(value) {
   for (const member of INVOCATION_PARAMETERS_CONTENT_MEMBERS) delete bag[member];
   return JSON.stringify(bag);
 }
-var EXCEPTION_EVENT_NAME, EXCEPTION_CONTENT_KEYS, STATUS_DESCRIPTION_KEY, MaskingSpanExporter;
+var METADATA_PREFIX, EXCEPTION_EVENT_NAME, EXCEPTION_CONTENT_KEYS, STATUS_DESCRIPTION_KEY, MaskingSpanExporter;
 var init_masking = __esm({
   "src/masking.ts"() {
     "use strict";
     init_esm_shims();
     init_semconv();
     init_serde();
+    METADATA_PREFIX = "metadata.";
     EXCEPTION_EVENT_NAME = "exception";
     EXCEPTION_CONTENT_KEYS = ["exception.message", "exception.stacktrace"];
     STATUS_DESCRIPTION_KEY = "status.description";
@@ -1804,7 +1845,7 @@ init_session();
 init_user();
 init_spans();
 init_workspace();
-var VERSION = "0.6.0";
+var VERSION = "0.7.0";
 export {
   Generation,
   Observation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassflow-ai/rius",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "OpenTelemetry-native tracing for AI agents and LLM applications",
   "keywords": [
     "opentelemetry",