fleetlens 0.10.2 → 0.10.3

package/dist/index.js

@@ -3720,9 +3720,9 @@ Installed: ${PACKAGE_NAME}@${verify.installedVersion}  at ${verify.installedPath
     console.warn(
       `    \u2022 reinstall in the correct Node env: 'npm install -g ${PACKAGE_NAME}@latest'`
     );
-  } else if (verify.installedVersion !== "0.10.2") {
+  } else if (verify.installedVersion !== "0.10.3") {
     console.log(
-      `  \u2192 This process is still running ${"0.10.2"}. Next invocation will use ${verify.installedVersion}.`
+      `  \u2192 This process is still running ${"0.10.3"}. Next invocation will use ${verify.installedVersion}.`
     );
   }
 }
@@ -3753,13 +3753,27 @@ function isDevMode() {
   const script = process.argv[1] ?? "";
   return script.includes("packages/cli/") || script.includes("packages\\cli\\");
 }
+async function getUpdateAvailability() {
+  if (isDevMode()) return null;
+  const latest = await fetchLatestVersion();
+  if (latest === null) return {
+    current: "0.10.3",
+    latest: null,
+    updateAvailable: false
+  };
+  return {
+    current: "0.10.3",
+    latest,
+    updateAvailable: shouldUpdate("0.10.3", latest)
+  };
+}
 async function checkForUpdate() {
   if (isDevMode()) return;
   if (process.env.__FLEETLENS_UPDATED === "1" || process.env.__CCLENS_UPDATED === "1") return;
-  const latest = await fetchLatestVersion();
-  if (latest === null) return;
-  const current = "0.10.2";
-  if (!shouldUpdate(current, latest)) return;
+  const availability = await getUpdateAvailability();
+  if (!availability?.latest) return;
+  if (!availability.updateAvailable) return;
+  const { current, latest } = availability;
   console.log(`Updating ${PACKAGE_NAME} ${current} \u2192 ${latest}...`);
   await stopRunningServices();
   const ok = runNpmInstall();
@@ -3840,7 +3854,7 @@ async function restartServices(state) {
 }
 async function forceUpdate() {
   const latest = await fetchLatestVersion();
-  const current = "0.10.2";
+  const current = "0.10.3";
   if (latest === null) {
     console.error("Could not reach npm registry. Check your network.");
     process.exit(1);
@@ -14617,9 +14631,147 @@ var init_config = __esm({
   }
 });
 
-// src/usage/profile.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync10, readFileSync as readFileSync13, writeFileSync as writeFileSync9 } from "node:fs";
+// src/team/push.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+function readLatestUsageSnapshotForWire(filePath, nowMs = Date.now()) {
+  const raw = latestClaudeCodeSnapshot(filePath);
+  if (!raw) return null;
+  const capturedMs = Date.parse(raw.captured_at);
+  if (Number.isNaN(capturedMs)) return null;
+  if (nowMs - capturedMs > SNAPSHOT_FRESHNESS_MS) return null;
+  const toWire = (w) => w ? { utilization: w.utilization, resetsAt: w.resets_at } : null;
+  return {
+    capturedAt: raw.captured_at,
+    fiveHour: { utilization: raw.five_hour.utilization, resetsAt: raw.five_hour.resets_at },
+    sevenDay: { utilization: raw.seven_day.utilization, resetsAt: raw.seven_day.resets_at },
+    sevenDayOpus: toWire(raw.seven_day_opus),
+    sevenDaySonnet: toWire(raw.seven_day_sonnet),
+    sevenDayOauthApps: toWire(raw.seven_day_oauth_apps),
+    sevenDayCowork: toWire(raw.seven_day_cowork),
+    extraUsage: raw.extra_usage ? {
+      isEnabled: raw.extra_usage.is_enabled,
+      monthlyLimitUsd: raw.extra_usage.monthly_limit,
+      usedCreditsUsd: raw.extra_usage.used_credits,
+      utilization: raw.extra_usage.utilization
+    } : null
+  };
+}
+function bucketToRollup(b) {
+  return {
+    day: b.date,
+    agentTimeMs: b.airTimeMs,
+    sessions: b.sessions,
+    toolCalls: b.toolCalls,
+    turns: b.turns,
+    tokens: { ...b.tokens }
+  };
+}
+function buildRollupsForRange(sessions, sinceDay) {
+  const buckets = dailyActivity(sessions);
+  const startCounts = /* @__PURE__ */ new Map();
+  for (const s of sessions) {
+    const d = sessionDay(s);
+    if (d) startCounts.set(d, (startCounts.get(d) ?? 0) + 1);
+  }
+  return buckets.filter((b) => !sinceDay || b.date >= sinceDay).map((b) => ({
+    ...bucketToRollup(b),
+    sessions: startCounts.get(b.date) ?? 0
+  }));
+}
+function buildIngestPayload(rollup, usageSnapshot, planTier, cyclePeaks) {
+  return {
+    ingestId: randomUUID2(),
+    observedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    ...rollup ? { dailyRollup: rollup } : {},
+    ...usageSnapshot ? { usageSnapshot } : {},
+    ...planTier ? { planTier } : {},
+    ...cyclePeaks ? { cyclePeaks } : {}
+  };
+}
+async function pushToTeamServer(config, payload) {
+  const res = await fetch(`${config.serverUrl}/api/ingest/metrics`, {
+    method: "POST",
+    signal: AbortSignal.timeout(POST_TIMEOUT_MS),
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${config.bearerToken}`
+    },
+    body: JSON.stringify(payload)
+  });
+  const body = await res.json().catch(() => null);
+  return { ok: res.ok, status: res.status, body };
+}
+var SNAPSHOT_FRESHNESS_MS, POST_TIMEOUT_MS;
+var init_push = __esm({
+  "src/team/push.ts"() {
+    "use strict";
+    init_dist();
+    init_storage();
+    SNAPSHOT_FRESHNESS_MS = 10 * 60 * 1e3;
+    POST_TIMEOUT_MS = 15e3;
+  }
+});
+
+// src/team/queue.ts
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync9, appendFileSync as appendFileSync4, statSync as statSync3, mkdirSync as mkdirSync10 } from "node:fs";
 import { dirname as dirname9 } from "node:path";
+function enqueuePayload(payload, queuePath = QUEUE_PATH) {
+  mkdirSync10(dirname9(queuePath), { recursive: true });
+  const entry = { payload, enqueuedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  appendFileSync4(queuePath, JSON.stringify(entry) + "\n", "utf8");
+  try {
+    const { size } = statSync3(queuePath);
+    if (size > MAX_SIZE_BYTES) {
+      pruneOldest(queuePath);
+    }
+  } catch {
+  }
+}
+function dequeuePayloads(queuePath = QUEUE_PATH) {
+  let lines;
+  try {
+    lines = readFileSync13(queuePath, "utf8").trim().split("\n").filter(Boolean);
+  } catch {
+    return [];
+  }
+  const now = Date.now();
+  const valid = [];
+  for (const line of lines) {
+    try {
+      const entry = JSON.parse(line);
+      if (now - new Date(entry.enqueuedAt).getTime() < MAX_AGE_MS) {
+        valid.push(entry);
+      }
+    } catch {
+    }
+  }
+  writeFileSync9(queuePath, "", "utf8");
+  return valid.map((e) => e.payload);
+}
+function pruneOldest(queuePath) {
+  let lines;
+  try {
+    lines = readFileSync13(queuePath, "utf8").trim().split("\n").filter(Boolean);
+  } catch {
+    return;
+  }
+  const keep = lines.slice(Math.floor(lines.length / 2));
+  writeFileSync9(queuePath, keep.join("\n") + "\n", "utf8");
+}
+var QUEUE_PATH, MAX_SIZE_BYTES, MAX_AGE_MS;
+var init_queue2 = __esm({
+  "src/team/queue.ts"() {
+    "use strict";
+    init_fs();
+    QUEUE_PATH = cclensPath("ingest-queue.jsonl");
+    MAX_SIZE_BYTES = 10 * 1024 * 1024;
+    MAX_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
+  }
+});
+
+// src/usage/profile.ts
+import { existsSync as existsSync12, mkdirSync as mkdirSync11, readFileSync as readFileSync14, writeFileSync as writeFileSync10 } from "node:fs";
+import { dirname as dirname10 } from "node:path";
 function mapRateLimitTier(rateLimitTier) {
   switch (rateLimitTier) {
     case "default_claude_pro":
@@ -14661,7 +14813,7 @@ async function fetchProfile(nowMs = Date.now()) {
 function readCachedProfile(cachePath) {
   if (!existsSync12(cachePath)) return null;
   try {
-    const raw = JSON.parse(readFileSync13(cachePath, "utf8"));
+    const raw = JSON.parse(readFileSync14(cachePath, "utf8"));
     if (typeof raw.fetchedAtMs !== "number" || !raw.profile) return null;
     return raw;
   } catch {
@@ -14669,8 +14821,8 @@ function readCachedProfile(cachePath) {
   }
 }
 function writeCachedProfile(cachePath, profile, nowMs = Date.now()) {
-  mkdirSync10(dirname9(cachePath), { recursive: true });
-  writeFileSync9(
+  mkdirSync11(dirname10(cachePath), { recursive: true });
+  writeFileSync10(
     cachePath,
     JSON.stringify({ fetchedAtMs: nowMs, profile }, null, 2),
     { mode: 384 }
@@ -14700,11 +14852,6 @@ var init_profile = __esm({
 });
 
 // src/team/backfill.ts
-var backfill_exports = {};
-__export(backfill_exports, {
-  chunk: () => chunk,
-  runTeamBackfill: () => runTeamBackfill
-});
 function rawToWire(raw) {
   const win = (w) => w ? { utilization: w.utilization, resetsAt: w.resets_at } : null;
   return {
@@ -14732,6 +14879,7 @@ function chunk(items, size) {
 async function postBatch(config, snapshots, planTier) {
   const res = await fetch(`${config.serverUrl}/api/ingest/usage-history`, {
     method: "POST",
+    signal: AbortSignal.timeout(POST_TIMEOUT_MS2),
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${config.bearerToken}`
@@ -14748,13 +14896,35 @@ async function postBatch(config, snapshots, planTier) {
     status: res.status
   };
 }
-async function runTeamBackfill(log = noopLog, filePath = USAGE_LOG3, configOverride) {
+function isAfterSince(snapshot, sinceCapturedAt) {
+  if (!sinceCapturedAt) return true;
+  const sinceMs = Date.parse(sinceCapturedAt);
+  if (Number.isNaN(sinceMs)) return true;
+  const capturedMs = Date.parse(snapshot.captured_at);
+  return !Number.isNaN(capturedMs) && capturedMs > sinceMs;
+}
+function capturedAtMs(snapshot) {
+  const ms = Date.parse(snapshot.captured_at);
+  return Number.isNaN(ms) ? Number.MAX_SAFE_INTEGER : ms;
+}
+function latestCapturedAt(snapshots) {
+  let latest = null;
+  for (const s of snapshots) {
+    const ms = Date.parse(s.capturedAt);
+    if (Number.isNaN(ms)) continue;
+    if (!latest || ms > latest.ms) latest = { at: s.capturedAt, ms };
+  }
+  return latest?.at;
+}
+async function runTeamBackfill(log = noopLog, filePath = USAGE_LOG3, configOverride, options = {}) {
   const config = configOverride === void 0 ? readTeamConfig() : configOverride;
   if (!config) {
     return { paired: false, sentSnapshots: 0, insertedSnapshots: 0, skippedSnapshots: 0, batches: 0 };
   }
   const raw = readSnapshots(filePath);
-  const claudeOnly = raw.filter((s) => !s.agent || s.agent === "claude-code");
+  const claudeOnly = raw.filter(
+    (s) => (!s.agent || s.agent === "claude-code") && isAfterSince(s, options.sinceCapturedAt)
+  ).sort((a, b) => capturedAtMs(a) - capturedAtMs(b));
   if (claudeOnly.length === 0) {
     log("info", "team backfill: no usage snapshots to send");
     return { paired: true, sentSnapshots: 0, insertedSnapshots: 0, skippedSnapshots: 0, batches: 0 };
@@ -14764,6 +14934,7 @@ async function runTeamBackfill(log = noopLog, filePath = USAGE_LOG3, configOverr
   const planTier = await getPlanTier(PROFILE_CACHE).catch(() => null) ?? void 0;
   let inserted = 0;
   let skipped = 0;
+  let lastSnapshotAt;
   for (let i = 0; i < batches.length; i++) {
     const batch = batches[i];
     try {
@@ -14776,11 +14947,13 @@ async function runTeamBackfill(log = noopLog, filePath = USAGE_LOG3, configOverr
           insertedSnapshots: inserted,
           skippedSnapshots: skipped,
           batches: i,
+          lastSnapshotAt,
           error: `HTTP ${result.status}`
         };
       }
       inserted += result.inserted;
       skipped += result.skipped;
+      lastSnapshotAt = latestCapturedAt(batch) ?? lastSnapshotAt;
     } catch (err) {
       log("warn", `team backfill: batch ${i + 1}/${batches.length} error: ${err.message}`);
       return {
@@ -14789,6 +14962,7 @@ async function runTeamBackfill(log = noopLog, filePath = USAGE_LOG3, configOverr
         insertedSnapshots: inserted,
         skippedSnapshots: skipped,
         batches: i,
+        lastSnapshotAt,
         error: err.message
       };
     }
@@ -14802,10 +14976,11 @@ async function runTeamBackfill(log = noopLog, filePath = USAGE_LOG3, configOverr
     sentSnapshots: wire.length,
     insertedSnapshots: inserted,
     skippedSnapshots: skipped,
-    batches: batches.length
+    batches: batches.length,
+    lastSnapshotAt
   };
 }
-var USAGE_LOG3, PROFILE_CACHE, BATCH_SIZE, noopLog;
+var USAGE_LOG3, PROFILE_CACHE, BATCH_SIZE, POST_TIMEOUT_MS2, noopLog;
 var init_backfill = __esm({
   "src/team/backfill.ts"() {
     "use strict";
@@ -14816,159 +14991,35 @@ var init_backfill = __esm({
     USAGE_LOG3 = cclensPath("usage.jsonl");
     PROFILE_CACHE = cclensPath("profile.json");
     BATCH_SIZE = 500;
+    POST_TIMEOUT_MS2 = 15e3;
     noopLog = () => {
     };
   }
 });
 
-// src/team/push.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
-function readLatestUsageSnapshotForWire(filePath, nowMs = Date.now()) {
-  const raw = latestClaudeCodeSnapshot(filePath);
-  if (!raw) return null;
-  const capturedMs = Date.parse(raw.captured_at);
-  if (Number.isNaN(capturedMs)) return null;
-  if (nowMs - capturedMs > SNAPSHOT_FRESHNESS_MS) return null;
-  const toWire = (w) => w ? { utilization: w.utilization, resetsAt: w.resets_at } : null;
-  return {
-    capturedAt: raw.captured_at,
-    fiveHour: { utilization: raw.five_hour.utilization, resetsAt: raw.five_hour.resets_at },
-    sevenDay: { utilization: raw.seven_day.utilization, resetsAt: raw.seven_day.resets_at },
-    sevenDayOpus: toWire(raw.seven_day_opus),
-    sevenDaySonnet: toWire(raw.seven_day_sonnet),
-    sevenDayOauthApps: toWire(raw.seven_day_oauth_apps),
-    sevenDayCowork: toWire(raw.seven_day_cowork),
-    extraUsage: raw.extra_usage ? {
-      isEnabled: raw.extra_usage.is_enabled,
-      monthlyLimitUsd: raw.extra_usage.monthly_limit,
-      usedCreditsUsd: raw.extra_usage.used_credits,
-      utilization: raw.extra_usage.utilization
-    } : null
-  };
-}
-function bucketToRollup(b) {
-  return {
-    day: b.date,
-    agentTimeMs: b.airTimeMs,
-    sessions: b.sessions,
-    toolCalls: b.toolCalls,
-    turns: b.turns,
-    tokens: { ...b.tokens }
-  };
-}
-function buildRollupsForRange(sessions, sinceDay) {
-  const buckets = dailyActivity(sessions);
-  const startCounts = /* @__PURE__ */ new Map();
-  for (const s of sessions) {
-    const d = sessionDay(s);
-    if (d) startCounts.set(d, (startCounts.get(d) ?? 0) + 1);
-  }
-  return buckets.filter((b) => !sinceDay || b.date >= sinceDay).map((b) => ({
-    ...bucketToRollup(b),
-    sessions: startCounts.get(b.date) ?? 0
-  }));
-}
-function buildIngestPayload(rollup, usageSnapshot, planTier, cyclePeaks) {
-  return {
-    ingestId: randomUUID2(),
-    observedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    ...rollup ? { dailyRollup: rollup } : {},
-    ...usageSnapshot ? { usageSnapshot } : {},
-    ...planTier ? { planTier } : {},
-    ...cyclePeaks ? { cyclePeaks } : {}
-  };
-}
-async function pushToTeamServer(config, payload) {
-  const res = await fetch(`${config.serverUrl}/api/ingest/metrics`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${config.bearerToken}`
-    },
-    body: JSON.stringify(payload)
-  });
-  const body = await res.json().catch(() => null);
-  return { ok: res.ok, status: res.status, body };
-}
-var SNAPSHOT_FRESHNESS_MS;
-var init_push = __esm({
-  "src/team/push.ts"() {
-    "use strict";
-    init_dist();
-    init_storage();
-    SNAPSHOT_FRESHNESS_MS = 10 * 60 * 1e3;
-  }
-});
-
-// src/team/queue.ts
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync10, appendFileSync as appendFileSync4, statSync as statSync3, mkdirSync as mkdirSync11 } from "node:fs";
-import { dirname as dirname10 } from "node:path";
-function enqueuePayload(payload, queuePath = QUEUE_PATH) {
-  mkdirSync11(dirname10(queuePath), { recursive: true });
-  const entry = { payload, enqueuedAt: (/* @__PURE__ */ new Date()).toISOString() };
-  appendFileSync4(queuePath, JSON.stringify(entry) + "\n", "utf8");
-  try {
-    const { size } = statSync3(queuePath);
-    if (size > MAX_SIZE_BYTES) {
-      pruneOldest(queuePath);
-    }
-  } catch {
-  }
-}
-function dequeuePayloads(queuePath = QUEUE_PATH) {
-  let lines;
-  try {
-    lines = readFileSync14(queuePath, "utf8").trim().split("\n").filter(Boolean);
-  } catch {
-    return [];
-  }
-  const now = Date.now();
-  const valid = [];
-  for (const line of lines) {
-    try {
-      const entry = JSON.parse(line);
-      if (now - new Date(entry.enqueuedAt).getTime() < MAX_AGE_MS) {
-        valid.push(entry);
-      }
-    } catch {
-    }
-  }
-  writeFileSync10(queuePath, "", "utf8");
-  return valid.map((e) => e.payload);
-}
-function pruneOldest(queuePath) {
-  let lines;
-  try {
-    lines = readFileSync14(queuePath, "utf8").trim().split("\n").filter(Boolean);
-  } catch {
-    return;
-  }
-  const keep = lines.slice(Math.floor(lines.length / 2));
-  writeFileSync10(queuePath, keep.join("\n") + "\n", "utf8");
-}
-var QUEUE_PATH, MAX_SIZE_BYTES, MAX_AGE_MS;
-var init_queue2 = __esm({
-  "src/team/queue.ts"() {
-    "use strict";
-    init_fs();
-    QUEUE_PATH = cclensPath("ingest-queue.jsonl");
-    MAX_SIZE_BYTES = 10 * 1024 * 1024;
-    MAX_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
-  }
-});
-
 // src/team/sync.ts
 var sync_exports = {};
 __export(sync_exports, {
   runTeamSync: () => runTeamSync
 });
-async function runTeamSync(log = noopLog2, configOverride) {
+async function runTeamSync(log = noopLog2, configOverride, options = {}) {
   const config = configOverride === void 0 ? readTeamConfig() : configOverride;
   if (!config) return { paired: false, pushed: 0, queued: 0, queuedDrained: 0 };
   try {
     const { listSessions: listSessions2, loadCalibrationCurve: loadCalibrationCurve2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
     const { toLocalDay: toLocalDay4 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
     const today = toLocalDay4(Date.now());
+    let nextConfig = { ...config };
+    const persistConfig = (patch) => {
+      nextConfig = { ...nextConfig, ...patch };
+      writeTeamConfig(nextConfig);
+    };
+    const usageBackfill = await runTeamBackfill(log, USAGE_LOG4, config, {
+      sinceCapturedAt: options.forceUsageBackfill ? void 0 : config.lastSyncedUsageSnapshotAt
+    });
+    if (usageBackfill.lastSnapshotAt) {
+      persistConfig({ lastSyncedUsageSnapshotAt: usageBackfill.lastSnapshotAt });
+    }
     const sessions = await listSessions2({ limit: 1e4 });
     const rollups = buildRollupsForRange(sessions, config.lastSyncedDay);
     const usageSnapshot = readLatestUsageSnapshotForWire(USAGE_LOG4) ?? void 0;
@@ -14977,15 +15028,15 @@ async function runTeamSync(log = noopLog2, configOverride) {
     if (rollups.length === 0) {
       const hasLiveData = Boolean(usageSnapshot || planTier || cyclePeaks);
       if (!hasLiveData) {
-        log("info", "team push: nothing to sync");
-        return { paired: true, pushed: 0, queued: 0, queuedDrained: 0 };
+        if (usageBackfill.sentSnapshots === 0) log("info", "team push: nothing to sync");
+        return { paired: true, pushed: 0, queued: 0, queuedDrained: 0, usageBackfill };
       }
       const payload = buildIngestPayload(void 0, usageSnapshot, planTier, cyclePeaks);
       const result = await pushToTeamServer(config, payload);
       if (!result.ok) {
         log("warn", `team push (live-only) failed (${result.status}); queueing`);
         enqueuePayload(payload);
-        return { paired: true, pushed: 0, queued: 1, queuedDrained: 0 };
+        return { paired: true, pushed: 0, queued: 1, queuedDrained: 0, usageBackfill };
       }
       let queuedDrained2 = 0;
       const backlog = dequeuePayloads();
@@ -14998,11 +15049,12 @@ async function runTeamSync(log = noopLog2, configOverride) {
         queuedDrained2++;
       }
       log("info", `team push ok: live-only (no new daily activity)` + (queuedDrained2 ? `, ${queuedDrained2} queued retried` : ""));
-      return { paired: true, pushed: 1, queued: 0, queuedDrained: queuedDrained2 };
+      return { paired: true, pushed: 1, queued: 0, queuedDrained: queuedDrained2, usageBackfill };
     }
     let pushed = 0;
     let queued = 0;
     let failedDay;
+    let lastPushedDay;
     for (let i = 0; i < rollups.length; i++) {
       const rollup = rollups[i];
       const isLatest = i === rollups.length - 1;
@@ -15023,9 +15075,13 @@ async function runTeamSync(log = noopLog2, configOverride) {
         break;
       }
       pushed++;
+      lastPushedDay = rollup.day;
+    }
+    if (failedDay) {
+      if (lastPushedDay) persistConfig({ lastSyncedDay: lastPushedDay });
+    } else {
+      persistConfig({ lastSyncedDay: today });
     }
-    const nextConfig = { ...config, lastSyncedDay: today };
-    if (pushed > 0 || !failedDay) writeTeamConfig(nextConfig);
     let queuedDrained = 0;
     if (!failedDay) {
       const backlog = dequeuePayloads();
@@ -15041,7 +15097,7 @@ async function runTeamSync(log = noopLog2, configOverride) {
     if (pushed > 0) {
       log("info", `team push ok: ${pushed} day${pushed === 1 ? "" : "s"} pushed` + (queuedDrained ? `, ${queuedDrained} queued retried` : "") + (queued ? `, ${queued} queued for retry` : ""));
     }
-    return { paired: true, pushed, queued, queuedDrained, failedDay };
+    return { paired: true, pushed, queued, queuedDrained, usageBackfill, failedDay };
   } catch (err) {
     const message = err.message;
     log("warn", `team push error: ${message}`);
@@ -15115,6 +15171,7 @@ var init_sync = __esm({
     init_config();
     init_push();
     init_queue2();
+    init_backfill();
     init_profile();
     init_fs();
     USAGE_LOG4 = cclensPath("usage.jsonl");
@@ -15158,24 +15215,24 @@ async function joinTeam(args2) {
   writeTeamConfig(config);
   console.log(`Paired with "${data.team.name}" as ${data.user.displayName || data.user.email}`);
   console.log(`  role: ${data.membership.role}`);
-  console.log("  Pushing local history\u2026");
-  const backfill = await runTeamBackfill(void 0, void 0, config);
-  if (backfill.error) {
-    console.log(`  \u26A0 Backfill failed: ${backfill.error} \u2014 run 'fleetlens team backfill' to retry.`);
-  } else if (backfill.insertedSnapshots > 0) {
+  console.log("  Syncing local history\u2026");
+  const sync = await runTeamSync(void 0, config, { forceUsageBackfill: true });
+  const backfill = sync.usageBackfill;
+  if (backfill?.error) {
+    console.log(`  \u26A0 Usage history sync failed: ${backfill.error} \u2014 daemon will retry automatically.`);
+  } else if ((backfill?.insertedSnapshots ?? 0) > 0) {
     console.log(
-      `  \u2713 Backfilled ${backfill.insertedSnapshots} usage snapshot${backfill.insertedSnapshots === 1 ? "" : "s"} from local history.`
+      `  \u2713 Synced ${backfill.insertedSnapshots} usage snapshot${backfill.insertedSnapshots === 1 ? "" : "s"} from local history.`
     );
-  } else if (backfill.sentSnapshots > 0) {
-    console.log(`  \u2713 ${backfill.sentSnapshots} snapshots already on server (deduped on capture time).`);
+  } else if ((backfill?.sentSnapshots ?? 0) > 0) {
+    console.log(`  \u2713 ${backfill.sentSnapshots} usage snapshots already on server (deduped on capture time).`);
   } else {
     console.log("  \xB7 No local usage snapshots yet \u2014 daemon will start collecting.");
   }
-  const sync = await runTeamSync(void 0, config);
   if (sync.error) {
-    console.log(`  \u26A0 Activity sync failed: ${sync.error} \u2014 will retry on next daemon cycle.`);
+    console.log(`  \u26A0 Team sync failed: ${sync.error} \u2014 will retry on next daemon cycle.`);
   } else if (sync.pushed > 0) {
-    console.log(`  \u2713 Synced ${sync.pushed} day${sync.pushed === 1 ? "" : "s"} of session activity.`);
+    console.log(`  \u2713 Synced ${sync.pushed} activity payload${sync.pushed === 1 ? "" : "s"}.`);
   } else {
     console.log("  \xB7 No new session activity to push.");
   }
@@ -15185,7 +15242,6 @@ var init_join = __esm({
   "src/team/join.ts"() {
     "use strict";
     init_config();
-    init_backfill();
     init_sync();
   }
 });
@@ -15322,22 +15378,31 @@ async function team(args2) {
         console.error("Not paired. Run 'fleetlens team join <url> <device-token>' first.");
         process.exit(1);
       }
-      if (outcome.error) process.exit(1);
+      const inserted = outcome.usageBackfill?.insertedSnapshots ?? 0;
+      const madeProgress = outcome.pushed > 0 || outcome.queuedDrained > 0 || inserted > 0;
+      if (outcome.error || outcome.usageBackfill?.error && !madeProgress) process.exit(1);
+      const sent = outcome.usageBackfill?.sentSnapshots ?? 0;
+      const usageChecked = sent > 0 ? `, ${sent} usage snapshot${sent === 1 ? "" : "s"} checked` : "";
       console.log(
-        `\u2713 ${outcome.pushed} day${outcome.pushed === 1 ? "" : "s"} pushed` + (outcome.queuedDrained ? `, ${outcome.queuedDrained} queued retried` : "") + (outcome.queued ? `, ${outcome.queued} queued for retry (will fire next cycle)` : "")
+        `\u2713 ${outcome.pushed} activity payload${outcome.pushed === 1 ? "" : "s"} pushed` + usageChecked + (outcome.queuedDrained ? `, ${outcome.queuedDrained} queued retried` : "") + (outcome.queued ? `, ${outcome.queued} queued for retry (will fire next cycle)` : "")
       );
       break;
     }
     case "backfill": {
-      const { runTeamBackfill: runTeamBackfill2 } = await Promise.resolve().then(() => (init_backfill(), backfill_exports));
-      const outcome = await runTeamBackfill2((level, msg) => console.log(`[${level}] ${msg}`));
+      const { runTeamSync: runTeamSync2 } = await Promise.resolve().then(() => (init_sync(), sync_exports));
+      const outcome = await runTeamSync2(
+        (level, msg) => console.log(`[${level}] ${msg}`),
+        void 0,
+        { forceUsageBackfill: true }
+      );
       if (!outcome.paired) {
         console.error("Not paired. Run 'fleetlens team join <url> <device-token>' first.");
         process.exit(1);
       }
-      if (outcome.error) process.exit(1);
+      if (outcome.error || outcome.usageBackfill?.error) process.exit(1);
+      const inserted = outcome.usageBackfill?.insertedSnapshots ?? 0;
       console.log(
-        `\u2713 ${outcome.insertedSnapshots} new snapshot${outcome.insertedSnapshots === 1 ? "" : "s"} loaded` + (outcome.skippedSnapshots ? `, ${outcome.skippedSnapshots} already-known` : "")
+        `\u2713 ${inserted} new snapshot${inserted === 1 ? "" : "s"} loaded` + (outcome.usageBackfill?.skippedSnapshots ? `, ${outcome.usageBackfill.skippedSnapshots} already-known` : "") + (outcome.pushed ? `, ${outcome.pushed} activity payload${outcome.pushed === 1 ? "" : "s"} pushed` : "")
       );
       break;
     }
@@ -15781,7 +15846,7 @@ async function main() {
     case "version":
     case "--version":
     case "-v":
-      console.log(`fleetlens ${"0.10.2"}`);
+      console.log(`fleetlens ${"0.10.3"}`);
       break;
     case "help":
     case "--help":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetlens",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "fleetlens — local-only dashboard and usage tracker for Claude Code sessions and agent fleets",
   "license": "MIT",
   "type": "module",