@tangle-network/traces 0.2.2 → 0.4.0

package/dist/{chunk-4PC7MQXT.js → chunk-33NBMIH4.js}

@@ -70,6 +70,25 @@ async function analyzeSpans(spans, opts = {}) {
   return { otlpPath, result };
 }
 
+// src/time.ts
+function parseIsoToEpochMs(ts) {
+  if (!ts) return 0;
+  if (/^\d+$/.test(ts)) return Number(ts);
+  const n = Date.parse(ts);
+  return Number.isNaN(n) ? 0 : n;
+}
+function parseSince(value) {
+  const m = value.match(/^(\d+)\s*([mhd])$/i);
+  if (m) {
+    const unit = m[2].toLowerCase();
+    const ms = unit === "m" ? 6e4 : unit === "h" ? 36e5 : 864e5;
+    return Date.now() - Number(m[1]) * ms;
+  }
+  const t = Date.parse(value);
+  if (Number.isNaN(t)) throw new Error(`--since: expected 30m / 2h / 7d or an ISO date, got "${value}"`);
+  return t;
+}
+
 // src/runtime-store.ts
 import { InMemoryTraceStore } from "@tangle-network/agent-eval";
 var KIND = {
@@ -79,10 +98,6 @@ var KIND = {
   CHAIN: "custom",
   SPAN: "custom"
 };
-function ms(iso2) {
-  const n = Date.parse(iso2);
-  return Number.isNaN(n) ? 0 : n;
-}
 async function toRuntimeStore(spans) {
   const store = new InMemoryTraceStore();
   const runIds = /* @__PURE__ */ new Set();
@@ -97,8 +112,8 @@ async function toRuntimeStore(spans) {
       parentSpanId: s.parent_span_id ?? void 0,
       runId: s.trace_id,
       name: s.name,
-      startedAt: ms(s.start_time),
-      endedAt: ms(s.end_time),
+      startedAt: parseIsoToEpochMs(s.start_time),
+      endedAt: parseIsoToEpochMs(s.end_time),
       status: s.status.code === "ERROR" ? "error" : "ok",
       error: s.status.message,
       attributes: s.attributes
@@ -129,6 +144,11 @@ import { readdir, readFile, stat } from "fs/promises";
 import { homedir } from "os";
 import { basename, join } from "path";
 var SERVICE = "amp";
+var CONTENT_CAP = 8e3;
+function textOf(content) {
+  if (typeof content === "string") return content.slice(0, CONTENT_CAP);
+  return (Array.isArray(content) ? content : []).filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("\n").trim().slice(0, CONTENT_CAP);
+}
 var AmpAdapter = class {
   harness = "amp";
   threadsRoot() {
@@ -177,25 +197,47 @@ var AmpAdapter = class {
     for (const m of messages) {
       const mid = m.messageId ?? step;
       const llmId = `llm:${mid}`;
-      const u = m.usage;
-      const inputTokens2 = u ? (u.inputTokens ?? 0) + (u.cacheReadInputTokens ?? 0) + (u.cacheCreationInputTokens ?? 0) || null : null;
-      spans.push(
-        span({
-          traceId,
-          spanId: llmId,
-          parentSpanId: rootId,
-          name: `message.${m.role ?? "unknown"}`,
-          kind: "LLM",
-          startTime: start,
-          service: SERVICE,
-          agent: SERVICE,
-          model: u?.model ?? null,
-          inputTokens: inputTokens2,
-          outputTokens: u?.outputTokens ?? null,
-          step
-        })
-      );
-      step += 1;
+      if (m.role === "user") {
+        const prompt = textOf(m.content);
+        if (prompt) {
+          spans.push(
+            span({
+              traceId,
+              spanId: `${llmId}:user`,
+              parentSpanId: rootId,
+              name: "user.prompt",
+              kind: "CHAIN",
+              startTime: start,
+              service: SERVICE,
+              agent: SERVICE,
+              step,
+              content: prompt
+            })
+          );
+          step += 1;
+        }
+      } else {
+        const u = m.usage;
+        const inputTokens2 = u ? (u.inputTokens ?? 0) + (u.cacheReadInputTokens ?? 0) + (u.cacheCreationInputTokens ?? 0) || null : null;
+        spans.push(
+          span({
+            traceId,
+            spanId: llmId,
+            parentSpanId: rootId,
+            name: `message.${m.role ?? "unknown"}`,
+            kind: "LLM",
+            startTime: start,
+            service: SERVICE,
+            agent: SERVICE,
+            model: u?.model ?? null,
+            inputTokens: inputTokens2,
+            outputTokens: u?.outputTokens ?? null,
+            step,
+            content: textOf(m.content) || null
+          })
+        );
+        step += 1;
+      }
       for (const b of m.content ?? []) {
         if (b.type === "tool_use" && b.name) {
           const t = span({
@@ -248,6 +290,11 @@ function inputTokens(u) {
 function asBlocks(content) {
   return Array.isArray(content) ? content : [];
 }
+var CONTENT_CAP2 = 8e3;
+function textOf2(content) {
+  if (typeof content === "string") return content.slice(0, CONTENT_CAP2);
+  return asBlocks(content).filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("\n").trim().slice(0, CONTENT_CAP2);
+}
 function stringifyToolResult(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) {
@@ -277,7 +324,8 @@ function parseClaudeStream(events, ctx) {
           model: ev.message.model ?? null,
           inputTokens: inputTokens(ev.message.usage),
           outputTokens: ev.message.usage?.output_tokens ?? null,
-          step
+          step,
+          content: textOf2(ev.message.content) || null
         })
       );
       step += 1;
@@ -303,6 +351,24 @@ function parseClaudeStream(events, ctx) {
         step += 1;
       }
     } else if (ev.type === "user" && ev.message) {
+      const prompt = textOf2(ev.message.content);
+      if (prompt) {
+        spans.push(
+          span({
+            traceId: ctx.traceId,
+            spanId: `${ctx.idPrefix}${uid}:user`,
+            parentSpanId: ctx.rootParent,
+            name: "user.prompt",
+            kind: "CHAIN",
+            startTime: ts,
+            service: SERVICE2,
+            agent: ctx.agent,
+            step,
+            content: prompt
+          })
+        );
+        step += 1;
+      }
       for (const block of asBlocks(ev.message.content)) {
         if (block.type !== "tool_result" || !block.tool_use_id) continue;
         backfillResult(toolSpanByUseId.get(block.tool_use_id), ts, block.is_error === true, stringifyToolResult(block.content));
@@ -452,6 +518,10 @@ function contentToString(content) {
   }
   return "";
 }
+var CONTENT_CAP3 = 8e3;
+function textOf3(content) {
+  return contentToString(content).trim().slice(0, CONTENT_CAP3);
+}
 function outputIsError(output) {
   const s = typeof output === "string" ? output : JSON.stringify(output ?? "");
   const error = /"success"\s*:\s*false|exit(?:_| )code["\s:]+[1-9]|\bcommand failed\b|\bENOENT\b|\berror:/i.test(s);
@@ -599,8 +669,27 @@ var CodexAdapter = class {
           t.end_time = ts;
           t.status = error ? { code: "ERROR", message } : { code: "OK" };
         }
+      } else if (l.type === "response_item" && l.payload?.type === "message" && l.payload.role === "user") {
+        const prompt = textOf3(l.payload.content);
+        if (prompt) {
+          spans.push(
+            span({
+              traceId,
+              spanId: `msg:${step}:user`,
+              parentSpanId: rootId,
+              name: "user.prompt",
+              kind: "CHAIN",
+              startTime: ts,
+              service: SERVICE3,
+              agent: SERVICE3,
+              step,
+              content: prompt
+            })
+          );
+          step += 1;
+        }
       } else if (l.type === "response_item" && l.payload?.type === "message") {
-        const text = contentToString(l.payload.content);
+        const text = textOf3(l.payload.content);
         if (text) {
           spans.push(
             span({
@@ -613,7 +702,7 @@ var CodexAdapter = class {
               service: SERVICE3,
               agent: SERVICE3,
               step,
-              content: text.slice(0, 8e3)
+              content: text
             })
           );
           step += 1;
@@ -755,6 +844,10 @@ import { readdir as readdir5, readFile as readFile5, stat as stat5 } from "fs/pr
 import { homedir as homedir5 } from "os";
 import { basename as basename4, join as join5 } from "path";
 var SERVICE5 = "factory";
+var CONTENT_CAP4 = 8e3;
+function textOf4(content) {
+  return (content ?? []).filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("").trim().slice(0, CONTENT_CAP4);
+}
 function parseLines4(raw) {
   const out = [];
   for (const line of raw.split("\n")) {
@@ -841,25 +934,45 @@ var FactoryAdapter = class {
       if (l.type !== "message" || !l.message) continue;
       const ts = l.timestamp ?? (/* @__PURE__ */ new Date(0)).toISOString();
       const role = l.message.role;
-      const llmId = `llm:${l.id ?? step}`;
-      const text = (l.message.content ?? []).filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("");
-      spans.push(
-        span({
-          traceId,
-          spanId: llmId,
-          parentSpanId: rootId,
-          name: `message.${role ?? "unknown"}`,
-          kind: "LLM",
-          startTime: ts,
-          service: SERVICE5,
-          agent: SERVICE5,
-          model: settings.model ?? null,
-          step,
-          content: text ? text.slice(0, 8e3) : null
-        })
-      );
-      lastLlm = llmId;
-      step += 1;
+      const text = textOf4(l.message.content);
+      if (role === "user") {
+        if (text) {
+          spans.push(
+            span({
+              traceId,
+              spanId: `user:${l.id ?? step}`,
+              parentSpanId: rootId,
+              name: "user.prompt",
+              kind: "CHAIN",
+              startTime: ts,
+              service: SERVICE5,
+              agent: SERVICE5,
+              step,
+              content: text
+            })
+          );
+          step += 1;
+        }
+      } else {
+        const llmId = `llm:${l.id ?? step}`;
+        spans.push(
+          span({
+            traceId,
+            spanId: llmId,
+            parentSpanId: rootId,
+            name: `message.${role ?? "unknown"}`,
+            kind: "LLM",
+            startTime: ts,
+            service: SERVICE5,
+            agent: SERVICE5,
+            model: settings.model ?? null,
+            step,
+            content: text || null
+          })
+        );
+        lastLlm = llmId;
+        step += 1;
+      }
       for (const b of l.message.content ?? []) {
         if (b.type === "tool_use" && b.name) {
           const t = span({
@@ -897,6 +1010,10 @@ function tokens(t) {
   if (!t) return null;
   return t.actual ?? t.approx ?? null;
 }
+var CONTENT_CAP5 = 8e3;
+function textOf5(content) {
+  return (content ?? "").trim().slice(0, CONTENT_CAP5);
+}
 var ForgeAdapter = class {
   harness = "forge";
   aliases = ["forgecode"];
@@ -949,7 +1066,26 @@ var ForgeAdapter = class {
     for (const raw of messages) {
       const entry = raw.message ?? raw;
       const ts = (/* @__PURE__ */ new Date(0)).toISOString();
-      if (entry.text) {
+      if (entry.text && entry.text.role === "user") {
+        const prompt = textOf5(entry.text.content);
+        if (prompt) {
+          spans.push(
+            span({
+              traceId,
+              spanId: `user:${step}`,
+              parentSpanId: rootId,
+              name: "user.prompt",
+              kind: "CHAIN",
+              startTime: ts,
+              service: SERVICE6,
+              agent: SERVICE6,
+              step,
+              content: prompt
+            })
+          );
+          step += 1;
+        }
+      } else if (entry.text) {
         const llmId = `llm:${step}`;
         spans.push(
           span({
@@ -965,7 +1101,7 @@ var ForgeAdapter = class {
             inputTokens: tokens(raw.usage?.prompt_tokens),
             outputTokens: tokens(raw.usage?.completion_tokens),
             step,
-            content: entry.text.content ? entry.text.content.slice(0, 8e3) : null
+            content: textOf5(entry.text.content) || null
           })
         );
         lastLlm = llmId;
@@ -1010,6 +1146,11 @@ function iso(ts, fallback) {
 function toolStatusError(status) {
   return status != null && /error|fail|cancel/i.test(status);
 }
+var CONTENT_CAP6 = 8e3;
+function textOf6(content) {
+  const s = typeof content === "string" ? content : JSON.stringify(content ?? "");
+  return s.trim().slice(0, CONTENT_CAP6);
+}
 var GeminiFamilyAdapter = class {
   harness;
   aliases;
@@ -1086,7 +1227,26 @@ var GeminiFamilyAdapter = class {
       const mid = m.id ?? `m${step}`;
       const ts = iso(m.timestamp, start);
       const llmId = `llm:${mid}`;
-      const content = typeof m.content === "string" ? m.content : JSON.stringify(m.content ?? "");
+      if (m.type === "user") {
+        const prompt = textOf6(m.content);
+        if (prompt) {
+          spans.push(
+            span({
+              traceId,
+              spanId: `${llmId}:user`,
+              parentSpanId: rootId,
+              name: "user.prompt",
+              kind: "CHAIN",
+              startTime: ts,
+              service: this.service,
+              agent: this.service,
+              step,
+              content: prompt
+            })
+          );
+          step += 1;
+        }
+      }
       spans.push(
         span({
           traceId,
@@ -1101,7 +1261,7 @@ var GeminiFamilyAdapter = class {
           inputTokens: m.tokens?.input ?? null,
           outputTokens: m.tokens?.output ?? null,
           step,
-          content: content ? content.slice(0, 8e3) : null
+          content: textOf6(m.content) || null
         })
       );
       step += 1;
@@ -1141,8 +1301,12 @@ import { readdir as readdir8, readFile as readFile8, stat as stat8 } from "fs/pr
 import { homedir as homedir8 } from "os";
 import { join as join8 } from "path";
 var SERVICE7 = "opencode";
-function isoOf(ms2) {
-  return new Date(ms2 ?? 0).toISOString();
+function isoOf(ms) {
+  return new Date(ms ?? 0).toISOString();
+}
+var CONTENT_CAP7 = 8e3;
+function textOf7(parts) {
+  return parts.filter((p) => p.type === "text" && typeof p.text === "string").map((p) => p.text).join("\n").trim().slice(0, CONTENT_CAP7);
 }
 var OpencodeAdapter = class {
   harness = "opencode";
@@ -1209,6 +1373,19 @@ var OpencodeAdapter = class {
     for (const { msg } of messages) {
       const mid = msg.id ?? `m${step}`;
       const llmId = `llm:${mid}`;
+      const pdir = join8(partRoot, mid);
+      const parts = [];
+      try {
+        const partFiles = (await readdir8(pdir)).filter((f) => f.endsWith(".json"));
+        for (const pf of partFiles) {
+          try {
+            parts.push(JSON.parse(await readFile8(join8(pdir, pf), "utf8")));
+          } catch {
+          }
+        }
+      } catch {
+      }
+      const turnText = textOf7(parts);
       spans.push(
         span({
           traceId,
@@ -1223,24 +1400,29 @@ var OpencodeAdapter = class {
           model: msg.modelID ?? null,
           inputTokens: msg.tokens?.input ?? null,
           outputTokens: msg.tokens?.output ?? null,
-          step
+          step,
+          content: turnText || null
         })
       );
       step += 1;
-      const pdir = join8(partRoot, mid);
-      let partFiles;
-      try {
-        partFiles = (await readdir8(pdir)).filter((f) => f.endsWith(".json"));
-      } catch {
-        continue;
+      if (msg.role === "user" && turnText) {
+        spans.push(
+          span({
+            traceId,
+            spanId: `${llmId}:user`,
+            parentSpanId: rootId,
+            name: "user.prompt",
+            kind: "CHAIN",
+            startTime: isoOf(msg.time?.created),
+            service: SERVICE7,
+            agent: SERVICE7,
+            step,
+            content: turnText
+          })
+        );
+        step += 1;
       }
-      for (const pf of partFiles) {
-        let part;
-        try {
-          part = JSON.parse(await readFile8(join8(pdir, pf), "utf8"));
-        } catch {
-          continue;
-        }
+      for (const part of parts) {
         if (part.type !== "tool" || !part.tool) continue;
         const err = part.state?.status === "error";
         spans.push(
@@ -1290,9 +1472,10 @@ function isToolBlock(b) {
 function isToolResultBlock(b) {
   return typeof b.type === "string" && /tool[_-]?result|tool[_-]?output/i.test(b.type);
 }
-function textOf(content) {
+var CONTENT_CAP8 = 8e3;
+function textOf8(content) {
   if (!content) return "";
-  return content.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("");
+  return content.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("").trim().slice(0, CONTENT_CAP8);
 }
 var PiAdapter = class {
   harness = "pi";
@@ -1360,27 +1543,48 @@ var PiAdapter = class {
       const mid = l.id ?? `m${step}`;
       const msg = l.message;
       const llmId = `llm:${mid}`;
-      const errored = !!msg.errorMessage;
-      spans.push(
-        span({
-          traceId,
-          spanId: llmId,
-          parentSpanId: rootId,
-          name: `message.${msg.role ?? "unknown"}`,
-          kind: "LLM",
-          startTime: ts,
-          status: errored ? "ERROR" : "OK",
-          statusMessage: errored ? msg.errorMessage.slice(0, 500) : void 0,
-          service: SERVICE8,
-          agent: SERVICE8,
-          model: msg.model ?? null,
-          inputTokens: msg.usage?.input ?? null,
-          outputTokens: msg.usage?.output ?? null,
-          step,
-          content: textOf(msg.content).slice(0, 8e3) || null
-        })
-      );
-      step += 1;
+      if (msg.role === "user") {
+        const prompt = textOf8(msg.content);
+        if (prompt) {
+          spans.push(
+            span({
+              traceId,
+              spanId: `${mid}:user`,
+              parentSpanId: rootId,
+              name: "user.prompt",
+              kind: "CHAIN",
+              startTime: ts,
+              service: SERVICE8,
+              agent: SERVICE8,
+              step,
+              content: prompt
+            })
+          );
+          step += 1;
+        }
+      } else {
+        const errored = !!msg.errorMessage;
+        spans.push(
+          span({
+            traceId,
+            spanId: llmId,
+            parentSpanId: rootId,
+            name: `message.${msg.role ?? "unknown"}`,
+            kind: "LLM",
+            startTime: ts,
+            status: errored ? "ERROR" : "OK",
+            statusMessage: errored ? msg.errorMessage.slice(0, 500) : void 0,
+            service: SERVICE8,
+            agent: SERVICE8,
+            model: msg.model ?? null,
+            inputTokens: msg.usage?.input ?? null,
+            outputTokens: msg.usage?.output ?? null,
+            step,
+            content: textOf8(msg.content) || null
+          })
+        );
+        step += 1;
+      }
       for (const b of msg.content ?? []) {
         if (isToolBlock(b)) {
           const name = b.toolName ?? b.name ?? "tool";
@@ -1432,7 +1636,7 @@ function parseLines6(raw) {
   }
   return out;
 }
-function textOf2(parts) {
+function textOf9(parts) {
   if (!parts) return "";
   return parts.filter((p) => typeof p.text === "string").map((p) => p.text).join("");
 }
@@ -1514,7 +1718,7 @@ var QwenAdapter = class {
             inputTokens: r.usageMetadata?.promptTokenCount ?? null,
             outputTokens: r.usageMetadata?.candidatesTokenCount ?? null,
             step,
-            content: textOf2(r.message?.parts).slice(0, 8e3) || null
+            content: textOf9(r.message?.parts).slice(0, 8e3) || null
           })
         );
         lastLlm = llmId;
@@ -1541,6 +1745,25 @@ var QwenAdapter = class {
           openToolsByName.set(name, q);
           step += 1;
         }
+      } else if (r.type === "user") {
+        const prompt = textOf9(r.message?.parts).slice(0, 8e3);
+        if (prompt) {
+          spans.push(
+            span({
+              traceId,
+              spanId: `user:${r.uuid ?? step}`,
+              parentSpanId: rootId,
+              name: "user.prompt",
+              kind: "CHAIN",
+              startTime: ts,
+              service: SERVICE9,
+              agent: SERVICE9,
+              step,
+              content: prompt
+            })
+          );
+          step += 1;
+        }
       } else if (r.type === "tool_result") {
         const err = r.toolCallResult?.status === "error" || r.toolCallResult?.error != null;
         for (const p of r.message?.parts ?? []) {
@@ -1585,9 +1808,45 @@ function resolveAdapter(harness) {
 function knownHarnesses() {
   return [...BY_NAME.keys()].sort();
 }
+function selectAdapters(opts) {
+  if (opts.adapters && opts.adapters.length > 0) return [...opts.adapters];
+  if (opts.all || !opts.harnesses || opts.harnesses.length === 0) return [...ADAPTERS];
+  return opts.harnesses.map((h) => {
+    const a = resolveAdapter(h);
+    if (!a) throw new Error(`unknown harness "${h}". Known: ${knownHarnesses().join(", ")}`);
+    return a;
+  });
+}
+
+// src/session-source.ts
+async function* scanSessions(opts) {
+  for (const adapter of selectAdapters(opts)) {
+    if (opts.signal?.aborted) return;
+    let refs;
+    try {
+      refs = await adapter.locate({ cwd: opts.cwd, sinceMs: opts.sinceMs });
+    } catch (err) {
+      opts.onError?.(err);
+      continue;
+    }
+    if (opts.last && opts.last > 0) refs = refs.slice(0, opts.last);
+    for (const ref of refs) {
+      if (opts.signal?.aborted) return;
+      let spans;
+      try {
+        spans = await adapter.parse(ref);
+      } catch (err) {
+        opts.onError?.(err, ref);
+        continue;
+      }
+      if (spans.length === 0) continue;
+      yield { adapter, ref, spans };
+    }
+  }
+}
 
 // src/observer.ts
-var sleep = (ms2, signal) => new Promise((resolve) => {
+var sleep = (ms, signal) => new Promise((resolve) => {
   const onAbort = () => {
     clearTimeout(t);
     resolve();
@@ -1595,19 +1854,9 @@ var sleep = (ms2, signal) => new Promise((resolve) => {
   const t = setTimeout(() => {
     signal?.removeEventListener("abort", onAbort);
     resolve();
-  }, ms2);
+  }, ms);
   signal?.addEventListener("abort", onAbort, { once: true });
 });
-function adaptersFor(opts) {
-  if (opts.adapters && opts.adapters.length > 0) return opts.adapters;
-  if (opts.all || !opts.harnesses || opts.harnesses.length === 0) return [...listAdapters()];
-  const out = [];
-  for (const h of opts.harnesses) {
-    const a = resolveAdapter(h);
-    if (a && !out.includes(a)) out.push(a);
-  }
-  return out;
-}
 function loopKey(sessionId, toolName, argHash) {
   return `${sessionId}\0${toolName}\0${argHash}`;
 }
@@ -1615,57 +1864,50 @@ async function watchSessions(opts) {
   const windowMs = opts.windowMs ?? 30 * 6e4;
   const intervalMs = Math.max(250, opts.intervalMs ?? 5e3);
   const minLoop = opts.minLoopOccurrences ?? 3;
-  const adapters = adaptersFor(opts);
   const seen = /* @__PURE__ */ new Map();
   while (!opts.signal?.aborted) {
-    const sinceMs = Date.now() - windowMs;
     let sessionCount = 0;
-    for (const adapter of adapters) {
-      if (opts.signal?.aborted) break;
-      let refs;
+    for await (const { adapter, ref, spans } of scanSessions({
+      adapters: opts.adapters,
+      all: opts.all,
+      harnesses: opts.harnesses,
+      cwd: opts.cwd,
+      sinceMs: Date.now() - windowMs,
+      signal: opts.signal,
+      onError: opts.onError
+    })) {
+      let report;
       try {
-        refs = await adapter.locate({ cwd: opts.cwd, sinceMs });
+        report = await runPipelines(spans, { minLoopOccurrences: minLoop });
       } catch (err) {
-        opts.onError?.(err);
+        opts.onError?.(err, ref);
         continue;
       }
-      for (const ref of refs) {
-        if (opts.signal?.aborted) break;
-        let report;
+      sessionCount += 1;
+      if (opts.onReport) {
         try {
-          const spans = await adapter.parse(ref);
-          if (spans.length === 0) continue;
-          report = await runPipelines(spans, { minLoopOccurrences: minLoop });
+          await opts.onReport(ref, report);
         } catch (err) {
           opts.onError?.(err, ref);
-          continue;
         }
-        sessionCount += 1;
-        if (opts.onReport) {
-          try {
-            await opts.onReport(ref, report);
-          } catch (err) {
-            opts.onError?.(err, ref);
-          }
-        }
-        for (const f of report.stuckLoops.findings) {
-          const key = loopKey(ref.sessionId, f.toolName, f.argHash);
-          if (f.occurrences > (seen.get(key) ?? 0)) {
-            seen.set(key, f.occurrences);
-            if (opts.onLoop) {
-              try {
-                await opts.onLoop({
-                  harness: adapter.harness,
-                  sessionId: ref.sessionId,
-                  cwd: ref.cwd,
-                  toolName: f.toolName,
-                  argHash: f.argHash,
-                  occurrences: f.occurrences,
-                  windowMs: f.windowMs
-                });
-              } catch (err) {
-                opts.onError?.(err, ref);
-              }
+      }
+      for (const f of report.stuckLoops.findings) {
+        const key = loopKey(ref.sessionId, f.toolName, f.argHash);
+        if (f.occurrences > (seen.get(key) ?? 0)) {
+          seen.set(key, f.occurrences);
+          if (opts.onLoop) {
+            try {
+              await opts.onLoop({
+                harness: adapter.harness,
+                sessionId: ref.sessionId,
+                cwd: ref.cwd,
+                toolName: f.toolName,
+                argHash: f.argHash,
+                occurrences: f.occurrences,
+                windowMs: f.windowMs
+              });
+            } catch (err) {
+              opts.onError?.(err, ref);
             }
           }
         }
@@ -1681,6 +1923,28 @@ async function watchSessions(opts) {
   }
 }
 
+// src/attributes.ts
+var ATTR = {
+  /** = the trace/session id. Wire contract (dedup linkage). */
+  SESSION_ID: "tangle.sessionId",
+  /** "cli" marks a CLI upload so the platform can drop a re-upload of a session
+   *  that also streamed live. Wire contract. */
+  INGEST_SOURCE: "tangle.ingest_source",
+  HARNESS: "tangle.harness",
+  CWD: "tangle.cwd",
+  GIT_BRANCH: "tangle.git_branch",
+  HOST: "tangle.host",
+  /** Basename of the session file. (Renamed from the ambiguous `tangle.source`,
+   *  which collided with `tangle.ingest_source`.) */
+  SESSION_FILE: "tangle.session_file",
+  UPLOADED_AT: "tangle.uploaded_at",
+  UPLOADER: "tangle.uploader",
+  REDACTION_VERSION: "redaction.version",
+  REDACTION_COUNT: "redaction.count"
+};
+var INGEST_SOURCE_CLI = "cli";
+var DEFAULT_HARNESS = "claude-code";
+
 // src/redact.ts
 import { DEFAULT_REDACTION_RULES, redactValue } from "@tangle-network/agent-eval/traces";
 var CODING_REDACTION_RULES = [
@@ -1759,42 +2023,19 @@ import { hostedClientFromEnv } from "@tangle-network/agent-eval/hosted";
 import { REDACTION_VERSION } from "@tangle-network/agent-eval/traces";
 var require2 = createRequire(import.meta.url);
 var TRACES_VERSION = require2("../package.json").version;
-function adaptersFor2(opts) {
-  if (opts.all) return [...listAdapters()];
-  const a = resolveAdapter(opts.harness ?? "claude-code");
-  if (!a) throw new Error(`unknown harness "${opts.harness}"`);
-  return [a];
-}
-async function planUpload(opts) {
+async function planUpload(opts = {}) {
   const state = await loadState();
   const items = [];
-  for (const adapter of adaptersFor2(opts)) {
-    let refs;
-    try {
-      refs = await adapter.locate({ cwd: opts.cwd, sinceMs: opts.sinceMs });
-    } catch (err) {
-      opts.onError?.(err);
-      continue;
-    }
-    for (const ref of refs) {
-      let raw;
-      try {
-        raw = await adapter.parse(ref);
-      } catch (err) {
-        opts.onError?.(err, ref);
-        continue;
-      }
-      if (raw.length === 0) continue;
-      const { spans, report } = redactSpans(raw);
-      const hash = sessionHash(spans);
-      items.push({
-        ref,
-        spans,
-        redaction: report,
-        hash,
-        isNew: !alreadyUploaded(state, ref.harness, ref.sessionId, hash)
-      });
-    }
+  for await (const { ref, spans: raw } of scanSessions(opts)) {
+    const { spans, report } = redactSpans(raw);
+    const hash = sessionHash(spans);
+    items.push({
+      ref,
+      spans,
+      redaction: report,
+      hash,
+      isNew: !alreadyUploaded(state, ref.harness, ref.sessionId, hash)
+    });
   }
   return { items, state, sinceMs: opts.sinceMs };
 }
@@ -1810,26 +2051,20 @@ async function gitBranch(cwd) {
 }
 async function sessionMeta(item, uploadedAt) {
   const meta = {
-    "tangle.harness": item.ref.harness,
-    "tangle.source": basename8(item.ref.path),
-    "tangle.host": hostname(),
-    "tangle.uploaded_at": uploadedAt,
-    "tangle.uploader": `tangle-traces@${TRACES_VERSION}`,
-    "redaction.version": REDACTION_VERSION,
-    "redaction.count": item.redaction.redactionCount
+    [ATTR.HARNESS]: item.ref.harness,
+    [ATTR.SESSION_FILE]: basename8(item.ref.path),
+    [ATTR.HOST]: hostname(),
+    [ATTR.UPLOADED_AT]: uploadedAt,
+    [ATTR.UPLOADER]: `tangle-traces@${TRACES_VERSION}`,
+    [ATTR.REDACTION_VERSION]: REDACTION_VERSION,
+    [ATTR.REDACTION_COUNT]: item.redaction.redactionCount
   };
-  if (item.ref.cwd) meta["tangle.cwd"] = item.ref.cwd;
+  if (item.ref.cwd) meta[ATTR.CWD] = item.ref.cwd;
   const branch = await gitBranch(item.ref.cwd);
-  if (branch) meta["tangle.git_branch"] = branch;
+  if (branch) meta[ATTR.GIT_BRANCH] = branch;
   return meta;
 }
-function epochMs(ts) {
-  if (!ts) return 0;
-  if (/^\d+$/.test(ts)) return Number(ts);
-  const n = Date.parse(ts);
-  return Number.isNaN(n) ? 0 : n;
-}
-var msToNano = (iso2) => epochMs(iso2) * 1e6;
+var msToNano = (iso2) => parseIsoToEpochMs(iso2) * 1e6;
 function toTraceSpanEvents(spans, rootMeta) {
   return spans.map((s) => {
     const attributes = {};
@@ -1837,8 +2072,8 @@ function toTraceSpanEvents(spans, rootMeta) {
       if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") attributes[k] = v;
       else if (v != null) attributes[k] = JSON.stringify(v);
     }
-    attributes["tangle.sessionId"] = s.trace_id;
-    attributes["tangle.ingest_source"] = "cli";
+    attributes[ATTR.SESSION_ID] = s.trace_id;
+    attributes[ATTR.INGEST_SOURCE] = INGEST_SOURCE_CLI;
     if (s.parent_span_id === null) Object.assign(attributes, rootMeta);
     const startNano = msToNano(s.start_time);
     return {
@@ -1907,6 +2142,8 @@ export {
   serializeSpans,
   writeOtlpFile,
   analyzeSpans,
+  parseIsoToEpochMs,
+  parseSince,
   toRuntimeStore,
   runPipelines,
   AmpAdapter,
@@ -1922,7 +2159,12 @@ export {
   listAdapters,
   resolveAdapter,
   knownHarnesses,
+  selectAdapters,
+  scanSessions,
   watchSessions,
+  ATTR,
+  INGEST_SOURCE_CLI,
+  DEFAULT_HARNESS,
   CODING_REDACTION_RULES,
   TRACES_REDACTION_RULES,
   redactSpans,

package/dist/cli.js

@@ -3,13 +3,14 @@ import {
   analyzeSpans,
   executeUpload,
   knownHarnesses,
-  listAdapters,
+  parseSince,
   planUpload,
   resolveAdapter,
   runPipelines,
+  selectAdapters,
   watchSessions,
   writeOtlpFile
-} from "./chunk-4PC7MQXT.js";
+} from "./chunk-33NBMIH4.js";
 
 // src/cli.ts
 import { stat, writeFile } from "fs/promises";
@@ -163,18 +164,6 @@ function parseArgs(argv) {
   }
   return a;
 }
-function parseSince(s) {
-  if (!s) return Date.now() - 24 * 60 * 60 * 1e3;
-  const m = s.match(/^(\d+)\s*([mhd])$/i);
-  if (m) {
-    const unit = m[2].toLowerCase();
-    const ms = unit === "m" ? 6e4 : unit === "h" ? 36e5 : 864e5;
-    return Date.now() - Number(m[1]) * ms;
-  }
-  const t = Date.parse(s);
-  if (Number.isNaN(t)) throw new Error(`--since: expected 30m / 2h / 7d or an ISO date, got "${s}"`);
-  return t;
-}
 async function confirm(question) {
   if (!process.stdin.isTTY) return false;
   const rl = (await import("readline/promises")).createInterface({
@@ -189,12 +178,7 @@ async function confirm(question) {
   }
 }
 function adaptersFor(args) {
-  if (args.all) return [...listAdapters()];
-  const adapter = resolveAdapter(args.harness);
-  if (!adapter) {
-    throw new Error(`unknown harness "${args.harness}". Known: ${knownHarnesses().join(", ")}`);
-  }
-  return [adapter];
+  return selectAdapters({ all: args.all, harnesses: [args.harness] });
 }
 async function discover(args) {
   const sinceMs = args.since ? Date.parse(args.since) : void 0;
@@ -304,9 +288,14 @@ async function cmdWatch(args) {
   });
 }
 async function cmdUpload(args) {
-  const sinceMs = parseSince(args.since);
+  const sinceMs = args.since ? parseSince(args.since) : Date.now() - 24 * 60 * 60 * 1e3;
   const all = args.all || !args.harnessExplicit;
-  const plan = await planUpload({ all, harness: args.harness, cwd: args.cwd, sinceMs });
+  const plan = await planUpload({
+    all,
+    harnesses: args.harnessExplicit ? [args.harness] : void 0,
+    cwd: args.cwd,
+    sinceMs
+  });
   const newItems = plan.items.filter((i) => i.isNew);
   const byRule = {};
   let totalRedactions = 0;

package/dist/index.d.ts

@@ -118,6 +118,49 @@ interface HarnessTraceAdapter {
     parse(ref: SessionRef): Promise<OtlpSpan[]>;
 }
 
+/**
+ * Span-attribute keys the upload path stamps. The CLI is the producer; the
+ * Tangle Intelligence Platform is the consumer.
+ *
+ * `SESSION_ID` and `INGEST_SOURCE` are a cross-repo WIRE CONTRACT — the platform
+ * keys its cross-source dedup on them (`session.id`/`tangle.sessionId` linkage +
+ * `tangle.ingest_source === "cli"`). Do NOT change their string VALUES without a
+ * coordinated platform release. The rest are stored-but-not-parsed metadata,
+ * free to evolve.
+ *
+ * `SESSION_ID` stays camelCase because it must match agent-eval's
+ * `parseConversationLinkage` key list; the metadata keys are snake_case.
+ */
+declare const ATTR: {
+    /** = the trace/session id. Wire contract (dedup linkage). */
+    readonly SESSION_ID: "tangle.sessionId";
+    /** "cli" marks a CLI upload so the platform can drop a re-upload of a session
+     *  that also streamed live. Wire contract. */
+    readonly INGEST_SOURCE: "tangle.ingest_source";
+    readonly HARNESS: "tangle.harness";
+    readonly CWD: "tangle.cwd";
+    readonly GIT_BRANCH: "tangle.git_branch";
+    readonly HOST: "tangle.host";
+    /** Basename of the session file. (Renamed from the ambiguous `tangle.source`,
+     *  which collided with `tangle.ingest_source`.) */
+    readonly SESSION_FILE: "tangle.session_file";
+    readonly UPLOADED_AT: "tangle.uploaded_at";
+    readonly UPLOADER: "tangle.uploader";
+    readonly REDACTION_VERSION: "redaction.version";
+    readonly REDACTION_COUNT: "redaction.count";
+};
+/** `tangle.ingest_source` value for CLI-uploaded traces. Wire contract. */
+declare const INGEST_SOURCE_CLI = "cli";
+/** Harness used when none is specified on a single-harness command. */
+declare const DEFAULT_HARNESS = "claude-code";
+
+/** Parse an ISO-8601 timestamp or an epoch-millis string to epoch ms.
+ *  Returns 0 for empty/unparseable input (callers treat 0 as "unknown"). */
+declare function parseIsoToEpochMs(ts: string): number;
+/** Parse a `--since` window: `30m` / `2h` / `7d` (relative to now) or an ISO
+ *  date, → epoch ms. Throws on a malformed value (fail-loud, not silent). */
+declare function parseSince(value: string): number;
+
 /**
  * Harness adapter registry — resolves a harness id (or alias) to the
  * adapter that knows its on-disk session format.
@@ -134,6 +177,41 @@ interface HarnessTraceAdapter {
 declare function listAdapters(): readonly HarnessTraceAdapter[];
 declare function resolveAdapter(harness: string): HarnessTraceAdapter | undefined;
 declare function knownHarnesses(): string[];
+/** Options for selecting which adapters a command/SDK call operates on. */
+interface AdapterSelection {
+    /** Use these adapters verbatim (e.g. a caller's own harness) — wins over all. */
+    adapters?: readonly HarnessTraceAdapter[];
+    /** Every known harness. Implied when no `adapters`/`harnesses` are given. */
+    all?: boolean;
+    /** Specific harness ids/aliases. Unknown ids throw (fail-loud). */
+    harnesses?: readonly string[];
+}
+/** Resolve a selection to the adapters to operate on. Precedence:
+ *  explicit `adapters` → named `harnesses` → everything (`all` or unspecified).
+ *  A named harness that doesn't resolve throws rather than silently dropping. */
+declare function selectAdapters(opts: AdapterSelection): HarnessTraceAdapter[];
+
+interface ScanOptions extends AdapterSelection {
+    /** Filter by working directory (exact/prefix). */
+    cwd?: string;
+    /** Only sessions modified at/after this epoch ms. */
+    sinceMs?: number;
+    /** Cap to the most-recent N sessions per harness. */
+    last?: number;
+    /** Cancel the scan; iteration stops between sessions. */
+    signal?: AbortSignal;
+    /** Per-adapter locate/parse failure (the scan continues). */
+    onError?: (error: unknown, ref?: SessionRef) => void;
+}
+interface ScannedSession {
+    adapter: HarnessTraceAdapter;
+    ref: SessionRef;
+    /** Non-empty parsed spans for the session. */
+    spans: OtlpSpan[];
+}
+/** Yield every non-empty session across the selected adapters. Locate/parse
+ *  errors route to `onError` and skip that adapter/session, never aborting. */
+declare function scanSessions(opts: ScanOptions): AsyncGenerator<ScannedSession>;
 
 /**
  * Claude Code adapter — `~/.claude/projects/<encoded-cwd>/<session>.jsonl`.
@@ -537,22 +615,9 @@ declare function redactSpans(spans: readonly OtlpSpan[], rules?: RedactionRule[]
  * Redaction is ON by default — the safe posture when traces leave the box.
  */
 
-interface CollectOptions {
-    /** Harness ids/aliases. Omit (or `all: true`) → every harness. */
-    harnesses?: string[];
-    all?: boolean;
-    /** Collect from these adapters instead of the built-in registry. */
-    adapters?: HarnessTraceAdapter[];
-    /** Filter by working directory (exact/prefix). */
-    cwd?: string;
-    /** Only sessions modified at/after this epoch ms. */
-    sinceMs?: number;
-    /** Cap to the most-recent N sessions per harness. */
-    last?: number;
+interface CollectOptions extends ScanOptions {
     /** Redact PII/secrets (default true). Set false to get raw spans. */
     redact?: boolean;
-    /** Called on a per-adapter locate/parse failure (collection continues). */
-    onError?: (error: unknown, ref?: SessionRef) => void;
 }
 interface SessionBatch {
     ref: SessionRef;
@@ -617,16 +682,9 @@ interface UploadPlan {
     state: UploadState;
     sinceMs?: number;
 }
-interface PlanOptions {
-    harness?: string;
-    all?: boolean;
-    cwd?: string;
-    sinceMs?: number;
-    /** Called on a per-adapter locate/parse failure (planning continues). */
-    onError?: (error: unknown, ref?: SessionRef) => void;
-}
+type PlanOptions = ScanOptions;
 /** Read-only: select sessions in the window, redact, and mark which are new. */
-declare function planUpload(opts: PlanOptions): Promise<UploadPlan>;
+declare function planUpload(opts?: PlanOptions): Promise<UploadPlan>;
 /** Map redacted OtlpSpan[] → the hosted TraceSpanEvent[] wire shape, attaching
  *  session metadata to the root span(s). */
 declare function toTraceSpanEvents(spans: readonly OtlpSpan[], rootMeta: Record<string, string | number | boolean>): TraceSpanEvent[];
@@ -656,4 +714,4 @@ interface ExecuteOptions {
 /** Send the NEW items (or, on dryRun, write the redacted OTLP that would send). */
 declare function executeUpload(plan: UploadPlan, opts?: ExecuteOptions): Promise<UploadResult>;
 
-export { AmpAdapter, type AnalyzeOptions, type AnalyzeResult, CODING_REDACTION_RULES, ClaudeAdapter, CodexAdapter, type CollectOptions, CopilotAdapter, type ExecuteOptions, FactoryAdapter, ForgeAdapter, GeminiAdapter, type HarnessTraceAdapter, type LocateOptions, type ObservedLoop, type ObserverOptions, OpencodeAdapter, type OtlpSpan, type OtlpSpanKind, type OtlpStatusCode, PiAdapter, type PipelineOptions, type PipelineReport, type PlanOptions, QwenAdapter, type RuntimeTrace, type SessionBatch, type SessionRef, type SpanInput, type SpanRedaction, TRACES_REDACTION_RULES, type UploadBackend, type UploadItem, type UploadPlan, type UploadRecord, type UploadResult, type UploadState, alreadyUploaded, analyzeSpans, collectSessions, executeUpload, knownHarnesses, listAdapters, loadState, planUpload, redactSpans, resolveAdapter, runPipelines, saveState, serializeSpans, sessionHash, span, toRuntimeStore, toTraceSpanEvents, uploadKey, watchSessions, writeOtlpFile };
+export { ATTR, AmpAdapter, type AnalyzeOptions, type AnalyzeResult, CODING_REDACTION_RULES, ClaudeAdapter, CodexAdapter, type CollectOptions, CopilotAdapter, DEFAULT_HARNESS, type ExecuteOptions, FactoryAdapter, ForgeAdapter, GeminiAdapter, type HarnessTraceAdapter, INGEST_SOURCE_CLI, type LocateOptions, type ObservedLoop, type ObserverOptions, OpencodeAdapter, type OtlpSpan, type OtlpSpanKind, type OtlpStatusCode, PiAdapter, type PipelineOptions, type PipelineReport, type PlanOptions, QwenAdapter, type RuntimeTrace, type ScanOptions, type ScannedSession, type SessionBatch, type SessionRef, type SpanInput, type SpanRedaction, TRACES_REDACTION_RULES, type UploadBackend, type UploadItem, type UploadPlan, type UploadRecord, type UploadResult, type UploadState, alreadyUploaded, analyzeSpans, collectSessions, executeUpload, knownHarnesses, listAdapters, loadState, parseIsoToEpochMs, parseSince, planUpload, redactSpans, resolveAdapter, runPipelines, saveState, scanSessions, selectAdapters, serializeSpans, sessionHash, span, toRuntimeStore, toTraceSpanEvents, uploadKey, watchSessions, writeOtlpFile };

package/dist/index.js

@@ -1,12 +1,15 @@
 import {
+  ATTR,
   AmpAdapter,
   CODING_REDACTION_RULES,
   ClaudeAdapter,
   CodexAdapter,
   CopilotAdapter,
+  DEFAULT_HARNESS,
   FactoryAdapter,
   ForgeAdapter,
   GeminiAdapter,
+  INGEST_SOURCE_CLI,
   OpencodeAdapter,
   PiAdapter,
   QwenAdapter,
@@ -17,11 +20,15 @@ import {
   knownHarnesses,
   listAdapters,
   loadState,
+  parseIsoToEpochMs,
+  parseSince,
   planUpload,
   redactSpans,
   resolveAdapter,
   runPipelines,
   saveState,
+  scanSessions,
+  selectAdapters,
   serializeSpans,
   sessionHash,
   span,
@@ -30,45 +37,17 @@ import {
   uploadKey,
   watchSessions,
   writeOtlpFile
-} from "./chunk-4PC7MQXT.js";
+} from "./chunk-33NBMIH4.js";
 
 // src/collect.ts
-function adaptersFor(opts) {
-  if (opts.adapters && opts.adapters.length > 0) return opts.adapters;
-  if (opts.all || !opts.harnesses || opts.harnesses.length === 0) return [...listAdapters()];
-  const out = [];
-  for (const h of opts.harnesses) {
-    const a = resolveAdapter(h);
-    if (a && !out.includes(a)) out.push(a);
-  }
-  return out;
-}
 async function collectSessions(opts = {}) {
   const out = [];
-  for (const adapter of adaptersFor(opts)) {
-    let refs;
-    try {
-      refs = await adapter.locate({ cwd: opts.cwd, sinceMs: opts.sinceMs });
-    } catch (err) {
-      opts.onError?.(err);
-      continue;
-    }
-    if (opts.last && opts.last > 0) refs = refs.slice(0, opts.last);
-    for (const ref of refs) {
-      let spans;
-      try {
-        spans = await adapter.parse(ref);
-      } catch (err) {
-        opts.onError?.(err, ref);
-        continue;
-      }
-      if (spans.length === 0) continue;
-      if (opts.redact === false) {
-        out.push({ ref, spans });
-      } else {
-        const r = redactSpans(spans);
-        out.push({ ref, spans: r.spans, redaction: r.report });
-      }
+  for await (const { ref, spans } of scanSessions(opts)) {
+    if (opts.redact === false) {
+      out.push({ ref, spans });
+    } else {
+      const r = redactSpans(spans);
+      out.push({ ref, spans: r.spans, redaction: r.report });
     }
   }
   return out;
@@ -83,16 +62,19 @@ import {
 import { createHostedClient, hostedClientFromEnv } from "@tangle-network/agent-eval/hosted";
 import { DEFAULT_REDACTION_RULES, redactString, redactValue } from "@tangle-network/agent-eval/traces";
 export {
+  ATTR,
   AmpAdapter,
   AnalystRegistry,
   CODING_REDACTION_RULES,
   ClaudeAdapter,
   CodexAdapter,
   CopilotAdapter,
+  DEFAULT_HARNESS,
   DEFAULT_REDACTION_RULES,
   FactoryAdapter,
   ForgeAdapter,
   GeminiAdapter,
+  INGEST_SOURCE_CLI,
   OpencodeAdapter,
   PiAdapter,
   QwenAdapter,
@@ -108,6 +90,8 @@ export {
   listAdapters,
   loadState,
   makeFinding,
+  parseIsoToEpochMs,
+  parseSince,
   planUpload,
   redactSpans,
   redactString,
@@ -115,6 +99,8 @@ export {
   resolveAdapter,
   runPipelines,
   saveState,
+  scanSessions,
+  selectAdapters,
   serializeSpans,
   sessionHash,
   span,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangle-network/traces",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "description": "Point it at your coding-agent session traces (Claude Code, Codex, OpenCode, Gemini, Pi, …) and get failure-mode + efficiency findings. CLI + SDK over the @tangle-network/agent-eval analyst suite — observe live sessions, run your own analysts, redact, and upload to the Tangle Intelligence Platform.",
   "type": "module",
   "license": "MIT",