@tangle-network/agent-eval 0.117.0 → 0.118.0

package/dist/chunk-PXE2VKMX.js

@@ -0,0 +1,140 @@
+// src/trace/extract-usage.ts
+import { SSEChunkParser } from "@tangle-network/agent-core/sse";
+import {
+  firstTokenCount,
+  TOKEN_USAGE_INPUT_KEYS,
+  TOKEN_USAGE_OUTPUT_KEYS,
+  tokenUsageSource
+} from "@tangle-network/agent-core/telemetry";
+var INPUT_OTHER_KEYS = ["input_other"];
+var EXCLUSIVE_REASONING_KEYS = ["reasoning", "reasoning_tokens", "reasoningTokens"];
+var INCLUSIVE_REASONING_KEYS = ["reasoning_output_tokens", "reasoningOutputTokens"];
+var INPUT_DETAIL_KEYS = ["prompt_tokens_details", "input_tokens_details"];
+var OUTPUT_DETAIL_KEYS = ["completion_tokens_details", "output_tokens_details"];
+var CACHED_KEYS = [
+  "cache",
+  "cached_tokens",
+  "cached_input_tokens",
+  "cache_read_tokens",
+  "cache_read_input_tokens",
+  "cachedTokens",
+  "cachedInputTokens",
+  "cacheReadTokens",
+  "cacheReadInputTokens",
+  "input_cache_read"
+];
+var CACHE_WRITE_KEYS = [
+  "cache_creation_tokens",
+  "cache_creation_input_tokens",
+  "cacheCreationTokens",
+  "cacheCreationInputTokens",
+  "input_cache_creation"
+];
+function nestedRecord(source, key) {
+  const value = source[key];
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function nestedNumber(source, recordKeys, valueKeys) {
+  for (const recordKey of recordKeys) {
+    const value = firstTokenCount(nestedRecord(source, recordKey), valueKeys);
+    if (value !== void 0) return value;
+  }
+  return void 0;
+}
+function extractUsage(body) {
+  if (!body || typeof body !== "object") return null;
+  const obj = body;
+  const usage = tokenUsageSource(obj);
+  const input = firstTokenCount(usage, TOKEN_USAGE_INPUT_KEYS);
+  const inputOther = firstTokenCount(usage, INPUT_OTHER_KEYS);
+  const output = firstTokenCount(usage, TOKEN_USAGE_OUTPUT_KEYS);
+  const exclusiveReasoning = firstTokenCount(usage, EXCLUSIVE_REASONING_KEYS);
+  const inclusiveReasoning = firstTokenCount(usage, INCLUSIVE_REASONING_KEYS) ?? nestedNumber(usage, OUTPUT_DETAIL_KEYS, ["reasoning_tokens", "reasoningTokens"]);
+  const reasoning = exclusiveReasoning ?? inclusiveReasoning;
+  const nestedCache = nestedRecord(usage, "cache");
+  const cached = firstTokenCount(usage, CACHED_KEYS) ?? firstTokenCount(nestedCache, ["read"]) ?? nestedNumber(usage, INPUT_DETAIL_KEYS, ["cached_tokens", "cachedTokens"]);
+  const cacheWrite = firstTokenCount(usage, CACHE_WRITE_KEYS) ?? firstTokenCount(nestedCache, ["write"]);
+  if (input === void 0 && inputOther === void 0 && output === void 0 && reasoning === void 0 && cached === void 0 && cacheWrite === void 0)
+    return null;
+  const result = {
+    input: (input ?? 0) + (inputOther ?? 0),
+    output: (output ?? (inclusiveReasoning !== void 0 ? inclusiveReasoning : 0)) + (exclusiveReasoning ?? 0)
+  };
+  if (reasoning !== void 0) result.reasoning = reasoning;
+  if (cached !== void 0) result.cached = cached;
+  if (cacheWrite !== void 0) result.cacheWrite = cacheWrite;
+  return result;
+}
+function extractUsageFromSse(text, options = {}) {
+  const mode = options.mode ?? "cumulative";
+  let input = 0;
+  let output = 0;
+  let reasoning = 0;
+  let sawReasoning = false;
+  let cached = 0;
+  let sawCached = false;
+  let cacheWrite = 0;
+  let sawCacheWrite = false;
+  let found = false;
+  const parser = new SSEChunkParser({ transform: parseSseJson });
+  const events = [...parser.push(text), ...parser.flush()];
+  const merge = mode === "delta" ? (current, next) => current + next : Math.max;
+  for (const event of events) {
+    const usage = extractUsage(event.data);
+    if (!usage) continue;
+    input = merge(input, usage.input);
+    output = merge(output, usage.output);
+    if (usage.reasoning !== void 0) {
+      reasoning = merge(reasoning, usage.reasoning);
+      sawReasoning = true;
+    }
+    if (usage.cached !== void 0) {
+      cached = merge(cached, usage.cached);
+      sawCached = true;
+    }
+    if (usage.cacheWrite !== void 0) {
+      cacheWrite = merge(cacheWrite, usage.cacheWrite);
+      sawCacheWrite = true;
+    }
+    found = true;
+  }
+  if (!found) return null;
+  return {
+    input,
+    output,
+    ...sawReasoning ? { reasoning } : {},
+    ...sawCached ? { cached } : {},
+    ...sawCacheWrite ? { cacheWrite } : {}
+  };
+}
+function parseSseJson(raw) {
+  const payload = raw.trim();
+  if (!payload || payload === "[DONE]") return null;
+  try {
+    return JSON.parse(payload);
+  } catch {
+    return null;
+  }
+}
+async function extractUsageFromResponse(response, sseOptions) {
+  let text;
+  try {
+    text = await response.clone().text();
+  } catch {
+    return null;
+  }
+  let json;
+  try {
+    json = JSON.parse(text);
+  } catch {
+    json = void 0;
+  }
+  return extractUsage(json) ?? extractUsageFromSse(text, sseOptions);
+}
+
+export {
+  extractUsage,
+  extractUsageFromSse,
+  extractUsageFromResponse
+};
+//# sourceMappingURL=chunk-PXE2VKMX.js.map

package/dist/chunk-PXE2VKMX.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/trace/extract-usage.ts"],"sourcesContent":["/**\n * Provider response and SSE usage extraction.\n *\n * Missing usage returns `null`; reported zeroes and cache-only activity remain\n * distinguishable from absent telemetry.\n */\n\nimport { SSEChunkParser } from '@tangle-network/agent-core/sse'\nimport {\n  firstTokenCount,\n  TOKEN_USAGE_INPUT_KEYS,\n  TOKEN_USAGE_OUTPUT_KEYS,\n  tokenUsageSource,\n} from '@tangle-network/agent-core/telemetry'\nimport type { RunTokenUsage } from '../run-record'\n\nexport type ExtractedUsage = RunTokenUsage\nexport type SseUsageMode = 'cumulative' | 'delta'\n\nexport interface ExtractUsageFromSseOptions {\n  /** Provider usage events are cumulative snapshots unless explicitly marked as deltas. */\n  mode?: SseUsageMode\n}\n\nconst INPUT_OTHER_KEYS = ['input_other'] as const\nconst EXCLUSIVE_REASONING_KEYS = ['reasoning', 'reasoning_tokens', 'reasoningTokens'] as const\nconst INCLUSIVE_REASONING_KEYS = ['reasoning_output_tokens', 'reasoningOutputTokens'] as const\nconst INPUT_DETAIL_KEYS = ['prompt_tokens_details', 'input_tokens_details'] as const\nconst OUTPUT_DETAIL_KEYS = ['completion_tokens_details', 'output_tokens_details'] as const\nconst CACHED_KEYS = [\n  'cache',\n  'cached_tokens',\n  'cached_input_tokens',\n  'cache_read_tokens',\n  'cache_read_input_tokens',\n  'cachedTokens',\n  'cachedInputTokens',\n  'cacheReadTokens',\n  'cacheReadInputTokens',\n  'input_cache_read',\n] as const\nconst CACHE_WRITE_KEYS = [\n  'cache_creation_tokens',\n  'cache_creation_input_tokens',\n  'cacheCreationTokens',\n  'cacheCreationInputTokens',\n  'input_cache_creation',\n] as const\n\nfunction nestedRecord(\n  source: Record<string, unknown>,\n  key: string,\n): Record<string, unknown> | undefined {\n  const value = source[key]\n  return value && typeof value === 'object' && !Array.isArray(value)\n    ? (value as Record<string, unknown>)\n    : undefined\n}\n\nfunction nestedNumber(\n  source: Record<string, unknown>,\n  recordKeys: readonly string[],\n  valueKeys: readonly string[],\n): number | undefined {\n  for (const recordKey of recordKeys) {\n    const value = firstTokenCount(nestedRecord(source, recordKey), valueKeys)\n    if (value !== undefined) return value\n  }\n  return undefined\n}\n\n/**\n * Pull `{ input, output, cached?, cacheWrite? }` from a parsed response\n * body. Accepts a top-level `usage` object (the common case) or a body that IS\n * the usage object. Returns null only when none of those categories is present.\n */\nexport function extractUsage(body: unknown): ExtractedUsage | null {\n  if (!body || typeof body !== 'object') return null\n  const obj = body as Record<string, unknown>\n  const usage = tokenUsageSource(obj)\n  const input = firstTokenCount(usage, TOKEN_USAGE_INPUT_KEYS)\n  const inputOther = firstTokenCount(usage, INPUT_OTHER_KEYS)\n  const output = firstTokenCount(usage, TOKEN_USAGE_OUTPUT_KEYS)\n  const exclusiveReasoning = firstTokenCount(usage, EXCLUSIVE_REASONING_KEYS)\n  const inclusiveReasoning =\n    firstTokenCount(usage, INCLUSIVE_REASONING_KEYS) ??\n    nestedNumber(usage, OUTPUT_DETAIL_KEYS, ['reasoning_tokens', 'reasoningTokens'])\n  const reasoning = exclusiveReasoning ?? inclusiveReasoning\n  const nestedCache = nestedRecord(usage, 'cache')\n  const cached =\n    firstTokenCount(usage, CACHED_KEYS) ??\n    firstTokenCount(nestedCache, ['read']) ??\n    nestedNumber(usage, INPUT_DETAIL_KEYS, ['cached_tokens', 'cachedTokens'])\n  const cacheWrite =\n    firstTokenCount(usage, CACHE_WRITE_KEYS) ?? firstTokenCount(nestedCache, ['write'])\n  if (\n    input === undefined &&\n    inputOther === undefined &&\n    output === undefined &&\n    reasoning === undefined &&\n    cached === undefined &&\n    cacheWrite === undefined\n  )\n    return null\n  const result: ExtractedUsage = {\n    input: (input ?? 0) + (inputOther ?? 0),\n    output:\n      (output ?? (inclusiveReasoning !== undefined ? inclusiveReasoning : 0)) +\n      (exclusiveReasoning ?? 0),\n  }\n  if (reasoning !== undefined) result.reasoning = reasoning\n  if (cached !== undefined) result.cached = cached\n  if (cacheWrite !== undefined) result.cacheWrite = cacheWrite\n  return result\n}\n\n/**\n * Extract token usage from a complete SSE response body using the shared SSE\n * frame parser. Cumulative snapshots are the fail-safe default because summing\n * them inflates billing; callers with explicit delta events opt into `mode: 'delta'`.\n */\nexport function extractUsageFromSse(\n  text: string,\n  options: ExtractUsageFromSseOptions = {},\n): ExtractedUsage | null {\n  const mode = options.mode ?? 'cumulative'\n  let input = 0\n  let output = 0\n  let reasoning = 0\n  let sawReasoning = false\n  let cached = 0\n  let sawCached = false\n  let cacheWrite = 0\n  let sawCacheWrite = false\n  let found = false\n  const parser = new SSEChunkParser<unknown>({ transform: parseSseJson })\n  const events = [...parser.push(text), ...parser.flush()]\n  const merge = mode === 'delta' ? (current: number, next: number) => current + next : Math.max\n\n  for (const event of events) {\n    const usage = extractUsage(event.data)\n    if (!usage) continue\n    input = merge(input, usage.input)\n    output = merge(output, usage.output)\n    if (usage.reasoning !== undefined) {\n      reasoning = merge(reasoning, usage.reasoning)\n      sawReasoning = true\n    }\n    if (usage.cached !== undefined) {\n      cached = merge(cached, usage.cached)\n      sawCached = true\n    }\n    if (usage.cacheWrite !== undefined) {\n      cacheWrite = merge(cacheWrite, usage.cacheWrite)\n      sawCacheWrite = true\n    }\n    found = true\n  }\n  if (!found) return null\n  return {\n    input,\n    output,\n    ...(sawReasoning ? { reasoning } : {}),\n    ...(sawCached ? { cached } : {}),\n    ...(sawCacheWrite ? { cacheWrite } : {}),\n  }\n}\n\nfunction parseSseJson(raw: string): unknown | null {\n  const payload = raw.trim()\n  if (!payload || payload === '[DONE]') return null\n  try {\n    return JSON.parse(payload)\n  } catch {\n    return null\n  }\n}\n\n/**\n * Extract usage from an HTTP `Response` without consuming the caller's body:\n * clones, reads the text, and tries the JSON parser first, then the SSE\n * accumulator. Best-effort — returns null on any read/parse miss so a usage tee\n * never takes down the underlying call.\n */\nexport async function extractUsageFromResponse(\n  response: Response,\n  sseOptions?: ExtractUsageFromSseOptions,\n): Promise<ExtractedUsage | null> {\n  let text: string\n  try {\n    text = await response.clone().text()\n  } catch {\n    return null\n  }\n  let json: unknown\n  try {\n    json = JSON.parse(text)\n  } catch {\n    json = undefined\n  }\n  return extractUsage(json) ?? extractUsageFromSse(text, sseOptions)\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-ZUXV7UWZ.js → chunk-Q442S5AS.js}

@@ -15,7 +15,7 @@ import {
   runImprovementLoop,
   surfaceContentHash,
   surfaceHash
-} from "./chunk-HQPHZGL6.js";
+} from "./chunk-YLMUS4MM.js";
 import {
   SearchLedgerConflictError,
   SearchLedgerError,
@@ -48,7 +48,14 @@ import {
   makePolicyEditCandidateRecord,
   policyEditsFromFindings,
   validatePolicyEditCandidateRecord
-} from "./chunk-MGEHEHSN.js";
+} from "./chunk-OIIMMLRB.js";
+import {
+  callLlm,
+  callLlmJson,
+  costReceiptFromLlm,
+  costReceiptFromLlmError,
+  maximumChargeForLlmRequest
+} from "./chunk-NJC7U437.js";
 import {
   eProcess,
   mcnemar,
@@ -57,33 +64,26 @@ import {
   pairedRiskDifference,
   wilcoxonSignedRank
 } from "./chunk-PJQFMIOX.js";
+import {
+  CostAccountingIncompleteError,
+  CostLedger
+} from "./chunk-VCTY3W6J.js";
 import {
   analyzeTraces
-} from "./chunk-4JLWXDYA.js";
+} from "./chunk-3EHHMC6E.js";
 import {
   OtlpFileTraceStore
-} from "./chunk-S2F4J57L.js";
+} from "./chunk-QKEGNI5B.js";
 import {
   modelHasSnapshot,
   validateRunRecord
-} from "./chunk-5UF54T55.js";
+} from "./chunk-S3UZOQ5Y.js";
 import {
   buildAgentProfileCell
 } from "./chunk-XJYR7XFV.js";
 import {
   canonicalize
 } from "./chunk-VSMTAMNK.js";
