@grafana/sigil-sdk-js 0.4.0 → 0.6.0

package/README.md

@@ -8,6 +8,14 @@ Sigil records normalized LLM generation and tool-execution telemetry using your
 pnpm add @grafana/sigil-sdk-js
 ```
 
+For low-dependency runtimes that only need the core `SigilClient` and generation export APIs, use the slim core package:
+
+```bash
+pnpm add @grafana/sigil-sdk-js-core
+```
+
+For a Grafana Cloud setup walkthrough (where to find the endpoint URL, instance ID, and API token), refer to the [Grafana Cloud setup guide](https://grafana.com/docs/grafana-cloud/machine-learning/ai-observability/get-started/grafana-cloud/).
+
 ## Validation
 
 Run the shared core conformance suite for the JavaScript SDK from the repo root:
@@ -24,6 +32,8 @@ mise run sdk:conformance
 
 ## Quick Start
 
+The snippet below configures the SDK explicitly. As an alternative, set `SIGIL_*` environment variables and call `new SigilClient()` with no arguments — refer to the [Grafana Cloud setup guide](https://grafana.com/docs/grafana-cloud/machine-learning/ai-observability/get-started/grafana-cloud/) for the variable names.
+
 ```ts
 import { SigilClient } from "@grafana/sigil-sdk-js";
 
@@ -316,7 +326,7 @@ Auth is configured for `generationExport`.
 - `mode: "none"`
 - `mode: "tenant"` (requires `tenantId`, injects `X-Scope-OrgID`)
 - `mode: "bearer"` (requires `bearerToken`, injects `Authorization: Bearer <token>`)
-- `mode: "basic"` (requires `basicPassword` + `basicUser` or `tenantId`, injects `Authorization: Basic <base64(user:password)>`; also injects `X-Scope-OrgID` when `tenantId` is set — for self-hosted multi-tenancy only, not needed for Grafana Cloud)
+- `mode: "basic"` (requires `basicPassword` + `basicUser` or `tenantId`, injects `Authorization: Basic <base64(user:password)>`; also injects `X-Scope-OrgID` when `tenantId` is set — for multi-tenant deployments only, not needed for Grafana Cloud)
 
 Invalid mode/field combinations throw during client config resolution.
 
@@ -346,8 +356,8 @@ const client = new SigilClient({
     endpoint: "https://sigil-prod-<region>.grafana.net",
     auth: {
       mode: "basic",
-      tenantId: process.env.GRAFANA_CLOUD_INSTANCE_ID,
-      basicPassword: process.env.GRAFANA_CLOUD_API_KEY,
+      tenantId: process.env.SIGIL_AUTH_TENANT_ID,
+      basicPassword: process.env.SIGIL_AUTH_TOKEN,
     },
   },
 });
@@ -358,18 +368,18 @@ If your deployment requires a distinct username, set `basicUser` explicitly:
 ```ts
 auth: {
   mode: "basic",
-  tenantId: process.env.GRAFANA_CLOUD_INSTANCE_ID,
-  basicUser: process.env.GRAFANA_CLOUD_INSTANCE_ID,
-  basicPassword: process.env.GRAFANA_CLOUD_API_KEY,
+  tenantId: process.env.SIGIL_AUTH_TENANT_ID,
+  basicUser: process.env.SIGIL_AUTH_TENANT_ID,
+  basicPassword: process.env.SIGIL_AUTH_TOKEN,
 },
 ```
 
-## Env-secret wiring example
+## Wiring custom env vars
 
