vibeusage 0.2.21 → 0.2.22

package/src/lib/runtime-config.js

@@ -1,23 +1,35 @@
-const DEFAULT_BASE_URL = 'https://5tmappuk.us-east.insforge.app';
-const DEFAULT_DASHBOARD_URL = 'https://www.vibeusage.cc';
+const DEFAULT_BASE_URL = "https://5tmappuk.us-east.insforge.app";
+const DEFAULT_DASHBOARD_URL = "https://www.vibeusage.cc";
 const DEFAULT_HTTP_TIMEOUT_MS = 20_000;
 
 function resolveRuntimeConfig({ cli = {}, config = {}, env = process.env, defaults = {} } = {}) {
-  const baseUrl = pickString(cli.baseUrl, config.baseUrl, env?.VIBEUSAGE_INSFORGE_BASE_URL, defaults.baseUrl, DEFAULT_BASE_URL);
+  const baseUrl = pickString(
+    cli.baseUrl,
+    config.baseUrl,
+    env?.VIBEUSAGE_INSFORGE_BASE_URL,
+    defaults.baseUrl,
+    DEFAULT_BASE_URL,
+  );
   const dashboardUrl = pickString(
     cli.dashboardUrl,
     config.dashboardUrl,
     env?.VIBEUSAGE_DASHBOARD_URL,
     defaults.dashboardUrl,
-    DEFAULT_DASHBOARD_URL
+    DEFAULT_DASHBOARD_URL,
+  );
+  const deviceToken = pickString(
+    cli.deviceToken,
+    config.deviceToken,
+    env?.VIBEUSAGE_DEVICE_TOKEN,
+    defaults.deviceToken,
+    null,
   );
-  const deviceToken = pickString(cli.deviceToken, config.deviceToken, env?.VIBEUSAGE_DEVICE_TOKEN, defaults.deviceToken, null);
   const httpTimeoutMs = pickHttpTimeoutMs(
     cli.httpTimeoutMs,
     config.httpTimeoutMs,
     env?.VIBEUSAGE_HTTP_TIMEOUT_MS,
     defaults.httpTimeoutMs,
-    DEFAULT_HTTP_TIMEOUT_MS
+    DEFAULT_HTTP_TIMEOUT_MS,
   );
   const debug = pickBoolean(cli.debug, config.debug, env?.VIBEUSAGE_DEBUG, defaults.debug, false);
   const insforgeAnonKey = pickString(
@@ -25,15 +37,15 @@ function resolveRuntimeConfig({ cli = {}, config = {}, env = process.env, defaul
     config.insforgeAnonKey,
     env?.VIBEUSAGE_INSFORGE_ANON_KEY,
     defaults.insforgeAnonKey,
-    ''
+    "",
   );
-  if (insforgeAnonKey.value == null) insforgeAnonKey.value = '';
+  if (insforgeAnonKey.value == null) insforgeAnonKey.value = "";
   const autoRetryNoSpawn = pickBoolean(
     cli.autoRetryNoSpawn,
     config.autoRetryNoSpawn,
     env?.VIBEUSAGE_AUTO_RETRY_NO_SPAWN,
     defaults.autoRetryNoSpawn,
-    false
+    false,
   );
 
   return {
@@ -51,8 +63,8 @@ function resolveRuntimeConfig({ cli = {}, config = {}, env = process.env, defaul
       httpTimeoutMs: httpTimeoutMs.source,
       debug: debug.source,
       insforgeAnonKey: insforgeAnonKey.source,
-      autoRetryNoSpawn: autoRetryNoSpawn.source
-    }
+      autoRetryNoSpawn: autoRetryNoSpawn.source,
+    },
   };
 }
 
@@ -69,37 +81,37 @@ function pickHttpTimeoutMs(...candidates) {
 }
 
 function pickValue(candidates, normalize) {
-  const labels = ['cli', 'config', 'env', 'default', 'default'];
+  const labels = ["cli", "config", "env", "default", "default"];
   for (let i = 0; i < candidates.length; i += 1) {
     const value = normalize(candidates[i]);
     if (value !== undefined) {
-      return { value, source: labels[i] || 'default' };
+      return { value, source: labels[i] || "default" };
     }
   }
-  return { value: null, source: 'default' };
+  return { value: null, source: "default" };
 }
 
 function normalizeString(value) {
-  if (typeof value !== 'string') return undefined;
+  if (typeof value !== "string") return undefined;
   const trimmed = value.trim();
   if (!trimmed) return undefined;
   return trimmed;
 }
 
 function normalizeBoolean(value) {
-  if (typeof value === 'boolean') return value;
-  if (typeof value === 'number') return value !== 0;
-  if (typeof value === 'string') {
+  if (typeof value === "boolean") return value;
+  if (typeof value === "number") return value !== 0;
+  if (typeof value === "string") {
     const trimmed = value.trim().toLowerCase();
     if (!trimmed) return undefined;
-    if (trimmed === '1' || trimmed === 'true') return true;
-    if (trimmed === '0' || trimmed === 'false') return false;
+    if (trimmed === "1" || trimmed === "true") return true;
+    if (trimmed === "0" || trimmed === "false") return false;
   }
   return undefined;
 }
 
 function normalizeHttpTimeoutMs(value) {
-  if (value == null || value === '') return undefined;
+  if (value == null || value === "") return undefined;
   const n = Number(value);
   if (!Number.isFinite(n)) return undefined;
   if (n <= 0) return 0;
@@ -116,5 +128,5 @@ module.exports = {
   DEFAULT_BASE_URL,
   DEFAULT_DASHBOARD_URL,
   DEFAULT_HTTP_TIMEOUT_MS,
-  resolveRuntimeConfig
+  resolveRuntimeConfig,
 };

package/src/lib/subscriptions.js

@@ -1,38 +1,40 @@
-const os = require('node:os');
-const path = require('node:path');
-const fs = require('node:fs');
-const cp = require('node:child_process');
+const os = require("node:os");
+const path = require("node:path");
+const fs = require("node:fs");
+const cp = require("node:child_process");
 
-const { readJson } = require('./fs');
+const { readJson } = require("./fs");
+const { resolveTrackerPaths } = require("./tracker-paths");
+const { probeOpenclawSessionPluginState } = require("./openclaw-session-plugin");
 
-const OPENAI_AUTH_CLAIM = 'https://api.openai.com/auth';
-const MACOS_SECURITY_BIN = '/usr/bin/security';
-const CLAUDE_CODE_KEYCHAIN_SERVICES = ['Claude Code-credentials'];
+const OPENAI_AUTH_CLAIM = "https://api.openai.com/auth";
+const MACOS_SECURITY_BIN = "/usr/bin/security";
+const CLAUDE_CODE_KEYCHAIN_SERVICES = ["Claude Code-credentials"];
 
 function normalizeString(value) {
-  if (typeof value !== 'string') return null;
+  if (typeof value !== "string") return null;
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : null;
 }
 
 function normalizeScalarToString(value) {
   if (value === null || value === undefined) return null;
-  if (typeof value === 'string') return normalizeString(value);
-  if (typeof value === 'number') {
+  if (typeof value === "string") return normalizeString(value);
+  if (typeof value === "number") {
     if (!Number.isFinite(value)) return null;
     return normalizeString(String(value));
   }
-  if (typeof value === 'boolean') return value ? 'true' : 'false';
+  if (typeof value === "boolean") return value ? "true" : "false";
   return null;
 }
 
 function base64UrlDecodeToString(value) {
-  if (typeof value !== 'string' || value.length === 0) return null;
+  if (typeof value !== "string" || value.length === 0) return null;
   const padLen = (4 - (value.length % 4)) % 4;
-  const padded = value + '='.repeat(padLen);
-  const base64 = padded.replace(/-/g, '+').replace(/_/g, '/');
+  const padded = value + "=".repeat(padLen);
+  const base64 = padded.replace(/-/g, "+").replace(/_/g, "/");
   try {
-    return Buffer.from(base64, 'base64').toString('utf8');
+    return Buffer.from(base64, "base64").toString("utf8");
   } catch (_e) {
     return null;
   }
@@ -41,7 +43,7 @@ function base64UrlDecodeToString(value) {
 function decodeJwtPayload(token) {
   const jwt = normalizeString(token);
   if (!jwt) return null;
-  const parts = jwt.split('.');
+  const parts = jwt.split(".");
   if (parts.length < 2) return null;
   const decoded = base64UrlDecodeToString(parts[1]);
   if (!decoded) return null;
@@ -53,9 +55,9 @@ function decodeJwtPayload(token) {
 }
 
 function extractOpenAiAuthNamespace(payload) {
-  if (!payload || typeof payload !== 'object') return null;
+  if (!payload || typeof payload !== "object") return null;
   const ns = payload[OPENAI_AUTH_CLAIM];
-  if (!ns || typeof ns !== 'object' || Array.isArray(ns)) return null;
+  if (!ns || typeof ns !== "object" || Array.isArray(ns)) return null;
   return ns;
 }
 
@@ -80,7 +82,7 @@ function mergeSubscription(primary, secondary) {
     planType: a.planType || b.planType || null,
     activeStart: a.activeStart || b.activeStart || null,
     activeUntil: a.activeUntil || b.activeUntil || null,
-    lastChecked: a.lastChecked || b.lastChecked || null
+    lastChecked: a.lastChecked || b.lastChecked || null,
   };
 }
 
@@ -88,26 +90,26 @@ function isDisplayablePlanType(planType) {
   const normalized = normalizeString(planType);
   if (!normalized) return false;
   const v = normalized.toLowerCase();
-  if (v === 'free' || v === 'none' || v === 'unknown') return false;
+  if (v === "free" || v === "none" || v === "unknown") return false;
   return true;
 }
 
 function resolveCodexHome({ home, env }) {
   const explicit = normalizeString(env?.CODEX_HOME);
-  return explicit ? path.resolve(explicit) : path.join(home, '.codex');
+  return explicit ? path.resolve(explicit) : path.join(home, ".codex");
 }
 
 function resolveOpencodeDataDir({ home, env }) {
   const explicit = normalizeString(env?.XDG_DATA_HOME);
-  const base = explicit ? path.resolve(explicit) : path.join(home, '.local', 'share');
-  return path.join(base, 'opencode');
+  const base = explicit ? path.resolve(explicit) : path.join(home, ".local", "share");
+  return path.join(base, "opencode");
 }
 
 async function detectCodexChatgptSubscription({ home, env }) {
   const codexHome = resolveCodexHome({ home, env });
-  const authPath = path.join(codexHome, 'auth.json');
+  const authPath = path.join(codexHome, "auth.json");
   const auth = await readJson(authPath);
-  if (!auth || typeof auth !== 'object') return null;
+  if (!auth || typeof auth !== "object") return null;
 
   const accessPayload = decodeJwtPayload(auth?.tokens?.access_token);
   const idPayload = decodeJwtPayload(auth?.tokens?.id_token);
@@ -118,114 +120,95 @@ async function detectCodexChatgptSubscription({ home, env }) {
   if (!merged || !isDisplayablePlanType(merged.planType)) return null;
 
   return {
-    tool: 'codex',
-    provider: 'openai',
-    product: 'chatgpt',
+    tool: "codex",
+    provider: "openai",
+    product: "chatgpt",
     planType: merged.planType,
     activeStart: merged.activeStart,
     activeUntil: merged.activeUntil,
-    lastChecked: merged.lastChecked
+    lastChecked: merged.lastChecked,
   };
 }
 
 async function detectOpencodeChatgptSubscription({ home, env }) {
   const dataDir = resolveOpencodeDataDir({ home, env });
-  const authPath = path.join(dataDir, 'auth.json');
+  const authPath = path.join(dataDir, "auth.json");
   const auth = await readJson(authPath);
-  if (!auth || typeof auth !== 'object') return null;
+  if (!auth || typeof auth !== "object") return null;
 
   const accessPayload = decodeJwtPayload(auth?.openai?.access);
   const info = extractChatgptSubscriptionFromPayload(accessPayload);
   if (!info || !isDisplayablePlanType(info.planType)) return null;
 
   return {
-    tool: 'opencode',
-    provider: 'openai',
-    product: 'chatgpt',
+    tool: "opencode",
+    provider: "openai",
+    product: "chatgpt",
     planType: info.planType,
     activeStart: info.activeStart,
     activeUntil: info.activeUntil,
-    lastChecked: info.lastChecked
+    lastChecked: info.lastChecked,
   };
 }
 
-function probeMacosKeychainGenericPassword({
-  service,
-  securityRunner,
-  timeoutMs
-} = {}) {
+function probeMacosKeychainGenericPassword({ service, securityRunner, timeoutMs } = {}) {
   const svc = normalizeString(service);
   if (!svc) return false;
 
-  const runner = typeof securityRunner === 'function' ? securityRunner : cp.spawnSync;
+  const runner = typeof securityRunner === "function" ? securityRunner : cp.spawnSync;
   if (runner === cp.spawnSync && !fs.existsSync(MACOS_SECURITY_BIN)) return false;
 
-  const result = runner(
-    MACOS_SECURITY_BIN,
-    ['find-generic-password', '-s', svc],
-    {
-      stdio: 'ignore',
-      timeout: Number.isFinite(timeoutMs) ? timeoutMs : 2000
-    }
-  );
+  const result = runner(MACOS_SECURITY_BIN, ["find-generic-password", "-s", svc], {
+    stdio: "ignore",
+    timeout: Number.isFinite(timeoutMs) ? timeoutMs : 2000,
+  });
 
   if (!result || result.error) return false;
   return result.status === 0;
 }
 
-function readMacosKeychainPassword({
-  service,
-  securityRunner,
-  timeoutMs
-} = {}) {
+function readMacosKeychainPassword({ service, securityRunner, timeoutMs } = {}) {
   const svc = normalizeString(service);
   if (!svc) return null;
 
-  const runner = typeof securityRunner === 'function' ? securityRunner : cp.spawnSync;
+  const runner = typeof securityRunner === "function" ? securityRunner : cp.spawnSync;
   if (runner === cp.spawnSync && !fs.existsSync(MACOS_SECURITY_BIN)) return null;
 
-  const result = runner(
-    MACOS_SECURITY_BIN,
-    ['find-generic-password', '-s', svc, '-w'],
-    {
-      stdio: ['ignore', 'pipe', 'ignore'],
-      timeout: Number.isFinite(timeoutMs) ? timeoutMs : 2000,
-      encoding: 'utf8'
-    }
-  );
+  const result = runner(MACOS_SECURITY_BIN, ["find-generic-password", "-s", svc, "-w"], {
+    stdio: ["ignore", "pipe", "ignore"],
+    timeout: Number.isFinite(timeoutMs) ? timeoutMs : 2000,
+    encoding: "utf8",
+  });
 
   if (!result || result.error) return null;
   if (result.status !== 0) return null;
 
   const stdout =
-    typeof result.stdout === 'string'
+    typeof result.stdout === "string"
       ? result.stdout
       : Buffer.isBuffer(result.stdout)
-        ? result.stdout.toString('utf8')
-        : '';
+        ? result.stdout.toString("utf8")
+        : "";
   const trimmed = stdout.trim();
   return trimmed.length > 0 ? trimmed : null;
 }
 
-function detectClaudeCodeCredentialsPresence({
-  platform,
-  securityRunner
-} = {}) {
-  if (platform !== 'darwin') return null;
+function detectClaudeCodeCredentialsPresence({ platform, securityRunner } = {}) {
+  if (platform !== "darwin") return null;
 
   for (const service of CLAUDE_CODE_KEYCHAIN_SERVICES) {
     const present = probeMacosKeychainGenericPassword({
       service,
-      securityRunner
+      securityRunner,
     });
     if (!present) continue;
 
     // Existence-only probe: do not read secrets or infer paid tier.
     return {
-      tool: 'claude',
-      provider: 'anthropic',
-      product: 'credentials',
-      planType: 'present'
+      tool: "claude",
+      provider: "anthropic",
+      product: "credentials",
+      planType: "present",
     };
   }
 
@@ -233,10 +216,10 @@ function detectClaudeCodeCredentialsPresence({
 }
 
 function extractClaudeKeychainSubscription(payload) {
-  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) return null;
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return null;
 
   const oauth = payload.claudeAiOauth;
-  if (!oauth || typeof oauth !== 'object' || Array.isArray(oauth)) return null;
+  if (!oauth || typeof oauth !== "object" || Array.isArray(oauth)) return null;
 
   const subscriptionType = normalizeScalarToString(oauth.subscriptionType);
   const rateLimitTier = normalizeScalarToString(oauth.rateLimitTier);
@@ -245,16 +228,13 @@ function extractClaudeKeychainSubscription(payload) {
   return { subscriptionType, rateLimitTier };
 }
 
-function detectClaudeCodeSubscriptionDetails({
-  platform,
-  securityRunner
-} = {}) {
-  if (platform !== 'darwin') return null;
+function detectClaudeCodeSubscriptionDetails({ platform, securityRunner } = {}) {
+  if (platform !== "darwin") return null;
 
   for (const service of CLAUDE_CODE_KEYCHAIN_SERVICES) {
     const raw = readMacosKeychainPassword({
       service,
-      securityRunner
+      securityRunner,
     });
     if (!raw) continue;
 
@@ -269,11 +249,11 @@ function detectClaudeCodeSubscriptionDetails({
     if (!info) continue;
 
     return {
-      tool: 'claude',
-      provider: 'anthropic',
-      product: 'subscription',
+      tool: "claude",
+      provider: "anthropic",
+      product: "subscription",
       planType: info.subscriptionType,
-      rateLimitTier: info.rateLimitTier
+      rateLimitTier: info.rateLimitTier,
     };
   }
 
@@ -286,7 +266,7 @@ async function collectLocalSubscriptions({
   platform = process.platform,
   securityRunner,
   probeKeychain = false,
-  probeKeychainDetails = false
+  probeKeychainDetails = false,
 } = {}) {
   const out = [];
 
@@ -308,10 +288,32 @@ async function collectLocalSubscriptions({
     if (claude) out.push(claude);
   }
 
+  const openclaw = await detectOpenclawSessionIntegration({ home, env });
+  if (openclaw) out.push(openclaw);
+
   // Gemini: no stable local subscription/tier signal found yet.
   return out;
 }
 
+async function detectOpenclawSessionIntegration({ home, env }) {
+  const { trackerDir } = await resolveTrackerPaths({ home });
+  let state = null;
+  try {
+    state = await probeOpenclawSessionPluginState({ home, trackerDir, env });
+  } catch (_err) {
+    return null;
+  }
+
+  if (!state?.configured) return null;
+
+  return {
+    tool: "openclaw",
+    provider: "openclaw",
+    product: "session_plugin",
+    planType: "enabled",
+  };
+}
+
 module.exports = {
-  collectLocalSubscriptions
+  collectLocalSubscriptions,
 };

package/src/lib/tracker-paths.js

@@ -1,15 +1,15 @@
-const os = require('node:os');
-const path = require('node:path');
+const os = require("node:os");
+const path = require("node:path");
 
 async function resolveTrackerPaths({ home = os.homedir() } = {}) {
-  const rootDir = path.join(home, '.vibeusage');
+  const rootDir = path.join(home, ".vibeusage");
   return {
     rootDir,
-    trackerDir: path.join(rootDir, 'tracker'),
-    binDir: path.join(rootDir, 'bin')
+    trackerDir: path.join(rootDir, "tracker"),
+    binDir: path.join(rootDir, "bin"),
   };
 }
 
 module.exports = {
-  resolveTrackerPaths
+  resolveTrackerPaths,
 };

package/src/lib/upload-throttle.js

@@ -6,20 +6,20 @@ const DEFAULTS = {
   maxBatchesSmall: 2,
   maxBatchesLarge: 4,
   backoffInitialMs: 60_000,
-  backoffMaxMs: 30 * 60_000
+  backoffMaxMs: 30 * 60_000,
 };
 
 function normalizeState(raw) {
-  const s = raw && typeof raw === 'object' ? raw : {};
+  const s = raw && typeof raw === "object" ? raw : {};
   return {
     version: 1,
     lastSuccessMs: toSafeInt(s.lastSuccessMs),
     nextAllowedAtMs: toSafeInt(s.nextAllowedAtMs),
     backoffUntilMs: toSafeInt(s.backoffUntilMs),
     backoffStep: toSafeInt(s.backoffStep),
-    lastErrorAt: typeof s.lastErrorAt === 'string' ? s.lastErrorAt : null,
-    lastError: typeof s.lastError === 'string' ? s.lastError : null,
-    updatedAt: typeof s.updatedAt === 'string' ? s.updatedAt : null
+    lastErrorAt: typeof s.lastErrorAt === "string" ? s.lastErrorAt : null,
+    lastError: typeof s.lastError === "string" ? s.lastError : null,
+    updatedAt: typeof s.updatedAt === "string" ? s.updatedAt : null,
   };
 }
 
@@ -29,22 +29,41 @@ function decideAutoUpload({ nowMs, pendingBytes, state, config }) {
   const pending = Number(pendingBytes || 0);
 
   if (pending <= 0) {
-    return { allowed: false, reason: 'no-pending', maxBatches: 0, batchSize: cfg.batchSize, blockedUntilMs: 0 };
+    return {
+      allowed: false,
+      reason: "no-pending",
+      maxBatches: 0,
+      batchSize: cfg.batchSize,
+      blockedUntilMs: 0,
+    };
   }
 
   const blockedUntilMs = Math.max(s.nextAllowedAtMs || 0, s.backoffUntilMs || 0);
   if (blockedUntilMs > 0 && nowMs < blockedUntilMs) {
-    return { allowed: false, reason: 'throttled', maxBatches: 0, batchSize: cfg.batchSize, blockedUntilMs };
+    return {
+      allowed: false,
+      reason: "throttled",
+      maxBatches: 0,
+      batchSize: cfg.batchSize,
+      blockedUntilMs,
+    };
   }
 
   const maxBatches = pending >= cfg.backlogBytes ? cfg.maxBatchesLarge : cfg.maxBatchesSmall;
-  return { allowed: true, reason: 'allowed', maxBatches, batchSize: cfg.batchSize, blockedUntilMs: 0 };
+  return {
+    allowed: true,
+    reason: "allowed",
+    maxBatches,
+    batchSize: cfg.batchSize,
+    blockedUntilMs: 0,
+  };
 }
 
 function recordUploadSuccess({ nowMs, state, config, randInt }) {
   const cfg = { ...DEFAULTS, ...(config || {}) };
   const s = normalizeState(state);
-  const jitter = typeof randInt === 'function' ? randInt(0, cfg.jitterMsMax) : randomInt(0, cfg.jitterMsMax);
+  const jitter =
+    typeof randInt === "function" ? randInt(0, cfg.jitterMsMax) : randomInt(0, cfg.jitterMsMax);
   const nextAllowedAtMs = nowMs + cfg.intervalMs + jitter;
 
   return {
@@ -55,7 +74,7 @@ function recordUploadSuccess({ nowMs, state, config, randInt }) {
     backoffStep: 0,
     lastErrorAt: null,
     lastError: null,
-    updatedAt: new Date(nowMs).toISOString()
+    updatedAt: new Date(nowMs).toISOString(),
   };
 }
 
@@ -83,13 +102,13 @@ function recordUploadFailure({ nowMs, state, error, config }) {
     backoffUntilMs,
     backoffStep: Math.min(20, (s.backoffStep || 0) + 1),
     lastErrorAt: new Date(nowMs).toISOString(),
-    lastError: truncate(String(error?.message || 'upload failed'), 200),
-    updatedAt: new Date(nowMs).toISOString()
+    lastError: truncate(String(error?.message || "upload failed"), 200),
+    updatedAt: new Date(nowMs).toISOString(),
   };
 }
 
 function parseRetryAfterMs(headerValue, nowMs = Date.now()) {
-  if (typeof headerValue !== 'string' || headerValue.trim().length === 0) return null;
+  if (typeof headerValue !== "string" || headerValue.trim().length === 0) return null;
   const v = headerValue.trim();
   const seconds = Number(v);
   if (Number.isFinite(seconds) && seconds >= 0) return Math.floor(seconds * 1000);
@@ -114,9 +133,9 @@ function toSafeInt(v) {
 }
 
 function truncate(s, maxLen) {
-  if (typeof s !== 'string') return '';
+  if (typeof s !== "string") return "";
   if (s.length <= maxLen) return s;
-  return s.slice(0, maxLen - 1) + '…';
+  return s.slice(0, maxLen - 1) + "…";
 }
 
 module.exports = {
@@ -125,5 +144,5 @@ module.exports = {
   decideAutoUpload,
   recordUploadSuccess,
   recordUploadFailure,
-  parseRetryAfterMs
+  parseRetryAfterMs,
 };