@vibescore/tracker 0.0.5 → 0.0.7

package/README.md

@@ -25,9 +25,19 @@ _Real-time AI Analytics for Codex CLI_
 
 > [!TIP] > **Core Index**: Our signature metric that reflects your flow state by analyzing token consumption rates and patterns.
 
+## 🔒 Privacy-First Architecture (Stealth Protocol)
+
+We believe your code and thoughts are your own. VibeScore is built with strict privacy pillars to ensure your data never leaves your control.
+
+- 🛡️ **Zero Code Infiltration**: We never touch your source code or prompts. Our sniffer only extracts numeric token counts (Input, Output, Reasoning, Cached).
+- 📡 **Local Aggregation**: All token consumption analysis happens on your machine. We only relay quantized 30-minute usage buckets to the cloud.
+- 🔐 **Hashed Identity**: Device tokens are hashed using SHA-256 server-side. Your raw credentials never exist in our database.
+- 🔦 **Full Transparency**: Audit the sync logic yourself in `src/lib/rollout.js`. We literally only capture numbers and timestamps.
+
 ## 🚀 Key Features
 
 - 📡 **Live Sniffer**: Real-time interception of Codex CLI pipes using low-level hooks to capture every completion event.
+- 🧭 **Multi-source Ingestion**: Supports Codex CLI and Every Code (tagged as `source=every-code`) without modifying Every Code.
 - 📊 **Matrix Dashboard**: A high-performance React + Vite dashboard featuring heatmaps, trend charts, and live logs.
 - ⚡ **AI Analytics**: Deep analysis of Input/Output tokens, with dedicated tracking for Cached and Reasoning components.
 - 🔒 **Identity Core**: Robust authentication and permission management to secure your development data.
@@ -42,6 +52,8 @@ Initialize your environment with a single command:
 npx --yes @vibescore/tracker init
 ```
 
+Note: If `~/.code/config.toml` exists (or `CODE_HOME`), `init` also configures Every Code `notify` automatically; it will not create the file when missing.
+
 ### Sync & Status
 
 ```bash
@@ -52,6 +64,11 @@ npx --yes @vibescore/tracker sync
 npx --yes @vibescore/tracker status
 ```
 
+### Sources
+
+- Codex CLI logs: `~/.codex/sessions/**/rollout-*.jsonl` (override with `CODEX_HOME`)
+- Every Code logs: `~/.code/sessions/**/rollout-*.jsonl` (override with `CODE_HOME`)
+
 ## 🧰 Troubleshooting
 
 ### Streak shows 0 days while totals look correct
@@ -60,9 +77,9 @@ npx --yes @vibescore/tracker status
 - If you expect a non-zero streak, clear cached auth/heatmap data and sign in again:
 
 ```js
-localStorage.removeItem('vibescore.dashboard.auth.v1');
+localStorage.removeItem("vibescore.dashboard.auth.v1");
 Object.keys(localStorage)
-  .filter((k) => k.startsWith('vibescore.heatmap.'))
+  .filter((k) => k.startsWith("vibescore.heatmap."))
   .forEach((k) => localStorage.removeItem(k));
 location.reload();
 ```

package/README.zh-CN.md

@@ -25,9 +25,19 @@ _Codex CLI 实时 AI 分析工具_
 
 > [!TIP] > **Core Index (核心指数)**: 我们的标志性指标，通过分析 Token 消耗速率与模式，反映你的开发心流状态。
 
+## 🔒 隐私优先架构 (隐身协议)
+
+我们坚信你的代码和思想属于你自己。VibeScore 建立在严格的隐私支柱之上，确保你的数据始终处于受控状态。
+
+- 🛡️ **代码零入侵**：我们绝不触碰你的源代码或 Prompt。我们的嗅探器仅提取数值化的 Token 计数（输入、输出、推理、缓存）。
+- 📡 **本地聚合**：所有 Token 消耗分析均在你的机器上完成。我们仅将量化的 30 分钟使用桶（Usage Buckets）中继到云端。
+- 🔐 **身份哈希**：设备令牌在服务端使用 SHA-256 进行哈希处理。你的原始凭据绝不会存在于我们的数据库中。
+- 🔦 **全程透明**：你可以亲自审计 `src/lib/rollout.js` 中的同步逻辑。我们真正采集的只有数字和时间戳。
+
 ## 🚀 核心功能
 
 - 📡 **Live Sniffer (实时嗅探)**: 实时监听 Codex CLI 管道，通过底层 Hook 捕获每一次补全事件。
+- 🧭 **多来源采集**：支持 Codex CLI 与 Every Code（标记为 `source=every-code`），无需修改 Every Code 客户端。
 - 📊 **Matrix Dashboard (矩阵控制台)**: 基于 React + Vite 的高性能仪表盘，具备热力图、趋势图与实时日志。
 - ⚡ **AI Analytics (AI 分析)**: 深度分析 Input/Output Token，支持缓存 (Cached) 与推理 (Reasoning) 部分的分离监控。
 - 🔒 **Identity Core (身份核心)**: 完备的身份验证与权限管理，保护你的开发数据资产。
@@ -42,6 +52,8 @@ _Codex CLI 实时 AI 分析工具_
 npx --yes @vibescore/tracker init
 ```
 
