@vibe-cafe/vibe-usage 0.10.23 → 0.10.24

package/package.json

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

package/src/api.js

@@ -280,6 +280,39 @@ export function getJson(apiUrl, apiKey, path, { timeoutMs = 15_000 } = {}) {
   });
 }
 
+/**
+ * Which vibecafe account this API key is bound to.
+ *
+ * Exists because a key minted against the wrong account is otherwise invisible
+ * from the client side: ingest and this endpoint both answer 200 for it, so the
+ * user sees a healthy CLI and a healthy desktop app while their uploads pile up
+ * on an account they never look at. Ask the backend whose data it is and say so.
+ *
+ * Returns null when the backend is too old to send `account`, or on any
+ * transient failure — identity is a nicety, never a reason to fail a command.
+ * UNAUTHORIZED still propagates: that one the caller must not swallow.
+ *
+ * @param {string} apiUrl
+ * @param {string} apiKey
+ * @returns {Promise<{handle: string, name: string | null} | null>}
+ */
+export async function fetchAccount(apiUrl, apiKey) {
+  let data;
+  try {
+    // bucketsOnly keeps the response to the aggregate we throw away; days=1
+    // keeps the window (and the scan) small.
+    data = await getJson(apiUrl, apiKey, '/api/usage?days=1&bucketsOnly=true', { timeoutMs: 10_000 });
+  } catch (err) {
+    if (err.message === 'UNAUTHORIZED') throw err;
+    return null;
+  }
+  const account = data?.account;
+  if (account && typeof account.handle === 'string') {
+    return { handle: account.handle, name: account.name ?? null };
+  }
+  return null;
+}
+
 /**
  * GET user settings from the vibecafe API.
  * Returns null after transient failures are exhausted. A 401 remains distinct

package/src/index.js

@@ -8,7 +8,8 @@ import {
   normalizeExtraRoot,
   validateExtraRoot,
 } from './extra-roots.js';
-import { failure, smallHeader } from './output.js';
+import { dim as dimText, failure, smallHeader, warn } from './output.js';
+import { fetchAccount } from './api.js';
 
 function printSmallHeader() {
   console.log();
@@ -27,6 +28,8 @@ async function showStatus() {
     console.log(`  Config: ${getConfigPath()}`);
     console.log(`  API key: ${config.apiKey.slice(0, 8)}...`);
     console.log(`  API URL: ${config.apiUrl || 'https://vibecafe.ai'}`);
+    // 数据算在谁名下,是这里最该回答、以前偏偏答不出的一件事。
+    await printBoundAccount(config.apiUrl || 'https://vibecafe.ai', config.apiKey);
     if (config.codexExtraHome) {
       console.log(`  Extra Codex Home: ${config.codexExtraHome}`);
     }
@@ -62,6 +65,30 @@ async function showStatus() {
   console.log();
 }
 
+/**
+ * Print the account this key uploads to. Never throws: an offline machine or an
+ * older backend just means we cannot name the account, which must not make
+ * `status` fail — but a revoked/invalid key is worth saying out loud.
+ */
+async function printBoundAccount(apiUrl, apiKey) {
+  try {
+    const account = await fetchAccount(apiUrl, apiKey);
+    if (account) {
+      const label = account.name ? `@${account.handle}(${account.name})` : `@${account.handle}`;
+      console.log(`  账号: ${label}`);
+      console.log(dimText(`        数据都记在这个账号名下,不是它就换个账号重新 init`));
+    } else {
+      console.log(dimText('  账号: 服务端未返回(后端版本较旧或网络异常)'));
+    }
+  } catch (err) {
+    if (err.message === 'UNAUTHORIZED') {
+      console.log(warn('账号: Key 已失效,请重新运行 `npx @vibe-cafe/vibe-usage init`'));
+      return;
+    }
+    console.log(dimText('  账号: 读取失败'));
+  }
+}
+
 const VALID_CONFIG_KEYS = ['apiKey', 'apiUrl', 'hostname', 'codexExtraHome'];
 
 function handleConfig(args) {

package/src/init.js

@@ -2,7 +2,7 @@ import { createInterface } from 'node:readline';
 import { execFile } from 'node:child_process';
 import { hostname as osHostname, platform } from 'node:os';
 import { loadConfig, saveConfig } from './config.js';
-import { ingest, requestDeviceCode, pollDeviceCode } from './api.js';
+import { fetchAccount, ingest, requestDeviceCode, pollDeviceCode } from './api.js';
 import { runSync } from './sync.js';
 import { detectInstalledTools } from './tools.js';
 import { bigHeader, success, failure, warn, arrow, link, dim, divider } from './output.js';
@@ -68,6 +68,13 @@ export async function runInit(options = {}) {
   try {
     await ingest(apiUrl, apiKey, []);
     console.log(success(`验证通过 ${dim(apiKey.slice(0, 12) + '...')}`));
+    // 说清楚数据会算在谁名下 —— 授权那一刻浏览器里登录的可能并不是他自己以为的
+    // 那个账号,而这是整条链路上最后一次能当场发现的机会。
+    const account = await fetchAccount(apiUrl, apiKey).catch(() => null);
+    if (account) {
+      console.log(success(`已链接到账号 ${account.name ? `@${account.handle}(${account.name})` : `@${account.handle}`}`));
+      console.log(dim('  数据都会记在这个账号名下;不是你要的账号就退出登录后重新 init。'));
+    }
   } catch (err) {
     if (err.message === 'UNAUTHORIZED') {
       console.error(failure('API Key 无效，请检查后重试。'));