@lmnr-ai/lmnr 0.8.28 → 0.8.30

package/dist/{evaluations-Cs-tqViJ.d.mts → evaluations-fF1Y_olL.d.mts}

@@ -174,11 +174,34 @@ type Event = {
 //#endregion
 //#region ../client/dist/index.d.cts
 //#region src/resources/index.d.ts
+/**
+ * Unified auth for every resource. A discriminated union so a single object
+ * drives both the URL prefix and the request headers:
+ *
+ *  - `apiKey`    → project API key (SDK / app surfaces). Routes to `/v1/*`,
+ *    Bearer is the project key, no `x-lmnr-project-id` header.
+ *  - `userToken` → BetterAuth user access JWT (the CLI user-token surface).
+ *    Routes to `/v1/cli/*`, Bearer is the JWT, carries the target project in
+ *    the `x-lmnr-project-id` header.
+ */
+type LaminarAuth = {
+  type: "apiKey";
+  key: string;
+} | {
+  type: "userToken";
+  token: string;
+  projectId: string;
+};
 declare class BaseResource {
   protected readonly baseHttpUrl: string;
-  protected readonly projectApiKey: string;
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  protected readonly auth: LaminarAuth;
+  /** The bearer credential, regardless of auth type (project key or user JWT). */
+  protected readonly credential: string;
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
+  /** API path prefix: `/v1/cli` for CLI user-token auth, `/v1` otherwise. */
+  protected get apiPrefix(): string;
   protected headers(): {
+    "x-lmnr-project-id"?: string | undefined;
     Authorization: string;
     "Content-Type": string;
     Accept: string;
@@ -187,7 +210,7 @@ declare class BaseResource {
 } //#endregion
 //#region src/resources/browser-events.d.ts
 declare class BrowserEventsResource extends BaseResource {
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   send({
     sessionId,
     traceId,
@@ -198,9 +221,30 @@ declare class BrowserEventsResource extends BaseResource {
     events: Record<string, any>[];
   }): Promise<void>;
 } //#endregion
+//#region src/resources/cli.d.ts
+interface CliProject {
+  id: string;
+  name: string;
+  workspaceId: string;
+  workspaceName: string;
+}
+/**
+ * User-scoped CLI endpoints that don't target a specific project. Authed by the
+ * BetterAuth user JWT (the `credential`); deliberately does NOT send an
+ * `x-lmnr-project-id` header (these routes are project discovery, pre-selection).
+ *
+ * Discovery exception: this resource always hits `/v1/cli/projects` with the
+ * bare bearer and overrides `BaseResource.headers()`/`apiPrefix`, so it works
+ * even when constructed with a `userToken` auth that has no real project id yet.
+ */
+declare class CliResource extends BaseResource {
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
+  /** Workspaces + projects the authenticated user can access. */
+  listProjects(): Promise<CliProject[]>;
+} //#endregion
 //#region src/resources/datasets.d.ts
 declare class DatasetsResource extends BaseResource {
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   /**
    * List all datasets.
    *
@@ -262,7 +306,7 @@ declare class DatasetsResource extends BaseResource {
 } //#endregion
 //#region src/resources/evals.d.ts
 declare class EvalsResource extends BaseResource {
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   /**
    * Initialize an evaluation.
    *
@@ -393,7 +437,7 @@ type ScoreOptions = {
  * Resource for creating evaluator scores
  */
 declare class EvaluatorsResource extends BaseResource {
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   /**
    * Create a score for a span or trace
    *
@@ -444,7 +488,7 @@ type CacheOutcome = {
   kind: "live";
 };
 declare class RolloutSessionsResource extends BaseResource {
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   /**
    * Idempotently register (upsert) a debug session on the backend, keyed on the
    * SDK-supplied session id. The backend stores the row so the session is
@@ -506,13 +550,13 @@ declare class RolloutSessionsResource extends BaseResource {
 } //#endregion
 //#region src/resources/sql.d.ts
 declare class SqlResource extends BaseResource {
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   query(sql: string, parameters?: Record<string, any>): Promise<Array<Record<string, any>>>;
 } //#endregion
 //#region src/resources/tags.d.ts
 declare class TagsResource extends BaseResource {
   /** Resource for tagging traces. */
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   /**
    * Tag a trace with a list of tags. Note that the trace must be ended before
    * tagging it. You may want to call `await Laminar.flush()` after the trace
@@ -550,7 +594,7 @@ declare class TagsResource extends BaseResource {
 //#region src/resources/traces.d.ts
 declare class TracesResource extends BaseResource {
   /** Resource for post-factum operations on existing traces. */
-  constructor(baseHttpUrl: string, projectApiKey: string);
+  constructor(baseHttpUrl: string, auth: LaminarAuth);
   /**
    * Push a metadata patch to an existing trace.
    *
@@ -608,8 +652,9 @@ declare class TracesResource extends BaseResource {
 //#region src/index.d.ts
 declare class LaminarClient {
   private baseUrl;
-  private projectApiKey;
+  private auth;
   private _browserEvents;
+  private _cli;
   private _datasets;
   private _evals;
   private _evaluators;
@@ -619,14 +664,45 @@ declare class LaminarClient {
   private _traces;
   constructor({
     baseUrl,
+    port,
+    auth,
     projectApiKey,
-    port
+    cliUserProjectId
   }?: {
     baseUrl?: string;
-    projectApiKey?: string;
     port?: number;
+    /**
+     * Unified auth. A discriminated union that drives both the URL prefix and
+     * the request headers:
+     *  - `{ type: "apiKey", key }`               → project key, `/v1/*`.
+     *  - `{ type: "userToken", token, projectId }` → user JWT, `/v1/cli/*` with
+     *    `x-lmnr-project-id`.
+     * When omitted, the legacy `projectApiKey` / `cliUserProjectId` fields (or
+     * `LMNR_PROJECT_API_KEY`) are normalized into this union.
+     */
+    auth?: LaminarAuth;
+    /**
+     * @deprecated Pass `auth: { type: "apiKey", key }` instead. Kept for
+     * backward compatibility — normalized into the unified `auth` union.
+     */
+    projectApiKey?: string;
+    /**
+     * @deprecated Pass `auth: { type: "userToken", token, projectId }` instead.
+     * Kept for backward compatibility: when set, the legacy `projectApiKey` is
+     * treated as a user JWT and routes to `/v1/cli/*` with this project id.
+     */
+    cliUserProjectId?: string;
   });
+  /**
+   * Normalize the constructor's auth inputs into a {@link LaminarAuth} union.
+   * Precedence: an explicit `auth` wins; otherwise the legacy
+   * `projectApiKey` (+ optional `cliUserProjectId`) is mapped — a present
+   * `cliUserProjectId` selects the user-token surface, otherwise the project
+   * key surface. Falls back to `LMNR_PROJECT_API_KEY` as a project key.
+   */
+  private static normalizeAuth;
   get browserEvents(): BrowserEventsResource;
+  get cli(): CliResource;
   get datasets(): DatasetsResource;
   get evals(): EvalsResource;
   get evaluators(): EvaluatorsResource;
@@ -31159,4 +31235,4 @@ declare function evaluate<D, T, O>({
 }: EvaluationConstructorProps<D, T, O>): Promise<EvaluationRunResult | undefined>;
 //#endregion
 export { TracingLevel as S, MaskInputOptions as _, HumanEvaluator as a, SpanType as b, InitializeOptions as c, LaminarClient as d, Dataset as f, LaminarSpanContext as g, Event as h, EvaluatorFunctionReturn as i, EvaluationDataset as l, EvaluationDatapointDatasetLink as m, Evaluation as n, evaluate as o, EvaluationDatapoint as p, EvaluatorFunction as r, StringUUID as s, Datapoint as t, LaminarDataset as u, PushDatapointsResponse as v, TraceType as x, SessionRecordingOptions as y };
-//# sourceMappingURL=evaluations-Cs-tqViJ.d.mts.map
+//# sourceMappingURL=evaluations-fF1Y_olL.d.mts.map

package/dist/index.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-BN4qSVkS.cjs");
 const require_utils = require("./utils-C_Pf3r64.cjs");
-const require_dist = require("./dist-BWFjum5L.cjs");
+const require_dist = require("./dist-Cyli7uVF.cjs");
 const require_consts = require("./consts-Cx9iKRmq.cjs");
 let _opentelemetry_api = require("@opentelemetry/api");
 let _opentelemetry_context_async_hooks = require("@opentelemetry/context-async-hooks");
@@ -5627,16 +5627,18 @@ const buildHeaders = (existing) => {
 * Read `laminar-span-context` (preferred) or `traceparent` (fallback) from
 * Temporal headers and push the restored context onto Laminar's ALS stack.
 *
-* Returns the restored `LaminarSpanContext` or `undefined` if headers contain
-* no usable trace context.
+* Returns the restored context (Laminar + OTel) or `undefined` if headers
+* contain no usable trace context.
 */
 const restoreContextFromHeaders = (headers) => {
 	if (!headers) return void 0;
 	const laminarRaw = decodePayload(headers[require_consts.LAMINAR_SPAN_CONTEXT_HEADER]);
 	if (laminarRaw) try {
 		const ctx = require_utils.deserializeLaminarSpanContext(laminarRaw);
-		pushLaminarContext(ctx);
-		return ctx;
+		return {
+			laminarCtx: ctx,
+			otelContext: pushLaminarContext(ctx)
+		};
 	} catch (e) {
 		logger$8.warn(`[Laminar] Could not restore ${require_consts.LAMINAR_SPAN_CONTEXT_HEADER}: ${require_utils.errorMessage(e)}`);
 	}
@@ -5651,15 +5653,20 @@ const restoreContextFromHeaders = (headers) => {
 					spanId: require_utils.otelSpanIdToUUID(spanHex),
 					isRemote: true
 				};
-				pushLaminarContext(ctx);
-				return ctx;
+				return {
+					laminarCtx: ctx,
+					otelContext: pushLaminarContext(ctx)
+				};
 			} catch (e) {
 				logger$8.warn(`[Laminar] Could not restore traceparent: ${require_utils.errorMessage(e)}`);
 			}
 		}
 	}
 };
-/** Push a LaminarSpanContext onto the Laminar ALS stack as a remote parent. */
+/**
+* Push a LaminarSpanContext onto the Laminar ALS stack as a remote parent and
+* return the enriched OTel `Context` that was pushed.
+*/
 const pushLaminarContext = (laminarCtx) => {
 	const otelCtx = require_utils.tryToOtelSpanContext(laminarCtx);
 	otelCtx.isRemote = true;
@@ -5668,6 +5675,7 @@ const pushLaminarContext = (laminarCtx) => {
 	const base = _opentelemetry_api.trace.setSpan(_opentelemetry_api.ROOT_CONTEXT, _opentelemetry_api.trace.wrapSpanContext(otelCtx));
 	const enriched = LaminarContextManager.setRawAssociationProperties(laminarCtx, base);
 	LaminarContextManager.pushContext(enriched);
+	return enriched;
 };
 //#endregion
 //#region src/opentelemetry-lib/instrumentation/temporal/interceptors.ts
@@ -5815,12 +5823,13 @@ var ActivityClientInterceptor = class {
 var ActivityInboundInterceptor = class {
 	constructor(options = {}, activityContext) {
 		this.execute = async (input, next) => LaminarContextManager.runWithIsolatedContext([_opentelemetry_api.ROOT_CONTEXT], async () => {
-			const restoredCtx = restoreContextFromHeaders(input.headers);
-			if (!this.createActivitySpan || !restoredCtx) return next(input);
+			const restored = restoreContextFromHeaders(input.headers);
+			if (!restored) return next(input);
+			if (!this.createActivitySpan) return _opentelemetry_api.context.with(restored.otelContext, () => next(input));
 			const activityName = this.activityType ?? "temporal.activity";
 			const span = Laminar.startSpan({
 				name: activityName,
-				parentSpanContext: restoredCtx,
+				parentSpanContext: restored.laminarCtx,
 				input: this.recordActivityArgs ? input.args : void 0
 			});
 			return Laminar.withSpan(span, async () => {
@@ -8101,7 +8110,7 @@ const applyUsage = (attributes, usage) => {
 };
 const standardizedPromptToMessages = (event) => {
 	const messages = [];
-	const sys = event.system;
+	const sys = event.instructions || event.system;
 	if (typeof sys === "string" && sys.length > 0) messages.push({
 		role: "system",
 		content: sys
@@ -8241,7 +8250,7 @@ var LaminarAiSdkTelemetry = class {
 			if (typeof event.functionId === "string") span.setAttribute("ai.functionId", event.functionId);
 			if (event.operationId === "ai.embed" || event.operationId === "ai.embedMany" || event.operationId === "ai.rerank") span.setAttribute(require_utils.SPAN_TYPE, "LLM");
 			if (this.recordInputs) {
-				if (Array.isArray(event.messages) || event.system !== void 0) applyPromptMessages(span, event);
+				if (Array.isArray(event.messages) || event.system !== void 0 || event.instructions !== void 0) applyPromptMessages(span, event);
 				else if (event.value !== void 0) span.setAttribute(require_utils.SPAN_INPUT, serializeJSON$1(event.value));
 				else if (event.query !== void 0 || event.documents !== void 0) span.setAttribute(require_utils.SPAN_INPUT, serializeJSON$1({
 					query: event.query,
@@ -8257,6 +8266,7 @@ var LaminarAiSdkTelemetry = class {
 			});
 		};
 		this.onStepStart = (event) => {
+			if (!this.createStepSpan) return;
 			const callId = event?.callId;
 			const stepNumber = event?.stepNumber ?? 0;
 			if (!callId) return;
@@ -8277,9 +8287,9 @@ var LaminarAiSdkTelemetry = class {
 			const callId = event?.callId;
 			if (!callId) return;
 			const step = this.findLatestStep(callId);
+			const stepNumber = step?.stepNumber ?? event?.stepNumber ?? 0;
 			const parentCtx = step?.ctx ?? this.operationByCallId.get(callId)?.ctx;
 			if (!parentCtx) return;
-			const stepNumber = step?.stepNumber ?? 0;
 			const span = getTracer().startSpan(`ai.llm ${event.provider ?? ""}:${event.modelId ?? ""}`, { kind: _opentelemetry_api.SpanKind.CLIENT }, parentCtx);
 			span.setAttribute(require_utils.SPAN_TYPE, "LLM");
 			applyRequestModelAttributes(span, event);
@@ -8293,7 +8303,7 @@ var LaminarAiSdkTelemetry = class {
 		this.onLanguageModelCallEnd = (event) => {
 			const callId = event?.callId;
 			if (!callId) return;
-			const stepNumber = this.findLatestStep(callId)?.stepNumber ?? 0;
+			const stepNumber = this.findLatestStep(callId)?.stepNumber ?? event?.stepNumber ?? 0;
 			const llm = this.llmByKey.get(stepKey(callId, stepNumber));
 			if (!llm) return;
 			const span = llm.span;
@@ -8343,8 +8353,6 @@ var LaminarAiSdkTelemetry = class {
 			const stepNumber = event?.stepNumber ?? 0;
 			if (!callId) return;
 			const key = stepKey(callId, stepNumber);
-			const step = this.stepByKey.get(key);
-			if (!step) return;
 			const llm = this.llmByKey.get(key);
 			if (llm) {
 				if (this.recordOutputs && llm.textDeltas.length > 0) {
@@ -8355,6 +8363,8 @@ var LaminarAiSdkTelemetry = class {
 				removeActiveLlmSpan(llm.span);
 				this.llmByKey.delete(key);
 			}
+			const step = this.stepByKey.get(key);
+			if (!step) return;
 			applyUsageToSpan(step.span, event.usage);
 			if (typeof event.finishReason === "string") applyFinishReason(step.span, event.finishReason);
 			if (this.recordOutputs) {
@@ -8563,6 +8573,7 @@ var LaminarAiSdkTelemetry = class {
 		};
 		this.recordInputs = options.recordInputs ?? true;
 		this.recordOutputs = options.recordOutputs ?? true;
+		this.createStepSpan = options.createStepSpan ?? false;
 	}
 	/** End child spans, end the operation span, and clean up both maps. */
 	closeOperation(callId, op) {