+说明：若存在 `~/.code/config.toml`（或 `CODE_HOME`），`init` 会自动配置 Every Code 的 `notify`；缺失时不会创建该文件。
+
 ### 同步与状态查看
 
 ```bash
@@ -52,6 +64,11 @@ npx --yes @vibescore/tracker sync
 npx --yes @vibescore/tracker status
 ```
 
+### 日志来源
+
+- Codex CLI 日志：`~/.codex/sessions/**/rollout-*.jsonl`（可用 `CODEX_HOME` 覆盖）
+- Every Code 日志：`~/.code/sessions/**/rollout-*.jsonl`（可用 `CODE_HOME` 覆盖）
+
 ## 🧰 常见问题
 
 ### Streak 显示 0 天但总量正常
@@ -60,9 +77,9 @@ npx --yes @vibescore/tracker status
 - 如果你确认应该有 streak，请清理本地缓存并重新登录：
 
 ```js
-localStorage.removeItem('vibescore.dashboard.auth.v1');
+localStorage.removeItem("vibescore.dashboard.auth.v1");
 Object.keys(localStorage)
-  .filter((k) => k.startsWith('vibescore.heatmap.'))
+  .filter((k) => k.startsWith("vibescore.heatmap."))
   .forEach((k) => localStorage.removeItem(k));
 location.reload();
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibescore/tracker",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Codex CLI token usage tracker (macOS-first, notify-driven).",
   "license": "MIT",
   "publishConfig": {

package/src/cli.js

@@ -48,8 +48,9 @@ function printHelp() {
       '',
       'Notes:',
       '  - init installs a Codex notify hook and issues a device token (default: browser sign in/up).',
+      '  - when ~/.code/config.toml exists, init also installs an Every Code notify hook.',
       '  - optional: set VIBESCORE_DASHBOARD_URL (or --dashboard-url) to use a hosted landing page.',
-      '  - sync parses ~/.codex/sessions/**/rollout-*.jsonl and uploads token_count deltas.',
+      '  - sync parses ~/.codex/sessions/**/rollout-*.jsonl and ~/.code/sessions/**/rollout-*.jsonl (Every Code), then uploads token_count deltas.',
       '  - --debug prints original backend errors when they are normalized.',
       ''
     ].join('\n')

package/src/commands/init.js

@@ -4,7 +4,12 @@ const fs = require('node:fs/promises');
 
 const { ensureDir, writeFileAtomic, readJson, writeJson, chmod600IfPossible } = require('../lib/fs');
 const { prompt, promptHidden } = require('../lib/prompt');
-const { upsertCodexNotify, loadCodexNotifyOriginal } = require('../lib/codex-config');
+const {
+  upsertCodexNotify,
+  loadCodexNotifyOriginal,
+  upsertEveryCodeNotify,
+  loadEveryCodeNotifyOriginal
+} = require('../lib/codex-config');
 const { beginBrowserAuth } = require('../lib/browser-auth');
 const { issueDeviceTokenWithPassword, issueDeviceTokenWithAccessToken } = require('../lib/insforge');
 const { cmdSync } = require('./sync');
@@ -84,6 +89,8 @@ async function cmdInit(argv) {
 
   // Configure Codex notify hook.
   const codexConfigPath = path.join(home, '.codex', 'config.toml');
+  const codeHome = process.env.CODE_HOME || path.join(home, '.code');
+  const codeConfigPath = path.join(codeHome, 'config.toml');
   const notifyCmd = ['/usr/bin/env', 'node', notifyPath];
   const result = await upsertCodexNotify({
     codexConfigPath,
@@ -92,6 +99,19 @@ async function cmdInit(argv) {
   });
 
   const chained = await loadCodexNotifyOriginal(notifyOriginalPath);
+  const codeNotifyOriginalPath = path.join(trackerDir, 'code_notify_original.json');
+  const codeConfigExists = await isFile(codeConfigPath);
+  let codeResult = null;
+  let codeChained = null;
+  if (codeConfigExists) {
+    const codeNotifyCmd = ['/usr/bin/env', 'node', notifyPath, '--source=every-code'];
+    codeResult = await upsertEveryCodeNotify({
+      codeConfigPath,
+      notifyCmd: codeNotifyCmd,
+      notifyOriginalPath: codeNotifyOriginalPath
+    });
+    codeChained = await loadEveryCodeNotifyOriginal(codeNotifyOriginalPath);
+  }
 
   process.stdout.write(
     [
@@ -101,6 +121,17 @@ async function cmdInit(argv) {
       `- Codex config: ${codexConfigPath}`,
       result.changed ? '- Codex notify: updated' : '- Codex notify: already set',
       chained ? '- Codex notify: chained (original preserved)' : '- Codex notify: no original',
+      codeConfigExists ? `- Every Code config: ${codeConfigPath}` : '- Every Code notify: skipped (config.toml not found)',
+      codeConfigExists && codeResult
+        ? codeResult.changed
+          ? '- Every Code notify: updated'
+          : '- Every Code notify: already set'
+        : null,
+      codeConfigExists
+        ? codeChained
+          ? '- Every Code notify: chained (original preserved)'
+          : '- Every Code notify: no original'
+        : null,
       deviceToken ? `- Device token: stored (${maskSecret(deviceToken)})` : '- Device token: not configured (set VIBESCORE_DEVICE_TOKEN and re-run init)',
       ''
     ].join('\n')
@@ -160,12 +191,32 @@ const os = require('node:os');
 const path = require('node:path');
 const cp = require('node:child_process');
 
-const payload = process.argv[2] || '';
+const rawArgs = process.argv.slice(2);
+let source = 'codex';
+const payloadArgs = [];
+for (let i = 0; i < rawArgs.length; i++) {
+  const arg = rawArgs[i];
+  if (arg === '--source') {
+    source = rawArgs[i + 1] || source;
+    i += 1;
+    continue;
+  }
+  if (arg.startsWith('--source=')) {
+    source = arg.slice('--source='.length) || source;
+    continue;
+  }
+  payloadArgs.push(arg);
+}
+
 const trackerDir = ${JSON.stringify(trackerDir)};
 const signalPath = ${JSON.stringify(queueSignalPath)};
-const originalPath = ${JSON.stringify(originalPath)};
+const codexOriginalPath = ${JSON.stringify(originalPath)};
+const codeOriginalPath = ${JSON.stringify(path.join(trackerDir, 'code_notify_original.json'))};
 const trackerBinPath = ${JSON.stringify(trackerBinPath)};
+const depsMarkerPath = path.join(trackerDir, 'app', 'node_modules', '@insforge', 'sdk', 'package.json');
 const fallbackPkg = ${JSON.stringify(fallbackPkg)};
+const selfPath = path.resolve(__filename);
+const home = os.homedir();
 
 try {
   fs.mkdirSync(trackerDir, { recursive: true });
@@ -180,7 +231,9 @@ try {
   try { last = Number(fs.readFileSync(throttlePath, 'utf8')) || 0; } catch (_) {}
   if (now - last > 20_000) {
     try { fs.writeFileSync(throttlePath, String(now), 'utf8'); } catch (_) {}
-    if (fs.existsSync(trackerBinPath)) {
+    const hasLocalRuntime = fs.existsSync(trackerBinPath);
+    const hasLocalDeps = fs.existsSync(depsMarkerPath);
+    if (hasLocalRuntime && hasLocalDeps) {
       spawnDetached([process.execPath, trackerBinPath, 'sync', '--auto', '--from-notify']);
     } else {
       spawnDetached(['npx', '--yes', fallbackPkg, 'sync', '--auto', '--from-notify']);
@@ -188,13 +241,14 @@ try {
   }
 } catch (_) {}
 
-// Chain the original Codex notify if present.
+// Chain the original notify if present.
 try {
+  const originalPath = source === 'every-code' ? codeOriginalPath : codexOriginalPath;
   const original = JSON.parse(fs.readFileSync(originalPath, 'utf8'));
   const cmd = Array.isArray(original?.notify) ? original.notify : null;
-  if (cmd && cmd.length > 0) {
+  if (cmd && cmd.length > 0 && !isSelfNotify(cmd)) {
     const args = cmd.slice(1);
-    args.push(payload);
+    if (payloadArgs.length > 0) args.push(...payloadArgs);
     spawnDetached([cmd[0], ...args]);
   }
 } catch (_) {}
@@ -211,6 +265,22 @@ function spawnDetached(argv) {
     child.unref();
   } catch (_) {}
 }
+
+function resolveMaybeHome(p) {
+  if (typeof p !== 'string') return null;
+  if (p.startsWith('~/')) return path.join(home, p.slice(2));
+  return path.resolve(p);
+}
+
+function isSelfNotify(cmd) {
+  for (const part of cmd) {
+    if (typeof part !== 'string') continue;
+    if (!part.includes('notify.cjs')) continue;
+    const resolved = resolveMaybeHome(part);
+    if (resolved && resolved === selfPath) return true;
+  }
+  return false;
+}
 `;
 }
 
