@genee/omp-opsx-addon 0.11.0 → 0.12.0

package/lib/cursor-auth.ts

@@ -84,30 +84,46 @@ export function isJwtExpired(token: string, nowMs: number = Date.now()): boolean
     return exp * 1000 <= nowMs;
 }
 
+function queryTokensFromDb(db: Database): CursorTokenStore | null {
+    const row = (key: string): string | undefined => {
+        const r = db.query('SELECT value FROM ItemTable WHERE key = ?').get(key) as
+            | { value?: unknown }
+            | null
+            | undefined;
+        if (!r || r.value == null) return undefined;
+        const v = r.value;
+        return typeof v === 'string' ? v : Buffer.isBuffer(v) ? v.toString('utf8') : String(v);
+    };
+    const accessToken = row('cursorAuth/accessToken')?.trim() || undefined;
+    const refreshToken = row('cursorAuth/refreshToken')?.trim() || undefined;
+    const membershipType = row('cursorAuth/stripeMembershipType')?.trim() || undefined;
+    if (!accessToken && !refreshToken) return null;
+    return { accessToken, refreshToken, membershipType };
+}
+
 function defaultReadTokensFromDb(dbPath: string): CursorTokenStore | null {
-    try {
-        const db = new Database(dbPath, { readonly: true });
+    // Read-only first. Bun's bundled SQLite defers the open to the first
+    // prepare, where a live Cursor DB (active WAL/locks on APFS) can raise
+    // SQLITE_CANTOPEN even though the file is readable — plain python3 and a
+    // default read-write handle both work. So a failed readonly pass falls
+    // back to the default open; the SHARED lock is only held for the three
+    // key reads before we close, same footprint as any external reader.
+    for (const opts of [{ readonly: true } as const, undefined]) {
+        let db: Database;
         try {
-            const row = (key: string): string | undefined => {
-                const r = db.query('SELECT value FROM ItemTable WHERE key = ?').get(key) as
-                    | { value?: unknown }
-                    | null
-                    | undefined;
-                if (!r || r.value == null) return undefined;
-                const v = r.value;
-                return typeof v === 'string' ? v : Buffer.isBuffer(v) ? v.toString('utf8') : String(v);
-            };
-            const accessToken = row('cursorAuth/accessToken')?.trim() || undefined;
-            const refreshToken = row('cursorAuth/refreshToken')?.trim() || undefined;
-            const membershipType = row('cursorAuth/stripeMembershipType')?.trim() || undefined;
-            if (!accessToken && !refreshToken) return null;
-            return { accessToken, refreshToken, membershipType };
+            db = new Database(dbPath, opts);
+        } catch {
+            continue;
+        }
+        try {
+            return queryTokensFromDb(db);
+        } catch {
+            // Try the next open mode.
         } finally {
             db.close();
         }
-    } catch {
-        return null;
     }
+    return null;
 }
 
 function readStore(env: NodeJS.ProcessEnv = process.env): CursorTokenStore {

package/lib/cursor-limit-status.ts

@@ -0,0 +1,250 @@
+/**
+ * Cursor usage-limit / slow-pool status via Connect RPC
+ * (`GetUsageLimitStatusAndActiveGrants`), plus note encode/decode for
+ * attaching the parsed status to a `UsageReport` without extending pi-ai types.
+ *
+ * Fail-soft everywhere: field drift / network errors / missing token → null /
+ * undefined, never throw. Module-level TTL cache absorbs intermittent RPC
+ * failures so the widget does not flap exhausted↔warning.
+ */
+
+import type { UsageReport } from '@oh-my-pi/pi-ai';
+import { resolveCursorAccessToken } from './cursor-auth.js';
+
+export const CURSOR_LIMIT_STATUS_URL =
+    'https://api2.cursor.sh/aiserver.v1.DashboardService/GetUsageLimitStatusAndActiveGrants';
+
+export const LIMIT_STATUS_TTL_MS = 5 * 60_000;
+export const LIMIT_STATUS_TIMEOUT_MS = 5000;
+
+export const CURSOR_LIMIT_STATUS_NOTE_PREFIX = 'cursorLimitStatus=';
+
+export interface CursorLimitStatus {
+    isInSlowPool: boolean;
+    stage?: string;
+    slownessMs?: number;
+    grantsRemainingCents: number;
+    grantsExpiresAtMs?: number;
+}
+
+export interface FetchCursorLimitStatusOpts {
+    timeoutMs?: number;
+    fetchImpl?: typeof fetch;
+    resolveCursorToken?: () => Promise<{ accessToken: string } | null>;
+    nowMs?: () => number;
+}
+
+type CacheEntry = { status: CursorLimitStatus; atMs: number };
+
+let cache: CacheEntry | null = null;
+
+/** Module-level seam defaults (opts override these). Cleared by `_resetLimitStatusCacheForTest`. */
+let seamFetchImpl: typeof fetch | undefined;
+let seamResolveCursorToken: (() => Promise<{ accessToken: string } | null>) | undefined;
+let seamNowMs: (() => number) | undefined;
+
+export function _setLimitStatusSeamsForTest(seams: {
+    fetchImpl?: typeof fetch;
+    resolveCursorToken?: () => Promise<{ accessToken: string } | null>;
+    nowMs?: () => number;
+} | null): void {
+    if (!seams) {
+        seamFetchImpl = undefined;
+        seamResolveCursorToken = undefined;
+        seamNowMs = undefined;
+        return;
+    }
+    if ('fetchImpl' in seams) seamFetchImpl = seams.fetchImpl;
+    if ('resolveCursorToken' in seams) seamResolveCursorToken = seams.resolveCursorToken;
+    if ('nowMs' in seams) seamNowMs = seams.nowMs;
+}
+
+export function _resetLimitStatusCacheForTest(): void {
+    cache = null;
+    seamFetchImpl = undefined;
+    seamResolveCursorToken = undefined;
+    seamNowMs = undefined;
+}
+
+/**
+ * Defensive parse of the Connect JSON body. Returns null on any structural
+ * drift (missing policy status, non-boolean isInSlowPool, non-object body).
+ * Invalid grant entries are skipped; cents are summed from valid ones.
+ */
+export function parseCursorLimitStatusResponse(data: unknown): CursorLimitStatus | null {
+    if (data === null || typeof data !== 'object' || Array.isArray(data)) return null;
+    const root = data as Record<string, unknown>;
+    const policy = root.usageLimitPolicyStatus;
+    if (policy === null || typeof policy !== 'object' || Array.isArray(policy)) return null;
+    const pol = policy as Record<string, unknown>;
+    if (typeof pol.isInSlowPool !== 'boolean') return null;
+
+    const stage = typeof pol.stage === 'string' ? pol.stage : undefined;
+    const slownessMs =
+        typeof pol.slownessMs === 'number' && Number.isFinite(pol.slownessMs) ? pol.slownessMs : undefined;
+
+    let grantsRemainingCents = 0;
+    let grantsExpiresAtMs: number | undefined;
+    const grants = root.activeGrants;
+    if (Array.isArray(grants)) {
+        for (const entry of grants) {
+            if (entry === null || typeof entry !== 'object' || Array.isArray(entry)) continue;
+            const g = entry as Record<string, unknown>;
+            const raw = g.remainingCents;
+            if (typeof raw !== 'string') continue;
+            // Integer cents string only — reject floats / signs / whitespace-padded junk.
+            if (!/^\d+$/.test(raw)) continue;
+            const cents = Number(raw);
+            if (!Number.isSafeInteger(cents) || cents < 0) continue;
+            grantsRemainingCents += cents;
+            if (cents > 0) {
+                const expRaw = g.expiresAtMs;
+                const exp =
+                    typeof expRaw === 'string' && /^\d+$/.test(expRaw)
+                        ? Number(expRaw)
+                        : typeof expRaw === 'number'
+                          ? expRaw
+                          : NaN;
+                if (Number.isFinite(exp) && Number.isSafeInteger(exp)) {
+                    grantsExpiresAtMs =
+                        grantsExpiresAtMs === undefined ? exp : Math.max(grantsExpiresAtMs, exp);
+                }
+            }
+        }
+    } else if (grants !== undefined) {
+        // Present but not an array → drift; treat whole parse as unknown.
+        return null;
+    }
+
+    const out: CursorLimitStatus = {
+        isInSlowPool: pol.isInSlowPool,
+        grantsRemainingCents,
+    };
+    if (stage !== undefined) out.stage = stage;
+    if (slownessMs !== undefined) out.slownessMs = slownessMs;
+    if (grantsExpiresAtMs !== undefined) out.grantsExpiresAtMs = grantsExpiresAtMs;
+    return out;
+}
+
+/** Encode status into the structured note (omit absent optional fields). */
+export function encodeCursorLimitStatusNote(status: CursorLimitStatus): string {
+    const parts: string[] = [`isInSlowPool:${status.isInSlowPool ? 1 : 0}`];
+    if (status.stage !== undefined) parts.push(`stage:${status.stage}`);
+    if (status.slownessMs !== undefined) parts.push(`slownessMs:${status.slownessMs}`);
+    parts.push(`grantsCents:${status.grantsRemainingCents}`);
+    if (status.grantsExpiresAtMs !== undefined) parts.push(`grantsExpiryMs:${status.grantsExpiresAtMs}`);
+    return CURSOR_LIMIT_STATUS_NOTE_PREFIX + parts.join(';');
+}
+
+/**
+ * Tolerant note parse: unknown fields ignored, truncated/malformed note →
+ * undefined (never throws). Requires at least a recognizable isInSlowPool bit.
+ */
+export function parseCursorLimitStatusNote(notes?: string[]): CursorLimitStatus | undefined {
+    if (!notes) return undefined;
+    for (const n of notes) {
+        if (!n.startsWith(CURSOR_LIMIT_STATUS_NOTE_PREFIX)) continue;
+        const body = n.slice(CURSOR_LIMIT_STATUS_NOTE_PREFIX.length);
+        if (!body) return undefined;
+        const fields = new Map<string, string>();
+        for (const part of body.split(';')) {
+            if (!part) continue;
+            const colon = part.indexOf(':');
+            if (colon <= 0) continue;
+            fields.set(part.slice(0, colon), part.slice(colon + 1));
+        }
+        const slowRaw = fields.get('isInSlowPool');
+        if (slowRaw !== '0' && slowRaw !== '1') return undefined;
+        const grantsRaw = fields.get('grantsCents');
+        let grantsRemainingCents = 0;
+        if (grantsRaw !== undefined) {
+            if (!/^\d+$/.test(grantsRaw)) return undefined;
+            const g = Number(grantsRaw);
+            if (!Number.isSafeInteger(g) || g < 0) return undefined;
+            grantsRemainingCents = g;
+        }
+        const out: CursorLimitStatus = {
+            isInSlowPool: slowRaw === '1',
+            grantsRemainingCents,
+        };
+        const stage = fields.get('stage');
+        if (stage !== undefined && stage.length > 0) out.stage = stage;
+        const slowMs = fields.get('slownessMs');
+        if (slowMs !== undefined && /^-?\d+(\.\d+)?$/.test(slowMs)) {
+            const v = Number(slowMs);
+            if (Number.isFinite(v)) out.slownessMs = v;
+        }
+        const exp = fields.get('grantsExpiryMs');
+        if (exp !== undefined && /^\d+$/.test(exp)) {
+            const v = Number(exp);
+            if (Number.isSafeInteger(v)) out.grantsExpiresAtMs = v;
+        }
+        return out;
+    }
+    return undefined;
+}
+
+/**
+ * Return a new report whose notes carry the encoded status. Replaces any
+ * existing `cursorLimitStatus=` note; preserves all other notes. Idempotent.
+ */
+export function enhanceCursorReport(report: UsageReport, status: CursorLimitStatus): UsageReport {
+    const note = encodeCursorLimitStatusNote(status);
+    const prev = report.notes ?? [];
+    const kept = prev.filter((n) => !n.startsWith(CURSOR_LIMIT_STATUS_NOTE_PREFIX));
+    return { ...report, notes: [...kept, note] };
+}
+
+/**
+ * Fetch + parse Cursor limit status. Fail-soft: network / non-OK / no token /
+ * parse failure → null (or cached value within TTL). Success overwrites cache.
+ */
+export async function fetchCursorLimitStatus(
+    opts?: FetchCursorLimitStatusOpts,
+): Promise<CursorLimitStatus | null> {
+    const now = (opts?.nowMs ?? seamNowMs ?? Date.now)();
+    const fetchFn = opts?.fetchImpl ?? seamFetchImpl ?? fetch;
+    const resolveToken =
+        opts?.resolveCursorToken ??
+        seamResolveCursorToken ??
+        (async () => {
+            const resolved = await resolveCursorAccessToken();
+            return resolved?.accessToken ? { accessToken: resolved.accessToken } : null;
+        });
+
+    try {
+        const auth = await resolveToken();
+        if (!auth?.accessToken) {
+            return softFail(now);
+        }
+        const res = await fetchFn(CURSOR_LIMIT_STATUS_URL, {
+            method: 'POST',
+            headers: {
+                'content-type': 'application/json',
+                authorization: `Bearer ${auth.accessToken}`,
+                'Connect-Protocol-Version': '1',
+                'x-cursor-client-version': '0.1.0',
+            },
+            body: JSON.stringify({}),
+            signal: AbortSignal.timeout(opts?.timeoutMs ?? LIMIT_STATUS_TIMEOUT_MS),
+        });
+        if (!res.ok) return softFail(now);
+        let data: unknown;
+        try {
+            data = await res.json();
+        } catch {
+            return softFail(now);
+        }
+        const parsed = parseCursorLimitStatusResponse(data);
+        if (!parsed) return softFail(now);
+        cache = { status: parsed, atMs: now };
+        return parsed;
+    } catch {
+        return softFail(now);
+    }
+}
+
+function softFail(now: number): CursorLimitStatus | null {
+    if (cache && now - cache.atMs < LIMIT_STATUS_TTL_MS) return cache.status;
+    return null;
+}

package/lib/model-selector.ts

@@ -130,7 +130,11 @@ export function candidateQuota(
     const win = health.windows.find((w) => w.id === bucket) ?? health.windows.find((w) => w.id === 'other');
     const ondemand = health.windows.find((w) => w.id === 'ondemand');
     if (!win) {
-        return { exhausted: health.exhausted, remainingFraction: health.worstRemainingFraction };
+        // D6: provider-level exhaustion was relaxed for slow-pool cursor; the
+        // !win fallback must NOT get more permissive than pre-change behavior.
+        const cls = health.cursorLimitStatus;
+        const slowPoolAlive = !!cls && (cls.isInSlowPool || cls.grantsRemainingCents > 0);
+        return { exhausted: health.exhausted || slowPoolAlive, remainingFraction: health.worstRemainingFraction };
     }
     if (win.exhausted) {
         if (ondemand && !ondemand.exhausted) {

package/lib/usage-poller.ts

@@ -56,6 +56,7 @@ import { homedir } from 'os';
 import type { UsageReport } from '@oh-my-pi/pi-ai';
 import type { AuthStorageLike, ProviderHealth, DirectFetcher, ApiKeyResolver } from './usage-resolver.js';
 import { resolveProviderReports, buildHealthMap, canonicalizeProvider, listDetectableProviders } from './usage-resolver.js';
+import { fetchCursorLimitStatus, enhanceCursorReport } from './cursor-limit-status.js';
 import { RedisRelay } from './usage-redis-probe.js';
 import type { RedisTransport } from './usage-redis-client.js';
 import type { UsageBucket } from './usage-estimator.js';
@@ -979,8 +980,16 @@ async function fetchProvider(
         lastFetchedByProvider.set(canonical, fetchedAt);
         // Replace (or insert) just this provider's report; keep all others.
         const byId = new Map(cachedReports.map((r) => [r.provider, r]));
-        const newReport = reports.find((r) => r.provider === canonical);
+        let newReport = reports.find((r) => r.provider === canonical);
         if (newReport) {
+            // Cursor slow-pool/grants enhancement (D1): rides the existing fetch
+            // cadence; failure is fail-soft inside fetchCursorLimitStatus and must
+            // NOT re-mark dirty (the outer catch only guards the report fetch).
+            // On null the report lands as-is — current behavior (exhausted).
+            if (canonical === 'cursor') {
+                const limitStatus = await fetchCursorLimitStatus();
+                if (limitStatus) newReport = enhanceCursorReport(newReport, limitStatus);
+            }
             byId.set(canonical, newReport);
             // Fresh report landed → the provider's health is CONFIRMED.
             unconfirmedProviders.delete(canonical);

package/lib/usage-render.ts

@@ -42,6 +42,8 @@ export interface Painter {
     pct(p: number): string;
     /** Exhausted-window marker text, error-colored. */
     exhausted(text: string): string;
+    /** Warning / soft-degraded marker (e.g. Cursor ⚠降速), warning-colored. */
+    warning(text: string): string;
     /** Inter-column separator, already dyed incl. flanking spaces (3 cells). */
     sep: string;
     /** Provider header. `brandAnsi` is a raw brand-color SGR (or "" when none). */
@@ -101,6 +103,7 @@ export const ansiPainter: Painter = {
         return c(col === 'error' ? X : col === 'warning' ? Y : G, pctValue(p));
     },
     exhausted: (text) => c(X, text),
+    warning: (text) => c(Y, text),
     sep: ` ${D}│${R} `,
     header: (label, brandAnsi) => c(brandAnsi ? BOLD + brandAnsi : BOLD, label),
     balance: (text) => c(WHITE, text),
@@ -113,6 +116,7 @@ export function themePainter(theme: PainterTheme): Painter {
     return {
         pct: (p) => theme.fg(pctColor(p), pctValue(p)),
         exhausted: (text) => theme.fg('error', text),
+        warning: (text) => theme.fg('warning', text),
         sep: ` ${theme.fg('dim', '│')} `,
         header: (label, brandAnsi) => (brandAnsi ? c(brandAnsi, label) : theme.fg('accent', label)),
         balance: (text) => theme.fg('text', text),
@@ -135,6 +139,7 @@ const PROVIDER: Record<string, { label: string; color: string }> = {
     'kimi-code': { label: 'Kimi', color: CYAN },
     'minimax-code-cn': { label: 'MiniMax', color: X },
     'ark-coding-plan': { label: '火山方舟', color: CYAN },
+    'alibaba-token-plan': { label: '千问云', color: PURPLE },
     deepseek: { label: 'DeepSeek', color: BLUE },
     cursor: { label: 'Cursor', color: CYAN },
     'opencode-go': { label: 'OpenCode', color: G },
@@ -349,6 +354,30 @@ export const buildColumn = (r: UsageReport, painter: Painter = ansiPainter, load
         // column visible rather than dropping a logged-in provider.
         return isCursor ? [header, painter.balance('—')] : undefined;
     }
+    // Cursor slow-pool / grants markers (provider not exhausted — chips path).
+    // Status lives on its own line: bucket chips first, then ⚠降速 / Grants /
+    // reset countdown. No cursorLimitStatus note → single chips line, exactly
+    // as before the change.
+    if (isCursor && health.cursorLimitStatus) {
+        const cls = health.cursorLimitStatus;
+        const status: string[] = [];
+        if (cls.isInSlowPool) status.push(painter.warning('⚠降速'));
+        if (cls.grantsRemainingCents > 0) {
+            status.push(painter.balance(`Grants $${(cls.grantsRemainingCents / 100).toFixed(2)}`));
+        }
+        // Included buckets reset with the billing period — surface the soonest
+        // reset so a slow-pooled user can see when quota revives. Reuses the
+        // existing exhausted-path formatter; hidden when no resetsAt.
+        let soonest: number | undefined;
+        for (const l of r.limits) {
+            const at = l.window?.resetsAt;
+            if (typeof at !== 'number') continue;
+            soonest = soonest === undefined ? at : Math.min(soonest, at);
+        }
+        if (soonest !== undefined) status.push(`${resetIn(soonest)}重置`);
+        if (status.length === 0) return [header, parts.join(' · ')];
+        return [header, parts.join(' · '), status.join(' · ')];
+    }
     return [header, parts.join(' · ')];
 };
 

package/lib/usage-resolver.ts

@@ -13,6 +13,7 @@
  */
 
 import type { UsageReport, UsageStatus } from '@oh-my-pi/pi-ai';
+import { parseCursorLimitStatusNote, type CursorLimitStatus } from './cursor-limit-status.js';
 
 export type ApiKeyResolver = (provider: string) => Promise<string | undefined>;
 
@@ -100,6 +101,8 @@ export interface ProviderHealth {
     exhaustedWindows: string[];
     fetchedAt: number;
     notes?: string[];
+    /** Cursor slow-pool / grants echo (from `cursorLimitStatus=` note); render + selector consume this. */
+    cursorLimitStatus?: CursorLimitStatus;
 }
 
 const HEALTHY_REMAINING_THRESHOLD = 0.1;
@@ -262,6 +265,8 @@ export function summarizeReport(report: UsageReport): ProviderHealth {
 
     let exhausted = false;
     let worstRemaining: number | undefined;
+    const limitStatus =
+        report.provider === 'cursor' ? parseCursorLimitStatusNote(report.notes) : undefined;
 
     if (policy === 'bucket') {
         const byId = new Map(windows.map((w) => [w.id, w]));
@@ -277,6 +282,17 @@ export function summarizeReport(report: UsageReport): ProviderHealth {
             if (w.remaining === undefined) continue;
             if (worstRemaining === undefined || w.remaining > worstRemaining) worstRemaining = w.remaining;
         }
+        // D3: slow-pool / grants keep provider usable (warning) instead of exhausted.
+        if (
+            exhausted &&
+            limitStatus &&
+            (limitStatus.isInSlowPool || limitStatus.grantsRemainingCents > 0)
+        ) {
+            exhausted = false;
+            status = 'warning';
+        } else if (!exhausted && limitStatus?.isInSlowPool && status === 'ok') {
+            status = 'warning';
+        }
     } else if (policy === 'balance') {
         const win = windows[0];
         exhausted = windows.some((w) => w.exhausted) || (win?.remaining !== undefined && win.remaining <= 0);
@@ -315,6 +331,7 @@ export function summarizeReport(report: UsageReport): ProviderHealth {
         exhaustedWindows,
         fetchedAt: report.fetchedAt,
         notes: report.notes,
+        cursorLimitStatus: limitStatus,
     };
 }
 
@@ -327,7 +344,11 @@ export function healthCacheKey(health: Map<string, ProviderHealth> | null | unde
             const h = health.get(p)!;
             const wins = h.windows.map((w) => `${w.id}:${w.exhausted ? 1 : 0}:${w.remaining ?? ''}`).join(',');
             const ab = (h.autoBucketModels ?? []).join('+');
-            return `${p}=${h.exhausted ? 1 : 0};${wins};${ab}`;
+            // Cursor only: boolean bits (not raw cents) so grants churn does not invalidate selection cache.
+            const cls = h.cursorLimitStatus
+                ? `;sp=${h.cursorLimitStatus.isInSlowPool ? 1 : 0};g=${h.cursorLimitStatus.grantsRemainingCents > 0 ? 1 : 0}`
+                : '';
+            return `${p}=${h.exhausted ? 1 : 0};${wins};${ab}${cls}`;
         })
         .join('|');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genee/omp-opsx-addon",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "type": "module",
   "description": "Pi Extension: OpenSpec workflow orchestration - coder/reviewer/planner agents, session title & progress",
   "main": "./index.ts",