@sentrial/sdk 0.4.3 → 0.4.4

package/dist/index.d.cts

@@ -1187,11 +1187,13 @@ type StreamTextResult = {
     }>;
     [key: string]: unknown;
 };
+/** String or function that returns a string (for dynamic per-request values) */
+type StringOrFn = string | (() => string | undefined);
 /** Per-instance config passed through closures (not global) */
 type WrapperConfig = {
     defaultAgent?: string;
-    userId?: string;
-    convoId?: string;
+    userId?: StringOrFn;
+    convoId?: StringOrFn;
 };
 /**
  * Configure the Sentrial SDK for Vercel AI SDK integration.
@@ -1211,8 +1213,8 @@ declare function configureVercel(config: {
     apiKey?: string;
     apiUrl?: string;
     defaultAgent?: string;
-    userId?: string;
-    convoId?: string;
+    userId?: StringOrFn;
+    convoId?: StringOrFn;
     failSilently?: boolean;
 }): void;
 declare function wrapGenerateText(originalFn: Function, client: SentrialClient, config: WrapperConfig): (params: GenerateTextParams) => Promise<GenerateTextResult>;
@@ -1246,8 +1248,8 @@ declare function wrapStreamObject(originalFn: Function, client: SentrialClient,
 declare function wrapAISDK(ai: AIModule, options?: {
     client?: SentrialClient;
     defaultAgent?: string;
-    userId?: string;
-    convoId?: string;
+    userId?: StringOrFn;
+    convoId?: StringOrFn;
 }): {
     generateText: ReturnType<typeof wrapGenerateText>;
     streamText: ReturnType<typeof wrapStreamText>;

package/dist/index.d.ts

@@ -1187,11 +1187,13 @@ type StreamTextResult = {
     }>;
     [key: string]: unknown;
 };
+/** String or function that returns a string (for dynamic per-request values) */
+type StringOrFn = string | (() => string | undefined);
 /** Per-instance config passed through closures (not global) */
 type WrapperConfig = {
     defaultAgent?: string;
-    userId?: string;
-    convoId?: string;
+    userId?: StringOrFn;
+    convoId?: StringOrFn;
 };
 /**
  * Configure the Sentrial SDK for Vercel AI SDK integration.
@@ -1211,8 +1213,8 @@ declare function configureVercel(config: {
     apiKey?: string;
     apiUrl?: string;
     defaultAgent?: string;
-    userId?: string;
-    convoId?: string;
+    userId?: StringOrFn;
+    convoId?: StringOrFn;
     failSilently?: boolean;
 }): void;
 declare function wrapGenerateText(originalFn: Function, client: SentrialClient, config: WrapperConfig): (params: GenerateTextParams) => Promise<GenerateTextResult>;
@@ -1246,8 +1248,8 @@ declare function wrapStreamObject(originalFn: Function, client: SentrialClient,
 declare function wrapAISDK(ai: AIModule, options?: {
     client?: SentrialClient;
     defaultAgent?: string;
-    userId?: string;
-    convoId?: string;
+    userId?: StringOrFn;
+    convoId?: StringOrFn;
 }): {
     generateText: ReturnType<typeof wrapGenerateText>;
     streamText: ReturnType<typeof wrapStreamText>;

package/dist/index.js

@@ -1565,6 +1565,7 @@ function getClient() {
 }
 function configure(config) {
   defaultClient = new SentrialClient(config);
+  setDefaultClient(defaultClient);
 }
 function begin(params) {
   return getClient().begin(params);
@@ -1583,6 +1584,10 @@ var sentrial = {
 };
 
 // src/vercel.ts
+function resolveStringOrFn(value, fallback) {
+  if (typeof value === "function") return value() ?? fallback;
+  return value ?? fallback;
+}
 var _defaultClient2 = null;
 var _globalConfig = {};
 function configureVercel(config) {
@@ -1591,6 +1596,7 @@ function configureVercel(config) {
     apiUrl: config.apiUrl,
     failSilently: config.failSilently ?? true
   });
+  setDefaultClient(_defaultClient2);
   _globalConfig = {
     defaultAgent: config.defaultAgent,
     userId: config.userId,
@@ -1640,14 +1646,26 @@ function calculateCostForCall(provider, modelId, promptTokens, completionTokens)
       return 0;
   }
 }
+function extractContentText(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    const textParts = content.filter((part) => part && part.type === "text" && typeof part.text === "string").map((part) => part.text);
+    if (textParts.length > 0) return textParts.join("\n");
+  }
+  return JSON.stringify(content);
+}
 function extractInput(params) {
   if (params.prompt) return params.prompt;
   if (params.messages && params.messages.length > 0) {
     const lastUserMessage = [...params.messages].reverse().find((m) => m.role === "user");
     if (lastUserMessage) {
-      return typeof lastUserMessage.content === "string" ? lastUserMessage.content : JSON.stringify(lastUserMessage.content);
+      return extractContentText(lastUserMessage.content);
     }
-    return JSON.stringify(params.messages);
+    const lastNonSystem = [...params.messages].reverse().find((m) => m.role !== "system");
+    if (lastNonSystem) {
+      return extractContentText(lastNonSystem.content);
+    }
+    return "";
   }
   return "";
 }
@@ -1761,8 +1779,8 @@ function wrapGenerateText(originalFn, client, config) {
     const sessionId = await client.createSession({
       name: `generateText: ${input.slice(0, 50)}${input.length > 50 ? "..." : ""}`,
       agentName: config.defaultAgent ?? "vercel-ai-sdk",
-      userId: config.userId ?? "anonymous",
-      convoId: config.convoId,
+      userId: resolveStringOrFn(config.userId, "anonymous"),
+      convoId: resolveStringOrFn(config.convoId),
       metadata: {
         model: modelId,
         provider,
@@ -1862,6 +1880,7 @@ function wrapStreamText(originalFn, client, config) {
     const { modelId, provider } = extractModelInfo(params.model);
     const input = extractInput(params);
     let sessionId = null;
+    let sessionCompleted = false;
     let resolveSessionReady;
     const sessionReady = new Promise((resolve) => {
       resolveSessionReady = resolve;
@@ -1871,8 +1890,8 @@ function wrapStreamText(originalFn, client, config) {
         const id = await client.createSession({
           name: `streamText: ${input.slice(0, 50)}${input.length > 50 ? "..." : ""}`,
           agentName: config.defaultAgent ?? "vercel-ai-sdk",
-          userId: config.userId ?? "anonymous",
-          convoId: config.convoId,
+          userId: resolveStringOrFn(config.userId, "anonymous"),
+          convoId: resolveStringOrFn(config.convoId),
           metadata: {
             model: modelId,
             provider,
@@ -1928,7 +1947,8 @@ function wrapStreamText(originalFn, client, config) {
       },
       onFinish: async (event) => {
         await sessionReady;
-        if (sessionId) {
+        if (sessionId && !sessionCompleted) {
+          sessionCompleted = true;
           const durationMs = Date.now() - startTime;
           const usage = normalizeUsage(event.totalUsage ?? event.usage);
           const resolvedModelId = event.response?.modelId ?? modelId;
@@ -1958,7 +1978,8 @@ function wrapStreamText(originalFn, client, config) {
       },
       onError: async (event) => {
         await sessionReady;
-        if (sessionId) {
+        if (sessionId && !sessionCompleted) {
+          sessionCompleted = true;
           const durationMs = Date.now() - startTime;
           const msg = event.error?.message ?? "Unknown error";
           await client.trackError({
@@ -2008,8 +2029,8 @@ function wrapGenerateObject(originalFn, client, config) {
     const sessionId = await client.createSession({
       name: `generateObject: ${input.slice(0, 50)}${input.length > 50 ? "..." : ""}`,
       agentName: config.defaultAgent ?? "vercel-ai-sdk",
-      userId: config.userId ?? "anonymous",
-      convoId: config.convoId,
+      userId: resolveStringOrFn(config.userId, "anonymous"),
+      convoId: resolveStringOrFn(config.convoId),
       metadata: {
         model: modelId,
         provider,
@@ -2084,8 +2105,8 @@ function wrapStreamObject(originalFn, client, config) {
         const id = await client.createSession({
           name: `streamObject: ${input.slice(0, 50)}${input.length > 50 ? "..." : ""}`,
           agentName: config.defaultAgent ?? "vercel-ai-sdk",
-          userId: config.userId ?? "anonymous",
-          convoId: config.convoId,
+          userId: resolveStringOrFn(config.userId, "anonymous"),
+          convoId: resolveStringOrFn(config.convoId),
           metadata: {
             model: modelId,
             provider,