@vibe-cafe/vibe-usage 0.8.4 → 0.9.1

package/README.md

@@ -4,31 +4,35 @@ Track your AI coding tool token usage and sync to [vibecafe.ai](https://vibecafe
 
 ## Quick Start
 
-Get your API key at [vibecafe.ai/usage/setup](https://vibecafe.ai/usage/setup), then copy the one-liner shown there:
-
-```bash
-npx @vibe-cafe/vibe-usage --key vbu_xxxxxxxxxxxx
-```
-
-Or run without a key and paste it interactively:
-
 ```bash
 npx @vibe-cafe/vibe-usage
 ```
 
-Either path will:
+That's it. The CLI opens [vibecafe.ai/usage/device](https://vibecafe.ai/usage/device) in your browser; sign in, confirm the verification code shown in your terminal, click 「确认链接」, and the CLI receives an API key automatically.
+
+After approval, it will:
 1. Save your API key to `~/.vibe-usage/config.json`
 2. Detect installed AI coding tools
 3. Run an initial sync of your usage data
 4. Prompt you to enable the background daemon for continuous syncing (recommended)
 
+### CI / Headless
+
+If you don't have a local browser (CI, remote SSH session, container), pre-issue a key at [vibecafe.ai/usage/setup](https://vibecafe.ai/usage/setup) and pass it on the command line:
+
+```bash
+npx @vibe-cafe/vibe-usage init --manual-key vbu_xxxxxxxxxxxx
+```
+
 ## Commands
 
 ```bash
-npx @vibe-cafe/vibe-usage              # Init (first run) or sync (subsequent runs)
-npx @vibe-cafe/vibe-usage --key <vbu_...>   # One-shot init with a pre-copied key
-npx @vibe-cafe/vibe-usage init         # Re-run setup
+npx @vibe-cafe/vibe-usage              # Init (first run, browser login) or sync (subsequent runs)
+npx @vibe-cafe/vibe-usage init         # Re-run setup via browser login
+npx @vibe-cafe/vibe-usage init --manual-key <vbu_...>   # Skip browser, use pre-issued key (CI/headless)
 npx @vibe-cafe/vibe-usage sync         # Manual sync
+npx @vibe-cafe/vibe-usage summary       # Print last 7 days as markdown (cost / tokens / by model / by project)
+npx @vibe-cafe/vibe-usage summary --days N  # Same, over the last N days (1-90)
 npx @vibe-cafe/vibe-usage daemon       # Continuous sync (every 30m, foreground)
 npx @vibe-cafe/vibe-usage daemon install    # Install background service (systemd/launchd)
 npx @vibe-cafe/vibe-usage daemon uninstall  # Remove background service

package/package.json

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

package/src/api.js

@@ -154,6 +154,64 @@ export function deleteAllData(apiUrl, apiKey, opts) {
   });
 }
 
+/**
+ * Start a device authorization flow.
+ * Returns the deviceCode (for polling) + userCode + URLs (for the user).
+ */
+export function requestDeviceCode(apiUrl, { clientName, hostname }) {
+  return _jsonRequest(apiUrl, '/api/usage/device/code', 'POST', { clientName, hostname }, 10_000);
+}
+
+/**
+ * One poll iteration. Resolves with one of:
+ *   { apiKey, apiUrl }                 — approved, key delivered
+ *   { error: 'authorization_pending' } — keep polling
+ *   { error: 'access_denied' }         — user pressed deny
+ *   { error: 'expired_token' }         — code expired or already consumed
+ *   { error: 'invalid_grant' | ... }   — unrecoverable
+ * Rejects only on network/server errors.
+ */
+export function pollDeviceCode(apiUrl, deviceCode) {
+  return _jsonRequest(apiUrl, '/api/usage/device/poll', 'POST', { deviceCode }, 15_000);
+}
+
+function _jsonRequest(apiUrl, path, method, body, timeoutMs) {
+  return new Promise((resolve, reject) => {
+    const url = new URL(path, apiUrl);
+    const mod = url.protocol === 'https:' ? https : http;
+    const raw = Buffer.from(JSON.stringify(body));
+
+    const req = mod.request(url, {
+      method,
+      timeout: timeoutMs,
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': raw.length,
+      },
+    }, (res) => {
+      let data = '';
+      res.on('data', (chunk) => { data += chunk; });
+      res.on('end', () => {
+        if (res.statusCode < 200 || res.statusCode >= 300) {
+          const err = new Error(`HTTP ${res.statusCode}: ${data}`);
+          err.statusCode = res.statusCode;
+          reject(err);
+          return;
+        }
+        try {
+          resolve(JSON.parse(data));
+        } catch {
+          reject(new Error(`Invalid JSON response: ${data}`));
+        }
+      });
+    });
+    req.on('error', reject);
+    req.on('timeout', () => { req.destroy(); reject(new Error(`Request timed out (${timeoutMs}ms)`)); });
+    req.write(raw);
+    req.end();
+  });
+}
+
 /**
  * GET user settings from the vibecafe API.
  * Returns null on any failure (network, auth, timeout) — caller should fail-safe.

package/src/index.js

@@ -108,7 +108,16 @@ function extractOption(args, name) {
 }
 
 export async function run(rawArgs) {
-  const { args, value: apiKey } = extractOption(rawArgs, 'key');
+  // --key and --manual-key both mean "skip device flow, take this vbu_ key".
+  // --manual-key is the documented name; --key is kept as a legacy alias so
+  // existing scripts/docs don't break when device flow becomes the default.
+  let stripped;
+  let apiKey;
+  ({ args: stripped, value: apiKey } = extractOption(rawArgs, 'manual-key'));
+  if (apiKey === undefined) {
+    ({ args: stripped, value: apiKey } = extractOption(stripped, 'key'));
+  }
+  const args = stripped;
   const command = args[0];
 
   switch (command) {
@@ -123,6 +132,11 @@ export async function run(rawArgs) {
       await runSync();
       break;
     }
+    case 'summary': {
+      const { runSummary } = await import('./summary.js');
+      await runSummary(args.slice(1));
+      break;
+    }
     case 'reset': {
       printSmallHeader();
       const { runReset } = await import('./reset.js');
@@ -164,11 +178,12 @@ export async function run(rawArgs) {
   vibe-usage - Vibe Usage Tracker by VibeCafé
 
   Usage:
-    npx @vibe-cafe/vibe-usage              Init (first run) or sync
-    npx @vibe-cafe/vibe-usage --key <vbu_...>   One-shot init with a pre-copied key
-    npx @vibe-cafe/vibe-usage init         Set up API key (interactive)
-    npx @vibe-cafe/vibe-usage init --key <vbu_...>   Init with key, skip paste prompt
+    npx @vibe-cafe/vibe-usage              Init (first run, browser login) or sync
+    npx @vibe-cafe/vibe-usage init         Set up via browser login (default)
+    npx @vibe-cafe/vibe-usage init --manual-key <vbu_...>   Skip browser, use a pre-issued key (CI/headless)
     npx @vibe-cafe/vibe-usage sync         Manually sync usage data
+    npx @vibe-cafe/vibe-usage summary       Print last 7 days as markdown (cost/tokens/model/project)
+    npx @vibe-cafe/vibe-usage summary --days N   Same, but over the last N days (1-90)
     npx @vibe-cafe/vibe-usage daemon       Continuous sync (every 30m, foreground)
     npx @vibe-cafe/vibe-usage daemon install    Install background service (systemd/launchd)
     npx @vibe-cafe/vibe-usage daemon uninstall  Remove background service

package/src/init.js

@@ -2,11 +2,13 @@ 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 } from './api.js';
+import { 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';
 
+const CLIENT_NAME = 'vibe-usage CLI';
+
 function prompt(question) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
@@ -49,6 +51,7 @@ export async function runInit(options = {}) {
   }
 
   const apiUrl = process.env.VIBE_USAGE_API_URL || 'https://vibecafe.ai';
+  const host = existing?.hostname || osHostname().replace(/\.local$/, '');
 
   let apiKey;
   if (providedKey) {
@@ -58,16 +61,8 @@ export async function runInit(options = {}) {
     }
     apiKey = providedKey;
   } else {
-    console.log(`${arrow('获取 API Key')} ${link(`${apiUrl}/usage/setup`)}`);
-    console.log(dim('  浏览器会自动打开，登录后在「API Keys」处生成并复制 Key（vbu_ 开头），粘贴到下方。'));
-    console.log();
-    openBrowser(`${apiUrl}/usage/setup`);
-
-    while (true) {
-      apiKey = await prompt('粘贴 API Key: ');
-      if (apiKey.startsWith('vbu_')) break;
-      console.log(warn('必须以 vbu_ 开头，请重试。'));
-    }
+    apiKey = await runDeviceFlow(apiUrl, host);
+    if (!apiKey) process.exit(1);
   }
 
   try {
@@ -84,7 +79,7 @@ export async function runInit(options = {}) {
   const config = {
     apiKey,
     apiUrl,
-    hostname: existing?.hostname || osHostname().replace(/\.local$/, ''),
+    hostname: host,
   };
   saveConfig(config);
 
@@ -119,3 +114,76 @@ export async function runInit(options = {}) {
     }
   }
 }
+
+async function runDeviceFlow(apiUrl, hostname) {
+  let device;
+  try {
+    device = await requestDeviceCode(apiUrl, { clientName: CLIENT_NAME, hostname });
+  } catch (err) {
+    console.error(failure(`无法连接 ${apiUrl}：${err.message}`));
+    return null;
+  }
+
+  console.log(`${arrow('登录确认')} ${link(device.verificationUriComplete)}`);
+  console.log(`  验证码: ${device.userCode}`);
+  console.log(dim('  浏览器会自动打开；如果没反应，请手动复制上方链接。'));
+  console.log();
+  openBrowser(device.verificationUriComplete);
+
+  const intervalMs = (device.interval || 5) * 1000;
+  const deadline = Date.now() + (device.expiresIn || 900) * 1000;
+
+  process.stdout.write(dim('等待审批…'));
+  const aborter = new AbortController();
+  const onSigint = () => { aborter.abort(); };
+  process.on('SIGINT', onSigint);
+  try {
+    while (Date.now() < deadline) {
+      if (aborter.signal.aborted) {
+        process.stdout.write('\n');
+        console.log(warn('已取消。'));
+        return null;
+      }
+      await sleep(intervalMs);
+      let res;
+      try {
+        res = await pollDeviceCode(apiUrl, device.deviceCode);
+      } catch (err) {
+        // Transient network blip — keep polling until deadline.
+        process.stdout.write(dim('.'));
+        continue;
+      }
+      if (res.apiKey) {
+        process.stdout.write('\n');
+        console.log(success('已批准，获取到 API Key。'));
+        return res.apiKey;
+      }
+      if (res.error === 'authorization_pending') {
+        process.stdout.write(dim('.'));
+        continue;
+      }
+      if (res.error === 'access_denied') {
+        process.stdout.write('\n');
+        console.error(failure('请求被拒绝。'));
+        return null;
+      }
+      if (res.error === 'expired_token') {
+        process.stdout.write('\n');
+        console.error(failure('验证码已过期，请重跑 init。'));
+        return null;
+      }
+      process.stdout.write('\n');
+      console.error(failure(`服务端返回未知错误：${res.error}`));
+      return null;
+    }
+    process.stdout.write('\n');
+    console.error(failure('验证码已过期，请重跑 init。'));
+    return null;
+  } finally {
+    process.removeListener('SIGINT', onSigint);
+  }
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}

package/src/skill.js

@@ -33,53 +33,42 @@ function tildePath(absPath) {
 
 const SKILL_CONTENT = `---
 name: vibe-usage
-description: Track and sync AI coding tool token usage to vibecafe.ai dashboard.
+description: 查询和同步 AI 编程工具的 token 用量（VibeCafé 旗下 Vibe Usage 数据）。
 ---
 
 # Vibe Usage
 
-Track your AI coding tool token usage and sync to [vibecafe.ai](https://vibecafe.ai/usage).
+Track and answer questions about the user's AI coding token spend via [Vibe Usage](https://vibecafe.ai/usage) (VibeCafé).
 
-## Setup
+## 查询用量（默认行为）
 
-First-time setup (interactive — asks for API key):
+当用户问以下问题时，运行命令并**原样展示输出**（不要总结、不要换算单位、不要翻译）：
 
-\`\`\`bash
-npx @vibe-cafe/vibe-usage
-\`\`\`
+| 用户说... | 运行 |
+|---|---|
+| 我这周花了多少 / 查 usage / 看看消费 | \`npx @vibe-cafe/vibe-usage summary\` |
+| 今天花了多少 / 今天 token | \`npx @vibe-cafe/vibe-usage summary --days 1\` |
+| 本月花费 / 这个月用量 | \`npx @vibe-cafe/vibe-usage summary --days 30\` |
+| 哪个模型最贵 / 模型对比 | \`npx @vibe-cafe/vibe-usage summary\`（输出已按模型拆） |
+| 哪个项目花得最多 | \`npx @vibe-cafe/vibe-usage summary\`（输出已按项目拆） |
 
-Get your API key at https://vibecafe.ai/usage/setup
+输出是 markdown 表格，直接展示给用户即可。
 
-## Commands
+## 维护命令
 
-When the user asks to sync usage, check costs, or track tokens, run:
+| 用户说... | 运行 |
+|---|---|
+| 同步数据 / 上传 usage / 数据没更新 | \`npx @vibe-cafe/vibe-usage sync\` |
+| 看 daemon 状态 / 后台同步还在跑吗 | \`npx @vibe-cafe/vibe-usage daemon status\` |
+| 启动后台同步 | \`npx @vibe-cafe/vibe-usage daemon install\` |
+| 重置数据 / 重新上传 | \`npx @vibe-cafe/vibe-usage reset\` |
 
-\`\`\`bash
-npx @vibe-cafe/vibe-usage sync
-\`\`\`
+## 注意
 
-Other available commands:
-
-| Command | Description |
-|---------|-------------|
-| \`npx @vibe-cafe/vibe-usage sync\` | Sync latest usage data |
-| \`npx @vibe-cafe/vibe-usage status\` | Show config and detected tools |
-| \`npx @vibe-cafe/vibe-usage daemon\` | Continuous sync every 30 minutes |
-| \`npx @vibe-cafe/vibe-usage reset\` | Delete all data and re-upload |
-| \`npx @vibe-cafe/vibe-usage reset --local\` | Delete this host's data and re-upload |
-
-## When to Use
-
-- User says "sync my usage", "upload usage", "track tokens"
-- User asks "how much have I spent?", "what's my cost?"
-- User wants to check if sync is working: run \`status\`
-- User wants continuous background sync: run \`daemon\`
-
-## Notes
-
-- Requires initial setup with an API key (run \`npx @vibe-cafe/vibe-usage\` first)
-- Config is stored at \`~/.vibe-usage/config.json\`
-- Supports: Claude Code, Codex CLI, Copilot CLI, Gemini CLI, OpenCode, OpenClaw, Qwen Code, Kimi Code, Amp, Droid
+- \`summary\` 读 \`~/.vibe-usage/config.json\` 里已有的 API key，不需要用户额外输入
+- summary 输出已是 markdown，**原样展示，不要复述**
+- 用户没装过 vibe-usage？提示运行 \`npx @vibe-cafe/vibe-usage\` 先用浏览器登录链接账号
+- 支持的工具：Claude Code, Codex CLI, Copilot CLI, Gemini CLI, OpenCode, OpenClaw, Qwen Code, Kimi Code, Amp, Droid 等
 `;
 
 export async function runSkill(args = []) {
@@ -88,7 +77,7 @@ export async function runSkill(args = []) {
   console.log('  检测到的工具:');
   for (const t of SKILL_TARGETS) {
     const found = existsSync(t.detectDir);
-    const mark = found ? green('✓') : red('✗');
+    const mark = found ? green('[OK]') : red('[未装]');
     console.log(`    ${mark} ${t.name}`);
   }
   console.log();

package/src/summary.js

@@ -0,0 +1,146 @@
+import https from 'node:https';
+import http from 'node:http';
+import { URL } from 'node:url';
+import { loadConfig } from './config.js';
+
+export async function runSummary(args = []) {
+  const days = parseDays(args);
+  const config = loadConfig();
+  if (!config?.apiKey) {
+    console.error('No vibe-usage config found. Run `npx @vibe-cafe/vibe-usage init` first.');
+    process.exit(1);
+  }
+
+  const url = new URL('/api/usage', config.apiUrl || 'https://vibecafe.ai');
+  url.searchParams.set('days', String(days));
+
+  let data;
+  try {
+    data = await fetchJson(url, config.apiKey);
+  } catch (err) {
+    if (err.statusCode === 401) {
+      console.error('API key invalid or revoked. Run `npx @vibe-cafe/vibe-usage init` to re-link.');
+    } else {
+      console.error(`Failed to fetch usage: ${err.message}`);
+    }
+    process.exit(1);
+  }
+
+  console.log(render(data, days));
+}
+
+function parseDays(args) {
+  const idx = args.findIndex(a => a === '--days');
+  if (idx === -1) return 7;
+  const v = parseInt(args[idx + 1], 10);
+  if (!v || v < 1) return 7;
+  if (v > 90) return 90;
+  return v;
+}
+
+function render(data, days) {
+  const buckets = Array.isArray(data?.buckets) ? data.buckets : [];
+  const sessions = Array.isArray(data?.sessions) ? data.sessions : [];
+
+  if (buckets.length === 0) {
+    return `# Vibe Usage Summary (Last ${days} ${days === 1 ? 'day' : 'days'})\n\n暂无数据。运行 \`npx @vibe-cafe/vibe-usage sync\` 上传本地 token 记录。\n\n详情: https://vibecafe.ai/usage\n`;
+  }
+
+  let totalCost = 0;
+  let totalTokens = 0;
+  const byModel = new Map();
+  const byProject = new Map();
+
+  for (const b of buckets) {
+    const cost = Number(b.estimatedCost ?? 0);
+    const tokens = Number(b.totalTokens ?? 0);
+    totalCost += cost;
+    totalTokens += tokens;
+    accumulate(byModel, b.model, { cost, tokens });
+    accumulate(byProject, b.project || 'unknown', { cost, tokens, sessions: 0 });
+  }
+
+  const sessionsCount = sessions.length;
+  let activeSeconds = 0;
+  for (const s of sessions) {
+    activeSeconds += Number(s.activeSeconds ?? 0);
+    const proj = byProject.get(s.project || 'unknown');
+    if (proj) proj.sessions += 1;
+  }
+  const activeHours = activeSeconds / 3600;
+
+  const lines = [];
+  lines.push(`# Vibe Usage Summary (Last ${days} ${days === 1 ? 'day' : 'days'})`);
+  lines.push('');
+  lines.push(`**总览**: $${totalCost.toFixed(2)} · ${formatTokens(totalTokens)} tokens · ${sessionsCount} sessions · ${activeHours.toFixed(1)}h active`);
+  lines.push('');
+
+  lines.push('## 按模型');
+  lines.push('');
+  lines.push('| 模型 | 费用 | Tokens | 占比 |');
+  lines.push('|---|---:|---:|---:|');
+  for (const [model, { cost, tokens }] of topN(byModel, 'cost', 8)) {
+    const pct = totalCost > 0 ? ((cost / totalCost) * 100).toFixed(0) : '0';
+    lines.push(`| ${model} | $${cost.toFixed(2)} | ${formatTokens(tokens)} | ${pct}% |`);
+  }
+  lines.push('');
+
+  lines.push('## 按项目');
+  lines.push('');
+  lines.push('| 项目 | 费用 | Sessions |');
+  lines.push('|---|---:|---:|');
+  for (const [project, { cost, sessions: ss }] of topN(byProject, 'cost', 8)) {
+    lines.push(`| ${project} | $${cost.toFixed(2)} | ${ss} |`);
+  }
+  lines.push('');
+
+  lines.push('详情: https://vibecafe.ai/usage');
+  return lines.join('\n');
+}
+
+function accumulate(map, key, delta) {
+  const cur = map.get(key) || { cost: 0, tokens: 0, sessions: 0 };
+  for (const k of Object.keys(delta)) cur[k] = (cur[k] || 0) + delta[k];
+  map.set(key, cur);
+}
+
+function topN(map, sortBy, n) {
+  return [...map.entries()]
+    .sort((a, b) => b[1][sortBy] - a[1][sortBy])
+    .slice(0, n);
+}
+
+function formatTokens(n) {
+  if (n >= 1_000_000) return (n / 1_000_000).toFixed(1) + 'M';
+  if (n >= 1_000) return (n / 1_000).toFixed(0) + 'K';
+  return String(n);
+}
+
+function fetchJson(url, apiKey) {
+  return new Promise((resolve, reject) => {
+    const mod = url.protocol === 'https:' ? https : http;
+    const req = mod.request(url, {
+      method: 'GET',
+      timeout: 15_000,
+      headers: { 'Authorization': `Bearer ${apiKey}` },
+    }, (res) => {
+      let data = '';
+      res.on('data', (chunk) => { data += chunk; });
+      res.on('end', () => {
+        if (res.statusCode === 401) {
+          const err = new Error('Unauthorized'); err.statusCode = 401; reject(err); return;
+        }
+        if (res.statusCode < 200 || res.statusCode >= 300) {
+          const err = new Error(`HTTP ${res.statusCode}: ${data.slice(0, 200)}`);
+          err.statusCode = res.statusCode;
+          reject(err); return;
+        }
+        try { resolve(JSON.parse(data)); }
+        catch { reject(new Error('Invalid JSON response')); }
+      });
+    });
+    req.on('error', reject);
+    req.on('timeout', () => { req.destroy(); reject(new Error('timeout (15s)')); });
+    req.end();
+  });
+}