bitfab 0.36.9 → 0.36.11

package/dist/index.d.cts

@@ -353,6 +353,12 @@ interface DeliveryReport {
     closed: boolean;
     /** Every carrier submitted under this trace came back accepted. */
     delivered: boolean;
+    /**
+     * The server's assigned `traces.id`, read back from the OTLP ingest response.
+     * Absent when talking to a server that predates this field, or before any
+     * carrier for the trace has been acked.
+     */
+    serverTraceId?: string;
 }
 declare class HttpClient {
     private readonly apiKey;
@@ -390,6 +396,12 @@ declare class HttpClient {
      * that was never tracked, so ordinary tracing costs no bookkeeping at all.
      */
     trackTraceDeliveries(traceIds: string[]): void;
+    /**
+     * The server's assigned `traces.id` for a tracked trace if it has already
+     * been read back off an ingest response, without stopping tracking. Lets a
+     * replay surface the id mid-run for items whose spans already landed.
+     */
+    peekServerTraceId(traceId: string): string | undefined;
     /** Whether any tracked trace has had its closing carrier submitted. */
     hasClosedDeliveries(traceIds: string[]): boolean;
     /**
@@ -410,6 +422,12 @@ declare class HttpClient {
      * delivered ref is proof its row exists: the same fact the replay status
      * endpoint would report, already in hand.
      */
+    /**
+     * Record the server's assigned `traces.id` for each tracked source trace,
+     * read back from the OTLP ingest response. Keyed by source trace id, the same
+     * key the delivery ledger uses. Untracked ids are ignored.
+     */
+    private recordServerTraceIds;
     private recordDeliveredCarriers;
     /**
      * Track deferred span work so this client's own lifecycle waits for it, and
@@ -2557,7 +2575,7 @@ declare class BitfabFunction {
 /**
  * SDK version from package.json (injected at build time)
  */
-declare const __version__ = "0.36.9";
+declare const __version__ = "0.36.11";
 
 /**
  * Constants for the Bitfab SDK.

package/dist/index.d.ts

@@ -353,6 +353,12 @@ interface DeliveryReport {
     closed: boolean;
     /** Every carrier submitted under this trace came back accepted. */
     delivered: boolean;
+    /**
+     * The server's assigned `traces.id`, read back from the OTLP ingest response.
+     * Absent when talking to a server that predates this field, or before any
+     * carrier for the trace has been acked.
+     */
+    serverTraceId?: string;
 }
 declare class HttpClient {
     private readonly apiKey;
@@ -390,6 +396,12 @@ declare class HttpClient {
      * that was never tracked, so ordinary tracing costs no bookkeeping at all.
      */
     trackTraceDeliveries(traceIds: string[]): void;
+    /**
+     * The server's assigned `traces.id` for a tracked trace if it has already
+     * been read back off an ingest response, without stopping tracking. Lets a
+     * replay surface the id mid-run for items whose spans already landed.
+     */
+    peekServerTraceId(traceId: string): string | undefined;
     /** Whether any tracked trace has had its closing carrier submitted. */
     hasClosedDeliveries(traceIds: string[]): boolean;
     /**
@@ -410,6 +422,12 @@ declare class HttpClient {
      * delivered ref is proof its row exists: the same fact the replay status
      * endpoint would report, already in hand.
      */
+    /**
+     * Record the server's assigned `traces.id` for each tracked source trace,
+     * read back from the OTLP ingest response. Keyed by source trace id, the same
+     * key the delivery ledger uses. Untracked ids are ignored.
+     */
+    private recordServerTraceIds;
     private recordDeliveredCarriers;
     /**
      * Track deferred span work so this client's own lifecycle waits for it, and
@@ -2557,7 +2575,7 @@ declare class BitfabFunction {
 /**
  * SDK version from package.json (injected at build time)
  */
-declare const __version__ = "0.36.9";
+declare const __version__ = "0.36.11";
 
 /**
  * Constants for the Bitfab SDK.

package/dist/index.js

@@ -20,7 +20,7 @@ import {
   getCurrentReplayBranch,
   getCurrentSpan,
   getCurrentTrace
-} from "./chunk-TJAFKZ4X.js";
+} from "./chunk-VDFPZYLH.js";
 import {
   BITFAB_PROGRESS_PREFIX,
   BitfabError,
@@ -32,7 +32,7 @@ import {
   flushTraces,
   reportReplayProgress,
   serializeReplayResult
-} from "./chunk-MBKY42QC.js";
+} from "./chunk-EKOAKLZC.js";
 export {
   BITFAB_PROGRESS_PREFIX,
   Bitfab,

package/dist/node.cjs

@@ -97,7 +97,7 @@ var __version__;
 var init_version_generated = __esm({
   "src/version.generated.ts"() {
     "use strict";
-    __version__ = "0.36.9";
+    __version__ = "0.36.11";
   }
 });
 
@@ -1451,6 +1451,10 @@ var init_http = __esm({
             ...error instanceof BitfabError && error.retryAfterMs !== void 0 ? { retryAfterMs: error.retryAfterMs } : {}
           });
         }
+        const serverTraceIds = asPayloadRecord(response?.traceIds);
+        if (serverTraceIds !== void 0) {
+          this.recordServerTraceIds(serverTraceIds);
+        }
         const partialSuccess = asPayloadRecord(response?.partialSuccess);
         const rejected = partialSuccess?.rejectedSpans;
         if (rejected !== void 0 && rejected !== "0" && rejected !== 0) {
@@ -1475,6 +1479,14 @@ var init_http = __esm({
           }
         }
       }
+      /**
+       * The server's assigned `traces.id` for a tracked trace if it has already
+       * been read back off an ingest response, without stopping tracking. Lets a
+       * replay surface the id mid-run for items whose spans already landed.
+       */
+      peekServerTraceId(traceId) {
+        return this.traceDeliveries.get(traceId)?.serverTraceId;
+      }
       /** Whether any tracked trace has had its closing carrier submitted. */
       hasClosedDeliveries(traceIds) {
         return traceIds.some((traceId) => this.traceDeliveries.get(traceId)?.closed);
@@ -1501,7 +1513,8 @@ var init_http = __esm({
             closed: delivery.closed,
             delivered: delivery.closingAcked && [...delivery.submittedSpanIds].every(
               (spanId) => delivery.ackedSpanIds.has(spanId)
-            )
+            ),
+            serverTraceId: delivery.serverTraceId
           };
         }
         return reports;
@@ -1530,6 +1543,23 @@ var init_http = __esm({
        * delivered ref is proof its row exists: the same fact the replay status
        * endpoint would report, already in hand.
        */
+      /**
+       * Record the server's assigned `traces.id` for each tracked source trace,
+       * read back from the OTLP ingest response. Keyed by source trace id, the same
+       * key the delivery ledger uses. Untracked ids are ignored.
+       */
+      recordServerTraceIds(map) {
+        for (const [sourceTraceId, serverTraceId] of Object.entries(map)) {
+          if (typeof serverTraceId !== "string") {
+            continue;
+          }
+          const delivery = this.traceDeliveries.get(sourceTraceId);
+          if (delivery === void 0) {
+            continue;
+          }
+          delivery.serverTraceId = serverTraceId;
+        }
+      }
       recordDeliveredCarriers(refs) {
         for (const ref of refs) {
           const delivery = this.traceDeliveries.get(ref.traceId);
@@ -2246,7 +2276,7 @@ async function captureCodeChangeFromGit(cwd, label) {
     const tracked = await git(root, [
       "diff",
       "--name-status",
-      "--no-renames",
+      "--find-renames",
       "-z",
       base,
       "--",
@@ -2262,23 +2292,23 @@ async function captureCodeChangeFromGit(cwd, label) {
     ]);
     const entries = [
       ...parseNameStatusZ(tracked ?? ""),
-      ...(untracked ?? "").split(NUL).filter((p) => p.length > 0).map((path) => ({ status: "A", path }))
+      ...(untracked ?? "").split(NUL).filter((p) => p.length > 0).map((path) => ({ status: "A", beforePath: path, path }))
     ];
     if (entries.length === 0) {
       return null;
     }
     const files = [];
     let totalBytes = 0;
-    for (const { status, path } of entries) {
+    for (const { status, beforePath, path } of entries) {
       if (files.length >= MAX_FILES) {
         break;
       }
-      const beforeBytes = status === "A" ? 0 : await blobBytes(base, path);
+      const beforeBytes = status === "A" ? 0 : await blobBytes(base, beforePath);
       const afterBytes = status === "D" ? 0 : await workingBytes(path);
       if (beforeBytes > MAX_FILE_BYTES || afterBytes > MAX_FILE_BYTES) {
         continue;
       }
-      const before = (status === "A" ? "" : await git(root, ["show", `${base}:${path}`]) ?? "").replace(/\r\n/g, "\n");
+      const before = (status === "A" ? "" : await git(root, ["show", `${base}:${beforePath}`]) ?? "").replace(/\r\n/g, "\n");
       const after = (status === "D" ? "" : await readWorkingFile(readFile, root, path)).replace(/\r\n/g, "\n");
       if (before === after) {
         continue;
@@ -2336,8 +2366,18 @@ async function readWorkingFile(readFile, root, path) {
 function parseNameStatusZ(raw) {
   const parts = raw.split(NUL).filter((p) => p.length > 0);
   const out = [];
-  for (let i = 0; i + 1 < parts.length; i += 2) {
-    out.push({ status: parts[i].charAt(0), path: parts[i + 1] });
+  let i = 0;
+  while (i + 1 < parts.length) {
+    const status = parts[i].charAt(0);
+    i += 1;
+    const beforePath = parts[i];
+    i += 1;
+    if ((status === "R" || status === "C") && i < parts.length) {
+      out.push({ status, beforePath, path: parts[i] });
+      i += 1;
+    } else {
+      out.push({ status, beforePath, path: beforePath });
+    }
   }
   return out;
 }
@@ -2667,13 +2707,17 @@ async function waitForReplayPersistence(httpClient, testRunId, replayedTraceIds)
   }
   if (!httpClient.hasClosedDeliveries(replayedTraceIds)) {
     httpClient.takeTraceDeliveries(replayedTraceIds);
-    return;
+    return {};
   }
   const flushed = await flushTraces(REPLAY_PERSISTENCE_TIMEOUT_MS);
   const deliveries = httpClient.takeTraceDeliveries(replayedTraceIds);
   const expectedSpanCounts = {};
+  const readBackTraceIds = {};
   let allDelivered = true;
   for (const [traceId, delivery] of Object.entries(deliveries)) {
+    if (delivery.serverTraceId !== void 0) {
+      readBackTraceIds[traceId] = delivery.serverTraceId;
+    }
     if (!delivery.closed) {
       continue;
     }
@@ -2681,7 +2725,7 @@ async function waitForReplayPersistence(httpClient, testRunId, replayedTraceIds)
     allDelivered = allDelivered && delivery.delivered;
   }
   if (allDelivered) {
-    return;
+    return readBackTraceIds;
   }
   const deadline = Date.now() + REPLAY_PERSISTENCE_TIMEOUT_MS;
   let missing = Object.keys(expectedSpanCounts).length;
@@ -2695,7 +2739,7 @@ async function waitForReplayPersistence(httpClient, testRunId, replayedTraceIds)
       (traceId) => ready[traceId] === void 0
     ).length;
     if (missing === 0) {
-      return;
+      return readBackTraceIds;
     }
     if (Date.now() >= deadline) {
       break;
@@ -2723,7 +2767,7 @@ async function mapWithConcurrency2(tasks, maxConcurrency, onSettled, onStarted)
       onStarted?.(index);
       const result = await tasks[index]();
       results[index] = result;
-      onSettled?.(result, index);
+      await onSettled?.(result, index);
     }
   }
   const workers = Array.from(
@@ -2813,10 +2857,36 @@ async function replay(httpClient, serviceUrl, traceFunctionKey, fn, options, reg
   let started = 0;
   let succeeded = 0;
   let errored = 0;
+  let flushInFlight = null;
+  let flushPending = false;
+  const flushFinishedItemTrace = () => {
+    flushPending = true;
+    if (!flushInFlight) {
+      flushInFlight = (async () => {
+        try {
+          while (flushPending) {
+            flushPending = false;
+            await httpClient.settleDeferredWork(REPLAY_PERSISTENCE_TIMEOUT_MS);
+            await flushTraces(REPLAY_PERSISTENCE_TIMEOUT_MS);
+          }
+        } finally {
+          flushInFlight = null;
+        }
+      })();
+    }
+    return flushInFlight;
+  };
   const resultItems = await mapWithConcurrency2(
     tasks,
     maxConcurrency,
-    (item) => {
+    async (item, index) => {
+      let serverTraceId = null;
+      try {
+        await flushFinishedItemTrace();
+        serverTraceId = httpClient.peekServerTraceId(replayedTraceIds[index]) ?? null;
+      } catch {
+      }
+      item.traceId = serverTraceId;
       completed += 1;
       if (item.error === null) {
         succeeded += 1;
@@ -2831,11 +2901,12 @@ async function replay(httpClient, serviceUrl, traceFunctionKey, fn, options, reg
           succeeded,
           errored,
           item: {
-            // The server replay trace id isn't known until completeReplay runs
-            // (below), so it can't be reported mid-run and we never emit the
-            // client-side placeholder. originalTraceId (the historical trace)
-            // is known now and is what a UI keys on to identify what settled.
-            traceId: null,
+            // The server's assigned traces.id, read back off the ingest
+            // response and surfaced as this item finishes. Null only if the
+            // per-item flush could not confirm delivery in time; the end-of-run
+            // barrier then fills the returned ReplayItem. The client-side
+            // placeholder is never surfaced.
+            traceId: serverTraceId,
             originalTraceId: item.originalTraceId ?? null,
             originalSpanId: item.originalSpanId ?? null,
             // Deprecated aliases for originalTraceId/originalSpanId.
@@ -2881,12 +2952,19 @@ async function replay(httpClient, serviceUrl, traceFunctionKey, fn, options, reg
       }
     } : void 0
   );
-  await preserveReplayFailure(
+  const deliveredTraceIds = await preserveReplayFailure(
     () => waitForReplayPersistence(httpClient, testRunId, replayedTraceIds),
     resultItems,
     testRunId,
     fullTestRunUrl
   );
+  for (let index = 0; index < resultItems.length; index += 1) {
+    const localId = replayedTraceIds[index];
+    const readBack = localId ? deliveredTraceIds[localId] : void 0;
+    if (readBack !== void 0) {
+      resultItems[index].traceId = readBack;
+    }
+  }
   const completeResult = await preserveReplayFailure(
     () => httpClient.completeReplay(testRunId),
     resultItems,
@@ -2902,7 +2980,7 @@ async function replay(httpClient, serviceUrl, traceFunctionKey, fn, options, reg
       const item = resultItems[index];
       const localId = replayedTraceIds[index];
       const mapped = localId ? serverTraceIds[localId] : void 0;
-      item.traceId = mapped ?? null;
+      item.traceId = item.traceId ?? mapped ?? null;
       if (item.error === null) {
         completedCount += 1;
         if (mapped === void 0) {