iteration-cli 0.14.1 → 0.14.3

package/dist/cli.js

@@ -939,7 +939,7 @@ import { promises as fs20 } from "node:fs";
 import { createInterface as createInterface2 } from "node:readline/promises";
 import { parseArgs } from "node:util";
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/util.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/util.js
 var util_exports = {};
 __export(util_exports, {
   BIGINT_FORMAT_RANGES: () => BIGINT_FORMAT_RANGES,
@@ -1010,6 +1010,7 @@ __export(util_exports, {
   required: () => required,
   safeExtend: () => safeExtend,
   shallowClone: () => shallowClone,
+  sizeCaps: () => sizeCaps,
   slugify: () => slugify,
   stringifyPrimitive: () => stringifyPrimitive,
   toZod: () => toZod,
@@ -1529,6 +1530,18 @@ function prefixIssues(path25, issues) {
 function unwrapMessage(message) {
   return typeof message === "string" ? message : message?.message;
 }
+function sizeCaps(defChecks) {
+  const caps = [];
+  for (const ch of defChecks ?? []) {
+    const d = ch._zod.def;
+    if (!/_(length|size)$|_equals$/.test(d.check))
+      break;
+    const max = d.maximum ?? d.length ?? d.size;
+    if (max >= 0)
+      caps.push([max, ch]);
+  }
+  return caps;
+}
 function attachSchema(issues, start2, inst) {
   var _a3;
   for (let i = start2; i < issues.length; i++) {
@@ -1782,7 +1795,7 @@ function constantCatch(value) {
   return fn;
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/core.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/core.js
 var _a;
 var _zodDesc = { value: void 0, enumerable: false };
 var _E = "captureStackTrace" in Error ? Error : null;
@@ -1900,7 +1913,7 @@ function config(newConfig) {
   return globalConfig;
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/errors.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/errors.js
 function _getMessage() {
   const internals = this._zod;
   internals.message ?? (internals.message = JSON.stringify(internals.def, jsonStringifyReplacer, 2));
@@ -2015,7 +2028,7 @@ function formatError(error2, mapper = (issue2) => issue2.message) {
   return fieldErrors;
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/parse.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/parse.js
 function finalizeParams(callee, params) {
   return { callee: params?.callee ?? callee, Err: params?.Err };
 }
@@ -2163,7 +2176,7 @@ var _safeDecodeAsync = (_Err) => async (schema, value, _ctx) => {
   return _safeParseAsync(_Err)(schema, value, _ctx);
 };
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/regexes.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/regexes.js
 var cuid = /^[cC][0-9a-z]{6,}$/;
 var cuid2 = /^[0-9a-z]+$/;
 var ulid = /^[0-7][0-9A-HJKMNP-TV-Za-hjkmnp-tv-z]{25}$/;
@@ -2223,7 +2236,7 @@ var _null = /^null$/i;
 var lowercase = /^[^A-Z]*$/;
 var uppercase = /^[^a-z]*$/;
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/checks.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/checks.js
 var $ZodCheck = /* @__PURE__ */ $constructor("$ZodCheck", (inst, def) => {
   var _a3;
   inst._zod ?? (inst._zod = {});
@@ -2543,7 +2556,7 @@ var $ZodCheckOverwrite = /* @__PURE__ */ $constructor("$ZodCheckOverwrite", (ins
   };
 });
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/doc.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/doc.js
 var Doc = class {
   constructor(args = [], closed = {}) {
     this.content = [];
@@ -2584,14 +2597,14 @@ ${content.join("\n")}
   }
 };
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/versions.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/versions.js
 var version = {
   major: 4,
   minor: 6,
-  patch: 4
+  patch: 6
 };
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/schemas.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/schemas.js
 var $ZodType = /* @__PURE__ */ $constructor("$ZodType", (inst, def) => {
   var _a3;
   inst ?? (inst = {});
@@ -3206,6 +3219,29 @@ var $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
     return payload;
   };
 });
+function capSize(inst, size) {
+  const caps = sizeCaps(inst._zod.def.checks);
+  if (!caps.length)
+    return;
+  const cap = Math.min(...caps.map((c) => c[0]));
+  const parse2 = inst._zod.parse;
+  inst._zod.parse = (payload, ctx) => {
+    const n = size(payload.value);
+    if (n > cap && !ctx?.skipChecks && ctx?.direction !== "backward") {
+      for (const [max, ch] of sizeCaps(inst._zod.def.checks)) {
+        if (n > max && ch._zod.def.when(payload)) {
+          const start2 = payload.issues.length;
+          ch._zod.check(payload);
+          payload.issues[start2].continue = false;
+          attachSchema(payload.issues, start2, inst);
+          return payload;
+        }
+      }
+    }
+    return parse2(payload, ctx);
+  };
+}
+var arraySize = (input) => Array.isArray(input) ? input.length : -1;
 function handleArrayResult(result, final, index) {
   if (result.issues.length) {
     final.issues.push(...prefixIssues(index, result.issues));
@@ -3249,6 +3285,7 @@ var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
     }
     return payload;
   };
+  capSize(inst, arraySize);
 });
 function handlePropertyResult(result, final, key, input, optin, optout) {
   const isPresent = key in input;
@@ -4292,7 +4329,7 @@ function handleRefineResult(result, payload, input, inst) {
   }
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/memoizer.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/memoizer.js
 var $ZodCyclicError = class extends Error {
   constructor() {
     super(`Cannot parse a reference cycle that closes through a transform`);
@@ -4566,7 +4603,7 @@ function isBackEdge(ctx, value) {
   return backEdges !== void 0 && isRef(value) && backEdges.has(value);
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/locales/en.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/locales/en.js
 var error = () => {
   const Sizable = {
     string: { unit: "characters", verb: "to have" },
@@ -4691,7 +4728,7 @@ function en_default() {
   };
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/registries.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/registries.js
 var _a2;
 var $ZodRegistry = class {
   constructor() {
@@ -4739,7 +4776,7 @@ function registry() {
 (_a2 = globalThis).__zod_globalRegistry ?? (_a2.__zod_globalRegistry = registry());
 var globalRegistry = globalThis.__zod_globalRegistry;
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/api.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/api.js
 function snapshotChecks(def) {
   if (def.checks)
     def.checks = [...def.checks];
@@ -5286,7 +5323,7 @@ function _check(fn, params) {
   return ch;
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/to-json-schema.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/to-json-schema.js
 function assignProps(target, ...sources) {
   for (const source of sources) {
     for (const key of Reflect.ownKeys(source)) {
@@ -5816,7 +5853,7 @@ var createStandardJSONSchemaMethod = (schema, io, processors = {}) => (params) =
   return finalize(ctx, schema);
 };
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/core/json-schema-processors.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/core/json-schema-processors.js
 var narrowMin = (agg, key, value) => {
   if (agg[key] === void 0 || value > agg[key])
     agg[key] = value;
@@ -6366,7 +6403,7 @@ var lazyProcessor = (schema, ctx, _json, params) => {
   seen.ref = innerType;
 };
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/classic/errors.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/classic/errors.js
 var _installedErrorProtos = /* @__PURE__ */ new WeakSet([Object.prototype, Error.prototype]);
 function _lazyMethod(proto, key, make) {
   Object.defineProperty(proto, key, {
@@ -6411,7 +6448,7 @@ var ZodRealError = /* @__PURE__ */ $constructor("ZodError", initializer2, void 0
   Parent: Error
 });
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/classic/parse.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/classic/parse.js
 var parse = /* @__PURE__ */ _parse(ZodRealError);
 var parseAsync = /* @__PURE__ */ _parseAsync(ZodRealError);
 var safeParse = /* @__PURE__ */ _safeParse(ZodRealError);
@@ -6425,7 +6462,7 @@ var safeDecode = /* @__PURE__ */ _safeDecode(ZodRealError);
 var safeEncodeAsync = /* @__PURE__ */ _safeEncodeAsync(ZodRealError);
 var safeDecodeAsync = /* @__PURE__ */ _safeDecodeAsync(ZodRealError);
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/classic/schemas.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/classic/schemas.js
 function _ensureDefaultLocale() {
   if (!globalConfig.localeError)
     config(en_default());
@@ -7447,7 +7484,7 @@ function json(params) {
   return jsonSchema;
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/classic/iso.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/classic/iso.js
 var iso_exports = {};
 __export(iso_exports, {
   ZodISODate: () => ZodISODate,
@@ -7472,7 +7509,7 @@ function duration2(params) {
   return _isoDuration(ZodISODuration, params);
 }
 
-// ../../node_modules/.pnpm/zod@4.6.4/node_modules/zod/v4/classic/coerce.js
+// ../../node_modules/.pnpm/zod@4.6.6/node_modules/zod/v4/classic/coerce.js
 var coerce_exports = {};
 __export(coerce_exports, {
   bigint: () => bigint2,
@@ -7497,7 +7534,7 @@ function date3(params) {
   return _coercedDate(ZodDate, params);
 }
 
-// ../trace-contracts/dist/index.js
+// ../trace-contracts/dist/contracts.js
 var TRACE_EVENT_TYPES = [
   "user_message",
   "assistant_message",
@@ -7585,10 +7622,10 @@ var codexBillingRequestSchema = object({
     mode: _enum(["chatgpt", "api_key", "conflicting"])
   }).strict()).max(5e3)
 }).strict();
-var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+var UUID_PATTERN = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/;
 var TIMESTAMP_PATTERN = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/;
 var unpairedSurrogate = /[\uD800-\uDFFF]/u;
-var traceIdentitySchema = string2().min(1).max(200).refine((value) => !value.includes("\0") && !unpairedSurrogate.test(value), "Trace identifiers cannot contain NUL or unpaired Unicode surrogates.");
+var traceIdentitySchema = string2().min(1).max(200).refine((value) => !value.includes("\0") && !unpairedSurrogate.test(value), "Trace identifiers cannot contain NUL or unpaired Unicode surrogates.").describe("Must not contain NUL or unpaired Unicode surrogates.");
 var jsonValueSchema = lazy(() => union([
   string2(),
   number2().finite(),
@@ -7619,28 +7656,28 @@ var traceEventSchema = object({
   sequence: number2().int().min(0).max(Number.MAX_SAFE_INTEGER),
   callId: string2().max(255).nullable(),
   projectId: string2().regex(UUID_PATTERN).nullable(),
-  occurredAt: string2().regex(TIMESTAMP_PATTERN).refine((value) => !Number.isNaN(Date.parse(value))).nullable(),
+  occurredAt: string2().regex(TIMESTAMP_PATTERN).refine((value) => !Number.isNaN(Date.parse(value))).describe("Must also be a timestamp accepted by Date.parse.").nullable(),
   eventType: _enum(TRACE_EVENT_TYPES),
   payload: jsonPayloadSchema,
   run: runMarkerSchema.optional()
 }).strict();
 var traceEventBatchSchema = object({
   events: array(traceEventSchema).min(1).max(MAX_TRACE_EVENTS_PER_BATCH)
-}).strict();
+}).strict().describe("Event IDs must be unique within the batch.");
 var acknowledgementSchema = object({
   deviceId: string2().regex(UUID_PATTERN),
   acceptedEventIds: array(string2())
-}).strict();
+}).strict().describe("Accepted event IDs must match the submitted batch exactly, without duplicates.");
 var episodeCountSchema = number2().int().min(0).max(Number.MAX_SAFE_INTEGER);
-var collectorFrictionSummarySchema = object({ weekEpisodes: episodeCountSchema, dayEpisodes: episodeCountSchema }).strict().refine((summary) => summary.dayEpisodes <= summary.weekEpisodes, "The last day cannot have more friction episodes than the last week.");
+var collectorFrictionSummarySchema = object({ weekEpisodes: episodeCountSchema, dayEpisodes: episodeCountSchema }).strict().refine((summary) => summary.dayEpisodes <= summary.weekEpisodes, "The last day cannot have more friction episodes than the last week.").describe("dayEpisodes must not exceed weekEpisodes.");
 var sessionCountSchema = number2().int().min(0).max(1e6);
 var collectorHistoryProgressSchema = object({
   sessions: sessionCountSchema,
   readSessions: sessionCountSchema,
   complete: boolean2()
-}).strict().refine((progress) => progress.readSessions <= progress.sessions, "Read sessions cannot exceed listed sessions.").refine((progress) => !progress.complete || progress.readSessions === progress.sessions, "A complete import has read every listed session.");
+}).strict().refine((progress) => progress.readSessions <= progress.sessions, "Read sessions cannot exceed listed sessions.").refine((progress) => !progress.complete || progress.readSessions === progress.sessions, "A complete import has read every listed session.").describe("readSessions must not exceed sessions; complete requires equal counts.");
 var collectorEnrollmentRequestSchema = object({
-  deviceName: string2().trim().min(1).max(160),
+  deviceName: string2().trim().min(1).max(160).describe("Trimmed before length validation."),
   organizationId: string2().regex(UUID_PATTERN).optional(),
   source: _enum(COLLECTOR_SOURCES).optional()
 }).strict();
@@ -7771,6 +7808,129 @@ import { execFile as execFile2 } from "node:child_process";
 import { createInterface } from "node:readline/promises";
 import { promisify as promisify2 } from "node:util";
 
+// src/collector-fetch.ts
+import { randomUUID } from "node:crypto";
+import http from "node:http";
+import https from "node:https";
+
+// src/logger.ts
+function writeLog(line, level) {
+  if (level === "info") console.info(line);
+  else console.error(line);
+}
+function createLogger(context, write = writeLog) {
+  return (entry) => {
+    write(
+      JSON.stringify({
+        ...entry,
+        ...context,
+        at: (/* @__PURE__ */ new Date()).toISOString(),
+        pid: process.pid,
+        runtimeVersion: process.env.ITERATION_RUNTIME_VERSION ?? null
+      }),
+      entry.level
+    );
+  };
+}
+var collectorLogger = createLogger({ component: "collector" });
+
+// src/collector-fetch.ts
+var MAX_RESPONSE_BYTES = 1024 * 1024;
+var NULL_BODY_STATUSES = /* @__PURE__ */ new Set([101, 103, 204, 205, 304]);
+var agents = {
+  "http:": new http.Agent({ keepAlive: false }),
+  "https:": new https.Agent({ keepAlive: false })
+};
+var sendCollectorRequest = (input, init = {}) => {
+  const url2 = new URL(input);
+  if (url2.protocol !== "https:" && url2.protocol !== "http:") {
+    throw new TypeError(
+      `Unsupported collector request protocol ${url2.protocol}`
+    );
+  }
+  const body = init.body ?? null;
+  const headers = { ...init.headers };
+  if (body !== null) {
+    headers["content-length"] = String(Buffer.byteLength(body, "utf8"));
+  }
+  const transport = url2.protocol === "https:" ? https : http;
+  return new Promise((resolve, reject) => {
+    const request2 = transport.request(
+      url2,
+      {
+        method: init.method ?? "GET",
+        headers,
+        agent: agents[url2.protocol],
+        signal: init.signal
+      },
+      (response) => {
+        const chunks = [];
+        let size = 0;
+        response.on("data", (chunk) => {
+          size += chunk.byteLength;
+          if (size > MAX_RESPONSE_BYTES) {
+            response.destroy(
+              new Error("Iteration returned an oversized response.")
+            );
+            return;
+          }
+          chunks.push(chunk);
+        });
+        response.on("error", reject);
+        response.on("end", () => {
+          const status2 = response.statusCode ?? 0;
+          const responseHeaders = new Headers();
+          for (const [name, value] of Object.entries(response.headers)) {
+            if (value === void 0) continue;
+            for (const item of Array.isArray(value) ? value : [value]) {
+              responseHeaders.append(name, item);
+            }
+          }
+          resolve(
+            new Response(
+              NULL_BODY_STATUSES.has(status2) ? null : Buffer.concat(chunks),
+              { status: status2, headers: responseHeaders }
+            )
+          );
+        });
+      }
+    );
+    request2.on("error", reject);
+    request2.end(body ?? void 0);
+  });
+};
+var collectorFetch = async (input, init = {}) => {
+  const requestId = randomUUID();
+  const started = performance.now();
+  const headers = new Headers(init.headers);
+  headers.set("X-Request-ID", requestId);
+  try {
+    const response = await sendCollectorRequest(input, {
+      ...init,
+      headers: Object.fromEntries(headers)
+    });
+    collectorLogger({
+      level: response.ok ? "info" : "warning",
+      operation: "http_request",
+      requestId,
+      method: init.method ?? "GET",
+      status: response.status,
+      durationMs: Math.round(performance.now() - started)
+    });
+    return response;
+  } catch (error2) {
+    collectorLogger({
+      level: "error",
+      operation: "http_request",
+      requestId,
+      method: init.method ?? "GET",
+      errorName: error2 instanceof Error ? error2.name : "UnknownError",
+      durationMs: Math.round(performance.now() - started)
+    });
+    throw error2;
+  }
+};
+
 // src/windows-powershell.ts
 import { execFile as execFileCallback } from "node:child_process";
 import path from "node:path";
@@ -7878,9 +8038,12 @@ async function responseJson(response) {
   }
 }
 async function loadOAuthConfiguration(endpoint) {
-  const response = await fetch(apiRoute(endpoint, "./collector-auth/config"), {
-    signal: AbortSignal.timeout(1e4)
-  });
+  const response = await collectorFetch(
+    apiRoute(endpoint, "./collector-auth/config"),
+    {
+      signal: AbortSignal.timeout(1e4)
+    }
+  );
   const body = await responseJson(response);
   if (!response.ok) {
     throw new Error(
@@ -8036,15 +8199,18 @@ async function enrollDevice(endpoint, accessToken, deviceName, organizationId, s
   const body = { deviceName };
   if (source !== "codex") body.source = source;
   if (organizationId !== null) body.organizationId = organizationId;
-  const response = await fetch(apiRoute(endpoint, "./collector-auth/enroll"), {
-    method: "POST",
-    headers: {
-      Authorization: "Bearer " + accessToken,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify(body),
-    signal: AbortSignal.timeout(15e3)
-  });
+  const response = await collectorFetch(
+    apiRoute(endpoint, "./collector-auth/enroll"),
+    {
+      method: "POST",
+      headers: {
+        Authorization: "Bearer " + accessToken,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(body),
+      signal: AbortSignal.timeout(15e3)
+    }
+  );
   const payload = await responseJson(response);
   const parsed = parseCollectorEnrollmentResponse(payload);
   if (response.ok && parsed.success) return parsed.value;
@@ -8824,8 +8990,8 @@ import { promisify as promisify5 } from "node:util";
 import { execFile as execFileCallback3 } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
 import { createWriteStream, promises as fs4 } from "node:fs";
-import http from "node:http";
-import https from "node:https";
+import http2 from "node:http";
+import https2 from "node:https";
 import path4 from "node:path";
 import { pipeline } from "node:stream/promises";
 import { Transform } from "node:stream";
@@ -8871,7 +9037,7 @@ function validateRegistryUrl(value) {
   return url2;
 }
 function request(url2, accept, signal) {
-  const transport = url2.protocol === "https:" ? https : http;
+  const transport = url2.protocol === "https:" ? https2 : http2;
   return new Promise((resolve, reject) => {
     const outgoing = transport.request(
       url2,
@@ -9859,74 +10025,6 @@ async function backgroundServiceUsesRuntime(directory, source) {
   ) === true;
 }
 
-// src/collector-fetch.ts
-import http2 from "node:http";
-import https2 from "node:https";
-var MAX_RESPONSE_BYTES = 1024 * 1024;
-var NULL_BODY_STATUSES = /* @__PURE__ */ new Set([101, 103, 204, 205, 304]);
-var agents = {
-  "http:": new http2.Agent({ keepAlive: false }),
-  "https:": new https2.Agent({ keepAlive: false })
-};
-var collectorFetch = (input, init = {}) => {
-  const url2 = new URL(input);
-  if (url2.protocol !== "https:" && url2.protocol !== "http:") {
-    throw new TypeError(
-      `Unsupported collector request protocol ${url2.protocol}`
-    );
-  }
-  const body = init.body ?? null;
-  const headers = { ...init.headers };
-  if (body !== null) {
-    headers["content-length"] = String(Buffer.byteLength(body, "utf8"));
-  }
-  const transport = url2.protocol === "https:" ? https2 : http2;
-  return new Promise((resolve, reject) => {
-    const request2 = transport.request(
-      url2,
-      {
-        method: init.method ?? "GET",
-        headers,
-        agent: agents[url2.protocol],
-        signal: init.signal
-      },
-      (response) => {
-        const chunks = [];
-        let size = 0;
-        response.on("data", (chunk) => {
-          size += chunk.byteLength;
-          if (size > MAX_RESPONSE_BYTES) {
-            response.destroy(
-              new Error("Iteration returned an oversized response.")
-            );
-            return;
-          }
-          chunks.push(chunk);
-        });
-        response.on("error", reject);
-        response.on("end", () => {
-          const status2 = response.statusCode ?? 0;
-          const responseHeaders = new Headers();
-          for (const [name, value] of Object.entries(response.headers)) {
-            if (value === void 0) continue;
-            for (const item of Array.isArray(value) ? value : [value]) {
-              responseHeaders.append(name, item);
-            }
-          }
-          resolve(
-            new Response(
-              NULL_BODY_STATUSES.has(status2) ? null : Buffer.concat(chunks),
-              { status: status2, headers: responseHeaders }
-            )
-          );
-        });
-      }
-    );
-    request2.on("error", reject);
-    request2.end(body ?? void 0);
-  });
-};
-
 // src/turn-summary.ts
 import { execFile as execFileCallback7 } from "node:child_process";
 import { createHash as createHash3 } from "node:crypto";
@@ -9936,7 +10034,7 @@ import { promisify as promisify8 } from "node:util";
 import { crc32 } from "node:zlib";
 
 // src/claude-git-hook.ts
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import { promises as fs10 } from "node:fs";
 import path9 from "node:path";
 
@@ -10058,7 +10156,7 @@ async function captureClaudeGit(dataDirectory2) {
     (name2) => name2.endsWith(".jsonl")
   );
   if (files.length >= 1e4) throw new Error("Claude Git hook queue is full.");
-  const name = randomUUID();
+  const name = randomUUID2();
   const temporary = path9.join(directory, `${name}.tmp`);
   const filename = path9.join(directory, `${name}.jsonl`);
   try {
@@ -10096,7 +10194,7 @@ async function claudeGitHookFiles(dataDirectory2) {
 async function recordClaudeGitHookFailure(dataDirectory2) {
   const filename = claudeGitHookPaths(dataDirectory2).failure;
   await ensurePrivateDirectory(path9.dirname(filename));
-  const temporary = `${filename}.${randomUUID()}.tmp`;
+  const temporary = `${filename}.${randomUUID2()}.tmp`;
   await fs10.writeFile(temporary, `${JSON.stringify({ atMs: Date.now() })}
 `, {
     mode: 384
@@ -16651,14 +16749,12 @@ async function connectNewDetectedSources(anchor2, consent) {
     try {
       if (source !== "cursor") await installTurnSummary(config2);
     } catch (error2) {
-      console.error(
-        JSON.stringify({
-          level: "warning",
-          source,
-          operation: "install_turn_summary",
-          message: error2 instanceof Error ? error2.message : "The turn summary could not be installed."
-        })
-      );
+      collectorLogger({
+        level: "warning",
+        source,
+        operation: "install_turn_summary",
+        message: error2 instanceof Error ? error2.message : "The turn summary could not be installed."
+      });
     }
   }
   return connected;
@@ -16798,12 +16894,17 @@ function parseClaudeLine(line, filename, byteOffset, repositoryUrl = gitReposito
   const record3 = object2(decoded);
   if (record3 === null) return { events: [], gaps: ["record_is_not_an_object"] };
   const recordType = string4(record3.type);
-  const sourceSessionId = string4(record3.sessionId);
-  if (identity.agentId !== null && sourceSessionId === null || sourceSessionId !== null && `claude:${sourceSessionId}` !== (identity.parentSessionId ?? identity.sessionId)) {
-    return { events: [], gaps: ["session_id_does_not_match_path"] };
-  }
-  if (identity.agentId !== null && string4(record3.agentId) !== identity.agentId)
-    return { events: [], gaps: ["agent_id_does_not_match_path"] };
+  const identityGap = () => {
+    const sourceSessionId = string4(record3.sessionId);
+    if (identity.agentId !== null && sourceSessionId === null || sourceSessionId !== null && `claude:${sourceSessionId}` !== (identity.parentSessionId ?? identity.sessionId)) {
+      return "session_id_does_not_match_path";
+    }
+    if (identity.agentId !== null && string4(record3.agentId) !== identity.agentId)
+      return "agent_id_does_not_match_path";
+    return null;
+  };
+  const gap = identityGap();
+  if (gap !== null) return { events: [], gaps: [gap] };
   const gaps = [];
   if (record3.timestamp !== void 0 && timestamp(record3) === null)
     gaps.push("invalid_source_timestamp");
@@ -16841,7 +16942,7 @@ function parseClaudeLine(line, filename, byteOffset, repositoryUrl = gitReposito
       }
     });
   }
-  if (recordType === "user") {
+  const appendUserMessage = () => {
     const message = object2(record3.message);
     const content = message === null ? null : string4(message.content);
     if (message === null) gaps.push("user_without_message");
@@ -16889,7 +16990,8 @@ function parseClaudeLine(line, filename, byteOffset, repositoryUrl = gitReposito
         }
       }
     } else gaps.push("unsupported_user_content");
-  } else if (recordType === "assistant") {
+  };
+  const appendAssistantMessage = () => {
     const message = object2(record3.message);
     if (message === null || !Array.isArray(message.content))
       gaps.push("assistant_without_content_blocks");
@@ -16942,7 +17044,10 @@ function parseClaudeLine(line, filename, byteOffset, repositoryUrl = gitReposito
         );
       }
     }
-  } else if (recordType !== null && CONTEXT_RECORD_TYPES.has(recordType)) {
+  };
+  if (recordType === "user") appendUserMessage();
+  else if (recordType === "assistant") appendAssistantMessage();
+  else if (recordType !== null && CONTEXT_RECORD_TYPES.has(recordType)) {
     const attachment = object2(record3.attachment);
     events.push(
       event(identity, record3, byteOffset, 1, "source_record", {
@@ -17060,8 +17165,7 @@ function parseCursorTranscriptLine(line, filename, byteOffset) {
       }
     });
   }
-  const role = string5(source.role);
-  if (role === "user" || role === "assistant") {
+  const appendMessage = (role2) => {
     const message = record2(source.message);
     if (message === null || !Array.isArray(message.content))
       gaps.push("cursor_message_without_content");
@@ -17073,7 +17177,7 @@ function parseCursorTranscriptLine(line, filename, byteOffset) {
           continue;
         }
         const type = string5(block.type);
-        const eventType = type === "tool_use" ? "tool_call" : type === "thinking" ? "reasoning" : type === "text" ? role === "user" ? "user_message" : "assistant_message" : "source_record";
+        const eventType = type === "tool_use" ? "tool_call" : type === "thinking" ? "reasoning" : type === "text" ? role2 === "user" ? "user_message" : "assistant_message" : "source_record";
         events.push(
           event2(
             conversationId,
@@ -17095,7 +17199,10 @@ function parseCursorTranscriptLine(line, filename, byteOffset) {
           gaps.push(`unsupported_cursor_content_block:${type ?? "unknown"}`);
       }
     }
-  } else if (source.type === "turn_ended") {
+  };
+  const role = string5(source.role);
+  if (role === "user" || role === "assistant") appendMessage(role);
+  else if (source.type === "turn_ended") {
     events.push(
       event2(
         conversationId,
@@ -17130,45 +17237,64 @@ function parseCursorHookLine(line, filename) {
   const hook = wrapper === null ? null : string5(wrapper.hook);
   const capturedAt = wrapper === null ? null : string5(wrapper.capturedAt);
   if (wrapper?.kind === "subagent_transcript_chunk") {
-    const subagent = record2(wrapper.subagent);
-    const part = nonnegativeInteger(subagent?.part);
-    const totalParts = nonnegativeInteger(subagent?.totalParts);
-    if (conversationId === null || !UUID.test(conversationId) || capturedAt === null || Number.isNaN(Date.parse(capturedAt)) || subagent === null || part === null || totalParts === null || part < 1 || part > totalParts || string5(subagent.base64) === null)
-      return { events: [], gaps: ["invalid_cursor_subagent_transcript_chunk"] };
-    const transcriptBytes2 = nonnegativeInteger(wrapper.transcriptBytes) ?? 0;
-    const candidate = event2(
+    return parseSubagentChunk(
+      wrapper,
+      input,
       conversationId,
-      filename,
-      transcriptBytes2,
-      part,
-      "source_record",
-      {
-        sourceType: "cursor_subagent_transcript",
-        text: string5(subagent.text),
-        base64: string5(subagent.base64),
-        path: string5(subagent.path),
-        part,
-        totalParts,
-        parent_conversation_id: string5(input?.parent_conversation_id),
-        subagent_id: string5(input?.subagent_id)
-      },
-      null,
-      capturedAt
-    );
-    const hash = candidate.eventId.split(":").at(-1);
-    return validated(
-      [
-        {
-          ...candidate,
-          sequence: transcriptBytes2 * 1e3 + 500,
-          eventId: `${String(Date.parse(capturedAt)).padStart(13, "0")}:${String(2e3 + part).padStart(4, "0")}:${hash}`
-        }
-      ],
-      []
+      capturedAt,
+      filename
     );
   }
   if (input === null || conversationId === null || !UUID.test(conversationId) || hook === null || capturedAt === null || Number.isNaN(Date.parse(capturedAt)))
     return { events: [], gaps: ["invalid_cursor_hook_record"] };
+  return parseHookEvents(
+    wrapper,
+    input,
+    conversationId,
+    hook,
+    capturedAt,
+    filename
+  );
+}
+function parseSubagentChunk(wrapper, input, conversationId, capturedAt, filename) {
+  const subagent = record2(wrapper.subagent);
+  const part = nonnegativeInteger(subagent?.part);
+  const totalParts = nonnegativeInteger(subagent?.totalParts);
+  if (conversationId === null || !UUID.test(conversationId) || capturedAt === null || Number.isNaN(Date.parse(capturedAt)) || subagent === null || part === null || totalParts === null || part < 1 || part > totalParts || string5(subagent.base64) === null)
+    return { events: [], gaps: ["invalid_cursor_subagent_transcript_chunk"] };
+  const transcriptBytes = nonnegativeInteger(wrapper.transcriptBytes) ?? 0;
+  const candidate = event2(
+    conversationId,
+    filename,
+    transcriptBytes,
+    part,
+    "source_record",
+    {
+      sourceType: "cursor_subagent_transcript",
+      text: string5(subagent.text),
+      base64: string5(subagent.base64),
+      path: string5(subagent.path),
+      part,
+      totalParts,
+      parent_conversation_id: string5(input?.parent_conversation_id),
+      subagent_id: string5(input?.subagent_id)
+    },
+    null,
+    capturedAt
+  );
+  const hash = candidate.eventId.split(":").at(-1);
+  return validated(
+    [
+      {
+        ...candidate,
+        sequence: transcriptBytes * 1e3 + 500,
+        eventId: `${String(Date.parse(capturedAt)).padStart(13, "0")}:${String(2e3 + part).padStart(4, "0")}:${hash}`
+      }
+    ],
+    []
+  );
+}
+function parseHookEvents(wrapper, input, conversationId, hook, capturedAt, filename) {
   const transcriptBytes = wrapper?.transcriptBytes;
   const sequence = nonnegativeInteger(transcriptBytes) ?? 0;
   const events = [];
@@ -17243,82 +17369,85 @@ function parseCursorHookLine(line, filename) {
         )
       );
   }
-  const next = events.length + 1;
-  if (hook === "preToolUse") {
-    events.push(
-      event2(
-        conversationId,
-        filename,
-        sequence,
-        next,
-        "tool_call",
-        {
-          name: string5(input.tool_name),
-          input: input.tool_input ?? null
-        },
-        string5(input.tool_use_id),
-        capturedAt
-      )
-    );
-  }
-  if (hook === "postToolUse" || hook === "postToolUseFailure") {
-    const output = string5(input.tool_output) ?? string5(input.error_message) ?? string5(input.error) ?? (input.tool_output === void 0 && input.error === void 0 ? null : JSON.stringify(input.tool_output ?? input.error));
-    const chunks = output === null ? [null] : splitText(output);
-    for (const [index, text] of chunks.entries())
+  const appendHookPayload = () => {
+    const next = events.length + 1;
+    if (hook === "preToolUse") {
       events.push(
         event2(
           conversationId,
           filename,
           sequence,
-          next + index,
-          "tool_result",
+          next,
+          "tool_call",
           {
-            text,
             name: string5(input.tool_name),
-            part: index + 1,
-            totalParts: chunks.length
+            input: input.tool_input ?? null
           },
           string5(input.tool_use_id),
           capturedAt
         )
       );
-  } else if (hook === "afterAgentThought") {
-    events.push(
-      event2(
-        conversationId,
-        filename,
-        sequence,
-        next,
-        "reasoning",
-        {
-          text: string5(input.text) ?? string5(input.thought)
-        },
-        null,
-        capturedAt
-      )
-    );
-  } else if (hook === "afterAgentResponse" && (input.usage !== void 0 || input.input_tokens !== void 0 || input.output_tokens !== void 0)) {
-    events.push(
-      event2(
-        conversationId,
-        filename,
-        sequence,
-        next,
-        "token_usage_record",
-        {
-          model: string5(input.model),
-          usage: input.usage ?? {
-            input_tokens: input.input_tokens ?? null,
-            output_tokens: input.output_tokens ?? null,
-            cache_read_tokens: input.cache_read_tokens ?? null,
-            cache_write_tokens: input.cache_write_tokens ?? null
-          }
-        },
-        null,
-        capturedAt
-      )
-    );
-  }
+    }
+    if (hook === "postToolUse" || hook === "postToolUseFailure") {
+      const output = hookToolOutput(input);
+      const chunks = output === null ? [null] : splitText(output);
+      for (const [index, text] of chunks.entries())
+        events.push(
+          event2(
+            conversationId,
+            filename,
+            sequence,
+            next + index,
+            "tool_result",
+            {
+              text,
+              name: string5(input.tool_name),
+              part: index + 1,
+              totalParts: chunks.length
+            },
+            string5(input.tool_use_id),
+            capturedAt
+          )
+        );
+    } else if (hook === "afterAgentThought") {
+      events.push(
+        event2(
+          conversationId,
+          filename,
+          sequence,
+          next,
+          "reasoning",
+          {
+            text: string5(input.text) ?? string5(input.thought)
+          },
+          null,
+          capturedAt
+        )
+      );
+    } else if (hook === "afterAgentResponse" && (input.usage !== void 0 || input.input_tokens !== void 0 || input.output_tokens !== void 0)) {
+      events.push(
+        event2(
+          conversationId,
+          filename,
+          sequence,
+          next,
+          "token_usage_record",
+          {
+            model: string5(input.model),
+            usage: input.usage ?? {
+              input_tokens: input.input_tokens ?? null,
+              output_tokens: input.output_tokens ?? null,
+              cache_read_tokens: input.cache_read_tokens ?? null,
+              cache_write_tokens: input.cache_write_tokens ?? null
+            }
+          },
+          null,
+          capturedAt
+        )
+      );
+    }
+  };
+  appendHookPayload();
   const capturedAtMs = Date.parse(capturedAt);
   const ordered = events.map((candidate, index) => {
     const digest3 = candidate.eventId.split(":").at(-1);
@@ -17333,6 +17462,9 @@ function parseCursorHookLine(line, filename) {
   });
   return validated(ordered, []);
 }
+function hookToolOutput(input) {
+  return string5(input.tool_output) ?? string5(input.error_message) ?? string5(input.error) ?? (input.tool_output === void 0 && input.error === void 0 ? null : JSON.stringify(input.tool_output ?? input.error));
+}
 function splitText(value) {
   if (value.length === 0) return [""];
   const chunks = [];
@@ -17569,83 +17701,86 @@ function parseRolloutLine(line, filename, byteOffset) {
     );
   }
   if (recordType === "event_msg" && payload !== null) {
-    const messageType = parseJsonString(payload.type);
-    if (messageType === "user_message") {
-      return capturedEvent(
-        record3,
-        filename,
-        byteOffset,
-        "user_message",
-        payload,
-        null
-      );
-    }
-    if (messageType === "agent_message") {
-      return capturedEvent(
-        record3,
-        filename,
-        byteOffset,
-        "assistant_message",
-        payload,
-        null
-      );
-    }
-    if (oneOf(messageType, [
-      "mcp_tool_call_end",
-      "web_search_end",
-      "image_generation_end",
-      "patch_apply_end"
-    ])) {
-      return capturedEvent(
-        record3,
-        filename,
-        byteOffset,
-        "tool_result",
-        payload,
-        callIdFrom(payload)
-      );
-    }
-    if (oneOf(messageType, IGNORED_EVENT_MESSAGES)) return { kind: "ignored" };
-    if (oneOf(messageType, EVENT_CONTEXT_TYPES)) {
-      const ordinal = sourceOrdinal(record3.ordinal);
-      const run = messageType === "thread_settings_applied" && parseJsonString(payload.thread_id) === sessionFromPath(filename).slice(-36) && ordinal !== null ? { kind: "start", sourceOrdinal: ordinal } : void 0;
-      return capturedEvent(
-        record3,
-        filename,
-        byteOffset,
-        messageType,
-        payload,
-        null,
-        run
-      );
-    }
-    if (messageType !== "item_completed") {
-      return {
-        kind: "gap",
-        reason: `unsupported_event_message:${messageType ?? "unknown"}`
-      };
-    }
-    const item = parseJsonRecord(payload.item);
-    if (item === null)
-      return { kind: "gap", reason: "item_completed_without_item" };
-    const mapped = mapCompletedItem(item);
-    if (mapped === null) {
-      const itemType = parseJsonString(item.type) ?? "unknown";
-      return { kind: "gap", reason: `unsupported_completed_item:${itemType}` };
-    }
+    return parseEventMessage(record3, payload, filename, byteOffset);
+  }
+  return {
+    kind: "gap",
+    reason: `unsupported_rollout_record:${recordType ?? "unknown"}`
+  };
+}
+function parseEventMessage(record3, payload, filename, byteOffset) {
+  const messageType = parseJsonString(payload.type);
+  if (messageType === "user_message") {
     return capturedEvent(
       record3,
       filename,
       byteOffset,
-      mapped.eventType,
-      item,
-      mapped.callId
+      "user_message",
+      payload,
+      null
     );
   }
-  return {
-    kind: "gap",
-    reason: `unsupported_rollout_record:${recordType ?? "unknown"}`
-  };
+  if (messageType === "agent_message") {
+    return capturedEvent(
+      record3,
+      filename,
+      byteOffset,
+      "assistant_message",
+      payload,
+      null
+    );
+  }
+  if (oneOf(messageType, [
+    "mcp_tool_call_end",
+    "web_search_end",
+    "image_generation_end",
+    "patch_apply_end"
+  ])) {
+    return capturedEvent(
+      record3,
+      filename,
+      byteOffset,
+      "tool_result",
+      payload,
+      callIdFrom(payload)
+    );
+  }
+  if (oneOf(messageType, IGNORED_EVENT_MESSAGES)) return { kind: "ignored" };
+  if (oneOf(messageType, EVENT_CONTEXT_TYPES)) {
+    const ordinal = sourceOrdinal(record3.ordinal);
+    const run = messageType === "thread_settings_applied" && parseJsonString(payload.thread_id) === sessionFromPath(filename).slice(-36) && ordinal !== null ? { kind: "start", sourceOrdinal: ordinal } : void 0;
+    return capturedEvent(
+      record3,
+      filename,
+      byteOffset,
+      messageType,
+      payload,
+      null,
+      run
+    );
+  }
+  if (messageType !== "item_completed") {
+    return {
+      kind: "gap",
+      reason: `unsupported_event_message:${messageType ?? "unknown"}`
+    };
+  }
+  const item = parseJsonRecord(payload.item);
+  if (item === null)
+    return { kind: "gap", reason: "item_completed_without_item" };
+  const mapped = mapCompletedItem(item);
+  if (mapped === null) {
+    const itemType = parseJsonString(item.type) ?? "unknown";
+    return { kind: "gap", reason: `unsupported_completed_item:${itemType}` };
+  }
+  return capturedEvent(
+    record3,
+    filename,
+    byteOffset,
+    mapped.eventType,
+    item,
+    mapped.callId
+  );
 }
 
 // src/collector.ts
@@ -17669,15 +17804,15 @@ var TraceUploadError = class extends Error {
     this.status = status2;
   }
 };
-function logGap(filename, offset, reason) {
-  console.error(
-    JSON.stringify({
-      level: "capture_gap",
-      filename,
-      offset,
-      reason
-    })
-  );
+function logGap(source, filename, offset, reason) {
+  collectorLogger({
+    level: "warning",
+    operation: "capture_gap",
+    source,
+    filename,
+    offset,
+    reason
+  });
 }
 function parseSourceRecord(source, line, filename, byteOffset) {
   if (source === "claude")
@@ -17716,11 +17851,37 @@ async function scanSourceOnce(config2, paths, signal) {
   const queuedIds = await pendingEventIds(paths);
   const tickIndexes = /* @__PURE__ */ new Map();
   const events = [];
+  const queueRecordEvents = async (parsedEvents, filename, byteOffset) => {
+    for (const parsedEvent of parsedEvents) {
+      const queuedAt = tickIndexes.get(parsedEvent.eventId);
+      if (queuedAt !== void 0 && parsedEvent.eventType === "token_usage_record") {
+        const event4 = await redactTraceEvent(parsedEvent);
+        if (Buffer.byteLength(JSON.stringify(event4), "utf8") <= MAX_EVENT_BYTES)
+          events[queuedAt] = event4;
+        continue;
+      }
+      if (queuedIds.has(parsedEvent.eventId)) continue;
+      const event3 = await redactTraceEvent(parsedEvent);
+      const eventBytes = Buffer.byteLength(JSON.stringify(event3), "utf8");
+      if (eventBytes > MAX_EVENT_BYTES) {
+        logGap(
+          source,
+          filename,
+          byteOffset,
+          "normalized_event_exceeds_upload_limit"
+        );
+      } else {
+        tickIndexes.set(event3.eventId, events.length);
+        events.push(event3);
+        queuedIds.add(event3.eventId);
+      }
+    }
+  };
   let remainingBudget = MAX_SCAN_BYTES_PER_TICK;
   let caughtUp = true;
   for (const filename of files) {
     signal?.throwIfAborted();
-    const recordLimit = source === "cursor" && filename.includes(`${path18.sep}cursor-hooks${path18.sep}`) ? 12 * 1024 * 1024 : MAX_RECORD_BYTES;
+    const recordLimit = isCursorHookFile(source, filename) ? 12 * 1024 * 1024 : MAX_RECORD_BYTES;
     if (remainingBudget === 0) {
       caughtUp = false;
       break;
@@ -17728,7 +17889,7 @@ async function scanSourceOnce(config2, paths, signal) {
     const size = listedSizes.get(filename) ?? (await fs15.stat(filename)).size;
     let offset = cursors[filename] ?? 0;
     if (offset > size) {
-      logGap(filename, offset, "rollout_file_shrank_resetting_cursor");
+      logGap(source, filename, offset, "rollout_file_shrank_resetting_cursor");
       offset = 0;
       skipping.delete(filename);
     }
@@ -17764,59 +17925,51 @@ async function scanSourceOnce(config2, paths, signal) {
       buffer = buffer.subarray(newline + 1);
       skipping.delete(filename);
     }
-    let lineStart = 0;
-    for (let index = 0; index < buffer.length; index += 1) {
-      if (buffer[index] !== 10) continue;
-      let lineBytes = buffer.subarray(lineStart, index);
-      if (lineBytes.at(-1) === 13) lineBytes = lineBytes.subarray(0, -1);
-      const byteOffset = offset + lineStart;
-      if (lineBytes.length > recordLimit) {
-        logGap(filename, byteOffset, "rollout_record_exceeds_scan_limit");
-        lineStart = index + 1;
-        continue;
-      }
-      let line;
-      try {
-        line = UTF8_DECODER.decode(lineBytes);
-      } catch {
-        logGap(filename, byteOffset, "rollout_record_is_not_utf8");
-        lineStart = index + 1;
-        continue;
-      }
-      const parsed = parseSourceRecord(source, line, filename, byteOffset);
-      for (const reason of parsed.gaps) logGap(filename, byteOffset, reason);
-      for (const parsedEvent of parsed.events) {
-        const queuedAt = tickIndexes.get(parsedEvent.eventId);
-        if (queuedAt !== void 0 && parsedEvent.eventType === "token_usage_record") {
-          const event4 = await redactTraceEvent(parsedEvent);
-          if (Buffer.byteLength(JSON.stringify(event4), "utf8") <= MAX_EVENT_BYTES)
-            events[queuedAt] = event4;
+    const scanRecords = async () => {
+      let lineStart = 0;
+      for (let index = 0; index < buffer.length; index += 1) {
+        if (buffer[index] !== 10) continue;
+        let lineBytes = buffer.subarray(lineStart, index);
+        if (lineBytes.at(-1) === 13) lineBytes = lineBytes.subarray(0, -1);
+        const byteOffset = offset + lineStart;
+        if (lineBytes.length > recordLimit) {
+          logGap(
+            source,
+            filename,
+            byteOffset,
+            "rollout_record_exceeds_scan_limit"
+          );
+          lineStart = index + 1;
           continue;
         }
-        if (queuedIds.has(parsedEvent.eventId)) continue;
-        const event3 = await redactTraceEvent(parsedEvent);
-        const eventBytes = Buffer.byteLength(JSON.stringify(event3), "utf8");
-        if (eventBytes > MAX_EVENT_BYTES) {
-          logGap(filename, byteOffset, "normalized_event_exceeds_upload_limit");
-        } else {
-          tickIndexes.set(event3.eventId, events.length);
-          events.push(event3);
-          queuedIds.add(event3.eventId);
+        let line;
+        try {
+          line = UTF8_DECODER.decode(lineBytes);
+        } catch {
+          logGap(source, filename, byteOffset, "rollout_record_is_not_utf8");
+          lineStart = index + 1;
+          continue;
         }
+        const parsed = parseSourceRecord(source, line, filename, byteOffset);
+        for (const reason of parsed.gaps)
+          logGap(source, filename, byteOffset, reason);
+        await queueRecordEvents(parsed.events, filename, byteOffset);
+        lineStart = index + 1;
       }
-      lineStart = index + 1;
-    }
-    if (buffer.length - lineStart > recordLimit) {
-      logGap(
-        filename,
-        offset + lineStart,
-        "incomplete_rollout_record_exceeds_scan_limit"
-      );
-      skipping.add(filename);
-      lineStart = buffer.length;
-    }
-    cursors[filename] = offset + lineStart;
-    if ((source === "cursor" && filename.includes(`${path18.sep}cursor-hooks${path18.sep}`) || source === "claude" && filename.includes(`${path18.sep}git-queue${path18.sep}`)) && cursors[filename] === size)
+      if (buffer.length - lineStart > recordLimit) {
+        logGap(
+          source,
+          filename,
+          offset + lineStart,
+          "incomplete_rollout_record_exceeds_scan_limit"
+        );
+        skipping.add(filename);
+        lineStart = buffer.length;
+      }
+      cursors[filename] = offset + lineStart;
+    };
+    await scanRecords();
+    if (isHookFile(source, filename) && cursors[filename] === size)
       completedHooks.push(filename);
   }
   await appendEvents(events, paths);
@@ -17845,12 +17998,24 @@ async function scanSourceOnce(config2, paths, signal) {
     }
   };
 }
+function isHookFile(source, filename) {
+  return isCursorHookFile(source, filename) || source === "claude" && filename.includes(`${path18.sep}git-queue${path18.sep}`);
+}
+function isCursorHookFile(source, filename) {
+  return source === "cursor" && filename.includes(`${path18.sep}cursor-hooks${path18.sep}`);
+}
+function retryAfterMs(response) {
+  const header = response.headers.get("retry-after");
+  if (header === null) return null;
+  const milliseconds = /^\d+$/.test(header) ? Number(header) * 1e3 : Date.parse(header) - Date.now();
+  return Number.isFinite(milliseconds) ? Math.max(1e3, Math.min(milliseconds, 3e5)) : 5e3;
+}
 async function uploadPendingOnce(config2, paths, fetcher = collectorFetch, signal, onAcknowledged) {
   let uploaded = 0;
   for (let attempt = 0; attempt < MAX_UPLOADS_PER_TICK; attempt += 1) {
     signal?.throwIfAborted();
     const batch = await nextBatch(paths, MAX_UPLOAD_BYTES);
-    if (batch.length === 0) return uploaded;
+    if (batch.length === 0) return { uploaded, retryAfterMs: null };
     const body = JSON.stringify({ events: batch });
     if (Buffer.byteLength(body, "utf8") > MAX_REQUEST_BYTES) {
       throw new Error("Queued trace batch exceeds the upload request limit.");
@@ -17875,6 +18040,10 @@ async function uploadPendingOnce(config2, paths, fetcher = collectorFetch, signa
         { cause: error2 }
       );
     }
+    if (response.status === 429) {
+      await response.body?.cancel();
+      return { uploaded, retryAfterMs: retryAfterMs(response) ?? 5e3 };
+    }
     if (response.status !== 202) {
       throw new TraceUploadError(
         "http",
@@ -17901,12 +18070,14 @@ async function uploadPendingOnce(config2, paths, fetcher = collectorFetch, signa
     await acknowledgeEvents(new Set(parsed.value.acceptedEventIds), paths);
     onAcknowledged?.();
     uploaded += batch.length;
+    const pause = retryAfterMs(response);
+    if (pause !== null) return { uploaded, retryAfterMs: pause };
   }
-  return uploaded;
+  return { uploaded, retryAfterMs: null };
 }
 async function collectorTick(config2, paths, fetcher = collectorFetch, signal, onAcknowledged) {
   await redactPendingOutbox(paths);
-  let uploaded = await uploadPendingOnce(
+  let upload = await uploadPendingOnce(
     config2,
     paths,
     fetcher,
@@ -17914,19 +18085,23 @@ async function collectorTick(config2, paths, fetcher = collectorFetch, signal, o
     onAcknowledged
   );
   const scan = await outboxSize(paths) >= SCAN_PAUSE_OUTBOX_BYTES ? { discovered: 0, caughtUp: false, history: null } : await scanSourceOnce(config2, paths, signal);
-  uploaded += await uploadPendingOnce(
-    config2,
-    paths,
-    fetcher,
-    signal,
-    onAcknowledged
-  );
+  if (upload.retryAfterMs === null) {
+    const next = await uploadPendingOnce(
+      config2,
+      paths,
+      fetcher,
+      signal,
+      onAcknowledged
+    );
+    upload = { ...next, uploaded: upload.uploaded + next.uploaded };
+  }
   return {
     discovered: scan.discovered,
-    uploaded,
+    uploaded: upload.uploaded,
     outboxBytes: await outboxSize(paths),
     historyCaughtUp: scan.caughtUp,
-    history: scan.history
+    history: scan.history,
+    retryAfterMs: upload.retryAfterMs ?? 0
   };
 }
 
@@ -18190,57 +18365,64 @@ async function syncCursorBilling(config2, fetcher = collectorFetch, signal) {
     nowMs
   );
   const byConversation = /* @__PURE__ */ new Map();
-  for (let page = 1; page <= MAX_PAGES; page += 1) {
-    signal?.throwIfAborted();
-    const response = await fetch(CURSOR_USAGE_URL, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${auth.token}`,
-        "Content-Type": "application/json",
-        "Connect-Protocol-Version": "1"
-      },
-      body: JSON.stringify({
-        page,
-        pageSize: PAGE_SIZE,
-        startDate: String(plan.startDateMs)
-      }),
-      signal: AbortSignal.any([
-        AbortSignal.timeout(2e4),
-        ...signal ? [signal] : []
-      ])
-    });
-    if (!response.ok)
-      throw new Error(
-        `Cursor billing lookup failed with HTTP ${response.status}.`
-      );
-    const rawPage = await response.json();
-    if (emptyUsagePageSchema.safeParse(rawPage).success) {
-      if (page !== 1)
+  const readUsagePages = async () => {
+    for (let page = 1; page <= MAX_PAGES; page += 1) {
+      signal?.throwIfAborted();
+      const response = await fetch(CURSOR_USAGE_URL, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${auth.token}`,
+          "Content-Type": "application/json",
+          "Connect-Protocol-Version": "1"
+        },
+        body: JSON.stringify({
+          page,
+          pageSize: PAGE_SIZE,
+          startDate: String(plan.startDateMs)
+        }),
+        signal: AbortSignal.any([
+          AbortSignal.timeout(2e4),
+          ...signal ? [signal] : []
+        ])
+      });
+      if (!response.ok)
+        throw new Error(
+          `Cursor billing lookup failed with HTTP ${response.status}.`
+        );
+      const rawPage = await response.json();
+      if (emptyUsagePageSchema.safeParse(rawPage).success) {
+        if (page !== 1)
+          throw new Error(
+            "Cursor billing history ended before its reported count."
+          );
+        break;
+      }
+      const decoded = usagePageSchema.safeParse(rawPage);
+      if (!decoded.success)
+        throw new Error("Cursor returned an invalid billing page.");
+      for (const value of decoded.data.usageEventsDisplay) {
+        const normalized = normalizeCursorUsageEvent(value, localConversations);
+        if (normalized === null) continue;
+        const events = byConversation.get(normalized.conversationId) ?? [];
+        events.push(normalized.event);
+        if (events.length > 5e3)
+          throw new Error(
+            "Cursor conversation exceeds the billing sync limit."
+          );
+        byConversation.set(normalized.conversationId, events);
+      }
+      if (page * PAGE_SIZE >= decoded.data.totalUsageEventsCount) break;
+      if (page === MAX_PAGES)
+        throw new Error(
+          "Cursor account exceeds the billing history page limit."
+        );
+      if (decoded.data.usageEventsDisplay.length === 0)
         throw new Error(
           "Cursor billing history ended before its reported count."
         );
-      break;
     }
-    const decoded = usagePageSchema.safeParse(rawPage);
-    if (!decoded.success)
-      throw new Error("Cursor returned an invalid billing page.");
-    for (const value of decoded.data.usageEventsDisplay) {
-      const normalized = normalizeCursorUsageEvent(value, localConversations);
-      if (normalized === null) continue;
-      const events = byConversation.get(normalized.conversationId) ?? [];
-      events.push(normalized.event);
-      if (events.length > 5e3)
-        throw new Error("Cursor conversation exceeds the billing sync limit.");
-      byConversation.set(normalized.conversationId, events);
-    }
-    if (page * PAGE_SIZE >= decoded.data.totalUsageEventsCount) break;
-    if (page === MAX_PAGES)
-      throw new Error("Cursor account exceeds the billing history page limit.");
-    if (decoded.data.usageEventsDisplay.length === 0)
-      throw new Error(
-        "Cursor billing history ended before its reported count."
-      );
-  }
+  };
+  await readUsagePages();
   const endpoint = new URL(config2.endpoint);
   endpoint.pathname = "/api/traces/cursor-billing";
   let matched = 0;
@@ -18615,11 +18797,14 @@ async function syncCodexBilling(config2, fetcher = collectorFetch, signal) {
   );
   const filenames = await sourceFiles("codex", config2.codexHome);
   const threads = [];
-  for (const filename of filenames) {
-    signal?.throwIfAborted();
-    const thread = await localThread(filename);
-    if (thread !== null) threads.push(thread);
-  }
+  const readLocalThreads = async () => {
+    for (const filename of filenames) {
+      signal?.throwIfAborted();
+      const thread = await localThread(filename);
+      if (thread !== null) threads.push(thread);
+    }
+  };
+  await readLocalThreads();
   const allTasks = groupCodexTasks(threads, auth.accountId);
   const retryIds = new Set(audit ? prior?.unavailableThreadIds ?? [] : []);
   const selected = allTasks.filter(
@@ -18657,36 +18842,40 @@ async function syncCodexBilling(config2, fetcher = collectorFetch, signal) {
   let apiTurns = 0;
   const endpoint = new URL(config2.endpoint);
   endpoint.pathname = "/api/traces/codex-billing";
-  const batches = [];
-  let current = [];
-  let currentIds = 0;
-  let currentTurns = 0;
-  for (const task of selected) {
-    const size = 1 + task.descendantThreadIds.length;
-    const turns = [task.threadId, ...task.descendantThreadIds].reduce(
-      (total, threadId) => total + (byThread.get(threadId)?.length ?? 0),
-      0
-    );
-    if (size > 1e3)
-      throw new Error("Codex task exceeds the billing thread limit.");
-    if (current.length >= TASK_BATCH_SIZE || currentIds + size > 1e3 || currentTurns + turns > 5e3) {
-      if (current.length > 0) batches.push(current);
-      current = [];
-      currentIds = 0;
-      currentTurns = 0;
-    }
-    current.push(task);
-    currentIds += size;
-    currentTurns += turns;
-    if (turns > 5e3) {
-      batches.push(current);
-      current = [];
-      currentIds = 0;
-      currentTurns = 0;
-    }
-  }
-  if (current.length > 0) batches.push(current);
-  for (const batch of batches) {
+  const createBatches = () => {
+    const batches2 = [];
+    let current = [];
+    let currentIds = 0;
+    let currentTurns = 0;
+    for (const task of selected) {
+      const size = 1 + task.descendantThreadIds.length;
+      const turns = [task.threadId, ...task.descendantThreadIds].reduce(
+        (total, threadId) => total + (byThread.get(threadId)?.length ?? 0),
+        0
+      );
+      if (size > 1e3)
+        throw new Error("Codex task exceeds the billing thread limit.");
+      if (current.length >= TASK_BATCH_SIZE || currentIds + size > 1e3 || currentTurns + turns > 5e3) {
+        if (current.length > 0) batches2.push(current);
+        current = [];
+        currentIds = 0;
+        currentTurns = 0;
+      }
+      current.push(task);
+      currentIds += size;
+      currentTurns += turns;
+      if (turns > 5e3) {
+        batches2.push(current);
+        current = [];
+        currentIds = 0;
+        currentTurns = 0;
+      }
+    }
+    if (current.length > 0) batches2.push(current);
+    return batches2;
+  };
+  const batches = createBatches();
+  const syncBatch = async (batch) => {
     signal?.throwIfAborted();
     const responseTasks = auth.accessToken === null || auth.accountId === null ? /* @__PURE__ */ new Map() : await queryTaskUsage(batch, auth.accessToken, auth.accountId, signal);
     const tasks = batch.map((task) => {
@@ -18734,7 +18923,7 @@ async function syncCodexBilling(config2, fetcher = collectorFetch, signal) {
         throw new Error("Iteration returned an invalid Codex billing result.");
       if (result.data.matched < tasks.length) serverIncomplete = true;
     }
-    for (const task of tasks) {
+    const reconcileTask = (task) => {
       if (task.dataStatus === "available" && task.balanceUsageCredits !== null && (task.usageSource === "included_plan" || task.usageSource === "plan_and_credits"))
         unavailable.delete(task.threadId);
       else if (task.dataStatus !== "not_queried")
@@ -18746,9 +18935,11 @@ async function syncCodexBilling(config2, fetcher = collectorFetch, signal) {
         else if (codexCreditSign(task.balanceUsageCredits) > 0)
           creditTasks += 1;
       }
-    }
+    };
+    for (const task of tasks) reconcileTask(task);
     apiTurns += batchTurns.filter((turn) => turn.mode === "api_key").length;
-  }
+  };
+  for (const batch of batches) await syncBatch(batch);
   await saveState2(stateFile, {
     accountFingerprint: auth.accountFingerprint,
     lastSyncedAtMs: nowMs,
@@ -18795,13 +18986,11 @@ async function persistHealth(health, paths) {
   try {
     await saveHealth(health, paths);
   } catch {
-    console.error(
-      JSON.stringify({
-        level: "warning",
-        operation: "save_collector_health",
-        message: "Local collector status could not be saved; collection continues."
-      })
-    );
+    collectorLogger({
+      level: "warning",
+      operation: "save_collector_health",
+      message: "Local collector status could not be saved; collection continues."
+    });
   }
 }
 async function acquireCollectorLock(paths) {
@@ -18873,15 +19062,12 @@ async function runtimeStep(version2, signal) {
     signal
   });
   if (outcome.kind !== "updated") return "continue";
-  console.info(
-    JSON.stringify({
-      level: "info",
-      at: (/* @__PURE__ */ new Date()).toISOString(),
-      operation: "runtime_update",
-      from: outcome.from,
-      to: outcome.to
-    })
-  );
+  collectorLogger({
+    level: "info",
+    operation: "runtime_update",
+    from: outcome.from,
+    to: outcome.to
+  });
   return "restart";
 }
 function versionFailure(error2) {
@@ -18911,13 +19097,11 @@ async function runCollector(directory, expectedSource) {
     const loadedHealth = await healthSnapshot(paths);
     let health = loadedHealth.health;
     if (loadedHealth.kind === "unavailable") {
-      console.error(
-        JSON.stringify({
-          level: "warning",
-          operation: "load_collector_health",
-          message: "Local collector status could not be read; collection continues."
-        })
-      );
+      collectorLogger({
+        level: "warning",
+        operation: "load_collector_health",
+        message: "Local collector status could not be read; collection continues."
+      });
     }
     if ("cursorHome" in config2) {
       await ensureCursorHistoryBackfill(config2.cursorHome, paths);
@@ -18933,37 +19117,34 @@ async function runCollector(directory, expectedSource) {
     const runtimeVersion = process.env.ITERATION_RUNTIME_VERSION;
     let lastRuntimeCheckAt = 0;
     let trialSettled = runtimeVersion === void 0;
-    while (!controller.signal.aborted) {
+    const checkRuntime = async () => {
       if (runtimeVersion !== void 0 && Date.now() - lastRuntimeCheckAt >= RUNTIME_CHECK_INTERVAL_MS) {
         lastRuntimeCheckAt = Date.now();
         let step = "continue";
         try {
           step = await runtimeStep(runtimeVersion, controller.signal);
         } catch (error2) {
-          if (controller.signal.aborted) break;
-          console.error(
-            JSON.stringify({
-              level: "error",
-              at: (/* @__PURE__ */ new Date()).toISOString(),
-              source,
-              operation: "runtime_update",
-              causes: errorCauses(error2),
-              message: error2 instanceof Error ? error2.message : "The update check failed."
-            })
-          );
+          if (controller.signal.aborted) return false;
+          collectorLogger({
+            level: "error",
+            source,
+            operation: "runtime_update",
+            causes: errorCauses(error2),
+            message: error2 instanceof Error ? error2.message : "The update check failed."
+          });
         }
         if (step === "restart") {
-          console.info(
-            JSON.stringify({
-              level: "info",
-              at: (/* @__PURE__ */ new Date()).toISOString(),
-              source,
-              operation: "runtime_restart"
-            })
-          );
-          break;
+          collectorLogger({
+            level: "info",
+            source,
+            operation: "runtime_restart"
+          });
+          return false;
         }
       }
+      return true;
+    };
+    const connectDetectedSources = async () => {
       if (Date.now() - lastAutoCheckAt >= 6e4) {
         lastAutoCheckAt = Date.now();
         try {
@@ -18971,25 +19152,50 @@ async function runCollector(directory, expectedSource) {
           if (consent?.anchorSource === source) {
             const connected = await connectNewDetectedSources(config2, consent);
             if (connected.length > 0) {
-              console.info(
-                JSON.stringify({
-                  level: "info",
-                  operation: "auto_connect_sources",
-                  connected
-                })
-              );
+              collectorLogger({
+                level: "info",
+                operation: "auto_connect_sources",
+                connected
+              });
             }
           }
         } catch (error2) {
-          console.error(
-            JSON.stringify({
-              level: "error",
-              operation: "auto_connect_sources",
-              message: error2 instanceof Error ? error2.message : "Automatic source connection failed."
-            })
-          );
+          collectorLogger({
+            level: "error",
+            operation: "auto_connect_sources",
+            message: error2 instanceof Error ? error2.message : "Automatic source connection failed."
+          });
         }
       }
+    };
+    const recordTickSuccess = async (result, acknowledgedAtMs) => {
+      if (acknowledgedAtMs !== null || health.lastFailure !== null || result.historyCaughtUp && health.historyCaughtUpAtMs === null) {
+        health = {
+          lastUploadAtMs: acknowledgedAtMs ?? health.lastUploadAtMs,
+          historyCaughtUpAtMs: health.historyCaughtUpAtMs ?? (result.historyCaughtUp ? Date.now() : null),
+          lastFailure: null
+        };
+        await persistHealth(health, paths);
+      }
+      if (!trialSettled && runtimeVersion !== void 0) {
+        await confirmRuntimeTrial(runtimeVersion, source);
+        trialSettled = true;
+      }
+      if (result.discovered > 0 || result.uploaded > 0) {
+        collectorLogger({
+          level: "info",
+          source,
+          operation: "collector_tick",
+          discovered: result.discovered,
+          uploaded: result.uploaded,
+          outboxBytes: result.outboxBytes
+        });
+      }
+      retryDelayMs = Math.max(5e3, result.retryAfterMs);
+      if (result.retryAfterMs > 0)
+        retryDelayMs += Math.floor(Math.random() * 1e3);
+    };
+    const collect = async () => {
       let acknowledgedAtMs = null;
       let billingReady = false;
       let history = null;
@@ -19010,33 +19216,9 @@ async function runCollector(directory, expectedSource) {
             complete: billingReady && result.history.readSessions === result.history.sessions
           };
         }
-        if (acknowledgedAtMs !== null || health.lastFailure !== null || result.historyCaughtUp && health.historyCaughtUpAtMs === null) {
-          health = {
-            lastUploadAtMs: acknowledgedAtMs ?? health.lastUploadAtMs,
-            historyCaughtUpAtMs: health.historyCaughtUpAtMs ?? (result.historyCaughtUp ? Date.now() : null),
-            lastFailure: null
-          };
-          await persistHealth(health, paths);
-        }
-        if (!trialSettled && runtimeVersion !== void 0) {
-          await confirmRuntimeTrial(runtimeVersion, source);
-          trialSettled = true;
-        }
-        if (result.discovered > 0 || result.uploaded > 0) {
-          console.info(
-            JSON.stringify({
-              level: "info",
-              at: (/* @__PURE__ */ new Date()).toISOString(),
-              source,
-              discovered: result.discovered,
-              uploaded: result.uploaded,
-              outboxBytes: result.outboxBytes
-            })
-          );
-        }
-        retryDelayMs = 5e3;
+        await recordTickSuccess(result, acknowledgedAtMs);
       } catch (error2) {
-        if (controller.signal.aborted) break;
+        if (controller.signal.aborted) return null;
         if (!trialSettled && runtimeVersion !== void 0) {
           if (versionFailure(error2) && await onTrial(runtimeVersion))
             throw error2;
@@ -19048,20 +19230,20 @@ async function runCollector(directory, expectedSource) {
           historyCaughtUpAtMs: health.historyCaughtUpAtMs,
           lastFailure: collectorFailure(error2)
         };
-        console.error(
-          JSON.stringify({
-            level: "error",
-            at: (/* @__PURE__ */ new Date()).toISOString(),
-            source,
-            operation: "collector_tick",
-            errorName: error2 instanceof Error ? error2.name : "UnknownError",
-            causes: errorCauses(error2),
-            message: error2 instanceof Error ? error2.message : "Unknown collector failure."
-          })
-        );
+        collectorLogger({
+          level: "error",
+          source,
+          operation: "collector_tick",
+          errorName: error2 instanceof Error ? error2.name : "UnknownError",
+          causes: errorCauses(error2),
+          message: error2 instanceof Error ? error2.message : "Unknown collector failure."
+        });
         await persistHealth(health, paths);
         retryDelayMs = Math.min(retryDelayMs * 2, 6e4);
       }
+      return { history, billingReady };
+    };
+    const reportHistory = async (history) => {
       if (history !== null) {
         try {
           await historyProgress.report(
@@ -19072,20 +19254,20 @@ async function runCollector(directory, expectedSource) {
             Date.now()
           );
         } catch (error2) {
-          if (controller.signal.aborted) break;
-          console.error(
-            JSON.stringify({
-              level: "warning",
-              at: (/* @__PURE__ */ new Date()).toISOString(),
-              source,
-              operation: "report_history_progress",
-              errorName: error2 instanceof Error ? error2.name : "UnknownError",
-              causes: errorCauses(error2),
-              message: error2 instanceof Error ? error2.message : "Unknown history progress failure."
-            })
-          );
+          if (controller.signal.aborted) return false;
+          collectorLogger({
+            level: "warning",
+            source,
+            operation: "report_history_progress",
+            errorName: error2 instanceof Error ? error2.name : "UnknownError",
+            causes: errorCauses(error2),
+            message: error2 instanceof Error ? error2.message : "Unknown history progress failure."
+          });
         }
       }
+      return true;
+    };
+    const refreshSummaries = async () => {
       try {
         if (source !== "cursor")
           await refreshTurnSummaries(
@@ -19096,19 +19278,19 @@ async function runCollector(directory, expectedSource) {
             controller.signal
           );
       } catch (error2) {
-        if (controller.signal.aborted) break;
-        console.error(
-          JSON.stringify({
-            level: "warning",
-            at: (/* @__PURE__ */ new Date()).toISOString(),
-            source,
-            operation: "refresh_turn_summaries",
-            errorName: error2 instanceof Error ? error2.name : "UnknownError",
-            causes: errorCauses(error2),
-            message: error2 instanceof Error ? error2.message : "Unknown turn summary failure."
-          })
-        );
+        if (controller.signal.aborted) return false;
+        collectorLogger({
+          level: "warning",
+          source,
+          operation: "refresh_turn_summaries",
+          errorName: error2 instanceof Error ? error2.name : "UnknownError",
+          causes: errorCauses(error2),
+          message: error2 instanceof Error ? error2.message : "Unknown turn summary failure."
+        });
       }
+      return true;
+    };
+    const syncBilling = async (billingReady) => {
       if ("cursorHome" in config2 && billingReady && Date.now() - lastBillingSyncAt >= 6 * 60 * 60 * 1e3) {
         try {
           const billing = await syncCursorBilling(
@@ -19117,23 +19299,19 @@ async function runCollector(directory, expectedSource) {
             controller.signal
           );
           lastBillingSyncAt = billing.skipped ? Date.now() - 6 * 60 * 60 * 1e3 + 5 * 60 * 1e3 : Date.now();
-          console.info(
-            JSON.stringify({
-              level: "info",
-              operation: "sync_cursor_billing",
-              ...billing
-            })
-          );
+          collectorLogger({
+            level: "info",
+            operation: "sync_cursor_billing",
+            ...billing
+          });
         } catch (error2) {
-          if (controller.signal.aborted) break;
+          if (controller.signal.aborted) return false;
           lastBillingSyncAt = Date.now() - 6 * 60 * 60 * 1e3 + 5 * 60 * 1e3;
-          console.error(
-            JSON.stringify({
-              level: "warning",
-              operation: "sync_cursor_billing",
-              message: error2 instanceof Error ? error2.message : "Cursor billing sync failed."
-            })
-          );
+          collectorLogger({
+            level: "warning",
+            operation: "sync_cursor_billing",
+            message: error2 instanceof Error ? error2.message : "Cursor billing sync failed."
+          });
         }
       }
       if ("codexHome" in config2 && billingReady && Date.now() - lastBillingSyncAt >= 6 * 60 * 60 * 1e3) {
@@ -19144,25 +19322,31 @@ async function runCollector(directory, expectedSource) {
             controller.signal
           );
           lastBillingSyncAt = billing.skipped ? Date.now() - 6 * 60 * 60 * 1e3 + 5 * 60 * 1e3 : Date.now();
-          console.info(
-            JSON.stringify({
-              level: "info",
-              operation: "sync_codex_billing",
-              ...billing
-            })
-          );
+          collectorLogger({
+            level: "info",
+            operation: "sync_codex_billing",
+            ...billing
+          });
         } catch (error2) {
-          if (controller.signal.aborted) break;
+          if (controller.signal.aborted) return false;
           lastBillingSyncAt = Date.now() - 6 * 60 * 60 * 1e3 + 5 * 60 * 1e3;
-          console.error(
-            JSON.stringify({
-              level: "warning",
-              operation: "sync_codex_billing",
-              message: error2 instanceof Error ? error2.message : "Codex billing sync failed."
-            })
-          );
+          collectorLogger({
+            level: "warning",
+            operation: "sync_codex_billing",
+            message: error2 instanceof Error ? error2.message : "Codex billing sync failed."
+          });
         }
       }
+      return true;
+    };
+    while (!controller.signal.aborted) {
+      if (!await checkRuntime()) break;
+      await connectDetectedSources();
+      const result = await collect();
+      if (result === null) break;
+      if (!await reportHistory(result.history)) break;
+      if (!await refreshSummaries()) break;
+      if (!await syncBilling(result.billingReady)) break;
       try {
         await delay4(retryDelayMs, void 0, { signal: controller.signal });
       } catch (error2) {
@@ -19372,76 +19556,90 @@ function renderHome(status2, nowMs = Date.now(), source = "codex") {
     workspaceName === null ? "Iteration" : `Iteration \xB7 ${workspaceName}`,
     ""
   ];
-  if (!status2.running) {
-    lines.push(`${name} is stopped`, "New sessions are not being collected.");
-    if (status2.pendingEvents > 0) lines.push(`${pendingDescription(status2)}.`);
-    lines.push(`Resume with iteration start ${source}.`);
-  } else if (status2.hookFailureAtMs !== null && status2.hookFailureAtMs !== void 0) {
-    lines.push(
-      `${name} hook capture needs attention`,
-      `A ${name} hook failed ${relativeTime(status2.hookFailureAtMs, nowMs)}. Some data may be missing. See iteration status ${source}.`
-    );
-  } else if (!status2.healthAvailable) {
-    lines.push(
-      `${name} is running; local status needs attention`,
-      "Upload history could not be read. Collection continues in the background."
-    );
-    if (status2.pendingEvents > 0) lines.push(`${pendingDescription(status2)}.`);
-    lines.push(`Details: iteration status ${source}`);
-  } else if (status2.health.lastFailure !== null) {
-    const failure2 = failureDescription(status2, source);
-    lines.push(failure2.heading, failure2.explanation);
-    if (status2.pendingEvents > 0) lines.push(`${pendingDescription(status2)}.`);
-    if (status2.health.lastUploadAtMs !== null) {
+  const appendConnectionStatus = () => {
+    if (!status2.running) {
+      lines.push(`${name} is stopped`, "New sessions are not being collected.");
+      if (status2.pendingEvents > 0)
+        lines.push(`${pendingDescription(status2)}.`);
+      lines.push(`Resume with iteration start ${source}.`);
+    } else if (status2.hookFailureAtMs !== null && status2.hookFailureAtMs !== void 0) {
+      lines.push(
+        `${name} hook capture needs attention`,
+        `A ${name} hook failed ${relativeTime(status2.hookFailureAtMs, nowMs)}. Some data may be missing. See iteration status ${source}.`
+      );
+    } else if (!status2.healthAvailable) {
+      lines.push(
+        `${name} is running; local status needs attention`,
+        "Upload history could not be read. Collection continues in the background."
+      );
+      if (status2.pendingEvents > 0)
+        lines.push(`${pendingDescription(status2)}.`);
+      lines.push(`Details: iteration status ${source}`);
+    } else if (status2.health.lastFailure !== null) {
+      const failure2 = failureDescription(status2, source);
+      lines.push(failure2.heading, failure2.explanation);
+      if (status2.pendingEvents > 0)
+        lines.push(`${pendingDescription(status2)}.`);
+      if (status2.health.lastUploadAtMs !== null) {
+        lines.push(
+          `Last successful upload ${relativeTime(status2.health.lastUploadAtMs, nowMs)}.`
+        );
+      }
+      lines.push(`Details: iteration status ${source}`);
+    } else return false;
+    return true;
+  };
+  const appendScanStatus = () => {
+    if (status2.scan.kind === "waiting") {
+      lines.push(
+        `${name} is preparing your history`,
+        progressDescription(status2.scan, source)
+      );
+    } else if (status2.scan.kind === "scanning" && status2.scan.totalBytes > 0 && status2.scan.scannedBytes < status2.scan.totalBytes && status2.health.historyCaughtUpAtMs === null) {
+      lines.push(
+        `${name} is importing existing sessions`,
+        historyDescription(status2, source),
+        "New activity is collected automatically."
+      );
+    } else if (status2.scan.kind === "scanning" && status2.scan.totalBytes - status2.scan.scannedBytes >= 1e6) {
+      lines.push(
+        `${name} is catching up with new activity`,
+        historyDescription(status2, source)
+      );
+      if (status2.pendingEvents > 0)
+        lines.push(`${pendingDescription(status2)}.`);
+    } else if (status2.pendingEvents > 0) {
+      lines.push(
+        `${name} is uploading captured sessions`,
+        `${pendingDescription(status2)}.`
+      );
+    } else if (status2.scan.totalBytes === 0) {
+      lines.push(
+        `${name} is connected`,
+        `Waiting for ${name} sessions on this computer.`
+      );
+    } else if (status2.scan.kind === "scanning" && status2.scan.scannedBytes < status2.scan.totalBytes) {
+      lines.push(
+        `${name} is collecting new activity`,
+        "Local history is imported; current activity is being scanned."
+      );
+    } else {
+      lines.push(
+        `${name} is collecting`,
+        "Local scan is caught up and no uploads are waiting.",
+        "New activity is collected automatically."
+      );
+    }
+  };
+  if (!appendConnectionStatus()) appendScanStatus();
+  const appendLastUpload = () => {
+    if (status2.running && status2.health.lastFailure === null && status2.health.lastUploadAtMs !== null) {
       lines.push(
         `Last successful upload ${relativeTime(status2.health.lastUploadAtMs, nowMs)}.`
       );
     }
-    lines.push(`Details: iteration status ${source}`);
-  } else if (status2.scan.kind === "waiting") {
-    lines.push(
-      `${name} is preparing your history`,
-      progressDescription(status2.scan, source)
-    );
-  } else if (status2.scan.kind === "scanning" && status2.scan.totalBytes > 0 && status2.scan.scannedBytes < status2.scan.totalBytes && status2.health.historyCaughtUpAtMs === null) {
-    lines.push(
-      `${name} is importing existing sessions`,
-      historyDescription(status2, source),
-      "New activity is collected automatically."
-    );
-  } else if (status2.scan.kind === "scanning" && status2.scan.totalBytes - status2.scan.scannedBytes >= 1e6) {
-    lines.push(
-      `${name} is catching up with new activity`,
-      historyDescription(status2, source)
-    );
-    if (status2.pendingEvents > 0) lines.push(`${pendingDescription(status2)}.`);
-  } else if (status2.pendingEvents > 0) {
-    lines.push(
-      `${name} is uploading captured sessions`,
-      `${pendingDescription(status2)}.`
-    );
-  } else if (status2.scan.totalBytes === 0) {
-    lines.push(
-      `${name} is connected`,
-      `Waiting for ${name} sessions on this computer.`
-    );
-  } else if (status2.scan.kind === "scanning" && status2.scan.scannedBytes < status2.scan.totalBytes) {
-    lines.push(
-      `${name} is collecting new activity`,
-      "Local history is imported; current activity is being scanned."
-    );
-  } else {
-    lines.push(
-      `${name} is collecting`,
-      "Local scan is caught up and no uploads are waiting.",
-      "New activity is collected automatically."
-    );
-  }
-  if (status2.running && status2.health.lastFailure === null && status2.health.lastUploadAtMs !== null) {
-    lines.push(
-      `Last successful upload ${relativeTime(status2.health.lastUploadAtMs, nowMs)}.`
-    );
-  }
+  };
+  appendLastUpload();
   if (status2.turnSummaryNeedsApproval) lines.push("", CODEX_APPROVAL_STEP);
   lines.push("", `Explore traces  ${status2.tracesUrl}`);
   return lines.join("\n");
@@ -19884,7 +20082,7 @@ async function connectAll(values) {
     );
   }
   const configs = await Promise.all(COLLECTOR_SOURCES.map(connectedConfig));
-  const sourceHomes = {
+  const resolveSourceHomes = () => ({
     codex: path24.resolve(
       optionalString(values, "codex-home") ?? (configs[0] && "codexHome" in configs[0] ? configs[0].codexHome : sourceHome("codex"))
     ),
@@ -19894,7 +20092,8 @@ async function connectAll(values) {
     cursor: path24.resolve(
       optionalString(values, "cursor-home") ?? (configs[2] && "cursorHome" in configs[2] ? configs[2].cursorHome : sourceHome("cursor"))
     )
-  };
+  });
+  const sourceHomes = resolveSourceHomes();
   const detected = await detectedSources(sourceHomes);
   const existing = COLLECTOR_SOURCES.flatMap(
     (source, index) => configs[index] ? [{ source, config: configs[index] }] : []
@@ -19916,63 +20115,76 @@ async function connectAll(values) {
       scope: await readCollectorScope(item.config)
     }))
   );
-  for (const item of existingScopes) {
-    if (item.config.endpoint !== endpoint) {
-      throw new Error(
-        "Existing sources use different Iteration servers. Connect one source at a time."
-      );
+  const validateWorkspace = () => {
+    for (const item of existingScopes) {
+      if (item.config.endpoint !== endpoint) {
+        throw new Error(
+          "Existing sources use different Iteration servers. Connect one source at a time."
+        );
+      }
+      if (existingScopes[0]?.scope.organizationId !== item.scope.organizationId) {
+        throw new Error(
+          "Existing sources use different workspaces. Connect one source at a time."
+        );
+      }
     }
-    if (existingScopes[0]?.scope.organizationId !== item.scope.organizationId) {
+    const requestedOrganizationId2 = optionalString(values, "workspace");
+    if (requestedOrganizationId2 && existingScopes[0] && requestedOrganizationId2 !== existingScopes[0].scope.organizationId) {
       throw new Error(
-        "Existing sources use different workspaces. Connect one source at a time."
+        "The existing collector belongs to a different workspace."
       );
     }
-  }
+  };
+  validateWorkspace();
   const requestedOrganizationId = optionalString(values, "workspace");
-  if (requestedOrganizationId && existingScopes[0] && requestedOrganizationId !== existingScopes[0].scope.organizationId) {
-    throw new Error("The existing collector belongs to a different workspace.");
-  }
   const previousConsent = await loadMachineConsent();
-  if (previousConsent === null || anchorExisting === null || previousConsent.endpoint !== endpoint || previousConsent.anchorSource !== anchorSource || previousConsent.anchorDataDirectory !== anchorExisting.dataDirectory || previousConsent.organizationId !== existingScopes[0]?.scope.organizationId || previousConsent.sourceHomes.codex !== sourceHomes.codex || previousConsent.sourceHomes.claude !== sourceHomes.claude || previousConsent.sourceHomes.cursor !== sourceHomes.cursor) {
-    await approveAllSources(
-      await Promise.all(
-        detected.map(async (source) => ({
-          source,
-          sessions: await countSavedSessions(source, sourceHomes[source])
-        }))
-      ),
-      existingScopes[0]?.scope.organizationName ?? null,
-      values.yes === true
-    );
-  }
+  const approveConnection = async () => {
+    const needsApproval = () => previousConsent === null || anchorExisting === null || previousConsent.endpoint !== endpoint || previousConsent.anchorSource !== anchorSource || previousConsent.anchorDataDirectory !== anchorExisting.dataDirectory || previousConsent.organizationId !== existingScopes[0]?.scope.organizationId || previousConsent.sourceHomes.codex !== sourceHomes.codex || previousConsent.sourceHomes.claude !== sourceHomes.claude || previousConsent.sourceHomes.cursor !== sourceHomes.cursor;
+    if (needsApproval()) {
+      await approveAllSources(
+        await Promise.all(
+          detected.map(async (source) => ({
+            source,
+            sessions: await countSavedSessions(source, sourceHomes[source])
+          }))
+        ),
+        existingScopes[0]?.scope.organizationName ?? null,
+        values.yes === true
+      );
+    }
+  };
+  await approveConnection();
   await prepareBackgroundPersistence();
   let anchor2 = anchorExisting ?? await initialize(anchorSource, values);
   let organizationId = requestedOrganizationId ?? existingScopes[0]?.scope.organizationId ?? anchor2.organizationId ?? null;
-  for (const source of detected) {
-    if (source === anchorSource || configs[COLLECTOR_SOURCES.indexOf(source)] !== null)
-      continue;
-    const paths = collectorPaths(defaultCollectorDirectory(source));
-    await assertFreshCollectorDirectory(paths, source);
-    const state = await prepareSourceInitialState(
-      source,
-      sourceHomes[source],
-      true
-    );
-    const enrollment = await expandSource(anchor2, source, organizationId);
-    const config2 = await activateSource(
-      source,
-      sourceHomes[source],
-      endpoint,
-      enrollment,
-      state
-    );
-    organizationId = enrollment.organizationId;
-    const notice = await turnSummaryNotice(config2);
-    process.stdout.write(
-      `${collectorSourceLabel(source)} is connected to ${enrollment.organizationName}.${notice}
+  const connectDetectedSources = async () => {
+    for (const source of detected) {
+      if (source === anchorSource || configs[COLLECTOR_SOURCES.indexOf(source)] !== null)
+        continue;
+      const paths = collectorPaths(defaultCollectorDirectory(source));
+      await assertFreshCollectorDirectory(paths, source);
+      const state = await prepareSourceInitialState(
+        source,
+        sourceHomes[source],
+        true
+      );
+      const enrollment = await expandSource(anchor2, source, organizationId);
+      const config2 = await activateSource(
+        source,
+        sourceHomes[source],
+        endpoint,
+        enrollment,
+        state
+      );
+      organizationId = enrollment.organizationId;
+      const notice = await turnSummaryNotice(config2);
+      process.stdout.write(
+        `${collectorSourceLabel(source)} is connected to ${enrollment.organizationName}.${notice}
 `
-    );
-  }
+      );
+    }
+  };
+  await connectDetectedSources();
   if (organizationId === null) {
     organizationId = (await readCollectorScope(anchor2)).organizationId;
   }
@@ -20242,15 +20454,15 @@ async function update(setting, values) {
   process.stdout.write(`${await waitForTrial(outcome.to)}
 `);
 }
-async function main() {
+async function runInternalCommand() {
   if (process.argv[2] === "supervise") {
-    const source2 = process.argv[3];
+    const source = process.argv[3];
     const directory = process.argv[5];
-    if (source2 !== "codex" && source2 !== "claude" && source2 !== "cursor" || process.argv[4] !== "--data-directory" || !directory || process.argv.length !== 6) {
+    if (source !== "codex" && source !== "claude" && source !== "cursor" || process.argv[4] !== "--data-directory" || !directory || process.argv.length !== 6) {
       throw new Error("Invalid collector supervisor command.");
     }
-    await superviseCollector(source2, directory);
-    return;
+    await superviseCollector(source, directory);
+    return true;
   }
   if (process.argv[2] === "claude-git-hook") {
     const directory = process.argv[3];
@@ -20262,21 +20474,31 @@ async function main() {
       await recordClaudeGitHookFailure(directory);
       throw error2;
     }
-    return;
+    return true;
   }
   if (process.argv[2] === "turn-summary-hook") {
     const directory = process.argv[3];
     if (!directory || process.argv.length !== 4)
       throw new Error("Invalid turn summary hook command.");
     await captureTurnSummary(directory);
-    return;
+    return true;
   }
+  return false;
+}
+async function main() {
+  if (await runInternalCommand()) return;
   const delegated = await delegateToInstalledVersion();
   if (delegated !== null) {
     process.exitCode = delegated;
     return;
   }
-  const { command, source, values } = argumentsForCli();
+  return dispatchCommand(argumentsForCli());
+}
+async function dispatchCommand({
+  command,
+  source,
+  values
+}) {
   const selectedSource = source === "codex" || source === "claude" || source === "cursor" ? source : null;
   if (values.help === true || command === "help") {
     return usage(command === "help" ? source : command);
@@ -20290,18 +20512,7 @@ async function main() {
     return connectAll(values);
   }
   if (command === "") {
-    if (Object.keys(values).length > 0) {
-      throw new Error(
-        "Options require a source. Run iteration connect --help for details."
-      );
-    }
-    if (isCollectorPlatform()) await adoptRuntime();
-    await defaultCommand();
-    const summary = await runtimeSummaryText();
-    if (summary !== null) process.stdout.write(`
-${summary}
-`);
-    return;
+    return showHome(values);
   }
   if (command === "version") {
     const state = await readRuntimeState(runtimePaths());
@@ -20311,13 +20522,45 @@ ${summary}
   }
   if (command === "self-check") return selfCheck2();
   if (command === "update") return update(source, values);
-  if (selectedSource !== null) {
-    for (const name of ["codex", "claude", "cursor"])
-      if (selectedSource !== name && values[`${name}-home`] !== void 0)
-        throw new Error(
-          `--${name}-home requires the ${collectorSourceLabel(name)} source.`
-        );
+  return dispatchSourceCommand(command, source, values, selectedSource);
+}
+async function showHome(values) {
+  if (Object.keys(values).length > 0) {
+    throw new Error(
+      "Options require a source. Run iteration connect --help for details."
+    );
+  }
+  if (isCollectorPlatform()) await adoptRuntime();
+  await defaultCommand();
+  const summary = await runtimeSummaryText();
+  if (summary !== null) process.stdout.write(`
+${summary}
+`);
+}
+async function disconnect(selectedSource, values) {
+  await uninstallBackgroundService(selectedSource);
+  const paths = collectorPaths(dataDirectory(selectedSource, values));
+  if (await fileExists(paths.config)) {
+    const config2 = await loadConfig(paths);
+    if ("cursorHome" in config2)
+      await uninstallCursorHooks(config2.cursorHome, config2.dataDirectory);
+    else await uninstallTurnSummary(config2);
   }
+  process.stdout.write(
+    "Collector startup removed. Local pending data was retained.\n"
+  );
+}
+async function dispatchSourceCommand(command, source, values, selectedSource) {
+  const validateSourceOptions = () => {
+    if (selectedSource !== null) {
+      for (const name of ["codex", "claude", "cursor"])
+        if (selectedSource !== name && values[`${name}-home`] !== void 0)
+          throw new Error(
+            `--${name}-home requires the ${collectorSourceLabel(name)} source.`
+          );
+    }
+  };
+  validateSourceOptions();
   if (command === "connect" && selectedSource !== null) {
     await initialize(selectedSource, values);
     return;
@@ -20331,39 +20574,30 @@ ${summary}
     );
   }
   if (command === "status" && (source === void 0 || selectedSource !== null)) {
-    if (source === void 0 && values["data-directory"] !== void 0)
-      throw new Error("--data-directory requires a source with status.");
-    requireCollectorPlatform();
-    await adoptRuntime();
-    await status(selectedSource ?? void 0, values);
-    const summary = await runtimeSummaryText();
-    if (summary !== null) process.stdout.write(`
-${summary}
-`);
-    return;
+    return showStatus(source, selectedSource, values);
   }
   if (command === "import-history" && selectedSource !== null)
     return importHistory(selectedSource, values);
   if (command === "start" && selectedSource !== null)
     return start(selectedSource, values);
   if (command === "disconnect" && selectedSource !== null) {
-    await uninstallBackgroundService(selectedSource);
-    const paths = collectorPaths(dataDirectory(selectedSource, values));
-    if (await fileExists(paths.config)) {
-      const config2 = await loadConfig(paths);
-      if ("cursorHome" in config2)
-        await uninstallCursorHooks(config2.cursorHome, config2.dataDirectory);
-      else await uninstallTurnSummary(config2);
-    }
-    process.stdout.write(
-      "Collector startup removed. Local pending data was retained.\n"
-    );
-    return;
+    return disconnect(selectedSource, values);
   }
   throw new Error(
     `Unknown Iteration command: ${[command, source].filter(Boolean).join(" ")}. Run iteration help for usage.`
   );
 }
+async function showStatus(source, selectedSource, values) {
+  if (source === void 0 && values["data-directory"] !== void 0)
+    throw new Error("--data-directory requires a source with status.");
+  requireCollectorPlatform();
+  await adoptRuntime();
+  await status(selectedSource ?? void 0, values);
+  const summary = await runtimeSummaryText();
+  if (summary !== null) process.stdout.write(`
+${summary}
+`);
+}
 var background = process.argv[2] === "run";
 main().then(
   () => {