@kaitranntt/ccs 8.1.4 → 8.2.0-dev.1

package/dist/web-server/usage/native-quota-collector.js

@@ -0,0 +1,378 @@
+"use strict";
+/**
+ * Native subscription quota collector — the ONLY server-side fetch surface for
+ * the user's own Claude Code + Codex subscription quota.
+ *
+ * The macOS bar reads localhost /api/bar/summary and NEVER calls Anthropic. All
+ * Anthropic traffic originates here, under strict safety controls, because the
+ * OAuth usage endpoint is undocumented and hostile to polling (persistent 429s,
+ * no Retry-After, first-party-only policy). The controls below exist to protect
+ * the user's account:
+ *
+ *   - long TTL (10 min) on-demand cache, never a tight timer loop
+ *   - in-flight coalescing so concurrent /summary calls share one fetch
+ *   - Retry-After honored; exponential backoff + jitter on 429/5xx
+ *   - circuit breaker stops calling after repeated 429s for a cooldown
+ *   - serve-stale-on-failure; only omit a row when there is genuinely no data
+ *
+ * Codex is a pure local file read (no network), so it skips the network guards.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNativeAccountRows = exports.resetNativeQuotaState = void 0;
+const claude_native_credentials_1 = require("./claude-native-credentials");
+const quota_fetcher_claude_1 = require("../../cliproxy/quota/quota-fetcher-claude");
+const codex_local_quota_collector_1 = require("./codex-local-quota-collector");
+// ============================================================================
+// Safety constants (concrete, named, module-level)
+// ============================================================================
+/** On-demand cache TTL. Floor is 5 min; we use 10 min because the bar polls
+ *  /summary far more often than a hook fires. */
+const NATIVE_QUOTA_TTL_MS = 600000; // 10 minutes
+/** Exponential backoff base; delay = min(base * 2^n, MAX) + jitter. */
+const RETRY_BASE_MS = 1000;
+/** Ceiling for any single backoff / Retry-After cooldown derived from one call. */
+const MAX_BACKOFF_MS = 60000; // 1 minute
+/** Jitter added to backoff to avoid synchronized retries. */
+const JITTER_MAX_MS = 500;
+/** Consecutive 429s that trip the breaker open. */
+const CB_TRIP_THRESHOLD = 3;
+/** How long the breaker stays open (zero network) once tripped. */
+const CB_COOLDOWN_MS = 900000; // 15 minutes
+const CLAUDE_PROVIDER = 'claude-code';
+const CODEX_PROVIDER = 'codex';
+function freshProviderState() {
+    return {
+        cachedRow: null,
+        cachedAt: 0,
+        pending: null,
+        consecutive429: 0,
+        breakerOpenUntil: 0,
+        cooldownUntil: 0,
+        backoffAttempt: 0,
+    };
+}
+const claudeState = freshProviderState();
+/** Reset all module state. Tests call this to avoid cross-test pollution. */
+function resetNativeQuotaState() {
+    Object.assign(claudeState, freshProviderState());
+}
+exports.resetNativeQuotaState = resetNativeQuotaState;
+// ============================================================================
+// Helpers
+// ============================================================================
+function defaultSleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/** Parse Retry-After (seconds or HTTP-date) into ms, capped at MAX_BACKOFF_MS. */
+function parseRetryAfterMs(detail, now) {
+    if (!detail)
+        return null;
+    const match = /retry-after:(.+)$/.exec(detail);
+    if (!match)
+        return null;
+    const raw = match[1].trim();
+    const asSeconds = Number(raw);
+    if (Number.isFinite(asSeconds)) {
+        return Math.min(Math.max(0, asSeconds) * 1000, MAX_BACKOFF_MS);
+    }
+    const asDate = Date.parse(raw);
+    if (Number.isFinite(asDate)) {
+        return Math.min(Math.max(0, asDate - now), MAX_BACKOFF_MS);
+    }
+    return null;
+}
+function computeBackoffMs(attempt) {
+    const exp = Math.min(RETRY_BASE_MS * 2 ** attempt, MAX_BACKOFF_MS);
+    const jitter = Math.floor(Math.random() * JITTER_MAX_MS);
+    return exp + jitter;
+}
+/**
+ * Best-guess remaining percentage across the 5h + weekly core windows, mirroring
+ * the CLIProxy quota-manager derivation: min of remaining across non-overage
+ * windows, falling back to all windows if core summary is absent.
+ */
+function deriveClaudeQuotaPercentage(quota) {
+    const coreWindows = [quota.coreUsage?.fiveHour, quota.coreUsage?.weekly].filter((w) => !!w);
+    if (coreWindows.length > 0) {
+        return Math.min(...coreWindows.map((w) => w.remainingPercent));
+    }
+    const usageWindows = quota.windows.filter((w) => w.rateLimitType !== 'overage');
+    if (usageWindows.length > 0) {
+        return Math.min(...usageWindows.map((w) => w.remainingPercent));
+    }
+    return null;
+}
+/** Soonest non-null reset ISO across the two core windows. */
+function deriveClaudeNextReset(quota) {
+    const resets = [quota.coreUsage?.fiveHour?.resetAt, quota.coreUsage?.weekly?.resetAt]
+        .filter((r) => typeof r === 'string')
+        .map((r) => ({ iso: r, ms: new Date(r).getTime() }))
+        .filter((r) => Number.isFinite(r.ms))
+        .sort((a, b) => a.ms - b.ms);
+    return resets.length > 0 ? resets[0].iso : null;
+}
+/** Window length in minutes by Claude rate-limit family. */
+const FIVE_HOUR_MINUTES = 300;
+const SEVEN_DAY_MINUTES = 10080;
+/**
+ * Build the per-window detail for a Claude subscription row.
+ *
+ * 5h + weekly come from coreUsage (the canonical core summary). Opus/Sonnet
+ * weekly splits come from quota.windows[] and only exist on Max plans, so they
+ * are omitted entirely when absent. Each window carries BOTH used and remaining
+ * percent so the bar never re-derives them.
+ */
+function buildClaudeQuotaWindows(quota) {
+    const windows = [];
+    const fiveHour = quota.coreUsage?.fiveHour;
+    if (fiveHour) {
+        windows.push({
+            key: 'five_hour',
+            label: '5h',
+            usedPercent: 100 - fiveHour.remainingPercent,
+            remainingPercent: fiveHour.remainingPercent,
+            resetAt: fiveHour.resetAt,
+            windowMinutes: FIVE_HOUR_MINUTES,
+        });
+    }
+    const weekly = quota.coreUsage?.weekly;
+    if (weekly) {
+        windows.push({
+            key: 'seven_day',
+            label: 'week',
+            usedPercent: 100 - weekly.remainingPercent,
+            remainingPercent: weekly.remainingPercent,
+            resetAt: weekly.resetAt,
+            windowMinutes: SEVEN_DAY_MINUTES,
+        });
+    }
+    // Opus/Sonnet weekly splits are Max-only; surface them when the API carries
+    // them, otherwise omit so non-Max plans get exactly the two core windows.
+    const splitLabels = {
+        seven_day_opus: 'Opus · week',
+        seven_day_sonnet: 'Sonnet · week',
+    };
+    for (const w of quota.windows) {
+        const label = splitLabels[w.rateLimitType];
+        if (!label)
+            continue;
+        windows.push({
+            key: w.rateLimitType,
+            label,
+            usedPercent: w.usedPercent,
+            remainingPercent: w.remainingPercent,
+            resetAt: w.resetAt,
+            windowMinutes: SEVEN_DAY_MINUTES,
+        });
+    }
+    return windows;
+}
+function buildClaudeRow(quota, tier, now) {
+    const quotaWindows = buildClaudeQuotaWindows(quota);
+    return {
+        account_id: CLAUDE_PROVIDER,
+        provider: CLAUDE_PROVIDER,
+        displayName: 'Claude Code',
+        tier,
+        paused: false,
+        quota_percentage: deriveClaudeQuotaPercentage(quota),
+        quotaStatus: 'ok',
+        next_reset: deriveClaudeNextReset(quota),
+        is_default: false,
+        last_activity_at: null,
+        today_cost: null,
+        health: 'ok',
+        cached: false,
+        fetchedAt: new Date(now).toISOString(),
+        needsReauth: false,
+        // Omit the field entirely (rather than an empty array) when no windows
+        // resolved, so the wire shape stays minimal.
+        ...(quotaWindows.length > 0 ? { quotaWindows } : {}),
+    };
+}
+/** Map the Codex local windows into the row's per-window detail shape. */
+function buildCodexQuotaWindows(quota) {
+    return quota.windows.map((w) => ({
+        key: w.key,
+        label: w.label,
+        usedPercent: w.usedPercent,
+        remainingPercent: w.remainingPercent,
+        resetAt: w.resetAt,
+        windowMinutes: w.windowMinutes,
+    }));
+}
+function buildCodexRow(quota, now) {
+    const quotaWindows = buildCodexQuotaWindows(quota);
+    return {
+        account_id: CODEX_PROVIDER,
+        provider: CODEX_PROVIDER,
+        displayName: 'Codex',
+        tier: quota.tier,
+        paused: false,
+        quota_percentage: quota.quotaPercentage,
+        quotaStatus: 'ok',
+        next_reset: quota.nextReset,
+        is_default: false,
+        last_activity_at: null,
+        today_cost: null,
+        // Codex is a local read; a stale source still reflects real usage so we keep
+        // quotaStatus 'ok' but flag health 'warning' to hint freshness.
+        health: quota.stale ? 'warning' : 'ok',
+        cached: false,
+        fetchedAt: new Date(now).toISOString(),
+        needsReauth: false,
+        ...(quotaWindows.length > 0 ? { quotaWindows } : {}),
+        // staleAsOf is only present (and serialized) when the source session is old.
+        ...(quota.staleAsOf ? { staleAsOf: quota.staleAsOf } : {}),
+    };
+}
+/** Return the cached row marked cached=true (used for TTL + stale serving). */
+function serveCached(state) {
+    if (!state.cachedRow)
+        return null;
+    return { ...state.cachedRow, cached: true };
+}
+// ============================================================================
+// Claude path with full safety controls
+// ============================================================================
+async function collectClaudeRow(deps) {
+    const now = (deps.now ?? Date.now)();
+    const state = claudeState;
+    // Serve from cache while within TTL — on-demand only, NO network.
+    if (state.cachedRow && now - state.cachedAt < NATIVE_QUOTA_TTL_MS) {
+        return serveCached(state);
+    }
+    // Breaker open or cooldown active -> zero network, serve stale (may be null).
+    if (now < state.breakerOpenUntil || now < state.cooldownUntil) {
+        return serveCached(state);
+    }
+    // Coalesce: concurrent callers past TTL share one in-flight fetch.
+    if (state.pending) {
+        return state.pending;
+    }
+    const readCredentials = deps.readCredentials ?? claude_native_credentials_1.readClaudeCredentials;
+    const fetchQuota = deps.fetchClaudeQuota ?? quota_fetcher_claude_1.fetchClaudeQuotaWithToken;
+    const sleep = deps.sleep ?? defaultSleep;
+    state.pending = (async () => {
+        try {
+            const creds = readCredentials();
+            // No token / unsupported subscription -> never spend a call, omit the row.
+            if (!creds || !(0, claude_native_credentials_1.hasSupportedSubscription)(creds)) {
+                return serveCached(state);
+            }
+            const token = (0, claude_native_credentials_1.getAccessToken)(creds);
+            if (!token) {
+                return serveCached(state);
+            }
+            const tier = (0, claude_native_credentials_1.getSubscriptionTier)(creds);
+            const quota = await fetchQuota(token, CLAUDE_PROVIDER);
+            if (quota.success) {
+                // Success closes the breaker and clears backoff.
+                state.consecutive429 = 0;
+                state.breakerOpenUntil = 0;
+                state.cooldownUntil = 0;
+                state.backoffAttempt = 0;
+                const row = buildClaudeRow(quota, tier, now);
+                state.cachedRow = row;
+                state.cachedAt = now;
+                return { ...row, cached: false };
+            }
+            // 401 -> token expired. Emit a reauth row so the bar can prompt; this is
+            // a real, actionable state distinct from a transient failure.
+            if (quota.needsReauth) {
+                const row = {
+                    account_id: CLAUDE_PROVIDER,
+                    provider: CLAUDE_PROVIDER,
+                    displayName: 'Claude Code',
+                    tier,
+                    paused: false,
+                    quota_percentage: null,
+                    quotaStatus: 'error',
+                    next_reset: null,
+                    is_default: false,
+                    last_activity_at: null,
+                    today_cost: null,
+                    health: 'error',
+                    cached: false,
+                    fetchedAt: new Date(now).toISOString(),
+                    needsReauth: true,
+                };
+                // Do not cache the reauth row as a good value; it should re-evaluate
+                // once the user re-auths. But return it now.
+                return row;
+            }
+            // 429 / 5xx / transient. Apply backoff + breaker, then serve stale.
+            const is429 = quota.httpStatus === 429;
+            if (is429) {
+                state.consecutive429 += 1;
+                if (state.consecutive429 >= CB_TRIP_THRESHOLD) {
+                    state.breakerOpenUntil = now + CB_COOLDOWN_MS;
+                }
+                const retryAfter = parseRetryAfterMs(quota.errorDetail, now);
+                const backoff = retryAfter ?? computeBackoffMs(state.backoffAttempt);
+                state.cooldownUntil = now + backoff;
+                state.backoffAttempt += 1;
+                // We do NOT sleep-then-retry inside the request path (that would burn
+                // the request budget). The cooldown gates the NEXT call instead.
+                void sleep; // retained as an injectable seam for future inline retry
+            }
+            else if (quota.retryable) {
+                const backoff = computeBackoffMs(state.backoffAttempt);
+                state.cooldownUntil = now + backoff;
+                state.backoffAttempt += 1;
+            }
+            // Serve last good row on failure; omit if we never succeeded.
+            return serveCached(state);
+        }
+        catch {
+            // Network/parse rejection -> treat as transient, serve stale.
+            const backoff = computeBackoffMs(state.backoffAttempt);
+            state.cooldownUntil = now + backoff;
+            state.backoffAttempt += 1;
+            return serveCached(state);
+        }
+        finally {
+            state.pending = null;
+        }
+    })();
+    return state.pending;
+}
+// ============================================================================
+// Codex path (local read, no network guards needed)
+// ============================================================================
+async function collectCodexRow(deps) {
+    const now = (deps.now ?? Date.now)();
+    const getCodex = deps.getCodexQuota ?? codex_local_quota_collector_1.getCodexLocalQuota;
+    try {
+        const quota = await getCodex();
+        if (!quota)
+            return null; // exec-mode / no rate_limits -> omit the row
+        return buildCodexRow(quota, now);
+    }
+    catch {
+        return null;
+    }
+}
+// ============================================================================
+// Public entry point
+// ============================================================================
+/**
+ * Build the native subscription rows (Claude Code + Codex) for /summary.
+ *
+ * Each path is independently try/caught so one failing source never blocks the
+ * other or the response. Returns only rows that represent real data.
+ */
+async function getNativeAccountRows(deps = {}) {
+    const [claude, codex] = await Promise.all([
+        collectClaudeRow(deps).catch(() => null),
+        collectCodexRow(deps).catch(() => null),
+    ]);
+    const rows = [];
+    if (claude)
+        rows.push(claude);
+    if (codex)
+        rows.push(codex);
+    return rows;
+}
+exports.getNativeAccountRows = getNativeAccountRows;
+//# sourceMappingURL=native-quota-collector.js.map