-The SDK does not auto-load env vars. Resolve env secrets in your app and map them into config.
+The SDK only auto-loads `SIGIL_*` env vars (`SIGIL_ENDPOINT`, `SIGIL_PROTOCOL`, `SIGIL_AUTH_MODE`, `SIGIL_AUTH_TOKEN`, etc.) when you call `new SigilClient()`. For any other env var (for example one your secret manager exposes under a different name), read it in your app and pass the value into the config:
 
 ```ts
-const generationBearerToken = (process.env.SIGIL_GEN_BEARER_TOKEN ?? "").trim();
+const generationBearerToken = (process.env.MY_APP_SIGIL_TOKEN ?? "").trim();
 
 const client = new SigilClient({
   generationExport: {

package/dist/cache-diagnostics.d.ts

@@ -0,0 +1,15 @@
+import type { GenerationRecorder } from './types.js';
+/** Reserved generation metadata keys (Sigil docs/guides/cache-diagnostics.md). */
+export declare const CACHE_DIAGNOSTICS_MISS_REASON_KEY = "sigil.cache_diagnostics.miss_reason";
+export declare const CACHE_DIAGNOSTICS_MISSED_INPUT_TOKENS_KEY = "sigil.cache_diagnostics.missed_input_tokens";
+export declare const CACHE_DIAGNOSTICS_PREVIOUS_MESSAGE_ID_KEY = "sigil.cache_diagnostics.previous_message_id";
+export type CacheDiagnosticsOptions = {
+    missedInputTokens?: number;
+    previousMessageId?: string;
+};
+/**
+ * Stamp `sigil.cache_diagnostics.*` metadata on a generation recorder.
+ * Call before `end()`, typically after the provider response is available.
+ */
+export declare function setCacheDiagnostics(rec: GenerationRecorder | null | undefined, missReason: string, opts?: CacheDiagnosticsOptions): void;
+//# sourceMappingURL=cache-diagnostics.d.ts.map

package/dist/cache-diagnostics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-diagnostics.d.ts","sourceRoot":"","sources":["../src/cache-diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,kFAAkF;AAClF,eAAO,MAAM,iCAAiC,wCAAwC,CAAC;AACvF,eAAO,MAAM,yCAAyC,gDAAgD,CAAC;AACvG,eAAO,MAAM,yCAAyC,gDAAgD,CAAC;AAEvG,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,EAC1C,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,uBAAuB,GAC7B,IAAI,CAKN"}

package/dist/cache-diagnostics.js

@@ -0,0 +1,15 @@
+/** Reserved generation metadata keys (Sigil docs/guides/cache-diagnostics.md). */
+export const CACHE_DIAGNOSTICS_MISS_REASON_KEY = 'sigil.cache_diagnostics.miss_reason';
+export const CACHE_DIAGNOSTICS_MISSED_INPUT_TOKENS_KEY = 'sigil.cache_diagnostics.missed_input_tokens';
+export const CACHE_DIAGNOSTICS_PREVIOUS_MESSAGE_ID_KEY = 'sigil.cache_diagnostics.previous_message_id';
+/**
+ * Stamp `sigil.cache_diagnostics.*` metadata on a generation recorder.
+ * Call before `end()`, typically after the provider response is available.
+ */
+export function setCacheDiagnostics(rec, missReason, opts) {
+    if (rec === null || rec === undefined) {
+        return;
+    }
+    rec.setCacheDiagnostics(missReason, opts);
+}
+//# sourceMappingURL=cache-diagnostics.js.map

package/dist/cache-diagnostics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-diagnostics.js","sourceRoot":"","sources":["../src/cache-diagnostics.ts"],"names":[],"mappings":"AAEA,kFAAkF;AAClF,MAAM,CAAC,MAAM,iCAAiC,GAAG,qCAAqC,CAAC;AACvF,MAAM,CAAC,MAAM,yCAAyC,GAAG,6CAA6C,CAAC;AACvG,MAAM,CAAC,MAAM,yCAAyC,GAAG,6CAA6C,CAAC;AAOvG;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,GAA0C,EAC1C,UAAkB,EAClB,IAA8B;IAE9B,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO;IACT,CAAC;IACD,GAAG,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC"}

package/dist/client.d.ts

@@ -108,18 +108,19 @@ export declare class SigilClient {
     internalEnqueueGeneration(generation: Generation): void;
     internalLogWarn(message: string, error?: unknown): void;
     internalResolveGenerationContentCaptureMode(seed: GenerationStart): ContentCaptureMode;
-    internalResolveToolIncludeContent(seed: ToolExecutionStart): boolean;
+    internalResolveEmbeddingContentCaptureMode(seed: EmbeddingStart): ContentCaptureMode;
+    internalResolveToolContentCaptureMode(seed: ToolExecutionStart): ContentCaptureMode;
     internalHasGenerationSanitizer(): boolean;
     internalSanitizeGeneration(generation: Generation): Generation;
-    internalStartGenerationSpan(seed: GenerationStart, mode: GenerationMode, startedAt: Date): Span;
+    internalStartGenerationSpan(seed: GenerationStart, mode: GenerationMode, startedAt: Date, contentCaptureMode: ContentCaptureMode): Span;
     internalStartEmbeddingSpan(seed: EmbeddingStart, startedAt: Date): Span;
     internalStartToolExecutionSpan(seed: ToolExecutionStart, startedAt: Date): Span;
     internalApplyTraceContextFromSpan(span: Span, generation: Generation): void;
     internalSyncGenerationSpan(span: Span, generation: Generation): void;
     internalClearSpanConversationTitle(span: Span): void;
     internalFinalizeGenerationSpan(span: Span, generation: Generation, callError: string | undefined, validationError: Error | undefined, enqueueError: Error | undefined, firstTokenAt: Date | undefined, precomputedCallErrorCategory?: string): void;
-    internalFinalizeEmbeddingSpan(span: Span, seed: EmbeddingStart, result: EmbeddingResult, hasResult: boolean, callError: Error | undefined, localError: Error | undefined, startedAt: Date, completedAt: Date): void;
-    internalFinalizeToolExecutionSpan(span: Span, toolExecution: ToolExecution, localError: Error | undefined): Error | undefined;
+    internalFinalizeEmbeddingSpan(span: Span, seed: EmbeddingStart, result: EmbeddingResult, hasResult: boolean, callError: Error | undefined, localError: Error | undefined, startedAt: Date, completedAt: Date, contentCaptureMode?: ContentCaptureMode): void;
+    internalFinalizeToolExecutionSpan(span: Span, toolExecution: ToolExecution, localError: Error | undefined, contentCaptureMode?: ContentCaptureMode): Error | undefined;
     private recordGenerationMetrics;
     private recordEmbeddingMetrics;
     private recordTokenUsage;

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/dist/client.js

@@ -1,4 +1,5 @@
-import { metrics, SpanKind, SpanStatusCode, trace, } from '@opentelemetry/api';
+import { context, metrics, SpanKind, SpanStatusCode, trace, } from '@opentelemetry/api';
+import { CACHE_DIAGNOSTICS_MISS_REASON_KEY, CACHE_DIAGNOSTICS_MISSED_INPUT_TOKENS_KEY, CACHE_DIAGNOSTICS_PREVIOUS_MESSAGE_ID_KEY, } from './cache-diagnostics.js';
 import { defaultLogger, mergeConfig } from './config.js';
 import { callContentCaptureResolver, resolveClientContentCaptureMode, resolveContentCaptureMode, shouldIncludeToolContent, stampContentCaptureMetadata, stripContent, } from './content_capture.js';
 import { agentNameFromContext, agentVersionFromContext, conversationIdFromContext, conversationTitleFromContext, userIdFromContext, } from './context.js';
@@ -42,7 +43,6 @@ const spanAttrEmbeddingDimCount = 'gen_ai.embeddings.dimension.count';
 const spanAttrRequestEncodingFormats = 'gen_ai.request.encoding_formats';
 const spanAttrCacheReadTokens = 'gen_ai.usage.cache_read_input_tokens';
 const spanAttrCacheWriteTokens = 'gen_ai.usage.cache_write_input_tokens';
-const spanAttrCacheCreationTokens = 'gen_ai.usage.cache_creation_input_tokens';
 const spanAttrReasoningTokens = 'gen_ai.usage.reasoning_tokens';
 const spanAttrToolName = 'gen_ai.tool.name';
 const spanAttrToolCallID = 'gen_ai.tool.call.id';
@@ -66,7 +66,6 @@ const metricTokenTypeInput = 'input';
 const metricTokenTypeOutput = 'output';
 const metricTokenTypeCacheRead = 'cache_read';
 const metricTokenTypeCacheWrite = 'cache_write';
-const metricTokenTypeCacheCreation = 'cache_creation';
 const metricTokenTypeReasoning = 'reasoning';
 const durationBucketsSeconds = [
     0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
@@ -451,9 +450,16 @@ export class SigilClient {
         const clientMode = resolveClientContentCaptureMode(resolveContentCaptureMode(resolverMode, this.config.contentCapture));
         return resolveContentCaptureMode(seed.contentCapture ?? 'default', clientMode);
     }
-    internalResolveToolIncludeContent(seed) {
+    internalResolveEmbeddingContentCaptureMode(seed) {
+        // Mirror generation resolution so a per-call resolver can hide
+        // gen_ai.embeddings.input_texts without changing the client default.
+        const resolverMode = callContentCaptureResolver(this.config.contentCaptureResolver, seed.metadata);
+        return resolveClientContentCaptureMode(resolveContentCaptureMode(resolverMode, this.config.contentCapture));
+    }
+    internalResolveToolContentCaptureMode(seed) {
         const resolverMode = callContentCaptureResolver(this.config.contentCaptureResolver, undefined);
-        return shouldIncludeToolContent(seed.contentCapture ?? 'default', this.config.contentCapture, resolverMode, seed.includeContent ?? false);
+        const clientMode = resolveClientContentCaptureMode(resolveContentCaptureMode(resolverMode, this.config.contentCapture));
+        return resolveContentCaptureMode(seed.contentCapture ?? 'default', clientMode);
     }
     internalHasGenerationSanitizer() {
         return this.config.generationSanitizer !== undefined;
@@ -469,16 +475,23 @@ export class SigilClient {
         }
         return cloneGeneration(sanitized);
     }
-    internalStartGenerationSpan(seed, mode, startedAt) {
+    internalStartGenerationSpan(seed, mode, startedAt, contentCaptureMode) {
         const operationName = seed.operationName ?? defaultOperationNameForMode(mode);
         const span = this.tracer.startSpan(generationSpanName(operationName, seed.model.name), {
             kind: SpanKind.CLIENT,
             startTime: startedAt,
         });
+        // metadata_only and full_with_metadata_spans both drop the title from
+        // the span. Under full_with_metadata_spans the proto payload still
+        // carries the title — it is rebuilt from `seed.conversationTitle` in
+        // end(), so we only zero the value sent to the span here.
+        const spanTitle = contentCaptureMode === 'metadata_only' || contentCaptureMode === 'full_with_metadata_spans'
+            ? undefined
+            : seed.conversationTitle;
         setGenerationSpanAttributes(span, {
             id: seed.id,
             conversationId: seed.conversationId,
-            conversationTitle: seed.conversationTitle,
+            conversationTitle: spanTitle,
             userId: seed.userId,
             agentName: seed.agentName,
             agentVersion: seed.agentVersion,
@@ -561,16 +574,23 @@ export class SigilClient {
         else {
             span.setStatus({ code: SpanStatusCode.OK });
         }
-        this.recordGenerationMetrics(generation, errorType, errorCategory, firstTokenAt);
+        const spanCtx = trace.setSpan(context.active(), span);
+        context.with(spanCtx, () => {
+            this.recordGenerationMetrics(generation, errorType, errorCategory, firstTokenAt);
+        });
         span.end(generation.completedAt);
     }
-    internalFinalizeEmbeddingSpan(span, seed, result, hasResult, callError, localError, startedAt, completedAt) {
+    internalFinalizeEmbeddingSpan(span, seed, result, hasResult, callError, localError, startedAt, completedAt, contentCaptureMode = 'default') {
         span.updateName(embeddingSpanName(seed.model.name));
-        setEmbeddingEndSpanAttributes(span, result, hasResult, this.config.embeddingCapture);
-        if (callError !== undefined) {
+        setEmbeddingEndSpanAttributes(span, result, hasResult, this.config.embeddingCapture, contentCaptureMode);
+        // Redact span-side error text under both stripped modes. Embeddings have
+        // no proto export, so the raw provider error never escapes the span
+        // path; matches the generation full_with_metadata_spans contract.
+        const redactSpanErrors = contentCaptureMode === 'metadata_only' || contentCaptureMode === 'full_with_metadata_spans';
+        if (callError !== undefined && !redactSpanErrors) {
             span.recordException(callError);
         }
-        if (localError !== undefined) {
+        if (localError !== undefined && !redactSpanErrors) {
             span.recordException(localError);
         }
         let errorType = '';
@@ -578,12 +598,18 @@ export class SigilClient {
         if (callError !== undefined) {
             errorType = 'provider_call_error';
             errorCategory = errorCategoryFromError(callError, true);
-            span.setStatus({ code: SpanStatusCode.ERROR, message: callError.message });
+            span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: redactSpanErrors ? errorCategory : callError.message,
+            });
         }
         else if (localError !== undefined) {
             errorType = 'validation_error';
             errorCategory = 'sdk_error';
-            span.setStatus({ code: SpanStatusCode.ERROR, message: localError.message });
+            span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: redactSpanErrors ? errorCategory : localError.message,
+            });
         }
         else {
             span.setStatus({ code: SpanStatusCode.OK });
@@ -592,10 +618,13 @@ export class SigilClient {
             span.setAttribute(spanAttrErrorType, errorType);
             span.setAttribute(spanAttrErrorCategory, errorCategory);
         }
-        this.recordEmbeddingMetrics(seed, result, startedAt, completedAt, errorType, errorCategory);
+        const spanCtx = trace.setSpan(context.active(), span);
+        context.with(spanCtx, () => {
+            this.recordEmbeddingMetrics(seed, result, startedAt, completedAt, errorType, errorCategory);
+        });
         span.end(completedAt);
     }
-    internalFinalizeToolExecutionSpan(span, toolExecution, localError) {
+    internalFinalizeToolExecutionSpan(span, toolExecution, localError, contentCaptureMode = 'default') {
         setToolSpanAttributes(span, toolExecution);
         if (toolExecution.includeContent) {
             const argumentsResult = serializeToolContent(toolExecution.arguments);
@@ -613,22 +642,41 @@ export class SigilClient {
                 span.setAttribute(spanAttrToolCallResult, resultValue.value);
             }
         }
+        // Tools have no proto export; under both stripped modes the span must
+        // not echo raw provider exception text via recordException events or the
+        // status description.
+        const redactSpanErrors = contentCaptureMode === 'metadata_only' || contentCaptureMode === 'full_with_metadata_spans';
         if (toolExecution.callError !== undefined) {
-            span.recordException(new Error(toolExecution.callError));
+            const errorCategory = errorCategoryFromError(toolExecution.callError, true);
+            if (!redactSpanErrors) {
+                span.recordException(new Error(toolExecution.callError));
+            }
             span.setAttribute(spanAttrErrorType, 'tool_execution_error');
-            span.setAttribute(spanAttrErrorCategory, errorCategoryFromError(toolExecution.callError, true));
-            span.setStatus({ code: SpanStatusCode.ERROR, message: toolExecution.callError });
+            span.setAttribute(spanAttrErrorCategory, errorCategory);
+            span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: redactSpanErrors ? errorCategory : toolExecution.callError,
+            });
         }
         else if (localError !== undefined) {
-            span.recordException(localError);
+            const errorCategory = errorCategoryFromError(localError, true);
+            if (!redactSpanErrors) {
+                span.recordException(localError);
+            }
             span.setAttribute(spanAttrErrorType, 'tool_execution_error');
-            span.setAttribute(spanAttrErrorCategory, errorCategoryFromError(localError, true));
-            span.setStatus({ code: SpanStatusCode.ERROR, message: localError.message });
+            span.setAttribute(spanAttrErrorCategory, errorCategory);
+            span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: redactSpanErrors ? errorCategory : localError.message,
+            });
         }
         else {
             span.setStatus({ code: SpanStatusCode.OK });
         }
-        this.recordToolExecutionMetrics(toolExecution, localError ?? (toolExecution.callError !== undefined ? new Error(toolExecution.callError) : undefined));
+        const spanCtx = trace.setSpan(context.active(), span);
+        context.with(spanCtx, () => {
+            this.recordToolExecutionMetrics(toolExecution, localError ?? (toolExecution.callError !== undefined ? new Error(toolExecution.callError) : undefined));
+        });
         span.end(toolExecution.completedAt);
         return localError;
     }
@@ -636,11 +684,10 @@ export class SigilClient {
         const startedMs = generation.startedAt.getTime();
         const completedMs = generation.completedAt.getTime();
         const durationSeconds = Math.max(0, (completedMs - startedMs) / 1_000);
+        const identityAttributes = metricIdentityAttributes(generation.model.provider, generation.model.name, generation.agentName, generation.agentVersion);
         this.operationDurationHistogram.record(durationSeconds, {
             [spanAttrOperationName]: generation.operationName,
-            [spanAttrProviderName]: generation.model.provider,
-            [spanAttrRequestModel]: generation.model.name,
-            [spanAttrAgentName]: generation.agentName ?? '',
+            ...identityAttributes,
             [spanAttrErrorType]: errorType,
             [spanAttrErrorCategory]: errorCategory,
         });
@@ -650,41 +697,33 @@ export class SigilClient {
             this.recordTokenUsage(generation, metricTokenTypeOutput, usage.outputTokens);
             this.recordTokenUsage(generation, metricTokenTypeCacheRead, usage.cacheReadInputTokens);
             this.recordTokenUsage(generation, metricTokenTypeCacheWrite, usage.cacheWriteInputTokens);
-            this.recordTokenUsage(generation, metricTokenTypeCacheCreation, usage.cacheCreationInputTokens);
             this.recordTokenUsage(generation, metricTokenTypeReasoning, usage.reasoningTokens);
         }
         this.toolCallsHistogram.record(countToolCallParts(generation.output ?? []), {
-            [spanAttrProviderName]: generation.model.provider,
-            [spanAttrRequestModel]: generation.model.name,
-            [spanAttrAgentName]: generation.agentName ?? '',
+            ...identityAttributes,
         });
         if (generation.operationName === 'streamText' && firstTokenAt !== undefined) {
             const ttftSeconds = (firstTokenAt.getTime() - startedMs) / 1_000;
             if (ttftSeconds >= 0) {
                 this.ttftHistogram.record(ttftSeconds, {
-                    [spanAttrProviderName]: generation.model.provider,
-                    [spanAttrRequestModel]: generation.model.name,
-                    [spanAttrAgentName]: generation.agentName ?? '',
+                    ...identityAttributes,
                 });
             }
         }
     }
     recordEmbeddingMetrics(seed, result, startedAt, completedAt, errorType, errorCategory) {
         const durationSeconds = Math.max(0, (completedAt.getTime() - startedAt.getTime()) / 1_000);
+        const identityAttributes = metricIdentityAttributes(seed.model.provider, seed.model.name, seed.agentName, seed.agentVersion);
         this.operationDurationHistogram.record(durationSeconds, {
             [spanAttrOperationName]: defaultEmbeddingOperationName,
-            [spanAttrProviderName]: seed.model.provider,
-            [spanAttrRequestModel]: seed.model.name,
-            [spanAttrAgentName]: seed.agentName ?? '',
+            ...identityAttributes,
             [spanAttrErrorType]: errorType,
             [spanAttrErrorCategory]: errorCategory,
         });
         if (result.inputTokens !== undefined && result.inputTokens !== 0) {
             this.tokenUsageHistogram.record(result.inputTokens, {
                 [spanAttrOperationName]: defaultEmbeddingOperationName,
-                [spanAttrProviderName]: seed.model.provider,
-                [spanAttrRequestModel]: seed.model.name,
-                [spanAttrAgentName]: seed.agentName ?? '',
+                ...identityAttributes,
                 [metricAttrTokenType]: metricTokenTypeInput,
             });
         }
@@ -695,9 +734,7 @@ export class SigilClient {
         }
         this.tokenUsageHistogram.record(value, {
             [spanAttrOperationName]: generation.operationName,
-            [spanAttrProviderName]: generation.model.provider,
-            [spanAttrRequestModel]: generation.model.name,
-            [spanAttrAgentName]: generation.agentName ?? '',
+            ...metricIdentityAttributes(generation.model.provider, generation.model.name, generation.agentName, generation.agentVersion),
             [metricAttrTokenType]: tokenType,
         });
     }
@@ -709,10 +746,8 @@ export class SigilClient {
         const errorCategory = finalError === undefined ? '' : errorCategoryFromError(finalError, true);
         this.operationDurationHistogram.record(durationSeconds, {
             [spanAttrOperationName]: 'execute_tool',
-            [spanAttrProviderName]: (toolExecution.requestProvider ?? '').trim(),
-            [spanAttrRequestModel]: (toolExecution.requestModel ?? '').trim(),
             [spanAttrToolName]: toolExecution.toolName.trim(),
-            [spanAttrAgentName]: toolExecution.agentName ?? '',
+            ...metricIdentityAttributes(toolExecution.requestProvider ?? '', toolExecution.requestModel ?? '', toolExecution.agentName, toolExecution.agentVersion),
             [spanAttrErrorType]: errorType,
             [spanAttrErrorCategory]: errorCategory,
         });
@@ -814,6 +849,7 @@ class GenerationRecorderImpl {
     callError;
     localError;
     firstTokenAt;
+    extraMetadata;
     constructor(client, seed, defaultMode) {
         this.client = client;
         this.seed = cloneGenerationStart(seed);
@@ -860,7 +896,7 @@ class GenerationRecorderImpl {
         this.mode = this.seed.mode ?? defaultMode;
         this.startedAt = this.seed.startedAt ?? this.client.internalNow();
         this.contentCaptureMode = this.client.internalResolveGenerationContentCaptureMode(this.seed);
-        this.span = this.client.internalStartGenerationSpan(this.seed, this.mode, this.startedAt);
+        this.span = this.client.internalStartGenerationSpan(this.seed, this.mode, this.startedAt, this.contentCaptureMode);
     }
     setResult(result) {
         if (this.ended) {
@@ -883,6 +919,28 @@ class GenerationRecorderImpl {
         }
         this.firstTokenAt = new Date(firstTokenAt);
     }
+    setCacheDiagnostics(missReason, opts) {
+        if (this.ended) {
+            return;
+        }
+        const trimmed = missReason.trim();
+        if (trimmed.length === 0) {
+            return;
+        }
+        if (this.extraMetadata === undefined) {
+            this.extraMetadata = {};
+        }
+        delete this.extraMetadata[CACHE_DIAGNOSTICS_MISSED_INPUT_TOKENS_KEY];
+        delete this.extraMetadata[CACHE_DIAGNOSTICS_PREVIOUS_MESSAGE_ID_KEY];
+        this.extraMetadata[CACHE_DIAGNOSTICS_MISS_REASON_KEY] = trimmed;
+        if (opts?.missedInputTokens !== undefined) {
+            this.extraMetadata[CACHE_DIAGNOSTICS_MISSED_INPUT_TOKENS_KEY] = String(opts.missedInputTokens);
+        }
+        const prev = opts?.previousMessageId?.trim();
+        if (prev !== undefined && prev.length > 0) {
+            this.extraMetadata[CACHE_DIAGNOSTICS_PREVIOUS_MESSAGE_ID_KEY] = prev;
+        }
+    }
     end() {
         if (this.ended) {
             return;
@@ -920,7 +978,7 @@ class GenerationRecorderImpl {
             startedAt: new Date(this.startedAt),
             completedAt: new Date(this.result?.completedAt ?? this.client.internalNow()),
             tags: mergeStringRecords(this.seed.tags, this.result?.tags),
-            metadata: mergeUnknownRecords(this.seed.metadata, this.result?.metadata),
+            metadata: mergeUnknownRecords(mergeUnknownRecords(this.seed.metadata, this.result?.metadata), this.extraMetadata),
             artifacts: this.result?.artifacts?.map(cloneArtifact),
             callError: this.callError,
         };
@@ -968,8 +1026,20 @@ class GenerationRecorderImpl {
             }
         }
         const validationError = validateGeneration(validationTarget);
-        this.client.internalSyncGenerationSpan(this.span, generation);
-        if (effectiveContentCaptureMode === 'metadata_only') {
+        // full_with_metadata_spans: proto export keeps the title, but the span
+        // path must drop it. Pass a shallow copy with the title cleared so the
+        // in-memory generation (the proto payload) stays untouched.
+        const spanGeneration = effectiveContentCaptureMode === 'full_with_metadata_spans'
+            ? { ...generation, conversationTitle: '' }
+            : generation;
+        this.client.internalSyncGenerationSpan(this.span, spanGeneration);
+        if (effectiveContentCaptureMode === 'metadata_only' &&
+            this.contentCaptureMode !== 'metadata_only' &&
+            this.contentCaptureMode !== 'full_with_metadata_spans') {
+            // Sanitizer fallback downgrades effective mode to metadata_only.
+            // Skipped when the original mode already left the attribute absent at
+            // start time (metadata_only / full_with_metadata_spans) so the
+            // start-span omission isn't re-emitted here as an empty value.
             this.client.internalClearSpanConversationTitle(this.span);
         }
         this.client.internalApplyTraceContextFromSpan(this.span, generation);
@@ -989,7 +1059,24 @@ class GenerationRecorderImpl {
                 this.client.internalLogWarn('sigil generation enqueue failed', enqueueError);
             }
         }
-        const finalCallError = effectiveContentCaptureMode === 'metadata_only' ? generation.callError : this.callError;
+        // Under metadata_only stripContent already replaced generation.callError
+        // with the category, so the span path can read it back from the
+        // generation. Under full_with_metadata_spans generation.callError stays
+        // raw for the gRPC export, so we substitute the precomputed category for
+        // the span path here.
+        let finalCallError;
+        if (this.callError === undefined) {
+            finalCallError = undefined;
+        }
+        else if (effectiveContentCaptureMode === 'metadata_only') {
+            finalCallError = generation.callError;
+        }
+        else if (effectiveContentCaptureMode === 'full_with_metadata_spans') {
+            finalCallError = callErrorCategory.length > 0 ? callErrorCategory : 'sdk_error';
+        }
+        else {
+            finalCallError = this.callError;
+        }
         this.client.internalFinalizeGenerationSpan(this.span, generation, finalCallError, validationError, enqueueError, this.firstTokenAt, callErrorCategory.length > 0 ? callErrorCategory : undefined);
     }
     getError() {
@@ -1001,6 +1088,7 @@ class EmbeddingRecorderImpl {
     seed;
     startedAt;
     span;
+    contentCaptureMode;
     ended = false;
     callError;
     result;
@@ -1010,6 +1098,7 @@ class EmbeddingRecorderImpl {
         this.client = client;
         this.seed = cloneEmbeddingStart(seed);
         this.startedAt = this.seed.startedAt ?? this.client.internalNow();
+        this.contentCaptureMode = this.client.internalResolveEmbeddingContentCaptureMode(this.seed);
         this.span = this.client.internalStartEmbeddingSpan(this.seed, this.startedAt);
     }
     setCallError(error) {
@@ -1036,7 +1125,7 @@ class EmbeddingRecorderImpl {
         if (localError === undefined) {
             localError = validateEmbeddingResult(normalizedResult);
         }
-        this.client.internalFinalizeEmbeddingSpan(this.span, this.seed, normalizedResult, this.hasResult, this.callError, localError, this.startedAt, completedAt);
+        this.client.internalFinalizeEmbeddingSpan(this.span, this.seed, normalizedResult, this.hasResult, this.callError, localError, this.startedAt, completedAt, this.contentCaptureMode);
         this.localError = localError;
     }
     getError() {
@@ -1049,6 +1138,7 @@ class ToolExecutionRecorderImpl {
     startedAt;
     span;
     resolvedIncludeContent;
+    toolMode;
     ended = false;
     result;
     callError;
@@ -1080,7 +1170,16 @@ class ToolExecutionRecorderImpl {
                 this.seed.agentVersion = fromConfig;
             }
         }
-        this.resolvedIncludeContent = this.client.internalResolveToolIncludeContent(this.seed);
+        // Under metadata_only or full_with_metadata_spans, the start-time tool
+        // span must not carry any content-bearing seed field. Tools have no
+        // proto export, so dropping these on the seed is the only redaction
+        // surface.
+        this.toolMode = this.client.internalResolveToolContentCaptureMode(this.seed);
+        if (this.toolMode === 'metadata_only' || this.toolMode === 'full_with_metadata_spans') {
+            this.seed.conversationTitle = undefined;
+            this.seed.toolDescription = undefined;
+        }
+        this.resolvedIncludeContent = shouldIncludeToolContent(this.toolMode, this.seed.includeContent ?? false);
         this.startedAt = this.seed.startedAt ?? this.client.internalNow();
         this.span = this.client.internalStartToolExecutionSpan(this.seed, this.startedAt);
     }
@@ -1128,7 +1227,7 @@ class ToolExecutionRecorderImpl {
         else {
             this.client.internalRecordToolExecution(toolExecution);
         }
-        this.localError = this.client.internalFinalizeToolExecutionSpan(this.span, toolExecution, this.localError);
+        this.localError = this.client.internalFinalizeToolExecutionSpan(this.span, toolExecution, this.localError, this.toolMode);
     }
     getError() {
         return this.localError;
@@ -1183,6 +1282,17 @@ function toolSpanName(toolName) {
     }
     return `execute_tool ${normalized}`;
 }
+function metricIdentityAttributes(provider, model, agentName, agentVersion) {
+    const attributes = {
+        [spanAttrProviderName]: provider.trim(),
+        [spanAttrRequestModel]: model.trim(),
+        [spanAttrAgentName]: agentName?.trim() ?? '',
+    };
+    if (notEmpty(agentVersion)) {
+        attributes[spanAttrAgentVersion] = agentVersion.trim();
+    }
+    return attributes;
+}
 function setGenerationSpanAttributes(span, generation) {
     span.setAttribute(spanAttrOperationName, generation.operationName);
     span.setAttribute(spanAttrSDKName, sdkName);
@@ -1286,9 +1396,6 @@ function setGenerationSpanAttributes(span, generation) {
     if ((usage.cacheWriteInputTokens ?? 0) !== 0) {
         span.setAttribute(spanAttrCacheWriteTokens, usage.cacheWriteInputTokens ?? 0);
     }
-    if ((usage.cacheCreationInputTokens ?? 0) !== 0) {
-        span.setAttribute(spanAttrCacheCreationTokens, usage.cacheCreationInputTokens ?? 0);
-    }
     if ((usage.reasoningTokens ?? 0) !== 0) {
         span.setAttribute(spanAttrReasoningTokens, usage.reasoningTokens ?? 0);
     }
@@ -1315,7 +1422,7 @@ function setEmbeddingStartSpanAttributes(span, start) {
         span.setAttribute(spanAttrRequestEncodingFormats, [start.encodingFormat]);
     }
 }
-function setEmbeddingEndSpanAttributes(span, result, hasResult, captureConfig) {
+function setEmbeddingEndSpanAttributes(span, result, hasResult, captureConfig, contentCaptureMode = 'default') {
     if (hasResult) {
         span.setAttribute(spanAttrEmbeddingInputCount, result.inputCount);
     }
@@ -1328,7 +1435,10 @@ function setEmbeddingEndSpanAttributes(span, result, hasResult, captureConfig) {
     if (result.dimensions !== undefined) {
         span.setAttribute(spanAttrEmbeddingDimCount, result.dimensions);
     }
-    if (captureConfig.captureInput && result.inputTexts !== undefined) {
+    // Embeddings have no proto export; full_with_metadata_spans matches
+    // metadata_only for input-text span attributes.
+    const omitInputTexts = contentCaptureMode === 'metadata_only' || contentCaptureMode === 'full_with_metadata_spans';
+    if (captureConfig.captureInput && result.inputTexts !== undefined && !omitInputTexts) {
         const texts = captureEmbeddingInputTexts(result.inputTexts, captureConfig.maxInputItems, captureConfig.maxTextLength);
         if (texts.length > 0) {
             span.setAttribute(spanAttrEmbeddingInputTexts, texts);
@@ -1444,7 +1554,10 @@ function baseURLFromAPIEndpoint(endpoint, insecure) {
     }
     if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
         const parsed = new URL(trimmed);
-        return `${parsed.protocol}//${parsed.host}`;
+        // Preserve a path prefix so prefix-mounted Sigil deployments
+        // (https://host/sigil) route /api/v1/conversations/... under the prefix.
+        const path = parsed.pathname.replace(/\/+$/, '');
+        return `${parsed.protocol}//${parsed.host}${path}`;
     }
     const withoutScheme = trimmed.startsWith('grpc://') ? trimmed.slice('grpc://'.length) : trimmed;
     const host = withoutScheme.split('/')[0]?.trim();