@agentv/core 3.11.0 → 3.12.0

package/dist/{chunk-HMXZ2AX4.js → chunk-3G2KXH7N.js}

@@ -8,6 +8,7 @@ var SimpleTraceFileExporter = class {
   streamReady = null;
   pendingWrites = [];
   _shuttingDown = false;
+  spansByTraceId = /* @__PURE__ */ new Map();
   constructor(filePath) {
     this.filePath = filePath;
   }
@@ -26,25 +27,27 @@ var SimpleTraceFileExporter = class {
       resultCallback({ code: 0 });
       return;
     }
-    const spanMap = /* @__PURE__ */ new Map();
-    const childMap = /* @__PURE__ */ new Map();
+    const rootSpans = [];
     for (const span of spans) {
-      spanMap.set(span.spanContext().spanId, span);
-      const parentId = span.parentSpanId;
-      if (parentId) {
-        if (!childMap.has(parentId)) childMap.set(parentId, []);
-        childMap.get(parentId)?.push(span);
+      const traceId = span.spanContext().traceId;
+      const existing = this.spansByTraceId.get(traceId) ?? [];
+      existing.push(span);
+      this.spansByTraceId.set(traceId, existing);
+      if (span.name === "agentv.eval") {
+        rootSpans.push(span);
       }
     }
-    const rootSpans = spans.filter(
-      (s) => !s.parentSpanId || !spanMap.has(s.parentSpanId)
-    );
     const writePromise = this.ensureStream().then((stream) => {
       for (const root of rootSpans) {
-        const children = this.collectChildren(root.spanContext().spanId, childMap);
+        const traceId = root.spanContext().traceId;
+        const traceSpans = this.spansByTraceId.get(traceId) ?? [root];
+        const children = traceSpans.filter(
+          (span) => span.spanContext().spanId !== root.spanContext().spanId
+        );
         const record = this.buildSimpleRecord(root, children);
         stream.write(`${JSON.stringify(record)}
 `);
+        this.spansByTraceId.delete(traceId);
       }
     });
     this.pendingWrites.push(writePromise);
@@ -54,6 +57,7 @@ var SimpleTraceFileExporter = class {
     this._shuttingDown = true;
     await Promise.all(this.pendingWrites);
     this.pendingWrites = [];
+    this.spansByTraceId.clear();
     return new Promise((resolve) => {
       if (this.stream) {
         this.stream.end(() => resolve());
@@ -66,17 +70,9 @@ var SimpleTraceFileExporter = class {
     await Promise.all(this.pendingWrites);
     this.pendingWrites = [];
   }
-  collectChildren(spanId, childMap) {
-    const direct = childMap.get(spanId) || [];
-    const all = [...direct];
-    for (const child of direct) {
-      all.push(...this.collectChildren(child.spanContext().spanId, childMap));
-    }
-    return all;
-  }
   buildSimpleRecord(root, children) {
     const attrs = root.attributes || {};
-    const durationMs = hrTimeDiffMs(root.startTime, root.endTime);
+    const durationMs = typeof attrs["agentv.trace.duration_ms"] === "number" ? attrs["agentv.trace.duration_ms"] : hrTimeDiffMs(root.startTime, root.endTime);
     let inputTokens = 0;
     let outputTokens = 0;
     for (const child of children) {
@@ -84,6 +80,14 @@ var SimpleTraceFileExporter = class {
       if (ca["gen_ai.usage.input_tokens"]) inputTokens += ca["gen_ai.usage.input_tokens"];
       if (ca["gen_ai.usage.output_tokens"]) outputTokens += ca["gen_ai.usage.output_tokens"];
     }
+    const rootInputTokens = typeof attrs["agentv.trace.token_input"] === "number" ? attrs["agentv.trace.token_input"] : 0;
+    const rootOutputTokens = typeof attrs["agentv.trace.token_output"] === "number" ? attrs["agentv.trace.token_output"] : 0;
+    const rootCachedTokens = typeof attrs["agentv.trace.token_cached"] === "number" ? attrs["agentv.trace.token_cached"] : void 0;
+    const llmSpans = children.filter((s) => s.attributes?.["gen_ai.operation.name"] === "chat").map((s) => ({
+      type: "llm",
+      name: s.name,
+      duration_ms: hrTimeDiffMs(s.startTime, s.endTime)
+    }));
     const toolSpans = children.filter((s) => s.attributes?.["gen_ai.tool.name"]).map((s) => ({
       type: "tool",
       name: s.attributes["gen_ai.tool.name"],
@@ -95,8 +99,12 @@ var SimpleTraceFileExporter = class {
       score: attrs["agentv.score"],
       duration_ms: durationMs,
       cost_usd: attrs["agentv.trace.cost_usd"],
-      token_usage: inputTokens || outputTokens ? { input: inputTokens, output: outputTokens } : void 0,
-      spans: toolSpans.length > 0 ? toolSpans : void 0
+      token_usage: inputTokens || outputTokens || rootInputTokens || rootOutputTokens || rootCachedTokens ? {
+        input: inputTokens || rootInputTokens,
+        output: outputTokens || rootOutputTokens,
+        ...rootCachedTokens ? { cached: rootCachedTokens } : {}
+      } : void 0,
+      spans: [...llmSpans, ...toolSpans].length > 0 ? [...llmSpans, ...toolSpans] : void 0
     };
   }
 };
@@ -109,4 +117,4 @@ function hrTimeDiffMs(start, end) {
 export {
   SimpleTraceFileExporter
 };
-//# sourceMappingURL=chunk-HMXZ2AX4.js.map
+//# sourceMappingURL=chunk-3G2KXH7N.js.map

package/dist/chunk-3G2KXH7N.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/observability/simple-trace-file-exporter.ts"],"sourcesContent":["import { type WriteStream, createWriteStream } from 'node:fs';\nimport { mkdir } from 'node:fs/promises';\nimport { dirname } from 'node:path';\n\n// biome-ignore lint/suspicious/noExplicitAny: OTel ReadableSpan loaded dynamically\ntype ReadableSpan = any;\n\n/**\n * SpanExporter that writes human-readable JSONL (one line per root span).\n * Designed for quick debugging and analysis without OTel tooling.\n */\nexport class SimpleTraceFileExporter {\n  private stream: WriteStream | null = null;\n  private filePath: string;\n  private streamReady: Promise<WriteStream> | null = null;\n  private pendingWrites: Promise<void>[] = [];\n  private _shuttingDown = false;\n  private spansByTraceId = new Map<string, ReadableSpan[]>();\n\n  constructor(filePath: string) {\n    this.filePath = filePath;\n  }\n\n  private async ensureStream(): Promise<WriteStream> {\n    if (!this.streamReady) {\n      this.streamReady = (async () => {\n        await mkdir(dirname(this.filePath), { recursive: true });\n        this.stream = createWriteStream(this.filePath, { flags: 'w' });\n        return this.stream;\n      })();\n    }\n    return this.streamReady;\n  }\n\n  export(spans: ReadableSpan[], resultCallback: (result: { code: number }) => void): void {\n    if (this._shuttingDown) {\n      resultCallback({ code: 0 });\n      return;\n    }\n    const rootSpans: ReadableSpan[] = [];\n    for (const span of spans) {\n      const traceId = span.spanContext().traceId;\n      const existing = this.spansByTraceId.get(traceId) ?? [];\n      existing.push(span);\n      this.spansByTraceId.set(traceId, existing);\n      if (span.name === 'agentv.eval') {\n        rootSpans.push(span);\n      }\n    }\n\n    const writePromise = this.ensureStream().then((stream) => {\n      for (const root of rootSpans) {\n        const traceId = root.spanContext().traceId;\n        const traceSpans = this.spansByTraceId.get(traceId) ?? [root];\n        const children = traceSpans.filter(\n          (span) => span.spanContext().spanId !== root.spanContext().spanId,\n        );\n        const record = this.buildSimpleRecord(root, children);\n        stream.write(`${JSON.stringify(record)}\\n`);\n        this.spansByTraceId.delete(traceId);\n      }\n    });\n    this.pendingWrites.push(writePromise);\n\n    resultCallback({ code: 0 });\n  }\n\n  async shutdown(): Promise<void> {\n    this._shuttingDown = true;\n    await Promise.all(this.pendingWrites);\n    this.pendingWrites = [];\n    this.spansByTraceId.clear();\n    return new Promise((resolve) => {\n      if (this.stream) {\n        this.stream.end(() => resolve());\n      } else {\n        resolve();\n      }\n    });\n  }\n\n  async forceFlush(): Promise<void> {\n    await Promise.all(this.pendingWrites);\n    this.pendingWrites = [];\n  }\n\n  private buildSimpleRecord(root: ReadableSpan, children: ReadableSpan[]): Record<string, unknown> {\n    const attrs = root.attributes || {};\n    const durationMs =\n      typeof attrs['agentv.trace.duration_ms'] === 'number'\n        ? attrs['agentv.trace.duration_ms']\n        : hrTimeDiffMs(root.startTime, root.endTime);\n\n    let inputTokens = 0;\n    let outputTokens = 0;\n    for (const child of children) {\n      const ca = child.attributes || {};\n      if (ca['gen_ai.usage.input_tokens']) inputTokens += ca['gen_ai.usage.input_tokens'];\n      if (ca['gen_ai.usage.output_tokens']) outputTokens += ca['gen_ai.usage.output_tokens'];\n    }\n    const rootInputTokens =\n      typeof attrs['agentv.trace.token_input'] === 'number' ? attrs['agentv.trace.token_input'] : 0;\n    const rootOutputTokens =\n      typeof attrs['agentv.trace.token_output'] === 'number'\n        ? attrs['agentv.trace.token_output']\n        : 0;\n    const rootCachedTokens =\n      typeof attrs['agentv.trace.token_cached'] === 'number'\n        ? attrs['agentv.trace.token_cached']\n        : undefined;\n\n    const llmSpans = children\n      .filter((s: ReadableSpan) => s.attributes?.['gen_ai.operation.name'] === 'chat')\n      .map((s: ReadableSpan) => ({\n        type: 'llm' as const,\n        name: s.name,\n        duration_ms: hrTimeDiffMs(s.startTime, s.endTime),\n      }));\n\n    const toolSpans = children\n      .filter((s: ReadableSpan) => s.attributes?.['gen_ai.tool.name'])\n      .map((s: ReadableSpan) => ({\n        type: 'tool' as const,\n        name: s.attributes['gen_ai.tool.name'],\n        duration_ms: hrTimeDiffMs(s.startTime, s.endTime),\n      }));\n\n    return {\n      test_id: attrs['agentv.test_id'],\n      target: attrs['agentv.target'],\n      score: attrs['agentv.score'],\n      duration_ms: durationMs,\n      cost_usd: attrs['agentv.trace.cost_usd'],\n      token_usage:\n        inputTokens || outputTokens || rootInputTokens || rootOutputTokens || rootCachedTokens\n          ? {\n              input: inputTokens || rootInputTokens,\n              output: outputTokens || rootOutputTokens,\n              ...(rootCachedTokens ? { cached: rootCachedTokens } : {}),\n            }\n          : undefined,\n      spans: [...llmSpans, ...toolSpans].length > 0 ? [...llmSpans, ...toolSpans] : undefined,\n    };\n  }\n}\n\nfunction hrTimeDiffMs(start: [number, number], end: [number, number]): number {\n  const diffSec = end[0] - start[0];\n  const diffNano = end[1] - start[1];\n  return Math.round(diffSec * 1000 + diffNano / 1_000_000);\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-AVTN5AB7.js → chunk-4XWPXNQM.js}

@@ -522,14 +522,14 @@ function resolveTargetDefinition(definition, env = process.env, evalFilePath) {
         providerBatching,
         config: resolvePiCodingAgentConfig(parsed, env, evalFilePath)
       };
-    case "pi-agent-sdk":
+    case "pi-cli":
       return {
-        kind: "pi-agent-sdk",
+        kind: "pi-cli",
         name: parsed.name,
         graderTarget: parsed.grader_target ?? parsed.judge_target,
         workers: parsed.workers,
         providerBatching,
-        config: resolvePiAgentSdkConfig(parsed, env)
+        config: resolvePiCliConfig(parsed, env, evalFilePath)
       };
     case "claude":
     case "claude-code":
@@ -946,23 +946,17 @@ function normalizeCopilotLogFormat(value) {
   throw new Error("copilot log format must be 'summary' or 'json'");
 }
 function resolvePiCodingAgentConfig(target, env, evalFilePath) {
-  const executableSource = target.executable ?? target.command ?? target.binary;
   const subproviderSource = target.subprovider;
   const modelSource = target.model ?? target.pi_model ?? target.piModel;
   const apiKeySource = target.api_key ?? target.apiKey;
   const toolsSource = target.tools ?? target.pi_tools ?? target.piTools;
   const thinkingSource = target.thinking ?? target.pi_thinking ?? target.piThinking;
-  const argsSource = target.args ?? target.arguments;
   const cwdSource = target.cwd;
   const workspaceTemplateSource = target.workspace_template ?? target.workspaceTemplate;
   const timeoutSource = target.timeout_seconds ?? target.timeoutSeconds;
   const logDirSource = target.log_dir ?? target.logDir ?? target.log_directory ?? target.logDirectory;
   const logFormatSource = target.log_format ?? target.logFormat;
   const systemPromptSource = target.system_prompt ?? target.systemPrompt;
-  const executable = resolveOptionalString(executableSource, env, `${target.name} pi executable`, {
-    allowLiteral: true,
-    optionalEnv: true
-  }) ?? "pi";
   const subprovider = resolveOptionalString(
     subproviderSource,
     env,
@@ -988,7 +982,6 @@ function resolvePiCodingAgentConfig(target, env, evalFilePath) {
     allowLiteral: true,
     optionalEnv: true
   });
-  const args = resolveOptionalStringArray(argsSource, env, `${target.name} pi args`);
   const cwd = resolveOptionalString(cwdSource, env, `${target.name} pi cwd`, {
     allowLiteral: true,
     optionalEnv: true
@@ -1018,13 +1011,11 @@ function resolvePiCodingAgentConfig(target, env, evalFilePath) {
   const logFormat = logFormatSource === "json" || logFormatSource === "summary" ? logFormatSource : void 0;
   const systemPrompt = typeof systemPromptSource === "string" && systemPromptSource.trim().length > 0 ? systemPromptSource.trim() : void 0;
   return {
-    executable,
     subprovider,
     model,
     apiKey,
     tools,
     thinking,
-    args,
     cwd,
     workspaceTemplate,
     timeoutMs,
@@ -1033,36 +1024,83 @@ function resolvePiCodingAgentConfig(target, env, evalFilePath) {
     systemPrompt
   };
 }
-function resolvePiAgentSdkConfig(target, env) {
+function resolvePiCliConfig(target, env, evalFilePath) {
+  const executableSource = target.executable ?? target.command ?? target.binary;
   const subproviderSource = target.subprovider;
   const modelSource = target.model ?? target.pi_model ?? target.piModel;
   const apiKeySource = target.api_key ?? target.apiKey;
+  const toolsSource = target.tools ?? target.pi_tools ?? target.piTools;
+  const thinkingSource = target.thinking ?? target.pi_thinking ?? target.piThinking;
+  const cwdSource = target.cwd;
+  const workspaceTemplateSource = target.workspace_template ?? target.workspaceTemplate;
   const timeoutSource = target.timeout_seconds ?? target.timeoutSeconds;
+  const logDirSource = target.log_dir ?? target.logDir ?? target.log_directory ?? target.logDirectory;
+  const logFormatSource = target.log_format ?? target.logFormat;
   const systemPromptSource = target.system_prompt ?? target.systemPrompt;
+  const executable = resolveOptionalString(executableSource, env, `${target.name} pi-cli executable`, {
+    allowLiteral: true,
+    optionalEnv: true
+  }) ?? "pi";
   const subprovider = resolveOptionalString(
     subproviderSource,
     env,
-    `${target.name} pi-agent-sdk subprovider`,
-    {
-      allowLiteral: true,
-      optionalEnv: true
-    }
+    `${target.name} pi-cli subprovider`,
+    { allowLiteral: true, optionalEnv: true }
   );
-  const model = resolveOptionalString(modelSource, env, `${target.name} pi-agent-sdk model`, {
+  const model = resolveOptionalString(modelSource, env, `${target.name} pi-cli model`, {
     allowLiteral: true,
     optionalEnv: true
   });
-  const apiKey = resolveOptionalString(apiKeySource, env, `${target.name} pi-agent-sdk api key`, {
+  const apiKey = resolveOptionalString(apiKeySource, env, `${target.name} pi-cli api key`, {
     allowLiteral: false,
     optionalEnv: true
   });
-  const timeoutMs = resolveTimeoutMs(timeoutSource, `${target.name} pi-agent-sdk timeout`);
+  const tools = resolveOptionalString(toolsSource, env, `${target.name} pi-cli tools`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  const thinking = resolveOptionalString(thinkingSource, env, `${target.name} pi-cli thinking`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  const rawArgs = target.args ?? target.arguments;
+  const args = resolveOptionalStringArray(rawArgs, env, `${target.name} pi-cli args`);
+  const cwd = resolveOptionalString(cwdSource, env, `${target.name} pi-cli cwd`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  let workspaceTemplate = resolveOptionalString(
+    workspaceTemplateSource,
+    env,
+    `${target.name} pi-cli workspace template`,
+    { allowLiteral: true, optionalEnv: true }
+  );
+  if (workspaceTemplate && evalFilePath && !path2.isAbsolute(workspaceTemplate)) {
+    workspaceTemplate = path2.resolve(path2.dirname(path2.resolve(evalFilePath)), workspaceTemplate);
+  }
+  if (cwd && workspaceTemplate) {
+    throw new Error(`${target.name}: 'cwd' and 'workspace_template' are mutually exclusive.`);
+  }
+  const timeoutMs = resolveTimeoutMs(timeoutSource, `${target.name} pi-cli timeout`);
+  const logDir = resolveOptionalString(logDirSource, env, `${target.name} pi-cli log directory`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  const logFormat = logFormatSource === "json" || logFormatSource === "summary" ? logFormatSource : void 0;
   const systemPrompt = typeof systemPromptSource === "string" && systemPromptSource.trim().length > 0 ? systemPromptSource.trim() : void 0;
   return {
+    executable,
     subprovider,
     model,
     apiKey,
+    tools,
+    thinking,
+    args,
+    cwd,
+    workspaceTemplate,
     timeoutMs,
+    logDir,
+    logFormat,
     systemPrompt
   };
 }
@@ -1543,7 +1581,7 @@ var AGENT_PROVIDER_KINDS = [
   "copilot-sdk",
   "copilot-cli",
   "pi-coding-agent",
-  "pi-agent-sdk",
+  "pi-cli",
   "claude",
   "claude-cli",
   "claude-sdk",
@@ -1560,7 +1598,7 @@ var KNOWN_PROVIDERS = [
   "copilot-sdk",
   "copilot-cli",
   "pi-coding-agent",
-  "pi-agent-sdk",
+  "pi-cli",
   "claude",
   "claude-cli",
   "claude-sdk",
@@ -1636,4 +1674,4 @@ export {
   extractLastAssistantContent,
   isAgentProvider
 };
-//# sourceMappingURL=chunk-AVTN5AB7.js.map
+//# sourceMappingURL=chunk-4XWPXNQM.js.map