package/dist/web-server/usage/native-quota-collector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"native-quota-collector.js","sourceRoot":"","sources":["../../../src/web-server/usage/native-quota-collector.ts"],"names":[],"mappings":"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"}

package/dist/web-server/usage/profile-filter.d.ts

@@ -5,7 +5,7 @@ export interface ProfileScopedUsageData {
     monthly: MonthlyUsage[];
     session: SessionUsage[];
 }
-export declare function normalizeProfileQuery(profile?: string): string | undefined;
+export declare function normalizeProfileQuery(profile?: unknown): string | undefined;
 export declare function annotateUsageProfile(data: ProfileScopedUsageData, profile: string): ProfileScopedUsageData;
 export declare function filterByProfile<T extends {
     profile?: string;

package/dist/web-server/usage/profile-filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"profile-filter.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/profile-filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnF,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB;AAID,wBAAgB,qBAAqB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO1E;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,MAAM,GACd,sBAAsB,CAOxB;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,CAGhG"}
+{"version":3,"file":"profile-filter.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/profile-filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnF,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB;AAID,wBAAgB,qBAAqB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAY3E;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,MAAM,GACd,sBAAsB,CAOxB;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,CAGhG"}

package/dist/web-server/usage/profile-filter.js

@@ -3,7 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterByProfile = exports.annotateUsageProfile = exports.normalizeProfileQuery = void 0;
 const PROFILE_NAME_REGEX = /^[A-Za-z0-9._-]+$/;
 function normalizeProfileQuery(profile) {
-    const value = profile?.trim();
+    if (profile === undefined)
+        return undefined;
+    if (typeof profile !== 'string') {
+        throw new Error('Invalid profile filter');
+    }
+    const value = profile.trim();
     if (!value || value === 'all')
         return undefined;
     if (!PROFILE_NAME_REGEX.test(value)) {

package/dist/web-server/usage/profile-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"profile-filter.js","sourceRoot":"","sources":["../../../src/web-server/usage/profile-filter.ts"],"names":[],"mappings":";;;AASA,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,MAAM,KAAK,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,KAAK;QAAE,OAAO,SAAS,CAAC;IAChD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,sDAOC;AAED,SAAgB,oBAAoB,CAClC,IAA4B,EAC5B,OAAe;IAEf,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACvD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3D,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;KAC5D,CAAC;AACJ,CAAC;AAVD,oDAUC;AAED,SAAgB,eAAe,CAAiC,IAAS,EAAE,OAAgB;IACzF,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;AACzD,CAAC;AAHD,0CAGC"}
+{"version":3,"file":"profile-filter.js","sourceRoot":"","sources":["../../../src/web-server/usage/profile-filter.ts"],"names":[],"mappings":";;;AASA,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,SAAgB,qBAAqB,CAAC,OAAiB;IACrD,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,KAAK;QAAE,OAAO,SAAS,CAAC;IAChD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,sDAYC;AAED,SAAgB,oBAAoB,CAClC,IAA4B,EAC5B,OAAe;IAEf,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACvD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3D,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;KAC5D,CAAC;AACJ,CAAC;AAVD,oDAUC;AAED,SAAgB,eAAe,CAAiC,IAAS,EAAE,OAAgB;IACzF,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;AACzD,CAAC;AAHD,0CAGC"}

package/dist/web-server/usage/types.d.ts

@@ -19,6 +19,8 @@ export interface DailyUsage {
     date: string;
     /** Stable CCS profile name when the source can be attributed to one. */
     profile?: string;
+    /** Account email/id when the source can be attributed to a specific CLIProxy account. */
+    accountId?: string;
     source: string;
     inputTokens: number;
     outputTokens: number;

package/dist/web-server/usage/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,yCAAyC;AACzC,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AAMD,2CAA2C;AAC3C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yFAAyF;IACzF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC;AAED,kDAAkD;AAClD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,0CAA0C;AAC1C,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC;AAED,sCAAsC;AACtC,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAMD,yCAAyC;AACzC,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,aAAa,EAAE,iBAAiB,CAAC;IACjC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED,gDAAgD;AAChD,MAAM,MAAM,WAAW,GACnB,YAAY,GACZ,eAAe,GACf,YAAY,GACZ,iBAAiB,CAAC;AAEtB,sCAAsC;AACtC,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wCAAwC;AACxC,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,4BAA4B;AAC5B,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,+CAA+C;AAC/C,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,cAAc,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB"}

package/lib/mcp/ccs-browser-server.cjs

@@ -159,6 +159,8 @@ const DEFAULT_WAIT_TIMEOUT_MS = 2000;
 const DEFAULT_WAIT_POLL_INTERVAL_MS = 100;
 const DEFAULT_DRAG_STEPS = 5;
 const MAX_POINTER_ACTIONS = 25;
+const MAX_CLICK_COUNT = 25;
+const MAX_KEY_REPEAT = 25;
 const SESSION_START_SETTLE_WINDOW_MS = 250;
 const MAX_ARTIFACT_FILE_BYTES = 5 * 1024 * 1024;
 const MAX_LOCAL_TRANSFER_FILE_BYTES = 10 * 1024 * 1024;
@@ -454,6 +456,7 @@ function getTools() {
           clickCount: {
             type: 'integer',
             minimum: 1,
+            maximum: MAX_CLICK_COUNT,
             description: 'Optional click count. Defaults to 1.',
           },
         },
@@ -519,6 +522,7 @@ function getTools() {
           repeat: {
             type: 'integer',
             minimum: 1,
+            maximum: MAX_KEY_REPEAT,
             description: 'Optional repeat count. Defaults to 1.',
           },
         },
@@ -1230,11 +1234,16 @@ function getTools() {
   ];
 }
 
-async function fetchJson(url, options = undefined) {
+async function fetchOk(url, options = undefined) {
   const response = await fetch(url, options);
   if (!response.ok) {
     throw new Error(`HTTP ${response.status} for ${url}`);
   }
+  return response;
+}
+
+async function fetchJson(url, options = undefined) {
+  const response = await fetchOk(url, options);
   return await response.json();
 }
 
@@ -2305,10 +2314,13 @@ function requirePositiveIntegerOrDefault(value, label, fallback) {
   return value;
 }
 
-function requirePositiveInteger(value, label) {
+function requirePositiveInteger(value, label, maximum = undefined) {
   if (!Number.isInteger(value) || value <= 0) {
     throw new Error(`${label} must be a positive integer`);
   }
+  if (maximum !== undefined && value > maximum) {
+    throw new Error(`${label} must be less than or equal to ${maximum}`);
+  }
   return value;
 }
 
@@ -3555,7 +3567,7 @@ async function handleClick(toolArgs) {
   const clickCount =
     toolArgs.clickCount === undefined
       ? 1
-      : requirePositiveInteger(toolArgs.clickCount, 'clickCount');
+      : requirePositiveInteger(toolArgs.clickCount, 'clickCount', MAX_CLICK_COUNT);
 
   const expression = `(() => {
     const selector = JSON.parse(${JSON.stringify(JSON.stringify(selector))});
@@ -3805,7 +3817,9 @@ async function handlePressKey(toolArgs) {
     'Shift',
   ]);
   const repeat =
-    toolArgs.repeat === undefined ? 1 : requirePositiveInteger(toolArgs.repeat, 'repeat');
+    toolArgs.repeat === undefined
+      ? 1
+      : requirePositiveInteger(toolArgs.repeat, 'repeat', MAX_KEY_REPEAT);
   const modifierMask =
     (modifiers.includes('Alt') ? 1 : 0) |
     (modifiers.includes('Control') ? 2 : 0) |
@@ -5097,16 +5111,18 @@ async function ensureInterceptSession(page) {
           })
         );
       }
-      pushRecentRequest({
-        requestId: String(paused.requestId || ''),
-        pageId: page.id,
-        url: String(paused.request?.url || ''),
-        method: String(paused.request?.method || ''),
-        resourceType: String(paused.resourceType || ''),
-        matchedRuleId: matchedRule ? matchedRule.ruleId : '',
-        action,
-        statusCode: action === 'fulfill' ? matchedRule.statusCode : 0,
-      });
+      if (matchedRule) {
+        pushRecentRequest({
+          requestId: String(paused.requestId || ''),
+          pageId: page.id,
+          url: String(paused.request?.url || ''),
+          method: String(paused.request?.method || ''),
+          resourceType: String(paused.resourceType || ''),
+          matchedRuleId: matchedRule.ruleId,
+          action,
+          statusCode: action === 'fulfill' ? matchedRule.statusCode : 0,
+        });
+      }
     })();
     activityChain = activityChain
       .catch(() => {})
@@ -5193,7 +5209,7 @@ async function handleClosePage(toolArgs) {
     activeRecordingSession = null;
   }
 
-  await fetchJson(`${getHttpUrl()}/json/close/${encodeURIComponent(page.id)}`);
+  await fetchOk(`${getHttpUrl()}/json/close/${encodeURIComponent(page.id)}`, { method: 'PUT' });
   const interceptSession = interceptSessionsByPageId.get(page.id);
   if (interceptSession) {
     closeSocket(interceptSession.ws);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaitranntt/ccs",
-  "version": "8.1.4",
+  "version": "8.2.0-dev.1",
   "description": "Claude Code Switch - Instant profile switching between Claude, GLM, Kimi, and more",
   "keywords": [
     "cli",

package/scripts/completion/ccs.bash

@@ -22,18 +22,6 @@ __ccs_completion_run() {
   local current="$1"
   shift || true
 
-  local script_dir repo_root repo_cli
-  script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-  repo_root="$(cd "${script_dir}/../.." && pwd)"
-  repo_cli="${repo_root}/dist/ccs.js"
-  if [[ ! -f "${repo_cli}" ]]; then
-    repo_cli="${repo_root}/bin/ccs.js"
-  fi
-  if [[ -f "${repo_cli}" ]]; then
-    node "${repo_cli}" __complete --shell bash --current "${current}" -- "$@" 2>/dev/null
-    return 0
-  fi
-
   if command -v ccs >/dev/null 2>&1; then
     ccs __complete --shell bash --current "${current}" -- "$@" 2>/dev/null
   fi

package/scripts/completion/ccs.fish

@@ -11,17 +11,6 @@ function __fish_ccs_complete
         set -e tokens_before_current[-1]
     end
 
-    set -l script_file (status filename)
-    set -l repo_root (realpath (dirname $script_file)/../.. 2>/dev/null)
-    set -l repo_cli "$repo_root/dist/ccs.js"
-    if not test -f "$repo_cli"
-        set repo_cli "$repo_root/bin/ccs.js"
-    end
-    if test -f "$repo_cli"
-        node "$repo_cli" __complete --shell fish --current "$current" -- $tokens_before_current 2>/dev/null
-        return
-    end
-
     if command -sq ccs
         ccs __complete --shell fish --current "$current" -- $tokens_before_current 2>/dev/null
     end

package/scripts/completion/ccs.ps1

@@ -6,16 +6,6 @@ function Invoke-CcsCompletionBackend {
         [string[]]$TokensBeforeCurrent
     )
 
-    $repoRoot = (Resolve-Path (Join-Path $PSScriptRoot '..\..')).Path
-    $repoCli = Join-Path $repoRoot 'dist\ccs.js'
-    if (-not (Test-Path $repoCli)) {
-        $repoCli = Join-Path $repoRoot 'bin\ccs.js'
-    }
-    if (Test-Path $repoCli) {
-        & node $repoCli __complete --shell powershell --current $CurrentWord -- @TokensBeforeCurrent 2>$null
-        return
-    }
-
     if (Get-Command ccs -ErrorAction SilentlyContinue) {
         & ccs __complete --shell powershell --current $CurrentWord -- @TokensBeforeCurrent 2>$null
     }