@agentmark-ai/shared-utils 0.3.2 → 0.3.3

package/dist/index.js

@@ -228,27 +228,26 @@ async function generateTypeDefinitionsV1_0(prompts) {
   for (const prompt of prompts) {
     const { path: promptPath, input_schema } = prompt;
     const name = getInterfaceName(promptPath);
-    let tools = {};
     try {
       let kind = "text";
       let output_schema = null;
+      let hasTools = false;
       if ("text_config" in prompt) {
         kind = "text";
-        tools = prompt.text_config.tools || {};
+        hasTools = Array.isArray(prompt.text_config.tools) ? prompt.text_config.tools.length > 0 : !!prompt.text_config.tools;
       } else if ("object_config" in prompt) {
         kind = "object";
-        tools = prompt.object_config.tools || {};
+        hasTools = Array.isArray(prompt.object_config.tools) ? prompt.object_config.tools.length > 0 : !!prompt.object_config.tools;
         output_schema = prompt.object_config.schema;
       } else if ("image_config" in prompt) {
         kind = "image";
-        tools = prompt.image_config.tools || {};
+        hasTools = Array.isArray(prompt.image_config.tools) ? prompt.image_config.tools.length > 0 : !!prompt.image_config.tools;
       }
       const compile = await getCompile();
       const inputInterface = input_schema ? await compile(input_schema, `${name}In`, {
         bannerComment: "",
         additionalProperties: false
       }) : `interface ${name}In { [key: string]: any }`;
-      const toolTypes = await generateToolTypes(tools);
       const outputInterface = output_schema ? await compile(output_schema, `${name}Out`, {
         bannerComment: "",
         additionalProperties: false
@@ -257,12 +256,11 @@ async function generateTypeDefinitionsV1_0(prompts) {
         inputInterface.replace("export interface", "interface"),
         outputInterface.replace("export type", "type").replace("export interface", "interface")
       );
-      output += toolTypes || "";
       output += `type ${name} = {
   kind: '${kind}';
   input:  ${name}In;
-  output: ${name}Out;${toolTypes ? `
-  tools?: Array<keyof Tools>;` : ""}
+  output: ${name}Out;${hasTools ? `
+  tools?: string[];` : ""}
 };
 
 `;
@@ -689,6 +687,7 @@ async function generateTypeDefinitions(prompts, language = "typescript") {
   return generateTypeDefinitionsV0(prompts);
 }
 async function fetchPromptsFrontmatter(options) {
+  var _a, _b, _c;
   if (options.local) {
     const baseUrl = `http://localhost:${options.local}`;
     try {
@@ -698,7 +697,8 @@ async function fetchPromptsFrontmatter(options) {
           `Failed to fetch prompt paths: ${pathsResponse.statusText}`
         );
       }
-      const { paths } = await pathsResponse.json();
+      const body = await pathsResponse.json();
+      const paths = (_c = (_b = (_a = body == null ? void 0 : body.data) == null ? void 0 : _a.paths) != null ? _b : body == null ? void 0 : body.paths) != null ? _c : [];
       return Promise.all(
         paths.map(async (promptPath) => {
           const templateResponse = await fetch(
@@ -764,34 +764,6 @@ async function fetchPromptsFrontmatter(options) {
   }
   throw new Error("Either --local or --root-dir must be specified");
 }
-async function generateToolTypes(tools) {
-  const toolArgTypes = [];
-  for (const [toolName, schema] of Object.entries(tools)) {
-    const typeName = `${getToolInterfaceName(toolName)}Args`;
-    try {
-      const compile = await getCompile();
-      const argInterface = schema.parameters ? await compile(schema.parameters, typeName, {
-        bannerComment: "",
-        additionalProperties: false
-      }) : `type ${typeName} = { ${Object.entries(schema.parameters || {}).map(([key]) => `${key}: any`).join("; ")} };`;
-      toolArgTypes.push(
-        argInterface.replace("export type", "type").replace("export interface", "interface")
-      );
-    } catch (error) {
-      console.error(`Error processing tool ${toolName}:`, error);
-      toolArgTypes.push(`type ${typeName} = { [key: string]: any };`);
-    }
-  }
-  if (Object.keys(tools).length > 0) {
-    const toolsInterface = `export interface Tools {
-${Object.keys(tools).map(
-      (toolName) => `  ${toolName}: { args: ${getToolInterfaceName(toolName)}Args };`
-    ).join("\n")}
-}`;
-    return toolArgTypes.join("\n\n") + "\n\n" + toolsInterface + "\n\n";
-  }
-  return null;
-}
 
 // src/normalizer/types.ts
 var SpanType = /* @__PURE__ */ ((SpanType2) => {
@@ -1778,6 +1750,7 @@ var AgentMarkTransformer = class {
    * Transform the span and extract normalized fields from GenAI attributes.
    */
   transform(_span, attributes) {
+    var _a;
     const result = {};
     const responseModel = attributes[GenAIAttributes.RESPONSE_MODEL];
     const requestModel = attributes[GenAIAttributes.REQUEST_MODEL];
@@ -1851,7 +1824,7 @@ var AgentMarkTransformer = class {
       } catch {
       }
     }
-    const amInput = attributes["agentmark.input"];
+    const amInput = (_a = attributes["agentmark.input"]) != null ? _a : attributes["agentmark.props"];
     if (amInput && typeof amInput === "string" && !result.input) {
       result.input = [{ role: "user", content: amInput }];
     }
@@ -1917,9 +1890,16 @@ var Attrs = {
   RESPONSE_FINISH_REASONS: "gen_ai.response.finish_reasons",
   USAGE_INPUT_TOKENS: "gen_ai.usage.input_tokens",
   USAGE_OUTPUT_TOKENS: "gen_ai.usage.output_tokens",
-  // v1.37.0+ content attributes
+  // v1.37.0+ content attributes (canonical OTel GenAI semantic conventions).
+  // SDKs that emit the AgentMark-scoped equivalents (`gen_ai.request.input`
+  // / `gen_ai.response.output` — used by `claude-agent-sdk-v0-adapter`) are
+  // also accepted here as fallbacks so an SDK picking either key set
+  // doesn't silently lose IO data on ingest. The canonical pair always wins
+  // when both are present.
   INPUT_MESSAGES: "gen_ai.input.messages",
   OUTPUT_MESSAGES: "gen_ai.output.messages",
+  REQUEST_INPUT_FALLBACK: "gen_ai.request.input",
+  RESPONSE_OUTPUT_FALLBACK: "gen_ai.response.output",
   SYSTEM_INSTRUCTIONS: "gen_ai.system_instructions",
   TOOL_DEFINITIONS: "gen_ai.tool.definitions",
   // Tool call attributes (v1.37.0+)
@@ -1984,6 +1964,7 @@ var OtelGenAiTransformer = class {
     return "SPAN" /* SPAN */;
   }
   transform(span, attributes) {
+    var _a, _b;
     const result = {};
     const model = attributes[Attrs.RESPONSE_MODEL] || attributes[Attrs.REQUEST_MODEL];
     if (model && typeof model === "string") {
@@ -2004,12 +1985,12 @@ var OtelGenAiTransformer = class {
     if (typeof temperature === "number") {
       result.settings = { ...result.settings, temperature };
     }
-    const inputMessages = attributes[Attrs.INPUT_MESSAGES];
+    const inputMessages = (_a = attributes[Attrs.INPUT_MESSAGES]) != null ? _a : attributes[Attrs.REQUEST_INPUT_FALLBACK];
     if (inputMessages && typeof inputMessages === "string") {
       const messages = normalizeMessages(inputMessages);
       if (messages) result.input = messages;
     }
-    const outputMessages = attributes[Attrs.OUTPUT_MESSAGES];
+    const outputMessages = (_b = attributes[Attrs.OUTPUT_MESSAGES]) != null ? _b : attributes[Attrs.RESPONSE_OUTPUT_FALLBACK];
     if (outputMessages && typeof outputMessages === "string") {
       const extracted = extractStructuredOutput(outputMessages);
       if (extracted) {