@@ -245,15 +315,26 @@ async function checkUrlReachable(url) {
   }
 }
 
+async function isFile(p) {
+  try {
+    const st = await fs.stat(p);
+    return st.isFile();
+  } catch (_e) {
+    return false;
+  }
+}
+
 async function installLocalTrackerApp({ appDir }) {
   // Copy the current package's runtime (bin + src) into ~/.vibescore so notify can run sync without npx.
   const packageRoot = path.resolve(__dirname, '../..');
   const srcFrom = path.join(packageRoot, 'src');
   const binFrom = path.join(packageRoot, 'bin', 'tracker.js');
+  const nodeModulesFrom = path.join(packageRoot, 'node_modules');
 
   const srcTo = path.join(appDir, 'src');
   const binToDir = path.join(appDir, 'bin');
   const binTo = path.join(binToDir, 'tracker.js');
+  const nodeModulesTo = path.join(appDir, 'node_modules');
 
   await fs.rm(appDir, { recursive: true, force: true }).catch(() => {});
   await ensureDir(appDir);
@@ -261,4 +342,20 @@ async function installLocalTrackerApp({ appDir }) {
   await ensureDir(binToDir);
   await fs.copyFile(binFrom, binTo);
   await fs.chmod(binTo, 0o755).catch(() => {});
+  await copyRuntimeDependencies({ from: nodeModulesFrom, to: nodeModulesTo });
+}
+
+async function copyRuntimeDependencies({ from, to }) {
+  try {
+    const st = await fs.stat(from);
+    if (!st.isDirectory()) return;
+  } catch (_e) {
+    return;
+  }
+
+  try {
+    await fs.cp(from, to, { recursive: true });
+  } catch (_e) {
+    // Best-effort: missing dependencies will fall back to npx at notify time.
+  }
 }

package/src/commands/status.js

@@ -3,7 +3,7 @@ const path = require('node:path');
 const fs = require('node:fs/promises');
 
 const { readJson } = require('../lib/fs');
-const { readCodexNotify } = require('../lib/codex-config');
+const { readCodexNotify, readEveryCodeNotify } = require('../lib/codex-config');
 const { normalizeState: normalizeUploadState } = require('../lib/upload-throttle');
 const { collectTrackerDiagnostics } = require('../lib/diagnostics');
 
@@ -27,6 +27,8 @@ async function cmdStatus(argv = []) {
   const autoRetryPath = path.join(trackerDir, 'auto.retry.json');
   const codexHome = process.env.CODEX_HOME || path.join(home, '.codex');
   const codexConfigPath = path.join(codexHome, 'config.toml');
+  const codeHome = process.env.CODE_HOME || path.join(home, '.code');
+  const codeConfigPath = path.join(codeHome, 'config.toml');
 
   const config = await readJson(configPath);
   const cursors = await readJson(cursorsPath);
@@ -42,6 +44,8 @@ async function cmdStatus(argv = []) {
 
   const codexNotify = await readCodexNotify(codexConfigPath);
   const notifyConfigured = Array.isArray(codexNotify) && codexNotify.length > 0;
+  const everyCodeNotify = await readEveryCodeNotify(codeConfigPath);
+  const everyCodeConfigured = Array.isArray(everyCodeNotify) && everyCodeNotify.length > 0;
 
   const lastUpload = uploadThrottle.lastSuccessMs
     ? parseEpochMsToIso(uploadThrottle.lastSuccessMs)
@@ -75,6 +79,7 @@ async function cmdStatus(argv = []) {
       lastUploadError ? `- Last upload error: ${lastUploadError}` : null,
       autoRetryLine,
       `- Codex notify: ${notifyConfigured ? JSON.stringify(codexNotify) : 'unset'}`,
+      `- Every Code notify: ${everyCodeConfigured ? JSON.stringify(everyCodeNotify) : 'unset'}`,
       ''
     ]
       .filter(Boolean)

package/src/commands/sync.js

@@ -43,8 +43,23 @@ async function cmdSync(argv) {
     let uploadThrottleState = uploadThrottle;
 
     const codexHome = process.env.CODEX_HOME || path.join(home, '.codex');
-    const sessionsDir = path.join(codexHome, 'sessions');
-    const rolloutFiles = await listRolloutFiles(sessionsDir);
+    const codeHome = process.env.CODE_HOME || path.join(home, '.code');
+
+    const sources = [
+      { source: 'codex', sessionsDir: path.join(codexHome, 'sessions') },
+      { source: 'every-code', sessionsDir: path.join(codeHome, 'sessions') }
+    ];
+
+    const rolloutFiles = [];
+    const seenSessions = new Set();
+    for (const entry of sources) {
+      if (seenSessions.has(entry.sessionsDir)) continue;
+      seenSessions.add(entry.sessionsDir);
+      const files = await listRolloutFiles(entry.sessionsDir);
+      for (const filePath of files) {
+        rolloutFiles.push({ path: filePath, source: entry.source });
+      }
+    }
 
     if (progress?.enabled) {
       progress.start(`Parsing ${renderBar(0)} 0/${formatNumber(rolloutFiles.length)} files | buckets 0`);

package/src/commands/uninstall.js

@@ -2,8 +2,7 @@ const os = require('node:os');
 const path = require('node:path');
 const fs = require('node:fs/promises');
 
-const { readJson } = require('../lib/fs');
-const { restoreCodexNotify } = require('../lib/codex-config');
+const { restoreCodexNotify, restoreEveryCodeNotify } = require('../lib/codex-config');
 
 async function cmdUninstall(argv) {
   const opts = parseArgs(argv);
@@ -11,15 +10,32 @@ async function cmdUninstall(argv) {
   const trackerDir = path.join(home, '.vibescore', 'tracker');
   const binDir = path.join(home, '.vibescore', 'bin');
   const codexConfigPath = path.join(home, '.codex', 'config.toml');
+  const codeHome = process.env.CODE_HOME || path.join(home, '.code');
+  const codeConfigPath = path.join(codeHome, 'config.toml');
+  const notifyPath = path.join(binDir, 'notify.cjs');
   const notifyOriginalPath = path.join(trackerDir, 'codex_notify_original.json');
+  const codeNotifyOriginalPath = path.join(trackerDir, 'code_notify_original.json');
+  const codexNotifyCmd = ['/usr/bin/env', 'node', notifyPath];
+  const codeNotifyCmd = ['/usr/bin/env', 'node', notifyPath, '--source=every-code'];
 
-  await restoreCodexNotify({
-    codexConfigPath,
-    notifyOriginalPath
-  });
+  const codexConfigExists = await isFile(codexConfigPath);
+  const codeConfigExists = await isFile(codeConfigPath);
+  const codexRestore = codexConfigExists
+    ? await restoreCodexNotify({
+        codexConfigPath,
+        notifyOriginalPath,
+        notifyCmd: codexNotifyCmd
+      })
+    : { restored: false, skippedReason: 'config-missing' };
+  const codeRestore = codeConfigExists
+    ? await restoreEveryCodeNotify({
+        codeConfigPath,
+        notifyOriginalPath: codeNotifyOriginalPath,
+        notifyCmd: codeNotifyCmd
+      })
+    : { restored: false, skippedReason: 'config-missing' };
 
   // Remove installed notify handler.
-  const notifyPath = path.join(binDir, 'notify.cjs');
   await fs.unlink(notifyPath).catch(() => {});
 
   // Remove local app runtime (installed by init for notify-driven sync).
@@ -32,7 +48,20 @@ async function cmdUninstall(argv) {
   process.stdout.write(
     [
       'Uninstalled:',
-      `- Codex notify restored: ${codexConfigPath}`,
+      codexConfigExists
+        ? codexRestore?.restored
+          ? `- Codex notify restored: ${codexConfigPath}`
+          : codexRestore?.skippedReason === 'no-backup-not-installed'
+            ? '- Codex notify: skipped (no backup; not installed)'
+            : '- Codex notify: no change'
+        : '- Codex notify: skipped (config.toml not found)',
+      codeConfigExists
+        ? codeRestore?.restored
+          ? `- Every Code notify restored: ${codeConfigPath}`
+          : codeRestore?.skippedReason === 'no-backup-not-installed'
+            ? '- Every Code notify: skipped (no backup; not installed)'
+            : '- Every Code notify: no change'
+        : '- Every Code notify: skipped (config.toml not found)',
       opts.purge ? `- Purged: ${path.join(home, '.vibescore')}` : '- Purge: skipped (use --purge)',
       ''
     ].join('\n')
@@ -50,3 +79,12 @@ function parseArgs(argv) {
 }
 
 module.exports = { cmdUninstall };
+
+async function isFile(p) {
+  try {
+    const st = await fs.stat(p);
+    return st.isFile();
+  } catch (_e) {
+    return false;
+  }
+}

package/src/lib/codex-config.js

@@ -3,10 +3,11 @@ const path = require('node:path');
 
 const { ensureDir, readJson, writeJson } = require('./fs');
 
-async function upsertCodexNotify({ codexConfigPath, notifyCmd, notifyOriginalPath }) {
-  const originalText = await fs.readFile(codexConfigPath, 'utf8').catch(() => null);
+async function upsertNotify({ configPath, notifyCmd, notifyOriginalPath, configLabel }) {
+  const originalText = await fs.readFile(configPath, 'utf8').catch(() => null);
   if (originalText == null) {
-    throw new Error(`Codex config not found: ${codexConfigPath}`);
+    const label = typeof configLabel === 'string' && configLabel.length > 0 ? configLabel : 'Config';
+    throw new Error(`${label} not found: ${configPath}`);
   }
 
   const existingNotify = extractNotify(originalText);
@@ -23,39 +24,97 @@ async function upsertCodexNotify({ codexConfigPath, notifyCmd, notifyOriginalPat
     }
 
     const updated = setNotify(originalText, notifyCmd);
-    const backupPath = `${codexConfigPath}.bak.${new Date().toISOString().replace(/[:.]/g, '-')}`;
-    await fs.copyFile(codexConfigPath, backupPath);
-    await fs.writeFile(codexConfigPath, updated, 'utf8');
+    const backupPath = `${configPath}.bak.${new Date().toISOString().replace(/[:.]/g, '-')}`;
+    await fs.copyFile(configPath, backupPath);
+    await fs.writeFile(configPath, updated, 'utf8');
     return { changed: true, backupPath };
   }
 
   return { changed: false, backupPath: null };
 }
 
-async function restoreCodexNotify({ codexConfigPath, notifyOriginalPath }) {
-  const text = await fs.readFile(codexConfigPath, 'utf8').catch(() => null);
-  if (text == null) return;
+async function restoreNotify({ configPath, notifyOriginalPath, expectedNotify }) {
+  const text = await fs.readFile(configPath, 'utf8').catch(() => null);
+  if (text == null) return { restored: false, skippedReason: 'config-missing' };
 
   const original = await readJson(notifyOriginalPath);
   const originalNotify = Array.isArray(original?.notify) ? original.notify : null;
+  const currentNotify = extractNotify(text);
+
+  if (!originalNotify && expectedNotify && !arraysEqual(currentNotify, expectedNotify)) {
+    return { restored: false, skippedReason: 'no-backup-not-installed' };
+  }
 
   const updated = originalNotify ? setNotify(text, originalNotify) : removeNotify(text);
-  const backupPath = `${codexConfigPath}.bak.${new Date().toISOString().replace(/[:.]/g, '-')}`;
-  await fs.copyFile(codexConfigPath, backupPath).catch(() => {});
-  await fs.writeFile(codexConfigPath, updated, 'utf8');
+  if (updated === text) return { restored: false, skippedReason: 'no-change' };
+
+  const backupPath = `${configPath}.bak.${new Date().toISOString().replace(/[:.]/g, '-')}`;
+  await fs.copyFile(configPath, backupPath).catch(() => {});
+  await fs.writeFile(configPath, updated, 'utf8');
+  return { restored: true, skippedReason: null };
 }
 
-async function loadCodexNotifyOriginal(notifyOriginalPath) {
+async function loadNotifyOriginal(notifyOriginalPath) {
   const original = await readJson(notifyOriginalPath);
   return Array.isArray(original?.notify) ? original.notify : null;
 }
 
-async function readCodexNotify(codexConfigPath) {
-  const text = await fs.readFile(codexConfigPath, 'utf8').catch(() => null);
+async function readNotify(configPath) {
+  const text = await fs.readFile(configPath, 'utf8').catch(() => null);
   if (text == null) return null;
   return extractNotify(text);
 }
 
+async function upsertCodexNotify({ codexConfigPath, notifyCmd, notifyOriginalPath }) {
+  return upsertNotify({
+    configPath: codexConfigPath,
+    notifyCmd,
+    notifyOriginalPath,
+    configLabel: 'Codex config'
+  });
+}
+
+async function restoreCodexNotify({ codexConfigPath, notifyOriginalPath, notifyCmd }) {
+  return restoreNotify({
+    configPath: codexConfigPath,
+    notifyOriginalPath,
+    expectedNotify: notifyCmd
+  });
+}
+
+async function loadCodexNotifyOriginal(notifyOriginalPath) {
+  return loadNotifyOriginal(notifyOriginalPath);
+}
+
+async function readCodexNotify(codexConfigPath) {
+  return readNotify(codexConfigPath);
+}
+
+async function upsertEveryCodeNotify({ codeConfigPath, notifyCmd, notifyOriginalPath }) {
+  return upsertNotify({
+    configPath: codeConfigPath,
+    notifyCmd,
+    notifyOriginalPath,
+    configLabel: 'Every Code config'
+  });
+}
+
+async function restoreEveryCodeNotify({ codeConfigPath, notifyOriginalPath, notifyCmd }) {
+  return restoreNotify({
+    configPath: codeConfigPath,
+    notifyOriginalPath,
+    expectedNotify: notifyCmd
+  });
+}
+
+async function loadEveryCodeNotifyOriginal(notifyOriginalPath) {
+  return loadNotifyOriginal(notifyOriginalPath);
+}
+
+async function readEveryCodeNotify(codeConfigPath) {
+  return readNotify(codeConfigPath);
+}
+
 function extractNotify(text) {
   // Heuristic parse: find a line that starts with "notify =".
   const lines = text.split(/\r?\n/);
@@ -150,8 +209,16 @@ function arraysEqual(a, b) {
 }
 
 module.exports = {
+  upsertNotify,
+  restoreNotify,
+  loadNotifyOriginal,
+  readNotify,
   upsertCodexNotify,
   restoreCodexNotify,
   loadCodexNotifyOriginal,
-  readCodexNotify
+  readCodexNotify,
+  upsertEveryCodeNotify,
+  restoreEveryCodeNotify,
+  loadEveryCodeNotifyOriginal,
+  readEveryCodeNotify
 };

package/src/lib/diagnostics.js

@@ -3,12 +3,13 @@ const path = require('node:path');
 const fs = require('node:fs/promises');
 
 const { readJson } = require('./fs');
-const { readCodexNotify } = require('./codex-config');
+const { readCodexNotify, readEveryCodeNotify } = require('./codex-config');
 const { normalizeState: normalizeUploadState } = require('./upload-throttle');
 
 async function collectTrackerDiagnostics({
   home = os.homedir(),
-  codexHome = process.env.CODEX_HOME || path.join(home, '.codex')
+  codexHome = process.env.CODEX_HOME || path.join(home, '.codex'),
+  codeHome = process.env.CODE_HOME || path.join(home, '.code')
 } = {}) {
   const trackerDir = path.join(home, '.vibescore', 'tracker');
   const configPath = path.join(trackerDir, 'config.json');
@@ -20,6 +21,7 @@ async function collectTrackerDiagnostics({
   const uploadThrottlePath = path.join(trackerDir, 'upload.throttle.json');
   const autoRetryPath = path.join(trackerDir, 'auto.retry.json');
   const codexConfigPath = path.join(codexHome, 'config.toml');
+  const codeConfigPath = path.join(codeHome, 'config.toml');
 
   const config = await readJson(configPath);
   const cursors = await readJson(cursorsPath);
@@ -37,6 +39,9 @@ async function collectTrackerDiagnostics({
   const codexNotifyRaw = await readCodexNotify(codexConfigPath);
   const notifyConfigured = Array.isArray(codexNotifyRaw) && codexNotifyRaw.length > 0;
   const codexNotify = notifyConfigured ? codexNotifyRaw.map((v) => redactValue(v, home)) : null;
+  const everyCodeNotifyRaw = await readEveryCodeNotify(codeConfigPath);
+  const everyCodeConfigured = Array.isArray(everyCodeNotifyRaw) && everyCodeNotifyRaw.length > 0;
+  const everyCodeNotify = everyCodeConfigured ? everyCodeNotifyRaw.map((v) => redactValue(v, home)) : null;
 
   const lastSuccessAt = uploadThrottle.lastSuccessMs ? new Date(uploadThrottle.lastSuccessMs).toISOString() : null;
   const autoRetryAt = parseEpochMsToIso(autoRetry?.retryAtMs);
@@ -53,7 +58,9 @@ async function collectTrackerDiagnostics({
     paths: {
       tracker_dir: redactValue(trackerDir, home),
       codex_home: redactValue(codexHome, home),
-      codex_config: redactValue(codexConfigPath, home)
+      codex_config: redactValue(codexConfigPath, home),
+      code_home: redactValue(codeHome, home),
+      code_config: redactValue(codeConfigPath, home)
     },
     config: {
       base_url: typeof config?.baseUrl === 'string' ? config.baseUrl : null,
@@ -75,7 +82,9 @@ async function collectTrackerDiagnostics({
       last_notify: lastNotify,
       last_notify_triggered_sync: lastNotifySpawn,
       codex_notify_configured: notifyConfigured,
-      codex_notify: codexNotify
+      codex_notify: codexNotify,
+      every_code_notify_configured: everyCodeConfigured,
+      every_code_notify: everyCodeNotify
     },
     upload: {
       last_success_at: lastSuccessAt,

package/src/lib/rollout.js

@@ -5,6 +5,9 @@ const readline = require('node:readline');
 
 const { ensureDir } = require('./fs');
 
+const DEFAULT_SOURCE = 'codex';
+const SOURCE_SEPARATOR = '|';
+
 async function listRolloutFiles(sessionsDir) {
   const out = [];
   const years = await safeReadDir(sessionsDir);
@@ -33,7 +36,7 @@ async function listRolloutFiles(sessionsDir) {
   return out;
 }
 
-async function parseRolloutIncremental({ rolloutFiles, cursors, queuePath, onProgress }) {
+async function parseRolloutIncremental({ rolloutFiles, cursors, queuePath, onProgress, source }) {
   await ensureDir(path.dirname(queuePath));
   let filesProcessed = 0;
   let eventsAggregated = 0;
@@ -42,13 +45,18 @@ async function parseRolloutIncremental({ rolloutFiles, cursors, queuePath, onPro
   const totalFiles = Array.isArray(rolloutFiles) ? rolloutFiles.length : 0;
   const hourlyState = normalizeHourlyState(cursors?.hourly);
   const touchedBuckets = new Set();
+  const defaultSource = normalizeSourceInput(source) || DEFAULT_SOURCE;
 
   if (!cursors.files || typeof cursors.files !== 'object') {
     cursors.files = {};
   }
 
   for (let idx = 0; idx < rolloutFiles.length; idx++) {
-    const filePath = rolloutFiles[idx];
+    const entry = rolloutFiles[idx];
+    const filePath = typeof entry === 'string' ? entry : entry?.path;
+    if (!filePath) continue;
+    const fileSource =
+      typeof entry === 'string' ? defaultSource : normalizeSourceInput(entry?.source) || defaultSource;
     const st = await fs.stat(filePath).catch(() => null);
     if (!st || !st.isFile()) continue;
 
@@ -65,7 +73,8 @@ async function parseRolloutIncremental({ rolloutFiles, cursors, queuePath, onPro
       lastTotal,
       lastModel,
       hourlyState,
-      touchedBuckets
+      touchedBuckets,
+      source: fileSource
     });
 
     cursors.files[key] = {
@@ -98,7 +107,15 @@ async function parseRolloutIncremental({ rolloutFiles, cursors, queuePath, onPro
   return { filesProcessed, eventsAggregated, bucketsQueued };
 }
 
-async function parseRolloutFile({ filePath, startOffset, lastTotal, lastModel, hourlyState, touchedBuckets }) {
+async function parseRolloutFile({
+  filePath,
+  startOffset,
+  lastTotal,
+  lastModel,
+  hourlyState,
+  touchedBuckets,
+  source
+}) {
   const st = await fs.stat(filePath);
   const endOffset = st.size;
   if (startOffset >= endOffset) {
@@ -130,13 +147,13 @@ async function parseRolloutFile({ filePath, startOffset, lastTotal, lastModel, h
       continue;
     }
 
-    const payload = obj?.payload;
-    if (!payload || payload.type !== 'token_count') continue;
+    const token = extractTokenCount(obj);
+    if (!token) continue;
 
-    const info = payload.info;
+    const info = token.info;
     if (!info || typeof info !== 'object') continue;
 
-    const tokenTimestamp = typeof obj.timestamp === 'string' ? obj.timestamp : null;
+    const tokenTimestamp = typeof token.timestamp === 'string' ? token.timestamp : null;
     if (!tokenTimestamp) continue;
 
     const lastUsage = info.last_token_usage;
@@ -152,9 +169,9 @@ async function parseRolloutFile({ filePath, startOffset, lastTotal, lastModel, h
     const bucketStart = toUtcHalfHourStart(tokenTimestamp);
     if (!bucketStart) continue;
 
-    const bucket = getHourlyBucket(hourlyState, bucketStart);
+    const bucket = getHourlyBucket(hourlyState, source, bucketStart);
     addTotals(bucket.totals, delta);
-    touchedBuckets.add(bucketStart);
+    touchedBuckets.add(bucketKey(source, bucketStart));
     eventsAggregated += 1;
   }
 
@@ -166,13 +183,17 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
 
   const toAppend = [];
   for (const bucketStart of touchedBuckets) {
-    const bucket = hourlyState.buckets[bucketStart];
+    const parsedKey = parseBucketKey(bucketStart);
+    const source = parsedKey.source || DEFAULT_SOURCE;
+    const hourStart = parsedKey.hourStart;
+    const bucket = hourlyState.buckets[bucketKey(source, hourStart)] || hourlyState.buckets[bucketStart];
     if (!bucket || !bucket.totals) continue;
     const key = totalsKey(bucket.totals);
     if (bucket.queuedKey === key) continue;
     toAppend.push(
       JSON.stringify({
-        hour_start: bucketStart,
+        source,
+        hour_start: hourStart,
         input_tokens: bucket.totals.input_tokens,
         cached_input_tokens: bucket.totals.cached_input_tokens,
         output_tokens: bucket.totals.output_tokens,
@@ -192,7 +213,15 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
 
 function normalizeHourlyState(raw) {
   const state = raw && typeof raw === 'object' ? raw : {};
-  const buckets = state.buckets && typeof state.buckets === 'object' ? state.buckets : {};
+  const rawBuckets = state.buckets && typeof state.buckets === 'object' ? state.buckets : {};
+  const buckets = {};
+  for (const [key, value] of Object.entries(rawBuckets)) {
+    if (key.includes(SOURCE_SEPARATOR)) {
+      buckets[key] = value;
+      continue;
+    }
+    buckets[bucketKey(DEFAULT_SOURCE, key)] = value;
+  }
   return {
     version: 1,
     buckets,
@@ -200,12 +229,14 @@ function normalizeHourlyState(raw) {
   };
 }
 
-function getHourlyBucket(state, hourStart) {
+function getHourlyBucket(state, source, hourStart) {
   const buckets = state.buckets;
-  let bucket = buckets[hourStart];
+  const normalizedSource = normalizeSourceInput(source) || DEFAULT_SOURCE;
+  const key = bucketKey(normalizedSource, hourStart);
+  let bucket = buckets[key];
   if (!bucket || typeof bucket !== 'object') {
     bucket = { totals: initTotals(), queuedKey: null };
-    buckets[hourStart] = bucket;
+    buckets[key] = bucket;
     return bucket;
   }
 
@@ -267,6 +298,37 @@ function toUtcHalfHourStart(ts) {
   return bucketStart.toISOString();
 }
 
+function bucketKey(source, hourStart) {
+  const safeSource = normalizeSourceInput(source) || DEFAULT_SOURCE;
+  return `${safeSource}${SOURCE_SEPARATOR}${hourStart}`;
+}
+
+function parseBucketKey(key) {
+  if (typeof key !== 'string') return { source: DEFAULT_SOURCE, hourStart: '' };
+  const idx = key.indexOf(SOURCE_SEPARATOR);
+  if (idx <= 0) return { source: DEFAULT_SOURCE, hourStart: key };
+  return { source: key.slice(0, idx), hourStart: key.slice(idx + 1) };
+}
+
+function normalizeSourceInput(value) {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim().toLowerCase();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function extractTokenCount(obj) {
+  const payload = obj?.payload;
+  if (!payload) return null;
+  if (payload.type === 'token_count') {
+    return { info: payload.info, timestamp: obj?.timestamp || null };
+  }
+  const msg = payload.msg;
+  if (msg && msg.type === 'token_count') {
+    return { info: msg.info, timestamp: obj?.timestamp || null };
+  }
+  return null;
+}
+
 function pickDelta(lastUsage, totalUsage, prevTotals) {
   const hasLast = isNonEmptyObject(lastUsage);
   const hasTotal = isNonEmptyObject(totalUsage);

package/src/lib/uploader.js

@@ -5,6 +5,9 @@ const readline = require('node:readline');
 const { ensureDir, readJson, writeJson } = require('./fs');
 const { ingestHourly } = require('./vibescore-api');
 
+const DEFAULT_SOURCE = 'codex';
+const SOURCE_SEPARATOR = '|';
+
 async function drainQueueToCloud({ baseUrl, deviceToken, queuePath, queueStatePath, maxBatches, batchSize, onProgress }) {
   await ensureDir(require('node:path').dirname(queueStatePath));
 
@@ -70,7 +73,9 @@ async function readBatch(queuePath, startOffset, maxBuckets) {
     }
     const hourStart = typeof bucket?.hour_start === 'string' ? bucket.hour_start : null;
     if (!hourStart) continue;
-    bucketMap.set(hourStart, bucket);
+    const source = normalizeSource(bucket?.source) || DEFAULT_SOURCE;
+    bucket.source = source;
+    bucketMap.set(bucketKey(source, hourStart), bucket);
     linesRead += 1;
     if (linesRead >= maxBuckets) break;
   }
@@ -89,4 +94,14 @@ async function safeFileSize(p) {
   }
 }
 
+function bucketKey(source, hourStart) {
+  return `${source}${SOURCE_SEPARATOR}${hourStart}`;
+}
+
+function normalizeSource(value) {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim().toLowerCase();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
 module.exports = { drainQueueToCloud };