-import {
-  callLlm,
-  callLlmJson,
-  costReceiptFromLlm,
-  costReceiptFromLlmError,
-  maximumChargeForLlmRequest
-} from "./chunk-NJC7U437.js";
-import {
-  CostAccountingIncompleteError,
-  CostLedger
-} from "./chunk-VCTY3W6J.js";
 import {
   AgentEvalError,
   ValidationError
@@ -7483,6 +7483,45 @@ function gitBytes(git, args, cwd, env) {
 function gitText(git, args, cwd, env) {
   return gitBytes(git, args, cwd, env).toString("utf8").trim();
 }
+function hasRegisteredWorktree(git, repoRoot, path) {
+  const expected = Buffer.from(`worktree ${resolve3(path)}`, "utf8");
+  const records = gitBytes(git, ["worktree", "list", "--porcelain", "-z"], repoRoot);
+  let start = 0;
+  while (start < records.length) {
+    const end = records.indexOf(0, start);
+    if (end < 0) {
+      throw new WorktreeAdapterError("Git worktree list output was not NUL-terminated");
+    }
+    if (records.subarray(start, end).equals(expected)) return true;
+    start = end + 1;
+  }
+  return false;
+}
+function hasLocalBranch(git, repoRoot, branch) {
+  const ref = `refs/heads/${branch}`;
+  return gitText(git, ["for-each-ref", "--format=%(refname)", "--", ref], repoRoot).split("\n").some((candidate) => candidate === ref);
+}
+function reconcileAbsent(exists, remove) {
+  try {
+    if (!exists()) return void 0;
+  } catch (err) {
+    return err;
+  }
+  try {
+    remove();
+    return void 0;
+  } catch (removeError) {
+    try {
+      if (!exists()) return void 0;
+    } catch (recheckError) {
+      return new AggregateError(
+        [removeError, recheckError],
+        "Removal failed and the resulting resource state could not be checked"
+      );
+    }
+    return removeError;
+  }
+}
 function sha2562(bytes) {
   return `sha256:${createHash8("sha256").update(bytes).digest("hex")}`;
 }
@@ -7947,8 +7986,23 @@ function gitWorktreeAdapter(opts) {
       return surface;
     },
     async discard(worktree) {
-      gitText(git, ["worktree", "remove", "--force", worktree.path], opts.repoRoot);
-      gitText(git, ["branch", "-D", worktree.branch], opts.repoRoot);
+      const failures = [
+        reconcileAbsent(
+          () => hasRegisteredWorktree(git, opts.repoRoot, worktree.path),
+          () => gitText(git, ["worktree", "remove", "--force", "--", worktree.path], opts.repoRoot)
+        ),
+        reconcileAbsent(
+          () => hasLocalBranch(git, opts.repoRoot, worktree.branch),
+          () => gitText(git, ["branch", "-D", "--", worktree.branch], opts.repoRoot)
+        )
+      ].filter((failure) => failure !== void 0);
+      if (failures.length > 0) {
+        const cause = failures.length === 1 ? failures[0] : new AggregateError(failures, "Multiple Git resources could not be removed");
+        throw new WorktreeAdapterError(
+          `Failed to discard worktree ${worktree.path} and branch ${worktree.branch}`,
+          cause
+        );
+      }
     }
   };
 }
@@ -8044,4 +8098,4 @@ export {
   verifyCodeSurface,
   resolveWorktreePath
 };
-//# sourceMappingURL=chunk-ZUXV7UWZ.js.map
+//# sourceMappingURL=chunk-Q442S5AS.js.map