@agentmark-ai/shared-utils 0.3.3 → 0.5.0

package/dist/index.d.mts

@@ -251,9 +251,11 @@ interface NormalizedSpan {
     datasetItemName?: string;
     datasetExpectedOutput?: string;
     datasetInput?: string;
+    experimentKey?: string;
     promptName?: string;
     props?: string;
     commitSha?: string;
+    sourceTreeHash?: string;
     metadata?: Record<string, string>;
     resourceAttributes: Record<string, any>;
     spanAttributes: Record<string, any>;
@@ -448,7 +450,7 @@ declare function parseAgentMarkAttributes(attributes: Record<string, any>, prefi
 declare const SEMANTIC_KINDS: readonly ["function", "llm", "tool", "agent", "retrieval", "embedding", "guardrail"];
 type SemanticKind = typeof SEMANTIC_KINDS[number];
 /**
- * Resolve the semantic kind of a span using an 8-level priority chain.
+ * Resolve the semantic kind of a span using a 9-level priority chain.
  *
  * Priority:
  * 1. normalized.semanticKind (from agentmark.span.kind attribute) — if valid
@@ -456,9 +458,11 @@ type SemanticKind = typeof SEMANTIC_KINDS[number];
  * 3. Framework-specific attributes (Vercel AI SDK, Traceloop, LangChain, Genkit)
  * 4. gen_ai.operation.name → llm/embedding
  * 5. Type = GENERATION → llm
- * 6. Has non-empty ToolCalls → tool
- * 7. Name-based heuristics
- * 8. Default → function
+ * 6. Carries a model (gen_ai.request.model) → llm — vendor-neutral generation
+ *    signal; catches model calls the framework maps above don't name.
+ * 7. Has non-empty ToolCalls → tool
+ * 8. Name-based heuristics
+ * 9. Default → function
  */
 declare function resolveSemanticKind(normalized: Partial<NormalizedSpan> & {
     type: SpanType;

package/dist/index.d.ts

@@ -251,9 +251,11 @@ interface NormalizedSpan {
     datasetItemName?: string;
     datasetExpectedOutput?: string;
     datasetInput?: string;
+    experimentKey?: string;
     promptName?: string;
     props?: string;
     commitSha?: string;
+    sourceTreeHash?: string;
     metadata?: Record<string, string>;
     resourceAttributes: Record<string, any>;
     spanAttributes: Record<string, any>;
@@ -448,7 +450,7 @@ declare function parseAgentMarkAttributes(attributes: Record<string, any>, prefi
 declare const SEMANTIC_KINDS: readonly ["function", "llm", "tool", "agent", "retrieval", "embedding", "guardrail"];
 type SemanticKind = typeof SEMANTIC_KINDS[number];
 /**
- * Resolve the semantic kind of a span using an 8-level priority chain.
+ * Resolve the semantic kind of a span using a 9-level priority chain.
  *
  * Priority:
  * 1. normalized.semanticKind (from agentmark.span.kind attribute) — if valid
@@ -456,9 +458,11 @@ type SemanticKind = typeof SEMANTIC_KINDS[number];
  * 3. Framework-specific attributes (Vercel AI SDK, Traceloop, LangChain, Genkit)
  * 4. gen_ai.operation.name → llm/embedding
  * 5. Type = GENERATION → llm
- * 6. Has non-empty ToolCalls → tool
- * 7. Name-based heuristics
- * 8. Default → function
+ * 6. Carries a model (gen_ai.request.model) → llm — vendor-neutral generation
+ *    signal; catches model calls the framework maps above don't name.
+ * 7. Has non-empty ToolCalls → tool
+ * 8. Name-based heuristics
+ * 9. Default → function
  */
 declare function resolveSemanticKind(normalized: Partial<NormalizedSpan> & {
     type: SpanType;

package/dist/index.js

@@ -986,39 +986,50 @@ var AiSdkV4Strategy = class {
     return attributes["gen_ai.request.model"] || attributes["ai.model.id"];
   }
   extractInput(attributes) {
-    let messagesValue;
-    if (attributes["ai.prompt.messages"] !== void 0) {
-      messagesValue = attributes["ai.prompt.messages"];
-    } else if (attributes["ai.prompt"] !== void 0) {
-      const promptValue = attributes["ai.prompt"];
-      if (typeof promptValue === "string") {
-        try {
-          const parsed = JSON.parse(promptValue);
-          messagesValue = parsed.messages || parsed;
-        } catch {
-          return void 0;
-        }
-      } else {
-        messagesValue = promptValue.messages || promptValue;
-      }
-    } else {
+    const raw = attributes["ai.prompt.messages"] !== void 0 ? attributes["ai.prompt.messages"] : attributes["ai.prompt"];
+    if (raw === void 0) {
       return void 0;
     }
-    let messages;
-    if (typeof messagesValue === "string") {
+    let value = raw;
+    if (typeof value === "string") {
       try {
-        messages = JSON.parse(messagesValue);
+        value = JSON.parse(value);
       } catch {
-        return void 0;
       }
-    } else {
-      messages = messagesValue;
     }
-    if (!Array.isArray(messages)) {
+    const messages = this.coerceToMessages(value);
+    if (!messages) {
       return void 0;
     }
     return this.normalizeMessages(messages);
   }
+  /**
+   * Coerce the shapes `ai.prompt` / `ai.prompt.messages` can take into a
+   * messages array: a raw array, `{ messages, system? }`,
+   * `{ prompt, system? }` (string prompt), or a bare string.
+   */
+  coerceToMessages(value) {
+    if (typeof value === "string") {
+      return [{ role: "user", content: value }];
+    }
+    if (Array.isArray(value)) {
+      return value;
+    }
+    if (value && typeof value === "object") {
+      if (Array.isArray(value.messages)) {
+        return typeof value.system === "string" ? [{ role: "system", content: value.system }, ...value.messages] : value.messages;
+      }
+      if (typeof value.prompt === "string") {
+        const messages = [];
+        if (typeof value.system === "string") {
+          messages.push({ role: "system", content: value.system });
+        }
+        messages.push({ role: "user", content: value.prompt });
+        return messages;
+      }
+    }
+    return void 0;
+  }
   extractOutput(attributes) {
     if (attributes["ai.result.text"] !== void 0) return attributes["ai.result.text"];
     if (attributes["ai.response.text"] !== void 0) return attributes["ai.response.text"];
@@ -1282,39 +1293,54 @@ var AiSdkV5Strategy = class {
     return attributes["gen_ai.request.model"] || attributes["ai.model.id"];
   }
   extractInput(attributes) {
-    let messagesValue;
-    if (attributes["ai.prompt.messages"] !== void 0) {
-      messagesValue = attributes["ai.prompt.messages"];
-    } else if (attributes["ai.prompt"] !== void 0) {
-      const promptValue = attributes["ai.prompt"];
-      if (typeof promptValue === "string") {
-        try {
-          const parsed = JSON.parse(promptValue);
-          messagesValue = parsed.messages || parsed;
-        } catch {
-          return void 0;
-        }
-      } else {
-        messagesValue = promptValue.messages || promptValue;
-      }
-    } else {
+    const raw = attributes["ai.prompt.messages"] !== void 0 ? attributes["ai.prompt.messages"] : attributes["ai.prompt"];
+    if (raw === void 0) {
       return void 0;
     }
-    let messages;
-    if (typeof messagesValue === "string") {
+    let value = raw;
+    if (typeof value === "string") {
       try {
-        messages = JSON.parse(messagesValue);
+        value = JSON.parse(value);
       } catch {
-        return void 0;
       }
-    } else {
-      messages = messagesValue;
     }
-    if (!Array.isArray(messages)) {
+    const messages = this.coerceToMessages(value);
+    if (!messages) {
       return void 0;
     }
     return this.normalizeMessages(messages);
   }
+  /**
+   * Coerce the shapes `ai.prompt` / `ai.prompt.messages` can take into a
+   * messages array:
+   *   - `[ ...messages ]`              — ai.prompt.messages (leaf spans)
+   *   - `{ messages: [...], system? }` — ai.prompt with messages
+   *   - `{ prompt: "text", system? }`  — ai.prompt for a string prompt
+   *                                      (the parent wrapper spans)
+   *   - `"text"`                       — a bare (non-JSON) prompt string
+   */
+  coerceToMessages(value) {
+    if (typeof value === "string") {
+      return [{ role: "user", content: value }];
+    }
+    if (Array.isArray(value)) {
+      return value;
+    }
+    if (value && typeof value === "object") {
+      if (Array.isArray(value.messages)) {
+        return typeof value.system === "string" ? [{ role: "system", content: value.system }, ...value.messages] : value.messages;
+      }
+      if (typeof value.prompt === "string") {
+        const messages = [];
+        if (typeof value.system === "string") {
+          messages.push({ role: "system", content: value.system });
+        }
+        messages.push({ role: "user", content: value.prompt });
+        return messages;
+      }
+    }
+    return void 0;
+  }
   extractOutput(attributes) {
     if (attributes["ai.response.text"] !== void 0) return attributes["ai.response.text"];
     return void 0;
@@ -1655,6 +1681,8 @@ function parseAgentMarkAttributes(attributes, prefix = "agentmark.") {
   if (get("dataset_expected_output")) result.datasetExpectedOutput = String(get("dataset_expected_output"));
   if (get("dataset_input")) result.datasetInput = String(get("dataset_input"));
   if (get("dataset_path")) result.datasetPath = String(get("dataset_path"));
+  if (get("experiment_key")) result.experimentKey = String(get("experiment_key"));
+  if (get("source_tree_hash")) result.sourceTreeHash = String(get("source_tree_hash"));
   return result;
 }
 
@@ -2169,13 +2197,20 @@ var FRAMEWORK_MAPPINGS = [
   {
     key: "ai.operationId",
     // Vercel AI SDK
+    // The AI SDK emits ai.operationId WITH the "ai." prefix (e.g.
+    // "ai.generateText"); accept both prefixed and unprefixed so generation
+    // wrappers resolve to "llm" instead of falling through to "function".
     map: {
       "embed": "embedding",
       "ai.embed": "embedding",
       "generateText": "llm",
+      "ai.generateText": "llm",
       "streamText": "llm",
+      "ai.streamText": "llm",
       "generateObject": "llm",
-      "streamObject": "llm"
+      "ai.generateObject": "llm",
+      "streamObject": "llm",
+      "ai.streamObject": "llm"
     }
   },
   {
@@ -2219,6 +2254,9 @@ function resolveSemanticKind(normalized, allAttributes) {
   if (normalized.type === "GENERATION" /* GENERATION */) {
     return "llm";
   }
+  if (normalized.model) {
+    return "llm";
+  }
   if (normalized.toolCalls && normalized.toolCalls.length > 0) {
     return "tool";
   }