@vibe-cafe/vibe-usage 0.10.1 → 0.10.2

package/package.json

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

package/src/api.js

@@ -14,7 +14,7 @@ export async function ingest(apiUrl, apiKey, buckets, opts, sessions) {
   let lastError;
   for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
     try {
-      return await _send(apiUrl, apiKey, buckets, opts?.onProgress, sessions);
+      return await _send(apiUrl, apiKey, buckets, opts, sessions);
     } catch (err) {
       lastError = err;
       // Don't retry auth errors or client errors
@@ -30,14 +30,22 @@ export async function ingest(apiUrl, apiKey, buckets, opts, sessions) {
   throw lastError;
 }
 
-function _send(apiUrl, apiKey, buckets, onProgress, sessions) {
+export function encodeIngestBody(buckets, opts, sessions) {
+  const payload = { buckets };
+  if (sessions && sessions.length > 0) payload.sessions = sessions;
+  if (opts?.client) payload.client = opts.client;
+  const raw = Buffer.from(JSON.stringify(payload));
+  const useGzip = raw.length >= GZIP_MIN_BYTES;
+  return {
+    body: useGzip ? gzipSync(raw) : raw,
+    useGzip,
+  };
+}
+
+function _send(apiUrl, apiKey, buckets, opts, sessions) {
   return new Promise((resolve, reject) => {
     const url = new URL('/api/usage/ingest', apiUrl);
-    const payload = { buckets };
-    if (sessions && sessions.length > 0) payload.sessions = sessions;
-    const raw = Buffer.from(JSON.stringify(payload));
-    const useGzip = raw.length >= GZIP_MIN_BYTES;
-    const body = useGzip ? gzipSync(raw) : raw;
+    const { body, useGzip } = encodeIngestBody(buckets, opts, sessions);
     const totalBytes = body.length;
     const mod = url.protocol === 'https:' ? https : http;
 
@@ -89,7 +97,7 @@ function _send(apiUrl, apiKey, buckets, onProgress, sessions) {
       while (ok && sent < totalBytes) {
         const slice = body.subarray(sent, sent + CHUNK);
         sent += slice.length;
-        if (onProgress) onProgress(sent, totalBytes);
+        if (opts?.onProgress) opts.onProgress(sent, totalBytes);
         ok = req.write(slice);
       }
       if (sent < totalBytes) {

package/src/client-meta.js

@@ -0,0 +1,44 @@
+import { readFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
+
+const pkg = JSON.parse(
+  readFileSync(new URL('../package.json', import.meta.url), 'utf-8'),
+);
+
+const SURFACES = new Set(['cli', 'daemon', 'mac-app', 'windows-app']);
+
+export const COLLECTOR_VERSION = String(pkg.version);
+
+function cleanEnv(value, maxLength = 50) {
+  if (typeof value !== 'string') return null;
+  const cleaned = value.trim().slice(0, maxLength);
+  return cleaned || null;
+}
+
+export function createSyncClient({ defaultSurface = 'cli', hostname } = {}) {
+  const requestedSurface = cleanEnv(process.env.VIBE_USAGE_SURFACE, 30);
+  const surface = requestedSurface && SURFACES.has(requestedSurface)
+    ? requestedSurface
+    : defaultSurface;
+  const runtime = process.versions.bun ? 'bun' : 'node';
+  const runtimeVersion = process.versions.bun || process.versions.node;
+
+  return {
+    collectorVersion: COLLECTOR_VERSION,
+    surface,
+    surfaceVersion: cleanEnv(process.env.VIBE_USAGE_SURFACE_VERSION) || COLLECTOR_VERSION,
+    runtime,
+    runtimeVersion,
+    platform: process.platform,
+    hostname: cleanEnv(hostname, 200) || 'unknown',
+    syncId: randomUUID(),
+  };
+}
+
+export function forBatch(client, batchIndex, batchCount) {
+  return {
+    ...client,
+    batchIndex,
+    batchCount,
+  };
+}

package/src/daemon.js

@@ -34,7 +34,7 @@ export async function runDaemon() {
   // eslint-disable-next-line no-constant-condition
   while (true) {
     try {
-      await runSync({ throws: true, quiet: true });
+      await runSync({ throws: true, quiet: true, surface: 'daemon' });
       consecutiveAuthFailures = 0;
     } catch (err) {
       if (err.message === 'UNAUTHORIZED') {

package/src/sync.js

@@ -5,6 +5,7 @@ import {
   bucketKey, bucketHash, sessionKey, sessionHash,
 } from './state.js';
 import { ingest, fetchSettings } from './api.js';
+import { createSyncClient, forBatch } from './client-meta.js';
 import { parsers } from './parsers/index.js';
 import { success, failure, arrow, link, dim } from './output.js';
 
@@ -17,7 +18,7 @@ function formatBytes(bytes) {
   return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
 }
 
-export async function runSync({ throws = false, quiet = false } = {}) {
+export async function runSync({ throws = false, quiet = false, surface = 'cli' } = {}) {
   const config = loadConfig();
   if (!config?.apiKey) {
     console.error(failure('尚未配置，请先运行 `npx @vibe-cafe/vibe-usage init`。'));
@@ -192,10 +193,12 @@ export async function runSync({ throws = false, quiet = false } = {}) {
   let totalDroppedBuckets = 0;
   let totalDroppedUnknownModels = 0;
   let totalDroppedImplausible = 0;
+  let totalProtectedBuckets = 0;
   const droppedSources = new Set();
   const bucketBatches = Math.ceil(allBucketsToSend.length / BATCH_SIZE);
   const sessionBatches = Math.ceil(allSessionsToSend.length / SESSION_BATCH_SIZE);
   const totalBatches = Math.max(bucketBatches, sessionBatches, 1);
+  const syncClient = createSyncClient({ defaultSurface: surface, hostname: host });
 
   try {
     for (let batchIdx = 0; batchIdx < totalBatches; batchIdx++) {
@@ -205,6 +208,7 @@ export async function runSync({ throws = false, quiet = false } = {}) {
       const prefix = totalBatches > 1 ? `  ${dim(`[${batchNum}/${totalBatches}]`)} 上传中 ` : '  上传中 ';
 
       const result = await ingest(apiUrl, config.apiKey, batch, {
+        client: forBatch(syncClient, batchIdx, totalBatches),
         onProgress(sent, total) {
           const pct = Math.round((sent / total) * 100);
           process.stdout.write(`\r${prefix}${dim(`${formatBytes(sent)}/${formatBytes(total)} (${pct}%)`)}\x1b[K`);
@@ -219,6 +223,7 @@ export async function runSync({ throws = false, quiet = false } = {}) {
         totalDroppedImplausible += Number(result.dropped.implausible) || 0;
         for (const s of result.dropped.unknownSources || []) droppedSources.add(s);
       }
+      totalProtectedBuckets += Number(result.protected?.buckets) || 0;
 
       // Commit only this batch's hashes, only after it uploaded successfully.
       // A batch that throws aborts the loop with its keys still absent from
@@ -259,6 +264,10 @@ export async function runSync({ throws = false, quiet = false } = {}) {
       console.log(dim(`  ${totalDroppedBuckets} buckets dropped (${reasons.join('；')})`));
     }
 
+    if (totalProtectedBuckets > 0) {
+      console.log(dim(`  服务端保留了 ${totalProtectedBuckets} 个更大的已有 bucket（本次较小快照未覆盖）`));
+    }
+
     if (!quiet && totalSessionsSynced > 0) {
       const totalActive = allSessionsToSend.reduce((s, x) => s + x.activeSeconds, 0);
       const totalDuration = allSessionsToSend.reduce((s, x) => s + x.durationSeconds, 0);