agent-inspect 6.31.32 → 6.31.34

package/packages/core/dist/exporters.cjs

@@ -193,8 +193,9 @@ var HIGH_CONFIDENCE_CREDENTIAL_PATTERNS = [
   /\beyJ[a-zA-Z0-9_-]{8,}\.[a-zA-Z0-9_-]{8,}\.[a-zA-Z0-9_-]{8,}\b/,
   /\b(?:sk-(?:proj-)?[a-zA-Z0-9_-]{16,}|sk-ant-[a-zA-Z0-9_-]{16,}|AIza[0-9A-Za-z_-]{20,})\b/,
   // Stripe secret / restricted keys use underscores (not sk-). Keep in sync with
-  // packages/redact/src/index.ts + packages/core/src/checks DEFAULT_SECRET_PATTERNS (#520).
-  /\b(?:sk|rk)_(?:live|test)_[A-Za-z0-9]{16,}\b/,
+  // packages/redact/src/index.ts + packages/core/src/checks DEFAULT_SECRET_PATTERNS (#520/#528).
+  // Use non-alnum lookarounds so underscore-adjacent forms (acct_sk_live_…, …_eu) match.
+  /(?<![A-Za-z0-9])(?:sk|rk)_(?:live|test)_[A-Za-z0-9]{16,}(?![A-Za-z0-9])/,
   /\bxox[abposr]-[A-Za-z0-9-]{10,}\b/,
   /\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9_]{20,}\b/,
   /\b(?:AKIA|ASIA)[A-Z0-9]{16}\b/,
@@ -845,11 +846,25 @@ function attemptIdOf(event) {
   }
   return void 0;
 }
+function operationIdOf(event) {
+  const direct = event.attributes?.operationId;
+  if (typeof direct === "string" && direct.trim() !== "") return direct;
+  const meta = event.attributes?.metadata;
+  if (meta && typeof meta === "object" && !Array.isArray(meta)) {
+    const nested = meta.operationId;
+    if (typeof nested === "string" && nested.trim() !== "") return nested;
+  }
+  return void 0;
+}
 function lifecycleKey(event) {
   if (event.kind === "RUN") return `run:${event.runId}`;
   const stepId = stepIdOf(event);
-  if (stepId !== void 0) return `step:${stepId}`;
-  return `event:${event.eventId}`;
+  if (stepId === void 0) return `event:${event.eventId}`;
+  const attemptId = attemptIdOf(event);
+  if (attemptId !== void 0) return `step:${stepId}:attempt:${attemptId}`;
+  const operationId = operationIdOf(event);
+  if (operationId !== void 0) return `step:${stepId}:op:${operationId}`;
+  return `step:${stepId}`;
 }
 function isTerminal(status) {
   return status === "ok" || status === "error";
@@ -900,6 +915,12 @@ function joinSiblingGroup(group) {
   const others = group.filter(
     (n) => !isTerminal(n.event.status) && n.event.status !== "running"
   );
+  const operationIds = new Set(
+    group.map((n) => operationIdOf(n.event)).filter((id) => id !== void 0)
+  );
+  if (operationIds.size > 1) {
+    return group;
+  }
   const terminalStatuses = new Set(terminals.map((n) => n.event.status));
   if (terminalStatuses.size > 1) {
     return group;
@@ -911,19 +932,22 @@ function joinSiblingGroup(group) {
   const out = [];
   for (const terminal of terminals) {
     const terminalAttempt = attemptIdOf(terminal.event);
+    const terminalOp = operationIdOf(terminal.event);
     const terminalTs = eventTime(terminal.event);
-    const candidate = runnings.find((r) => {
+    const candidates = runnings.filter((r) => {
       if (usedRunning.has(r.event.eventId)) return false;
       if (eventTime(r.event) > terminalTs) return false;
+      const runningOp = operationIdOf(r.event);
+      if (terminalOp !== void 0 && runningOp !== void 0 && terminalOp !== runningOp) {
+        return false;
+      }
       const runningAttempt = attemptIdOf(r.event);
       if (terminalAttempt !== void 0) {
         return runningAttempt === terminalAttempt;
       }
-      if (runningAttempt !== void 0) {
-        return true;
-      }
-      return true;
+      return runningAttempt === void 0;
     });
+    const candidate = candidates.length === 1 ? candidates[0] : void 0;
     if (candidate) {
       usedRunning.add(candidate.event.eventId);
       out.push(joinOnePair(candidate, terminal));