@withone/cli 1.55.2 → 1.55.3

package/dist/index.js

@@ -5810,7 +5810,7 @@ async function enrichPhase(api, db, config2, model, idField, connectionKey, plat
     );
     let batchHitRateLimit = false;
     const now = (/* @__PURE__ */ new Date()).toISOString();
-    const pending = [];
+    const pending2 = [];
     for (let j = 0; j < results.length; j++) {
       const result = results[j];
       const row = batch[j];
@@ -5829,7 +5829,7 @@ async function enrichPhase(api, db, config2, model, idField, connectionKey, plat
           const fp = merged[config2.invalidateOn] ?? row[config2.invalidateOn];
           merged[ENRICH_FINGERPRINT_COLUMN] = fp == null ? null : String(fp);
         }
-        pending.push({ merged, id });
+        pending2.push({ merged, id });
       } else if (result.status === "fulfilled" && result.value === null) {
         rateLimited++;
         skipped++;
@@ -5838,14 +5838,14 @@ async function enrichPhase(api, db, config2, model, idField, connectionKey, plat
         skipped++;
       }
     }
-    let writes = pending;
-    if (ctx.transform && pending.length > 0) {
-      const transformed = await transformRecords(ctx.transform, pending.map((p10) => p10.merged));
+    let writes = pending2;
+    if (ctx.transform && pending2.length > 0) {
+      const transformed = await transformRecords(ctx.transform, pending2.map((p10) => p10.merged));
       if (transformed) {
         const byId = /* @__PURE__ */ new Map();
         for (const r of transformed) byId.set(r[idField], r);
         writes = [];
-        for (const p10 of pending) {
+        for (const p10 of pending2) {
           const t = byId.get(p10.id);
           if (!t) continue;
           if (!t[tsField]) t[tsField] = now;
@@ -11664,8 +11664,20 @@ import pc14 from "picocolors";
 var require3 = createRequire2(import.meta.url);
 var DEFAULT_POSTHOG_HOST = "https://us.i.posthog.com";
 var DEFAULT_POSTHOG_KEY = "phc_a9ok4w0uxiZcVoSWOISIlin85lHMXQD3vWPaYnuRlRV";
+var SEND_MAX_ATTEMPTS = 3;
+var QUEUE_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
+var EXIT_GRACE_MS = 300;
 var inFlight = /* @__PURE__ */ new Set();
+var pending = /* @__PURE__ */ new Set();
+var dispatched = /* @__PURE__ */ new Set();
 var delivered = /* @__PURE__ */ new Set();
+var UUID_SHAPE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function uuidFromInsertId(insertId) {
+  if (UUID_SHAPE.test(insertId)) return insertId.toLowerCase();
+  const h = createHash("sha1").update(`one-cli-event:${insertId}`).digest("hex");
+  const variant = (parseInt(h[16], 16) & 3 | 8).toString(16);
+  return `${h.slice(0, 8)}-${h.slice(8, 12)}-5${h.slice(13, 16)}-${variant}${h.slice(17, 20)}-${h.slice(20, 32)}`;
+}
 function posthogHost() {
   return process.env.ONE_POSTHOG_HOST || DEFAULT_POSTHOG_HOST;
 }
@@ -11721,9 +11733,10 @@ function personSet() {
 }
 function send(item) {
   const insertId = item.properties.$insert_id;
+  if (insertId) dispatched.add(insertId);
   const controller = new AbortController();
   inFlight.add(controller);
-  void (async () => {
+  const run = (async () => {
     try {
       const res = await fetch(`${posthogHost()}/i/v0/e/`, {
         method: "POST",
@@ -11732,6 +11745,8 @@ function send(item) {
           api_key: posthogKey(),
           event: item.event,
           distinct_id: item.distinct_id,
+          // PostHog's dedupe key — a re-sent copy is dropped on ingest.
+          uuid: item.uuid ?? (insertId ? uuidFromInsertId(insertId) : void 0),
           properties: item.properties,
           timestamp: item.timestamp
         }),
@@ -11745,6 +11760,8 @@ function send(item) {
       inFlight.delete(controller);
     }
   })();
+  pending.add(run);
+  void run.finally(() => pending.delete(run));
 }
 function capture(event, properties = {}, opts = {}) {
   if (isTelemetryDisabled()) {
@@ -11754,7 +11771,10 @@ function capture(event, properties = {}, opts = {}) {
   const did = opts.distinctId ?? distinctId();
   const props = { ...baseProperties(), ...properties };
   if (props.$insert_id === void 0) props.$insert_id = randomUUID();
-  if (did === distinctId()) {
+  const insertId = props.$insert_id;
+  if (opts.personProfile === false) {
+    props.$process_person_profile = false;
+  } else if (did === distinctId()) {
     const set = personSet();
     if (set) props.$set = set;
   }
@@ -11762,7 +11782,8 @@ function capture(event, properties = {}, opts = {}) {
     event,
     distinct_id: did,
     properties: props,
-    timestamp: opts.timestamp ?? (/* @__PURE__ */ new Date()).toISOString()
+    timestamp: opts.timestamp ?? (/* @__PURE__ */ new Date()).toISOString(),
+    uuid: uuidFromInsertId(insertId)
   };
   appendAnalyticsQueue(JSON.stringify(item));
 }
@@ -11856,7 +11877,12 @@ function emitRollup(did, group) {
       window_end: new Date(group[group.length - 1].ts).toISOString(),
       $insert_id: insertId
     },
-    { distinctId: did, timestamp: new Date(group[group.length - 1].ts).toISOString() }
+    {
+      distinctId: did,
+      timestamp: new Date(group[group.length - 1].ts).toISOString(),
+      // Rollups bill at the anonymous rate; the person already exists.
+      personProfile: false
+    }
   );
   debugLog(`rollup \u2014 ${group.length} command(s) for ${did}`);
 }
@@ -11874,25 +11900,62 @@ function drainQueue() {
     writeAnalyticsQueue([]);
     return;
   }
+  const now = Date.now();
+  const kept = [];
+  let changed = false;
   for (const line of readAnalyticsQueue()) {
+    let item;
     try {
-      const item = JSON.parse(line);
-      if (item?.properties?.$insert_id) send(item);
+      item = JSON.parse(line);
     } catch {
+      changed = true;
+      continue;
+    }
+    const insertId = item?.properties?.$insert_id;
+    if (!insertId) {
+      changed = true;
+      continue;
+    }
+    const age = now - Date.parse(item.timestamp);
+    const attempts = item.attempts ?? 0;
+    if (!(age < QUEUE_MAX_AGE_MS) || attempts >= SEND_MAX_ATTEMPTS) {
+      debugLog(`"${item.event}" dropped (${attempts} attempts, ${Math.round(age / 6e4)} min old)`);
+      changed = true;
+      continue;
+    }
+    if (dispatched.has(insertId)) {
+      kept.push(line);
+      continue;
     }
+    item.attempts = attempts + 1;
+    if (!item.uuid) item.uuid = uuidFromInsertId(insertId);
+    kept.push(JSON.stringify(item));
+    changed = true;
+    send(item);
   }
+  if (changed) writeAnalyticsQueue(kept);
 }
-function flush() {
+async function flush() {
+  if (pending.size > 0) {
+    await Promise.race([
+      Promise.allSettled([...pending]),
+      new Promise((resolve) => setTimeout(resolve, EXIT_GRACE_MS))
+    ]);
+  }
   for (const controller of inFlight) controller.abort();
   const remaining = readAnalyticsQueue().filter((line) => {
     try {
-      const id = JSON.parse(line).properties?.$insert_id;
-      return id ? !delivered.has(id) : false;
+      const item = JSON.parse(line);
+      const id = item.properties?.$insert_id;
+      if (!id || delivered.has(id)) return false;
+      return (item.attempts ?? 0) < SEND_MAX_ATTEMPTS;
     } catch {
       return false;
     }
   });
   writeAnalyticsQueue(remaining);
+  dispatched.clear();
+  delivered.clear();
 }
 function maybeShowTelemetryNotice() {
   if (isTelemetryDisabled() || isAgentMode()) return;
@@ -12006,7 +12069,8 @@ program.hook("preAction", (thisCommand, actionCommand) => {
 program.hook("postAction", async () => {
   await closeBackendIfCached();
   flushUsageRollups();
-  flush();
+  drainQueue();
+  await flush();
   if (!updateCheckPromise) return;
   const info = await updateCheckPromise;
   if (!info) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withone/cli",
-  "version": "1.55.2",
+  "version": "1.55.3",
   "description": "CLI for managing One",
   "type": "module",
   "files": [