@vibe-cafe/vibe-usage 0.10.26 → 0.10.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-cafe/vibe-usage",
-  "version": "0.10.26",
+  "version": "0.10.27",
   "description": "Track your AI coding tool token usage and sync to vibecafe.ai",
   "type": "module",
   "scripts": {

package/src/sync.js

@@ -15,6 +15,28 @@ import { success, failure, warn, arrow, link, dim } from './output.js';
 const BATCH_SIZE = 100;
 const SESSION_BATCH_SIZE = 500;
 
+/** Coarse human duration: "45s" / "2m10s" / "1h 20m". */
+export function formatDuration(seconds) {
+  const secs = Math.max(0, Math.round(seconds));
+  if (secs < 60) return `${secs}s`;
+  const h = Math.floor(secs / 3600);
+  const m = Math.floor((secs % 3600) / 60);
+  const s = secs % 60;
+  if (h > 0) return m > 0 ? `${h}h ${m}m` : `${h}h`;
+  return s > 0 ? `${m}m${s}s` : `${m}m`;
+}
+
+/**
+ * Remaining upload time from batches already finished. Measured, never guessed:
+ * returns null until at least one batch has completed, because a first-sync
+ * backlog and a steady-state trickle differ by three orders of magnitude and
+ * any a-priori rate would be wrong for one of them.
+ */
+export function estimateRemainingSeconds({ elapsedMs, doneBatches, totalBatches }) {
+  if (!(elapsedMs > 0) || doneBatches < 1 || totalBatches <= doneBatches) return null;
+  return ((elapsedMs / doneBatches) * (totalBatches - doneBatches)) / 1000;
+}
+
 function formatBytes(bytes) {
   if (bytes < 1024) return `${bytes}B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
@@ -321,6 +343,20 @@ export async function runSync({
   const totalBatches = Math.max(bucketBatches, sessionBatches, 1);
   const syncClient = createSyncClient({ defaultSurface: surface, hostname: host });
 
+  // Say up front how much is about to go up. A first sync (or one that
+  // backfills after a parser was broken) can be thousands of batches, and with
+  // only a per-batch progress line the user cannot tell a long upload from a
+  // hung one -- which is exactly how a silently failing parser stayed hidden.
+  if (!quiet) {
+    const pending = [`${allBucketsToSend.length} buckets`];
+    if (allSessionsToSend.length > 0) pending.push(`${allSessionsToSend.length} sessions`);
+    const batchNote = totalBatches > 1 ? `，分 ${totalBatches} 批` : '';
+    console.log(dim(`  待上传 ${pending.join(' · ')}${batchNote}`));
+  }
+
+  let uploadedBytes = 0;
+  const uploadStartedAt = Date.now();
+
   try {
     for (let batchIdx = 0; batchIdx < totalBatches; batchIdx++) {
       const batch = allBucketsToSend.slice(batchIdx * BATCH_SIZE, (batchIdx + 1) * BATCH_SIZE);
@@ -328,13 +364,25 @@ export async function runSync({
       const batchNum = batchIdx + 1;
       const prefix = totalBatches > 1 ? `  ${dim(`[${batchNum}/${totalBatches}]`)} 上传中 ` : '  上传中 ';
 
+      // Only measured batches feed the estimate, so the first batch shows no
+      // ETA rather than a made-up one.
+      const remaining = estimateRemainingSeconds({
+        elapsedMs: Date.now() - uploadStartedAt,
+        doneBatches: batchIdx,
+        totalBatches,
+      });
+      const etaNote = remaining === null ? '' : ` · 预计还需 ${formatDuration(remaining)}`;
+
+      let batchBytes = 0;
       const result = await ingest(apiUrl, config.apiKey, batch, {
         client: forBatch(syncClient, batchIdx, totalBatches),
         onProgress(sent, total) {
+          batchBytes = total;
           const pct = Math.round((sent / total) * 100);
-          process.stdout.write(`\r${prefix}${dim(`${formatBytes(sent)}/${formatBytes(total)} (${pct}%)`)}\x1b[K`);
+          process.stdout.write(`\r${prefix}${dim(`${formatBytes(sent)}/${formatBytes(total)} (${pct}%)${etaNote}`)}\x1b[K`);
         },
       }, batchSessions.length > 0 ? batchSessions : undefined);
+      uploadedBytes += batchBytes;
       totalIngested += result.ingested ?? batch.length;
       totalSessionsSynced += result.sessions ?? 0;
       const batchUnknownSources = new Set(result.dropped?.unknownSources || []);
@@ -379,6 +427,10 @@ export async function runSync({
     const syncParts = [`${totalIngested} buckets`];
     if (totalSessionsSynced > 0) syncParts.push(`${totalSessionsSynced} sessions`);
     console.log(success(`已同步 ${syncParts.join(' · ')}`));
+    if (!quiet && uploadedBytes > 0) {
+      const elapsed = (Date.now() - uploadStartedAt) / 1000;
+      console.log(dim(`  上传 ${formatBytes(uploadedBytes)}（已压缩），用时 ${formatDuration(elapsed)}`));
+    }
 
     if (totalDroppedBuckets > 0) {
       const reasons = [];
@@ -399,13 +451,7 @@ export async function runSync({
       const totalActive = allSessionsToSend.reduce((s, x) => s + x.activeSeconds, 0);
       const totalDuration = allSessionsToSend.reduce((s, x) => s + x.durationSeconds, 0);
       const totalMsgs = allSessionsToSend.reduce((s, x) => s + x.messageCount, 0);
-      const fmtTime = (secs) => {
-        if (secs < 60) return `${secs}s`;
-        const h = Math.floor(secs / 3600);
-        const m = Math.floor((secs % 3600) / 60);
-        return h > 0 ? (m > 0 ? `${h}h ${m}m` : `${h}h`) : `${m}m`;
-      };
-      console.log(dim(`  活跃 ${fmtTime(totalActive)} / 总时长 ${fmtTime(totalDuration)} · ${totalMsgs} 条消息`));
+      console.log(dim(`  活跃 ${formatDuration(totalActive)} / 总时长 ${formatDuration(totalDuration)} · ${totalMsgs} 条消息`));
     }
 
     if (!quiet) {