fleetlens 0.14.0 → 0.15.1

package/dist/index.js

@@ -4222,8 +4222,17 @@ var init_cowork = __esm({
 });
 
 // ../parser/dist/team-config.js
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2, mkdirSync as mkdirSync2 } from "node:fs";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2, mkdirSync as mkdirSync2, renameSync } from "node:fs";
 import { join } from "node:path";
+function shouldSyncProject(repoName, sp) {
+  if (!sp)
+    return true;
+  if (sp.excluded.includes(repoName))
+    return false;
+  if (sp.included.includes(repoName))
+    return true;
+  return sp.autoIncludeNew;
+}
 function readTeamConfig(dir) {
   const d = dir ?? cclensHome();
   try {
@@ -4235,7 +4244,9 @@ function readTeamConfig(dir) {
 function writeTeamConfig(config, dir) {
   const d = dir ?? cclensHome();
   mkdirSync2(d, { recursive: true });
-  writeFileSync2(join(d, CONFIG_FILE), JSON.stringify(config, null, 2), { mode: 384 });
+  const tmp = join(d, `${CONFIG_FILE}.${process.pid}.tmp`);
+  writeFileSync2(tmp, JSON.stringify(config, null, 2), { mode: 384 });
+  renameSync(tmp, join(d, CONFIG_FILE));
 }
 function clearTeamConfig(dir) {
   const d = dir ?? cclensHome();
@@ -4309,6 +4320,7 @@ __export(fs_exports, {
   readJsonlFile: () => readJsonlFile,
   readTeamConfig: () => readTeamConfig,
   sessionIdFromFileName: () => sessionIdFromFileName,
+  shouldSyncProject: () => shouldSyncProject,
   walkJsonlFiles: () => walkJsonlFiles,
   writeTeamConfig: () => writeTeamConfig
 });
@@ -4677,7 +4689,7 @@ function getServerStatus() {
   return { running: false };
 }
 function isServerStale(status2) {
-  return status2.running === true && status2.version !== "0.14.0";
+  return status2.running === true && status2.version !== "0.15.1";
 }
 async function ensureCurrentServer(opts = {}) {
   const status2 = getServerStatus();
@@ -4733,8 +4745,8 @@ async function startServer(opts = {}) {
   });
   child.unref();
   const pid = child.pid;
-  writePid(PID_FILE, pid, port, "0.14.0");
-  await waitForHealth(`http://localhost:${port}`, 1e4);
+  writePid(PID_FILE, pid, port, "0.15.1");
+  await waitForHealth(`http://localhost:${port}`, 3e4);
   return { pid, port };
 }
 function stopServer() {
@@ -4796,6 +4808,13 @@ var init_server = __esm({
 });
 
 // src/usage/storage.ts
+var storage_exports = {};
+__export(storage_exports, {
+  appendSnapshot: () => appendSnapshot,
+  latestClaudeCodeSnapshot: () => latestClaudeCodeSnapshot,
+  latestSnapshot: () => latestSnapshot,
+  readSnapshots: () => readSnapshots
+});
 import { appendFileSync, mkdirSync as mkdirSync3, readFileSync as readFileSync3, existsSync as existsSync2 } from "node:fs";
 import { dirname as dirname3 } from "node:path";
 function appendSnapshot(filePath, snapshot) {
@@ -5013,7 +5032,7 @@ async function fetchLatestVersion() {
 }
 function runNpmInstall() {
   try {
-    execSync(`npm install -g ${PACKAGE_NAME}@latest`, {
+    execSync(`npm install -g ${PACKAGE_NAME}@latest --prefer-online`, {
       stdio: "pipe",
       timeout: 6e4
     });
@@ -5093,9 +5112,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.14.0") {
+  } else if (verify.installedVersion !== "0.15.1") {
     console.log(
-      `  \u2192 This process is still running ${"0.14.0"}. Next invocation will use ${verify.installedVersion}.`
+      `  \u2192 This process is still running ${"0.15.1"}. Next invocation will use ${verify.installedVersion}.`
     );
   }
 }
@@ -5130,14 +5149,14 @@ async function getUpdateAvailability() {
   if (isDevMode()) return null;
   const latest = await fetchLatestVersion();
   if (latest === null) return {
-    current: "0.14.0",
+    current: "0.15.1",
     latest: null,
     updateAvailable: false
   };
   return {
-    current: "0.14.0",
+    current: "0.15.1",
     latest,
-    updateAvailable: shouldUpdate("0.14.0", latest)
+    updateAvailable: shouldUpdate("0.15.1", latest)
   };
 }
 async function checkForUpdate() {
@@ -5227,7 +5246,7 @@ async function restartServices(state) {
 }
 async function forceUpdate() {
   const latest = await fetchLatestVersion();
-  const current = "0.14.0";
+  const current = "0.15.1";
   if (latest === null) {
     console.error("Could not reach npm registry. Check your network.");
     process.exit(1);
@@ -5270,10 +5289,14 @@ __export(autostart_exports, {
   autostart: () => autostart,
   buildPlist: () => buildPlist,
   dismissPrompt: () => dismissPrompt,
+  ensureTeamAutostart: () => ensureTeamAutostart,
+  hasOptedOut: () => hasOptedOut,
   installAutostart: () => installAutostart,
   isAutostartInstalled: () => isAutostartInstalled,
   isPromptDismissed: () => isPromptDismissed,
-  maybePromptAutostart: () => maybePromptAutostart
+  isStalePlistContent: () => isStalePlistContent,
+  maybePromptAutostart: () => maybePromptAutostart,
+  recordOptOut: () => recordOptOut
 });
 import { existsSync as existsSync5, mkdirSync as mkdirSync4, writeFileSync as writeFileSync3, rmSync, readFileSync as readFileSync6, realpathSync as realpathSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
@@ -5290,6 +5313,16 @@ function isMac() {
 function isAutostartInstalled() {
   return isMac() && existsSync5(plistPath());
 }
+function isStalePlistContent(content) {
+  return content.includes("<string>daemon</string>");
+}
+function installedPlistIsStale() {
+  try {
+    return isStalePlistContent(readFileSync6(plistPath(), "utf8"));
+  } catch {
+    return false;
+  }
+}
 function resolveScriptPath() {
   const argv1 = process.argv[1] ?? "";
   try {
@@ -5310,7 +5343,6 @@ function buildPlist(opts) {
   <array>
     <string>${nodePath}</string>
     <string>${scriptPath}</string>
-    <string>daemon</string>
     <string>start</string>
   </array>
   <key>RunAtLoad</key>
@@ -5342,9 +5374,10 @@ async function installAutostart() {
   await runLaunchctl(["unload", p]).catch(() => {
   });
   await runLaunchctl(["load", "-w", p]);
-  console.log("Autostart installed \u2014 the Fleetlens usage daemon will start at login.");
+  writeFlags({ optedOut: false });
+  console.log("Autostart installed \u2014 Fleetlens (dashboard + usage daemon) will start at login.");
   console.log(`  LaunchAgent: ${p}`);
-  console.log(`  Runs:        ${nodePath} ${scriptPath} daemon start`);
+  console.log(`  Runs:        ${nodePath} ${scriptPath} start`);
   console.log(
     "  Note: the Node path above is baked in. If you upgrade or switch Node (e.g. via nvm), re-run `fleetlens autostart install`."
   );
@@ -5356,14 +5389,33 @@ async function uninstallAutostart() {
     return;
   }
   const p = plistPath();
+  recordOptOut();
   if (!existsSync5(p)) {
-    console.log("Autostart is not installed \u2014 nothing to remove.");
+    console.log("Autostart is not installed \u2014 nothing to remove. Noted your opt-out; team join won't enable it.");
     return;
   }
   await runLaunchctl(["unload", "-w", p]).catch(() => {
   });
   rmSync(p, { force: true });
   console.log(`Autostart removed (${p}). The daemon will no longer start at login.`);
+  console.log("  Opt-out recorded \u2014 team join/start won't re-enable it.");
+}
+async function ensureTeamAutostart() {
+  try {
+    if (!isMac()) return;
+    if (isAutostartInstalled()) {
+      if (installedPlistIsStale()) {
+        console.log("  Updating the Fleetlens login item to launch the full stack (dashboard + daemon).");
+        await installAutostart();
+      }
+      return;
+    }
+    if (hasOptedOut()) return;
+    console.log("  Team reporting stays on across reboots: enabling Fleetlens auto-start at login (dashboard + daemon).");
+    console.log("  (Opt out anytime: fleetlens autostart uninstall \u2014 join won't re-enable it.)");
+    await installAutostart();
+  } catch {
+  }
 }
 async function statusAutostart() {
   if (!isMac()) {
@@ -5384,22 +5436,33 @@ async function statusAutostart() {
 function promptFlagPath() {
   return cclensPath("autostart.json");
 }
-function isPromptDismissed() {
+function readFlags() {
   try {
-    const j = JSON.parse(readFileSync6(promptFlagPath(), "utf8"));
-    return j.promptDismissed === true;
+    return JSON.parse(readFileSync6(promptFlagPath(), "utf8"));
   } catch {
-    return false;
+    return {};
   }
 }
-function dismissPrompt() {
+function writeFlags(patch) {
   const p = promptFlagPath();
   try {
     mkdirSync4(dirname6(p), { recursive: true });
-    writeFileSync3(p, JSON.stringify({ promptDismissed: true }, null, 2), "utf8");
+    writeFileSync3(p, JSON.stringify({ ...readFlags(), ...patch }, null, 2), "utf8");
   } catch {
   }
 }
+function isPromptDismissed() {
+  return readFlags().promptDismissed === true;
+}
+function dismissPrompt() {
+  writeFlags({ promptDismissed: true });
+}
+function hasOptedOut() {
+  return readFlags().optedOut === true;
+}
+function recordOptOut() {
+  writeFlags({ optedOut: true });
+}
 function promptYesNo(question, defaultYes) {
   return new Promise((resolve3) => {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
@@ -5414,15 +5477,26 @@ function promptYesNo(question, defaultYes) {
 async function maybePromptAutostart(opts) {
   try {
     if (!isMac()) return;
-    if (!opts.daemonStarted) return;
     if (process.env.__FLEETLENS_UPDATED) return;
+    const { readTeamConfig: readTeamConfig2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
+    if (readTeamConfig2()) {
+      await ensureTeamAutostart();
+      return;
+    }
+    if (!opts.daemonStarted) return;
     if (!process.stdin.isTTY) return;
-    if (isAutostartInstalled()) return;
+    if (isAutostartInstalled()) {
+      if (installedPlistIsStale()) {
+        console.log("Updating the Fleetlens login item to launch the full stack (dashboard + daemon).");
+        await installAutostart();
+      }
+      return;
+    }
     if (isPromptDismissed()) return;
     console.log("");
-    console.log("Tip: keep the Fleetlens usage daemon running after you restart your Mac?");
-    console.log("     This installs a launchd LaunchAgent that runs `fleetlens daemon start`");
-    console.log("     at login (daemon only \u2014 not the dashboard server).");
+    console.log("Tip: keep Fleetlens running after you restart your Mac?");
+    console.log("     This installs a launchd LaunchAgent that runs `fleetlens start`");
+    console.log("     at login (dashboard server + usage daemon).");
     const yes = await promptYesNo("Set that up now? [Y/n] ", true);
     if (yes) {
       await installAutostart();
@@ -5585,7 +5659,7 @@ async function status() {
     console.log(`Server:  running on ${url} (PID ${server.pid}, v${ver})`);
     if (isServerStale(server)) {
       console.log(
-        `  \u26A0  serving stale ${ver} (CLI is ${"0.14.0"}) \u2014 run 'fleetlens start' to restart on the current version`
+        `  \u26A0  serving stale ${ver} (CLI is ${"0.15.1"}) \u2014 run 'fleetlens start' to restart on the current version`
       );
     }
   } else {
@@ -5723,6 +5797,11 @@ var init_token = __esm({
 });
 
 // src/usage/api.ts
+var api_exports = {};
+__export(api_exports, {
+  UsageApiError: () => UsageApiError,
+  fetchUsage: () => fetchUsage
+});
 async function fetchUsage() {
   const creds = readOAuthCredentials();
   if (!creds) {
@@ -7510,7 +7589,7 @@ var init_dist2 = __esm({
 });
 
 // ../entries/dist/digest-fs.js
-import { readFileSync as readFileSync8, readdirSync, writeFileSync as writeFileSync4, renameSync, chmodSync, mkdirSync as mkdirSync5, existsSync as existsSync6 } from "node:fs";
+import { readFileSync as readFileSync8, readdirSync, writeFileSync as writeFileSync4, renameSync as renameSync2, chmodSync, mkdirSync as mkdirSync5, existsSync as existsSync6 } from "node:fs";
 import { dirname as dirname7, join as join7 } from "node:path";
 function parseDigestFile(path7, expectedVersion) {
   try {
@@ -7559,7 +7638,7 @@ function writeDayDigest(digest2) {
     } catch {
     }
   }
-  renameSync(tmp, final);
+  renameSync2(tmp, final);
 }
 function readDayDigest(date) {
   const p = dayDigestPath(date);
@@ -7595,7 +7674,7 @@ function writeWeekDigest(digest2) {
     } catch {
     }
   }
-  renameSync(tmp, final);
+  renameSync2(tmp, final);
 }
 function readWeekDigest(monday) {
   const p = weekDigestPath(monday);
@@ -7632,7 +7711,7 @@ function writeMonthDigest(digest2) {
     } catch {
     }
   }
-  renameSync(tmp, final);
+  renameSync2(tmp, final);
 }
 function readMonthDigest(yearMonth) {
   const p = monthDigestPath(yearMonth);
@@ -7704,7 +7783,7 @@ __export(fs_exports2, {
   writeMonthDigest: () => writeMonthDigest,
   writeWeekDigest: () => writeWeekDigest
 });
-import { readFileSync as readFileSync9, readdirSync as readdirSync2, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6, renameSync as renameSync2, existsSync as existsSync7 } from "node:fs";
+import { readFileSync as readFileSync9, readdirSync as readdirSync2, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6, renameSync as renameSync3, existsSync as existsSync7 } from "node:fs";
 import { randomBytes } from "node:crypto";
 import { join as join8 } from "node:path";
 function entriesDir() {
@@ -7731,7 +7810,7 @@ function writeEntry(entry) {
   const tmp = tmpPathFor(final);
   const json = JSON.stringify(entry, null, 2);
   writeFileSync5(tmp, json, { encoding: "utf8" });
-  renameSync2(tmp, final);
+  renameSync3(tmp, final);
 }
 function enrichmentInputHash(e) {
   return [
@@ -7759,7 +7838,7 @@ function writeEntryPreservingEnrichment(fresh) {
   }
   const tmp = tmpPathFor(final);
   writeFileSync5(tmp, JSON.stringify(toWrite, null, 2), { encoding: "utf8" });
-  renameSync2(tmp, final);
+  renameSync3(tmp, final);
 }
 function readEntry(sessionId, localDay2) {
   const p = pathFor(sessionId, localDay2);
@@ -12052,7 +12131,7 @@ RESPOND WITH ONLY VALID JSON (no prose, no code fence):
 });
 
 // ../entries/dist/tmux-runner.js
-import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync6, existsSync as existsSync8, readdirSync as readdirSync3, realpathSync as realpathSync3, readFileSync as readFileSync10, unlinkSync as unlinkSync3, renameSync as renameSync3 } from "node:fs";
+import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync6, existsSync as existsSync8, readdirSync as readdirSync3, realpathSync as realpathSync3, readFileSync as readFileSync10, unlinkSync as unlinkSync3, renameSync as renameSync4 } from "node:fs";
 import { join as join9 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 import { spawnSync as spawnSync2 } from "node:child_process";
@@ -12095,7 +12174,7 @@ function ensureRuntimeCwdTrusted(cwd) {
   const tmp = `${cfgPath}.cclens-tmp-${process.pid}`;
   try {
     writeFileSync6(tmp, JSON.stringify(cfg, null, 2));
-    renameSync3(tmp, cfgPath);
+    renameSync4(tmp, cfgPath);
   } catch {
     try {
       unlinkSync3(tmp);
@@ -13038,7 +13117,7 @@ var init_queue = __esm({
 });
 
 // ../entries/dist/settings.js
-import { readFileSync as readFileSync13, writeFileSync as writeFileSync9, renameSync as renameSync4, chmodSync as chmodSync2, mkdirSync as mkdirSync10, existsSync as existsSync12 } from "node:fs";
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync9, renameSync as renameSync5, chmodSync as chmodSync2, mkdirSync as mkdirSync10, existsSync as existsSync12 } from "node:fs";
 import { dirname as dirname9 } from "node:path";
 function settingsPath() {
   if (settingsPathCached)
@@ -13091,7 +13170,7 @@ function writeSettings(s) {
   if (process.platform !== "win32") {
     chmodSync2(tmp, 384);
   }
-  renameSync4(tmp, p);
+  renameSync5(tmp, p);
 }
 var DEFAULT_SETTINGS, settingsPathCached;
 var init_settings = __esm({
@@ -16933,6 +17012,10 @@ function clipSegmentsToDay(segments, bounds) {
   }
   return out;
 }
+function filterSyncedSessions(sessions, syncProjects) {
+  if (!syncProjects) return sessions;
+  return sessions.filter((s) => shouldSyncProject(projectRepoName(s.projectName), syncProjects));
+}
 function sessionTouchesDay(s, day2) {
   const bounds = dayBoundsMs(day2);
   if (s.activeSegments && s.activeSegments.length > 0) {
@@ -17087,7 +17170,8 @@ function ensureEntriesForDay(day2, daySessions) {
 }
 function buildRichBlocksForDay(day2, daySessions, resolveRepo) {
   ensureEntriesForDay(day2, daySessions);
-  const entries2 = listEntriesForDay(day2);
+  const sessionIds = new Set(daySessions.map((s) => s.id));
+  const entries2 = listEntriesForDay(day2).filter((e) => sessionIds.has(e.session_id));
   if (entries2.length === 0) return void 0;
   const rich = buildRichRollupBlocks(day2, daySessions, entries2, resolveRepo);
   const enriched = buildEnrichedExtras(entries2);
@@ -17098,7 +17182,7 @@ function buildIngestPayload(inputs) {
   return {
     ingestId: randomUUID2(),
     observedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    cliVersion: "0.14.0",
+    cliVersion: "0.15.1",
     ...richRollup || inputs.enrichedExtras || inputs.artifactSignals ? { schemaVersion: RICH_ROLLUP_SCHEMA_VERSION } : {},
     ...inputs.rollup ? { dailyRollup: inputs.rollup } : {},
     ...richRollup ? { richRollup } : {},
@@ -17762,8 +17846,8 @@ async function dispatchCommand(command2, config, log) {
   }
 }
 async function runActivityBackfill(command2, config, log) {
-  const { listSessions: listSessions2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
-  const { toLocalDay: toLocalDay4 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+  const { listSessions: listSessions2, shouldSyncProject: shouldSyncProject2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
+  const { toLocalDay: toLocalDay4, projectRepoName: projectRepoName2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
   const { probeArtifactSignals: probeArtifactSignals2 } = await Promise.resolve().then(() => (init_file_probe(), file_probe_exports));
   const days = command2.params.days;
   const todayMs = Date.now();
@@ -17772,7 +17856,7 @@ async function runActivityBackfill(command2, config, log) {
   log("info", `command ${command2.id}: backfill-activity from ${targetDay} (${days} days)`);
   let sessions;
   try {
-    sessions = await listSessions2({ limit: 1e4 });
+    sessions = filterSyncedSessions(await listSessions2({ limit: 1e4 }), config.syncProjects);
   } catch (err) {
     return {
       id: command2.id,
@@ -17797,7 +17881,8 @@ async function runActivityBackfill(command2, config, log) {
     const richBlocks = buildRichBlocksForDay(rollup.day, daySessions, resolveRepo);
     let artifactSignals = null;
     try {
-      artifactSignals = probeArtifactSignals2({ day: rollup.day, extraRoots: [process.cwd()] });
+      const cwdAllowed = shouldSyncProject2(projectRepoName2(process.cwd()), config.syncProjects);
+      artifactSignals = probeArtifactSignals2({ day: rollup.day, extraRoots: cwdAllowed ? [process.cwd()] : [] });
     } catch {
     }
     const payload = buildIngestPayload({
@@ -17902,6 +17987,26 @@ function buildSyncLine(status2, trigger, s, elapsedMs, nextSyncMs) {
 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 };
+  if (config.setupPending) {
+    log(
+      "info",
+      buildSyncLine(
+        "idle",
+        options.trigger ?? "auto",
+        {
+          pushedDays: [],
+          droppedDays: [],
+          queued: 0,
+          queuedDrained: 0,
+          usageSnapshots: 0,
+          idleReason: "setup pending \u2014 finish onboarding in the dashboard (/team/onboarding)"
+        },
+        0,
+        options.nextSyncMs
+      )
+    );
+    return { paired: true, pushed: 0, queued: 0, queuedDrained: 0, setupPending: true };
+  }
   const startedAt = Date.now();
   const trigger = options.trigger ?? "auto";
   const summary = {
@@ -17923,15 +18028,19 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
       summary.skipped = { ...summary.skipped, ...body.blocks.skipped };
     }
   };
+  const emit = options.onProgress ?? (() => {
+  });
   try {
     resetEnsuredSessions();
     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 { toLocalDay: toLocalDay4, projectRepoName: projectRepoName2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
     const today = toLocalDay4(Date.now());
-    let nextConfig = { ...config };
+    let patches = {};
     const persistConfig = (patch) => {
-      nextConfig = { ...nextConfig, ...patch };
-      writeTeamConfig(nextConfig);
+      patches = { ...patches, ...patch };
+      const onDisk = readTeamConfig();
+      if (!onDisk) return;
+      writeTeamConfig({ ...onDisk, ...patches });
     };
     const pendingLog = readPendingSyncLog(config.lastSyncedLogAt);
     const collectedCommands = /* @__PURE__ */ new Map();
@@ -17976,7 +18085,12 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
       let drained = 0;
       const backlog = dequeuePayloads();
       for (let i = 0; i < backlog.length; i++) {
-        const qResult = await pushToTeamServer(config, backlog[i]);
+        const queuedPayload = backlog[i];
+        if (queuedPayload.richRollup?.projects?.some((p) => !shouldSyncProject(p.project, config.syncProjects))) {
+          log("info", "team push: dropped queued payload containing now-excluded project(s)");
+          continue;
+        }
+        const qResult = await pushToTeamServer(config, queuedPayload);
         if (!qResult.ok) {
           if (isValidationPoison(qResult.status)) {
             log("warn", `team push: queued payload rejected (HTTP ${qResult.status}); dropping unrecoverable item`);
@@ -17990,15 +18104,41 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
       }
       return drained;
     };
+    emit({ type: "phase", phase: "usage-backfill" });
     const usageBackfill = await runTeamBackfill(log, USAGE_LOG4, config, {
       sinceCapturedAt: options.forceUsageBackfill ? void 0 : config.lastSyncedUsageSnapshotAt
     });
+    emit({
+      type: "usage",
+      inserted: usageBackfill.insertedSnapshots ?? 0,
+      alreadyKnown: usageBackfill.skippedSnapshots ?? 0
+    });
     if (usageBackfill.lastSnapshotAt) {
       persistConfig({ lastSyncedUsageSnapshotAt: usageBackfill.lastSnapshotAt });
     }
-    const sessions = await listSessions2({ limit: 1e4 });
+    const unfilteredSessions = await listSessions2({ limit: 1e4 });
+    const sessions = filterSyncedSessions(unfilteredSessions, config.syncProjects);
     const allRollups = buildRollupsForRange(sessions);
-    const rollups = allRollups.filter((r) => !config.lastSyncedDay || r.day >= config.lastSyncedDay);
+    const inWindow = (day2) => !config.lastSyncedDay || day2 >= config.lastSyncedDay;
+    const rollups = allRollups.filter((r) => inWindow(r.day));
+    if (config.syncProjects) {
+      const filteredDays = new Set(allRollups.map((r) => r.day));
+      for (const r of buildRollupsForRange(unfilteredSessions)) {
+        if (!filteredDays.has(r.day) && inWindow(r.day)) {
+          rollups.push({
+            day: r.day,
+            agentTimeMs: 0,
+            sessions: 0,
+            uniqueSessions: 0,
+            toolCalls: 0,
+            turns: 0,
+            tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
+          });
+        }
+      }
+      rollups.sort((a, b) => a.day < b.day ? -1 : 1);
+    }
+    emit({ type: "phase", phase: "activity", totalDays: rollups.length });
     const usageSnapshot = readLatestUsageSnapshotForWire(USAGE_LOG4) ?? void 0;
     const planTier = await getPlanTier(PROFILE_CACHE2).catch(() => null) ?? void 0;
     const cyclePeaks = await buildCyclePeaksForPush(planTier, loadCalibrationCurve2);
@@ -18012,6 +18152,7 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
           summary.idleReason = "nothing to sync";
           finish("idle");
         }
+        emit({ type: "done", pushed: 0, queued: 0, pushedDays: summary.pushedDays });
         return { paired: true, pushed: 0, queued: 0, queuedDrained: 0, usageBackfill };
       }
       summary.usageSnapshots = usageBackfill.sentSnapshots;
@@ -18024,6 +18165,7 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
           writeLastPushFailure(payload, errLine2);
           summary.errorMsg = `live-snapshot push HTTP ${result.status} (validation) \u2014 dropped unrecoverable`;
           finish("error");
+          emit({ type: "done", pushed: 0, queued: 0, pushedDays: summary.pushedDays });
           return { paired: true, pushed: 0, queued: 0, queuedDrained: 0, usageBackfill };
         }
         const errLine = `team push failed (${result.status})`;
@@ -18032,6 +18174,7 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
         summary.queued = 1;
         summary.errorMsg = `live-snapshot push HTTP ${result.status} \u2014 queued for retry`;
         finish("failed");
+        emit({ type: "done", pushed: 0, queued: 1, pushedDays: summary.pushedDays });
         return { paired: true, pushed: 0, queued: 1, queuedDrained: 0, usageBackfill };
       }
       writeLastPushSuccess(payload);
@@ -18045,12 +18188,12 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
       summary.idleReason = "no new daily activity";
       finish(summary.skipped && Object.keys(summary.skipped).length ? "degraded" : "idle");
       await dispatchAndReport();
+      emit({ type: "done", pushed: 1, queued: 0, pushedDays: summary.pushedDays });
       return { paired: true, pushed: 1, queued: 0, queuedDrained: queuedDrained2, usageBackfill };
     }
     let pushed = 0;
     let queued = 0;
     let failedDay;
-    let lastResolvedDay;
     const droppedDaysBefore = config.droppedDays ?? [];
     const workingDropped = [...droppedDaysBefore];
     let syncLogWasDelivered = false;
@@ -18059,15 +18202,32 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
     const buildDayPayload = (rollup, opts) => {
       const daySessions = sessions.filter((s) => sessionTouchesDay(s, rollup.day));
       const richBlocks = buildRichBlocksForDay(rollup.day, daySessions, resolveRepo);
+      const tombstone = daySessions.length === 0 && !!config.syncProjects;
+      const emptyRich = tombstone ? {
+        projects: [],
+        workingShapes: [],
+        concurrencyPeak: 0,
+        parallelMinutes: 0,
+        longAutonomous: { count: 0, totalMin: 0, maxSingleMin: 0 },
+        toolErrors: 0,
+        skillsLoaded: [],
+        subagentsDispatched: [],
+        brainstormWarmupSessions: 0,
+        planModeUsed: 0,
+        prs: 0,
+        commits: 0,
+        pushes: 0
+      } : void 0;
       let artifactSignals = null;
       try {
-        artifactSignals = probeArtifactSignals2({ day: rollup.day, extraRoots: [process.cwd()] });
+        const cwdAllowed = shouldSyncProject(projectRepoName2(process.cwd()), config.syncProjects);
+        artifactSignals = probeArtifactSignals2({ day: rollup.day, extraRoots: cwdAllowed ? [process.cwd()] : [] });
       } catch {
       }
       return buildIngestPayload({
         rollup,
-        richExtras: richBlocks?.rich,
-        enrichedExtras: richBlocks?.enriched,
+        richExtras: richBlocks?.rich ?? emptyRich,
+        enrichedExtras: richBlocks?.enriched ?? (tombstone ? { outcomeMix: {}, helpfulnessMix: {}, goalMix: {} } : void 0),
         artifactSignals: artifactSignals ?? void 0,
         // Current-cycle data only on the latest day so older days aren't tagged
         // with today's snapshot / peaks.
@@ -18077,9 +18237,10 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
         syncLog: opts.syncLog
       });
     };
-    for (let i = 0; i < rollups.length; i++) {
-      const rollup = rollups[i];
-      const isLatest = i === rollups.length - 1;
+    const rollupsDesc = [...rollups].reverse();
+    for (let i = 0; i < rollupsDesc.length; i++) {
+      const rollup = rollupsDesc[i];
+      const isLatest = i === 0;
       const payload = buildDayPayload(rollup, {
         latest: isLatest,
         syncLog: i === 0 ? pendingLog.lines : void 0
@@ -18091,7 +18252,7 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
           writeLastPushFailure(payload, errLine2);
           summary.droppedDays.push(rollup.day);
           if (!workingDropped.includes(rollup.day)) workingDropped.push(rollup.day);
-          lastResolvedDay = rollup.day;
+          emit({ type: "day", day: rollup.day, index: i + 1, total: rollupsDesc.length, outcome: "dropped" });
           continue;
         }
         const errLine = `team push failed on ${rollup.day} (${result.status})`;
@@ -18101,6 +18262,7 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
         summary.queuedDay = rollup.day;
         summary.queuedStatus = result.status;
         failedDay = rollup.day;
+        emit({ type: "day", day: rollup.day, index: i + 1, total: rollupsDesc.length, outcome: "queued" });
         break;
       }
       writeLastPushSuccess(payload);
@@ -18109,11 +18271,24 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
       if (i === 0) syncLogWasDelivered = syncLogDelivered(result.body);
       pushed++;
       summary.pushedDays.push(rollup.day);
-      lastResolvedDay = rollup.day;
+      emit({ type: "day", day: rollup.day, index: i + 1, total: rollupsDesc.length, outcome: "pushed" });
     }
     if (!failedDay) {
       const retryDay = [...droppedDaysBefore].sort().find((d) => !summary.droppedDays.includes(d));
-      const retryRollup = retryDay ? allRollups.find((r) => r.day === retryDay) : void 0;
+      if (retryDay && summary.pushedDays.includes(retryDay)) {
+        const idx = workingDropped.indexOf(retryDay);
+        if (idx >= 0) workingDropped.splice(idx, 1);
+        summary.recoveredDays = [retryDay];
+      }
+      const retryRollup = retryDay && !summary.pushedDays.includes(retryDay) ? allRollups.find((r) => r.day === retryDay) ?? (config.syncProjects ? {
+        day: retryDay,
+        agentTimeMs: 0,
+        sessions: 0,
+        uniqueSessions: 0,
+        toolCalls: 0,
+        turns: 0,
+        tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
+      } : void 0) : void 0;
       if (retryDay && retryRollup) {
         const payload = buildDayPayload(retryRollup, { latest: false });
         const result = await pushToTeamServer(config, payload);
@@ -18134,9 +18309,7 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
     const droppedChanged = nextDropped.length !== prevDropped.length || nextDropped.some((d, i) => d !== prevDropped[i]);
     const droppedPatch = droppedChanged ? { droppedDays: nextDropped } : {};
     if (failedDay) {
-      if (lastResolvedDay || droppedChanged) {
-        persistConfig({ ...lastResolvedDay ? { lastSyncedDay: lastResolvedDay } : {}, ...droppedPatch });
-      }
+      if (droppedChanged) persistConfig(droppedPatch);
     } else {
       persistConfig({ lastSyncedDay: today, ...droppedPatch });
     }
@@ -18153,10 +18326,12 @@ async function runTeamSync(log = noopLog2, configOverride, options = {}) {
     else status2 = "ok";
     finish(status2);
     await dispatchAndReport();
+    emit({ type: "done", pushed, queued, pushedDays: summary.pushedDays });
     return { paired: true, pushed, queued, queuedDrained, usageBackfill, failedDay };
   } catch (err) {
     const message = err.message;
     summary.errorMsg = `sync aborted: ${message}`;
+    emit({ type: "error", message });
     finish("error");
     writeLastPushFailure(
       { ingestId: "n/a", observedAt: (/* @__PURE__ */ new Date()).toISOString() },
@@ -18279,12 +18454,20 @@ var init_daemon_log = __esm({
 // src/team/join.ts
 var join_exports = {};
 __export(join_exports, {
+  carryOverSyncProjects: () => carryOverSyncProjects,
   joinTeam: () => joinTeam
 });
+function carryOverSyncProjects(existing, serverUrl, teamSlug) {
+  if (existing && existing.serverUrl === serverUrl && existing.teamSlug === teamSlug) {
+    return existing.syncProjects;
+  }
+  return void 0;
+}
 async function joinTeam(args2) {
-  const [serverUrl, bearerToken] = args2;
+  const noBrowser = args2.includes("--no-browser");
+  const [serverUrl, bearerToken] = args2.filter((a) => !a.startsWith("--"));
   if (!serverUrl || !bearerToken) {
-    console.error("Usage: fleetlens team join <server-url> <device-token>");
+    console.error("Usage: fleetlens team join <server-url> <device-token> [--no-browser]");
     console.error("");
     console.error("Get the device token from the dashboard after signup,");
     console.error("or from Settings \u2192 My device token.");
@@ -18300,6 +18483,7 @@ async function joinTeam(args2) {
     process.exit(1);
   }
   const data = await res.json();
+  const existing = readTeamConfig();
   const config = {
     serverUrl,
     memberId: data.membership.id,
@@ -18311,36 +18495,70 @@ async function joinTeam(args2) {
     // doesn't sweep the prior team's [sync] lines onto this team's log. The
     // pair run's own [sync] line is written after this instant, so it still
     // uploads on the next sync.
-    lastSyncedLogAt: (/* @__PURE__ */ new Date()).toISOString()
+    lastSyncedLogAt: (/* @__PURE__ */ new Date()).toISOString(),
+    syncProjects: carryOverSyncProjects(existing, serverUrl, data.team.slug),
+    // Browser path: gate the daemon until the wizard's "Start syncing".
+    ...noBrowser ? {} : { setupPending: true }
   };
   writeTeamConfig(config);
   console.log(`Paired with "${data.team.name}" as ${data.user.displayName || data.user.email}`);
   console.log(`  role: ${data.membership.role}`);
-  console.log("  Syncing local history\u2026");
-  const sync = await runTeamSync(logToDaemonLog, config, {
-    forceUsageBackfill: true,
-    trigger: "pair"
-  });
-  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 Synced ${backfill.insertedSnapshots} usage snapshot${backfill.insertedSnapshots === 1 ? "" : "s"} from local history.`
-    );
-  } 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.");
+  if (noBrowser) {
+    console.log("  Syncing local history\u2026");
+    const sync = await runTeamSync(logToDaemonLog, config, {
+      forceUsageBackfill: true,
+      trigger: "pair"
+    });
+    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 Synced ${backfill.insertedSnapshots} usage snapshot${backfill.insertedSnapshots === 1 ? "" : "s"} from local history.`
+      );
+    } 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.");
+    }
+    if (sync.error) {
+      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} activity payload${sync.pushed === 1 ? "" : "s"}.`);
+    } else {
+      console.log("  \xB7 No new session activity to push.");
+    }
+    console.log("  Daemon polls every 5 minutes \u2014 next push happens automatically.");
+    const { ensureTeamAutostart: ensureNoBrowser } = await Promise.resolve().then(() => (init_autostart(), autostart_exports));
+    await ensureNoBrowser();
+    return;
   }
-  if (sync.error) {
-    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} activity payload${sync.pushed === 1 ? "" : "s"}.`);
-  } else {
-    console.log("  \xB7 No new session activity to push.");
+  try {
+    const { fetchUsage: fetchUsage2 } = await Promise.resolve().then(() => (init_api(), api_exports));
+    const { appendSnapshot: appendSnapshot2 } = await Promise.resolve().then(() => (init_storage(), storage_exports));
+    const { cclensPath: cclensPath2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
+    appendSnapshot2(cclensPath2("usage.jsonl"), await fetchUsage2());
+  } catch {
+  }
+  const { ensureTeamAutostart: ensureTeamAutostart2 } = await Promise.resolve().then(() => (init_autostart(), autostart_exports));
+  await ensureTeamAutostart2();
+  console.log("  Opening your browser to finish setup\u2026");
+  let url;
+  try {
+    const server = await ensureCurrentServer({});
+    url = `http://localhost:${server.port}/team/onboarding`;
+    const daemon2 = startDaemonSilent();
+    if (!daemon2.started && !daemon2.alreadyRunning) {
+      console.warn(`  \u26A0 Daemon failed to start \u2014 ${daemon2.error}`);
+    }
+  } catch (err) {
+    console.error(`  \u26A0 Could not start the dashboard: ${err.message}`);
+    console.error("  Re-run 'fleetlens team join' after fixing it, or use --no-browser to sync everything from the terminal.");
+    process.exit(1);
   }
-  console.log("  Daemon polls every 5 minutes \u2014 next push happens automatically.");
+  openBrowser(url);
+  console.log(`  Continue in your browser: ${url}`);
+  console.log("  Nothing syncs until you finish setup there.");
 }
 var logToDaemonLog;
 var init_join = __esm({
@@ -18349,6 +18567,8 @@ var init_join = __esm({
     init_config();
     init_sync();
     init_daemon_log();
+    init_server();
+    init_daemon();
     logToDaemonLog = appendDaemonLogLine;
   }
 });
@@ -18481,28 +18701,42 @@ async function team(args2) {
       break;
     }
     case "sync": {
+      const progressJson = args2.includes("--progress-json");
       const { runTeamSync: runTeamSync2 } = await Promise.resolve().then(() => (init_sync(), sync_exports));
       const { appendDaemonLogLine: appendDaemonLogLine2 } = await Promise.resolve().then(() => (init_daemon_log(), daemon_log_exports));
       const outcome = await runTeamSync2(
         (level, msg) => {
-          console.log(`[${level}] ${msg}`);
+          if (!progressJson) console.log(`[${level}] ${msg}`);
           appendDaemonLogLine2(level, msg);
         },
         void 0,
-        { trigger: "manual" }
+        {
+          trigger: "manual",
+          onProgress: progressJson ? (ev) => console.log(JSON.stringify(ev)) : void 0
+        }
       );
       if (!outcome.paired) {
         console.error("Not paired. Run 'fleetlens team join <url> <device-token>' first.");
         process.exit(1);
       }
+      if (outcome.setupPending) {
+        if (progressJson) {
+          console.log(JSON.stringify({ type: "error", message: "setup pending \u2014 selection not saved yet" }));
+        } else {
+          console.error("Setup pending \u2014 nothing synced. Finish onboarding in the dashboard (/team/onboarding) or re-run 'fleetlens team join'.");
+        }
+        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} 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)` : "")
-      );
+      if (!progressJson) {
+        const sent = outcome.usageBackfill?.sentSnapshots ?? 0;
+        const usageChecked = sent > 0 ? `, ${sent} usage snapshot${sent === 1 ? "" : "s"} checked` : "";
+        console.log(
+          `\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": {
@@ -18526,7 +18760,7 @@ async function team(args2) {
     default:
       console.log(`Usage: fleetlens team <join|status|leave|logs|sync|backfill>
 
-  join <url> <device-token>    Pair daemon with a team server (auto-backfills usage history)
+  join <url> <device-token> [--no-browser]   Pair with a team server (opens browser setup; --no-browser syncs everything immediately)
   status                       Show team pairing state and sync info
   leave                        Unpair from the team server
   logs                         Show recent team-related daemon log entries
@@ -18968,7 +19202,7 @@ async function main() {
     case "version":
     case "--version":
     case "-v":
-      console.log(`fleetlens ${"0.14.0"}`);
+      console.log(`fleetlens ${"0.15.1"}`);
       break;
     case "help":
     case "--help":
@@ -18997,7 +19231,7 @@ Advanced:
   autostart <install|uninstall|status>   Run the usage daemon at login (macOS launchd)
 
 Team:
-  team join <url> <token>           Pair with a team server
+  team join <url> <token>           Pair with a team server (browser setup)
   team status                       Show team pairing state
   team leave                        Unpair from team server
   team logs                         Show team-related daemon logs