@tracemarketplace/cli 0.0.22 → 0.0.24

package/src/flush.ts

@@ -75,6 +75,23 @@ interface IngestResponse {
   trace_id?: string;
 }
 
+export function prepareTraceForUpload(
+  trace: NormalizedTrace,
+  options: { homeDir?: string } = {},
+): NormalizedTrace {
+  const { homeDir = homedir() } = options;
+
+  // Keep session-sized raw payloads local until they have a separate upload path.
+  return redactTrace(
+    {
+      ...trace,
+      raw_json: null,
+      raw_json_format: null,
+    },
+    { homeDir },
+  );
+}
+
 export function collectIdleSessionSources(
   sessions: Record<string, SessionUploadState>,
   now = new Date()
@@ -90,7 +107,10 @@ export function collectIdleSessionSources(
 
 interface ChunkExistsResponse {
   exists: boolean;
+  pending?: boolean;
+  status?: "queued" | "running" | "retry_wait" | "completed" | "duplicate" | "failed_terminal" | "payload_expired" | "missing";
   trace_id?: string;
+  retry_after_ms?: number;
 }
 
 export async function verifyUnconfirmedChunks(
@@ -100,20 +120,9 @@ export async function verifyUnconfirmedChunks(
 ): Promise<void> {
   for (const [key, session] of Object.entries(state.sessions)) {
     if (session.confirmedChunkIndex >= session.nextChunkIndex) continue;
-
-    // Check if timed out — reset to re-submit from last confirmed point
-    if (session.unconfirmedSince) {
-      const age = now.getTime() - Date.parse(session.unconfirmedSince);
-      if (age >= UNCONFIRMED_RESUBMIT_MS) {
-        state.sessions[key] = {
-          ...session,
-          nextChunkIndex: session.confirmedChunkIndex,
-          openChunkStartTurn: session.confirmedOpenChunkStartTurn,
-          unconfirmedSince: null,
-        };
-        continue;
-      }
-    }
+    const timedOut = session.unconfirmedSince
+      ? now.getTime() - Date.parse(session.unconfirmedSince) >= UNCONFIRMED_RESUBMIT_MS
+      : false;
 
     // Check each unconfirmed chunk sequentially — stop at first missing one
     for (let i = session.confirmedChunkIndex; i < session.nextChunkIndex; i++) {
@@ -124,20 +133,52 @@ export async function verifyUnconfirmedChunks(
           chunk_index: String(i),
         });
         const result = await client.get(`/api/v1/traces/exists?${params}`) as ChunkExistsResponse;
-        if (!result.exists) break;
-        state.sessions[key] = {
-          ...state.sessions[key]!,
-          confirmedChunkIndex: i + 1,
-          confirmedOpenChunkStartTurn: state.sessions[key]!.openChunkStartTurn,
-          unconfirmedSince: i + 1 >= session.nextChunkIndex ? null : state.sessions[key]!.unconfirmedSince,
-        };
+        if (result.exists) {
+          state.sessions[key] = {
+            ...state.sessions[key]!,
+            confirmedChunkIndex: i + 1,
+            confirmedOpenChunkStartTurn: state.sessions[key]!.openChunkStartTurn,
+            unconfirmedSince: i + 1 >= session.nextChunkIndex ? null : state.sessions[key]!.unconfirmedSince,
+          };
+          continue;
+        }
+
+        if (result.pending) {
+          break;
+        }
+
+        if (result.status === "failed_terminal" || result.status === "payload_expired") {
+          resetSessionToConfirmedBaseline(state, key, session);
+          break;
+        }
+
+        if (timedOut) {
+          resetSessionToConfirmedBaseline(state, key, session);
+        }
+        break;
       } catch {
+        if (timedOut) {
+          resetSessionToConfirmedBaseline(state, key, session);
+        }
         break;
       }
     }
   }
 }
 
+function resetSessionToConfirmedBaseline(
+  state: ReturnType<typeof loadState>,
+  key: string,
+  session: SessionUploadState,
+): void {
+  state.sessions[key] = {
+    ...session,
+    nextChunkIndex: session.confirmedChunkIndex,
+    openChunkStartTurn: session.confirmedOpenChunkStartTurn,
+    unconfirmedSince: null,
+  };
+}
+
 export async function flushTrackedSessions(
   config: Config,
   sources: SessionSource[],
@@ -400,7 +441,7 @@ async function uploadTraceChunk(
   sync = false,
 ): Promise<ChunkUploadResult> {
   // Client-side regex redaction runs before transmission; Presidio runs server-side async.
-  const payloadTrace = redactTrace(trace, { homeDir: homedir() });
+  const payloadTrace = prepareTraceForUpload(trace);
   const jsonSize = JSON.stringify({ trace: payloadTrace, source_tool: payloadTrace.source_tool }).length;
   console.error(`[upload] ${payloadTrace.source_session_id} payload=${Math.round(jsonSize/1024)}KB turns=${payloadTrace.turn_count}`);