quotacap 0.0.50 → 0.0.52

package/dist/web/src/components/OpencodeGoBanner.js

@@ -1,13 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from "react";
-export const OPENCODE_GO_CONSENT_COPY = [
-    "• What is read: API key OpenCode already stored when you ran `opencode auth login -p opencode-go` (`~/.local/share/opencode/auth.json`, `opencode-go` → `opencode` fallback).",
-    "• Read frequency: in-memory, read-only once per poll (every 15 minutes by default).",
-    "• Request destination: sent only as `Authorization: Bearer` to `https://opencode.ai/zen/go/v1/usage` to fetch `rolling/weekly/monthly` `percent` + `resetsAt`.",
-    "• Never-list: never used to make chat or model requests, never written or rotated, never stored in the `quotacap` DB, never returned by the API or MCP, and never logged (errors show `[redacted]`).",
-    "• Revocation instructions: revoke at `https://opencode.ai/auth` or `opencode providers logout opencode-go` and run `quotacap providers disable opencode-go` to stop polling.",
-    "• Optional environment override: if you prefer no file access, set `OPENCODE_API_KEY` instead.",
-].join("\n");
+export function openCodeGoConsentCopy(loginCommand) {
+    const loginClause = loginCommand
+        ? `when you ran \`${loginCommand}\``
+        : "with the command for your CLI version: v2 `opencode auth login opencode` or v1 `opencode console login`";
+    return [
+        `• What is read: Bearer [REDACTED] already stored ${loginClause} (v2 \`~/.local/share/opencode/opencode.db\` active credential, else legacy \`~/.local/share/opencode/auth.json\`; \`opencode-go\` then \`opencode\`).`,
+        "• Read frequency: in-memory, read-only once per poll (every 15 minutes by default).",
+        "• Request destination: sent only as `Authorization: Bearer` to `https://opencode.ai/zen/go/v1/usage` to fetch `rolling/weekly/monthly` `percent` + `resetsAt`.",
+        "• Never-list: never used to make chat or model requests, never written or rotated, never stored in the `quotacap` DB, never returned by the API or MCP, and never logged (errors show `[redacted]`).",
+        "• Revocation instructions: revoke at `https://opencode.ai/auth` or `opencode providers logout opencode-go` and run `quotacap providers disable opencode-go` to stop polling.",
+        "• Optional environment override: if you prefer no file access, set `OPENCODE_API_KEY` instead.",
+    ].join("\n");
+}
+export const OPENCODE_GO_CONSENT_COPY = openCodeGoConsentCopy();
 export function showOpenCodeGoBanner(runtime, providers, suppressed) {
     const detected = runtime?.detectedProviders?.includes("opencode-go") ?? false;
     const row = providers.find((p) => p.id === "opencode-go");
@@ -16,7 +22,7 @@ export function showOpenCodeGoBanner(runtime, providers, suppressed) {
 export function OpencodeGoBanner({ onEnable }) {
     return (_jsxs("div", { "data-testid": "opencode-go-banner", role: "status", className: "alert", children: [_jsxs("span", { children: [_jsx("strong", { children: "OpenCode Go detected." }), " Enable to track 5h/weekly usage? The API key stays with OpenCode until you enable tracking."] }), _jsx("button", { type: "button", className: "linkbtn", onClick: onEnable, style: { flex: "none", marginLeft: "auto" }, children: "Enable OpenCode Go" })] }));
 }
-export function ConsentModal({ onConfirm, onCancel, busy, }) {
+export function ConsentModal({ onConfirm, onCancel, busy, loginCommand, }) {
     useEffect(() => {
         const onKey = (e) => {
             if (e.key === "Escape")
@@ -39,5 +45,5 @@ export function ConsentModal({ onConfirm, onCancel, busy, }) {
                 padding: "var(--s4) var(--s5)",
                 maxWidth: 560,
                 margin: "var(--s4)",
-            }, children: [_jsx("h2", { id: "opencode-go-consent-title", style: { fontSize: "var(--t-4)", margin: "0 0 var(--s3)" }, children: "Enable OpenCode Go?" }), _jsx("p", { style: { fontSize: "var(--t-2)", color: "var(--ink-soft)", margin: "0 0 var(--s4)", whiteSpace: "pre-line" }, children: OPENCODE_GO_CONSENT_COPY }), _jsxs("div", { style: { display: "flex", justifyContent: "flex-end", gap: "var(--s2)" }, children: [_jsx("button", { type: "button", className: "btn btn-quiet", onClick: onCancel, disabled: busy, children: "Cancel" }), _jsx("button", { type: "button", className: "btn btn-primary", onClick: onConfirm, disabled: busy, children: busy ? "Enabling…" : "Enable" })] })] }) }));
+            }, children: [_jsx("h2", { id: "opencode-go-consent-title", style: { fontSize: "var(--t-4)", margin: "0 0 var(--s3)" }, children: "Enable OpenCode Go?" }), _jsx("p", { style: { fontSize: "var(--t-2)", color: "var(--ink-soft)", margin: "0 0 var(--s4)", whiteSpace: "pre-line" }, children: openCodeGoConsentCopy(loginCommand) }), _jsxs("div", { style: { display: "flex", justifyContent: "flex-end", gap: "var(--s2)" }, children: [_jsx("button", { type: "button", className: "btn btn-quiet", onClick: onCancel, disabled: busy, children: "Cancel" }), _jsx("button", { type: "button", className: "btn btn-primary", onClick: onConfirm, disabled: busy, children: busy ? "Enabling…" : "Enable" })] })] }) }));
 }

package/dist/web/src/components/PaceBar.d.ts

@@ -8,6 +8,47 @@ export type PaceBadge = "Not reporting" | "Cap risk" | "Watch" | "Behind pace" |
  * otherwise urgency decides. No client thresholds.
  */
 export declare function paceBadge(provider: ProviderView): PaceBadge;
+/**
+ * Quota-window resolution. The advisory `bindingWindow` names the window
+ * that actually rations the account (weekly for most providers, monthly
+ * for OpenCode Go / Kimi when the month is scarcer). Every standalone
+ * reset, pace figure, and main bar reads this window; the other windows
+ * stay visible only inside Limits / the windows row as rate-limit detail.
+ * Weekly-bound providers are untouched: every helper falls back to the
+ * weekly fields.
+ */
+export declare function isMonthlyBound(provider: ProviderView): boolean;
+/** Reset instant of the quota window, or null without a quota reading. */
+export declare function quotaResetsAt(provider: ProviderView): string | null;
+/** Used percent of the quota window. Null without a quota reading. */
+export declare function quotaUsedPct(provider: ProviderView): number | null;
+/** Display name of the quota window ("Monthly" / "Weekly"). */
+export declare function quotaWindowName(provider: ProviderView): "Monthly" | "Weekly";
+/**
+ * Start of the monthly window. Providers report only the monthly reset,
+ * so the start is one calendar month before it (same inference the
+ * drawer Limits bars use).
+ */
+export declare function monthlyWindowStartIso(resetsAt: string): string | null;
+/** Start instant of the quota window. Null when unusable. */
+export declare function quotaWindowStartIso(provider: ProviderView): string | null;
+/** Elapsed share (0..100) of the quota window. Null when either stamp is unusable. */
+export declare function quotaElapsedPct(provider: ProviderView, asOfMs: number): number | null;
+/** Even pace that lands on 100% at the quota reset: binding remaining ÷ binding days left. */
+export declare function quotaIdealRate(advisory: {
+    idealRate: number;
+    bindingWindow?: string;
+    bindingRemaining?: number;
+    bindingDaysLeft?: number;
+}): number;
+/**
+ * Window-average pace of the quota window. Weekly reads the server
+ * `avgPace`; monthly divides the monthly used percent by the elapsed
+ * monthly days. Null under a 6h span, mirroring the server minimum.
+ */
+export declare function quotaAvgPace(provider: ProviderView, asOfMs: number): number | null;
+/** Estimated-reset flag for the quota window; monthly resets are reported, never estimated. */
+export declare function quotaResetEstimated(provider: ProviderView): boolean;
 export interface PaceFigures {
     /** Window average: used % ÷ days elapsed. Null before the window start is known. */
     avg: number | null;
@@ -37,6 +78,16 @@ export declare function paceCells(advisory: {
     recentRate?: number | null;
     paceSource: string;
 } | null | undefined): PaceCells;
+/**
+ * Four-cell pace grid shared by the provider card and the drawer Pace
+ * section, so both surfaces present the same figures the same way:
+ * average pace, 24h pace, ideal pace, and time until reset. Unknown
+ * figures read "—" rather than disappearing.
+ */
+export declare function PaceStats({ provider, asOf }: {
+    provider: ProviderView;
+    asOf: string;
+}): React.JSX.Element;
 /** Hover explanations shared by cards and rows. Plain words, no jargon. */
 export declare const PACE_TIPS: {
     readonly avg: "Window average — quota used ÷ days elapsed. Your overall pace this window.";
@@ -57,7 +108,10 @@ export declare function paceLines(advisory: {
     recentRate?: number | null;
     paceSource: string;
     idealRate: number;
-} | null | undefined): PaceLine[];
+    bindingWindow?: string;
+    bindingRemaining?: number;
+    bindingDaysLeft?: number;
+} | null | undefined, provider?: ProviderView, asOfMs?: number): PaceLine[];
 /** Plain-words reason shown beside "Not reporting". Null when the badge says it all. */
 export declare function exclusionDetail(reason: ExclusionReason): string | null;
 export declare function isEstimated(provider: ProviderView): boolean;
@@ -74,6 +128,14 @@ export declare function resetDateClock(resetsAt: string, locale?: string): strin
 export declare function resetDay(iso: string | undefined): string;
 /** "6d 12h" style time left from server timestamps. Null when unparseable. */
 export declare function timeLeft(resetsAt: string, asOfMs: number): string | null;
+/**
+ * Days-to-duration formatter mirroring timeLeft: under 1h `Xm`, under 48h
+ * `Xh Ym`, at 48h+ `Xd Xh`. Hours in the days branch round to the nearest
+ * hour so 2.4d reads "2d 10h".
+ */
+export declare function daysToDuration(days: number): string;
+export declare const formatDurationDays: typeof daysToDuration;
+export declare const durationFromDays: typeof daysToDuration;
 /**
  * Reset rendering for a row. Estimated resets carry "(est.)"; reset-passed
  * rows await a fresh window; invalid rows carry a row-level note.
@@ -100,7 +162,7 @@ export interface BarGeometry {
     usedPct: number;
     elapsedPct: number | null;
 }
-/** Bar geometry from server timestamps and percents. Presentation only. */
+/** Bar geometry of the quota window from server timestamps and percents. Presentation only. */
 export declare function barGeometry(provider: ProviderView, asOfMs: number): BarGeometry;
 export declare function badgeColor(badge: PaceBadge): string;
 export declare function fillToken(badge: PaceBadge): string;
@@ -116,9 +178,24 @@ export declare function hatchGradient(_badge?: PaceBadge): string;
  * confessed on the end. Other badges read their own label and need no title.
  */
 export declare function badgeTitle(badge: PaceBadge, estimated: boolean): string | undefined;
-export declare function Badge({ provider }: {
+export declare function Badge({ provider, compact, }: {
     provider: ProviderView;
+    /** Compact drops the exclusion detail from the label into the tooltip. */
+    compact?: boolean;
 }): React.JSX.Element;
+export type PaceHeadlineKind = "behind" | "watch" | "cap" | "ontrack" | "none";
+export interface PaceHeadline {
+    text: string;
+    kind: PaceHeadlineKind;
+    /** True when the projected-unused hatch belongs on the bar. */
+    hatch: boolean;
+}
+/**
+ * Headline forecast shared by the card bar and the drawer quota row:
+ * "expires unused" wording when a waste hatch applies, otherwise the
+ * one-line forecast. Null when there is nothing to forecast.
+ */
+export declare function paceHeadline(provider: ProviderView): PaceHeadline | null;
 /**
  * Two-tier pacing rail: used fill, elapsed tick, projected-unused hatch.
  * Unknown pace shows fill and tick but no hatch and no numeric rate.

package/dist/web/src/components/PaceBar.js

@@ -33,6 +33,123 @@ export function paceBadge(provider) {
             return "On track";
     }
 }
+/**
+ * Quota-window resolution. The advisory `bindingWindow` names the window
+ * that actually rations the account (weekly for most providers, monthly
+ * for OpenCode Go / Kimi when the month is scarcer). Every standalone
+ * reset, pace figure, and main bar reads this window; the other windows
+ * stay visible only inside Limits / the windows row as rate-limit detail.
+ * Weekly-bound providers are untouched: every helper falls back to the
+ * weekly fields.
+ */
+export function isMonthlyBound(provider) {
+    return (provider.advisory?.bindingWindow === "monthly" &&
+        !!provider.quota?.monthlyResetsAt &&
+        typeof provider.quota?.monthlyPct === "number");
+}
+/** Reset instant of the quota window, or null without a quota reading. */
+export function quotaResetsAt(provider) {
+    if (!provider.quota)
+        return null;
+    if (isMonthlyBound(provider))
+        return provider.quota.monthlyResetsAt ?? null;
+    return provider.quota.resetsAt ?? null;
+}
+/** Used percent of the quota window. Null without a quota reading. */
+export function quotaUsedPct(provider) {
+    if (!provider.quota)
+        return null;
+    if (isMonthlyBound(provider))
+        return provider.quota.monthlyPct ?? null;
+    return provider.quota.weeklyPct ?? null;
+}
+/** Display name of the quota window ("Monthly" / "Weekly"). */
+export function quotaWindowName(provider) {
+    return isMonthlyBound(provider) ? "Monthly" : "Weekly";
+}
+/**
+ * Start of the monthly window. Providers report only the monthly reset,
+ * so the start is one calendar month before it (same inference the
+ * drawer Limits bars use).
+ */
+export function monthlyWindowStartIso(resetsAt) {
+    const resetMs = Date.parse(resetsAt);
+    if (!Number.isFinite(resetMs))
+        return null;
+    const start = new Date(resetMs);
+    start.setMonth(start.getMonth() - 1);
+    return start.toISOString();
+}
+/** Start instant of the quota window. Null when unusable. */
+export function quotaWindowStartIso(provider) {
+    if (!provider.quota)
+        return null;
+    if (isMonthlyBound(provider)) {
+        return provider.quota.monthlyResetsAt
+            ? monthlyWindowStartIso(provider.quota.monthlyResetsAt)
+            : null;
+    }
+    return provider.quota.periodStart ?? null;
+}
+/** Elapsed share (0..100) of the quota window. Null when either stamp is unusable. */
+export function quotaElapsedPct(provider, asOfMs) {
+    const startIso = quotaWindowStartIso(provider);
+    const resetIso = quotaResetsAt(provider);
+    if (!startIso || !resetIso)
+        return null;
+    const startMs = Date.parse(startIso);
+    const resetMs = Date.parse(resetIso);
+    if (!Number.isFinite(startMs) || !Number.isFinite(resetMs) || resetMs <= startMs)
+        return null;
+    if (!Number.isFinite(asOfMs))
+        return null;
+    return Math.min(100, Math.max(0, ((asOfMs - startMs) / (resetMs - startMs)) * 100));
+}
+/** Even pace that lands on 100% at the quota reset: binding remaining ÷ binding days left. */
+export function quotaIdealRate(advisory) {
+    if (advisory.bindingWindow === "monthly" &&
+        typeof advisory.bindingRemaining === "number" &&
+        typeof advisory.bindingDaysLeft === "number" &&
+        advisory.bindingDaysLeft > 0) {
+        return advisory.bindingRemaining / advisory.bindingDaysLeft;
+    }
+    return advisory.idealRate;
+}
+/**
+ * Window-average pace of the quota window. Weekly reads the server
+ * `avgPace`; monthly divides the monthly used percent by the elapsed
+ * monthly days. Null under a 6h span, mirroring the server minimum.
+ */
+export function quotaAvgPace(provider, asOfMs) {
+    if (!provider.quota || !provider.advisory)
+        return null;
+    if (!isMonthlyBound(provider))
+        return provider.advisory.avgPace ?? null;
+    const used = provider.quota.monthlyPct;
+    if (typeof used !== "number" || !Number.isFinite(used))
+        return null;
+    const startIso = quotaWindowStartIso(provider);
+    if (!startIso)
+        return null;
+    const startMs = Date.parse(startIso);
+    if (!Number.isFinite(startMs) || !Number.isFinite(asOfMs))
+        return null;
+    const elapsedDays = (asOfMs - startMs) / 86_400_000;
+    if (elapsedDays < 0.25)
+        return null;
+    const pace = used / elapsedDays;
+    return Number.isFinite(pace) ? Math.max(0, pace) : null;
+}
+/** Estimated-reset flag for the quota window; monthly resets are reported, never estimated. */
+export function quotaResetEstimated(provider) {
+    if (isMonthlyBound(provider))
+        return false;
+    if (provider.quota?.resetsAtEstimated === true)
+        return true;
+    return Array.isArray(provider.evidence)
+        ? provider.evidence.includes("estimated-reset")
+        : false;
+}
 /** Split the advisory into its two displayed paces. The 24h figure is the
  * measured `recentRate`, not the blended `burnRate` forecast input; an
  * advisory from a daemon older than the blend falls back to `burnRate`,
@@ -58,6 +175,26 @@ export function paceCells(advisory) {
         recent: recent !== null ? `${recent.toFixed(1)}%/day` : "—",
     };
 }
+/**
+ * Four-cell pace grid shared by the provider card and the drawer Pace
+ * section, so both surfaces present the same figures the same way:
+ * average pace, 24h pace, ideal pace, and time until reset. Unknown
+ * figures read "—" rather than disappearing.
+ */
+export function PaceStats({ provider, asOf }) {
+    const asOfMs = Date.parse(asOf);
+    const advisory = provider.advisory;
+    const monthly = isMonthlyBound(provider);
+    // Pace follows the quota window: average and ideal are quota figures,
+    // and the 24h rate exists only for the weekly window (monthly history
+    // is not tracked), so a monthly-bound grid reads "—" there.
+    const avg = quotaAvgPace(provider, asOfMs);
+    const pace = paceCells(provider.advisory);
+    const ideal = advisory ? `${quotaIdealRate(advisory).toFixed(1)}%/day` : "—";
+    const resetIso = quotaResetsAt(provider);
+    const resetsIn = resetIso ? timeLeft(resetIso, asOfMs) : null;
+    return (_jsxs("div", { className: "pstats", children: [_jsxs("div", { title: PACE_TIPS.avg, children: [_jsx("span", { className: "l", children: "Avg pace" }), _jsx("span", { className: "v", children: avg !== null ? `${avg.toFixed(1)}%/day` : "—" })] }), _jsxs("div", { title: PACE_TIPS.recent, children: [_jsx("span", { className: "l", children: "24h pace" }), _jsx("span", { className: "v", children: monthly ? "—" : pace.recent })] }), _jsxs("div", { title: PACE_TIPS.ideal, children: [_jsx("span", { className: "l", children: "Ideal pace" }), _jsx("span", { className: "v", children: ideal })] }), _jsxs("div", { children: [_jsx("span", { className: "l", children: "Resets in" }), _jsx("span", { className: "v", children: resetsIn ? `${resetsIn}${quotaResetEstimated(provider) ? " (est.)" : ""}` : resetCountdown(provider, asOfMs) })] })] }));
+}
 /** Hover explanations shared by cards and rows. Plain words, no jargon. */
 export const PACE_TIPS = {
     avg: "Window average — quota used ÷ days elapsed. Your overall pace this window.",
@@ -67,16 +204,21 @@ export const PACE_TIPS = {
 /** Table-row pace stack: one labeled line per known pace plus the needed
  * rate. Both paces always show when known (no collapsing) so rows read
  * uniformly. Empty when no advisory is present. */
-export function paceLines(advisory) {
+export function paceLines(advisory, provider, asOfMs) {
     if (!advisory)
         return [];
-    const { avg, recent } = paceFigures(advisory);
+    // Quota-window pace: a monthly-bound row shows the monthly average and
+    // ideal; the 24h rate is weekly-only and drops out.
+    const monthly = provider ? isMonthlyBound(provider) : advisory.bindingWindow === "monthly";
+    const avg = provider && asOfMs !== undefined ? quotaAvgPace(provider, asOfMs) : (paceFigures(advisory).avg);
+    const { recent } = paceFigures(advisory);
+    const ideal = quotaIdealRate(advisory) ?? advisory.idealRate;
     const lines = [];
     if (avg !== null)
         lines.push({ label: "Avg", value: `${avg.toFixed(1)}%/day`, tip: PACE_TIPS.avg });
-    if (recent !== null)
+    if (!monthly && recent !== null)
         lines.push({ label: "24h", value: `${recent.toFixed(1)}%/day`, tip: PACE_TIPS.recent });
-    lines.push({ label: "Ideal", value: `${advisory.idealRate.toFixed(1)}%/day`, tip: PACE_TIPS.ideal });
+    lines.push({ label: "Ideal", value: `${ideal.toFixed(1)}%/day`, tip: PACE_TIPS.ideal });
     return lines;
 }
 /** Plain-words reason shown beside "Not reporting". Null when the badge says it all. */
@@ -155,6 +297,33 @@ export function timeLeft(resetsAt, asOfMs) {
         return `${hours}h ${minutes}m`;
     return `${Math.max(1, minutes)}m`;
 }
+/**
+ * Days-to-duration formatter mirroring timeLeft: under 1h `Xm`, under 48h
+ * `Xh Ym`, at 48h+ `Xd Xh`. Hours in the days branch round to the nearest
+ * hour so 2.4d reads "2d 10h".
+ */
+export function daysToDuration(days) {
+    if (!Number.isFinite(days) || days <= 0)
+        return "0m";
+    const totalMinutes = Math.round(days * 24 * 60);
+    if (totalMinutes < 60)
+        return `${Math.max(1, totalMinutes)}m`;
+    if (totalMinutes < 48 * 60) {
+        const hours = Math.floor(totalMinutes / 60);
+        const minutes = totalMinutes % 60;
+        return `${hours}h ${minutes}m`;
+    }
+    let d = Math.floor(totalMinutes / (24 * 60));
+    const remainderMinutes = totalMinutes - d * 24 * 60;
+    let h = Math.round(remainderMinutes / 60);
+    if (h === 24) {
+        d += 1;
+        h = 0;
+    }
+    return `${d}d ${h}h`;
+}
+export const formatDurationDays = daysToDuration;
+export const durationFromDays = daysToDuration;
 /**
  * Reset rendering for a row. Estimated resets carry "(est.)"; reset-passed
  * rows await a fresh window; invalid rows carry a row-level note.
@@ -164,14 +333,17 @@ export function resetCountdown(provider, asOfMs) {
         return "awaiting fresh window";
     if (!provider.quota)
         return "no readings";
-    const left = timeLeft(provider.quota.resetsAt, asOfMs);
+    const resetIso = quotaResetsAt(provider);
+    if (!resetIso)
+        return "no readings";
+    const left = timeLeft(resetIso, asOfMs);
     if (left === null) {
-        const resetMs = Date.parse(provider.quota.resetsAt);
+        const resetMs = Date.parse(resetIso);
         if (Number.isFinite(resetMs) && resetMs <= asOfMs)
             return "awaiting fresh window";
         return "reset unknown";
     }
-    const estimated = isEstimated(provider) ? " (est.)" : "";
+    const estimated = quotaResetEstimated(provider) ? " (est.)" : "";
     return `in ${left}${estimated}`;
 }
 /**
@@ -184,13 +356,18 @@ export function resetCellLines(provider, asOfMs) {
         return { top: "awaiting fresh window", bottom: null };
     if (!provider.quota)
         return { top: "no readings", bottom: null };
-    const clock = resetClock(provider.quota.resetsAt);
-    const left = timeLeft(provider.quota.resetsAt, asOfMs);
-    const estimated = isEstimated(provider) ? " (est.)" : "";
+    const resetIso = quotaResetsAt(provider);
+    if (!resetIso)
+        return { top: "no readings", bottom: null };
+    // A monthly quota reset sits weeks out: it carries the calendar date,
+    // where the weekly clock's weekday alone would read as this week.
+    const clock = isMonthlyBound(provider) ? resetDateClock(resetIso) : resetClock(resetIso);
+    const left = timeLeft(resetIso, asOfMs);
+    const estimated = quotaResetEstimated(provider) ? " (est.)" : "";
     if (clock && left)
         return { top: `${clock}${estimated}`, bottom: `in ${left}` };
     if (left === null) {
-        const resetMs = Date.parse(provider.quota.resetsAt);
+        const resetMs = Date.parse(resetIso);
         if (Number.isFinite(resetMs) && resetMs <= asOfMs)
             return { top: "awaiting fresh window", bottom: null };
         return { top: "reset unknown", bottom: null };
@@ -205,17 +382,11 @@ export function resetCell(provider, asOfMs) {
     const { top, bottom } = resetCellLines(provider, asOfMs);
     return bottom ? `${top} · ${bottom}` : top;
 }
-/** Bar geometry from server timestamps and percents. Presentation only. */
+/** Bar geometry of the quota window from server timestamps and percents. Presentation only. */
 export function barGeometry(provider, asOfMs) {
-    const usedPct = provider.quota ? Math.min(100, Math.max(0, provider.quota.weeklyPct)) : 0;
-    let elapsedPct = null;
-    if (provider.quota) {
-        const startMs = Date.parse(provider.quota.periodStart);
-        const resetMs = Date.parse(provider.quota.resetsAt);
-        if (Number.isFinite(startMs) && Number.isFinite(resetMs) && resetMs > startMs) {
-            elapsedPct = Math.min(1, Math.max(0, (asOfMs - startMs) / (resetMs - startMs))) * 100;
-        }
-    }
+    const usedRaw = quotaUsedPct(provider);
+    const usedPct = usedRaw !== null ? Math.min(100, Math.max(0, usedRaw)) : 0;
+    const elapsedPct = quotaElapsedPct(provider, asOfMs);
     return { usedPct, elapsedPct };
 }
 export function badgeColor(badge) {
@@ -313,7 +484,7 @@ export function badgeTitle(badge, estimated) {
         title += " (estimated reset)";
     return title;
 }
-export function Badge({ provider }) {
+export function Badge({ provider, compact = false, }) {
     const badge = paceBadge(provider);
     const detail = exclusionDetail(provider.exclusionReason);
     const badgeClass = badge === "Behind pace"
@@ -327,7 +498,30 @@ export function Badge({ provider }) {
                     : badge === "Cap risk" || badge === "Monthly exhausted"
                         ? "pace-cap"
                         : "pace-out"; // Not reporting and Measuring share the neutral style
-    return (_jsxs("span", { "data-testid": "pace-badge", className: `pace ${badgeClass}`, title: badgeTitle(badge, provider.quota?.resetsAtEstimated === true), children: [badge, detail ? ` · ${detail}` : ""] }));
+    const title = compact && detail
+        ? `${badge} · ${detail}`
+        : badgeTitle(badge, quotaResetEstimated(provider));
+    return (_jsxs("span", { "data-testid": "pace-badge", className: `pace ${badgeClass}`, title: title, children: [badge, !compact && detail ? ` · ${detail}` : ""] }));
+}
+/**
+ * Headline forecast shared by the card bar and the drawer quota row:
+ * "expires unused" wording when a waste hatch applies, otherwise the
+ * one-line forecast. Null when there is nothing to forecast.
+ */
+export function paceHeadline(provider) {
+    const badge = paceBadge(provider);
+    const monthlyBinds = provider.advisory?.bindingWindow === "monthly";
+    const wastePct = provider.advisory?.wastePct;
+    const hatch = !monthlyBinds && wastePct !== null && wastePct !== undefined && Number.isFinite(wastePct) && wastePct >= 3;
+    const text = hatch && badge === "Behind pace" ? `${Math.round(wastePct)}% expires unused` : forecastLine(provider);
+    if (!text)
+        return null;
+    const kind = monthlyBinds
+        ? provider.advisory.bindingRemaining === 0
+            ? "cap"
+            : "behind"
+        : outKind(badge);
+    return { text, kind, hatch };
 }
 /**
  * Two-tier pacing rail: used fill, elapsed tick, projected-unused hatch.
@@ -337,18 +531,15 @@ export function PaceBar({ provider, asOf, showHeadline = true, }) {
     const badge = paceBadge(provider);
     const asOfMs = Date.parse(asOf);
     const { usedPct, elapsedPct } = barGeometry(provider, asOfMs);
-    const monthlyBinds = provider.advisory?.bindingWindow === "monthly";
     const wastePct = provider.advisory?.wastePct;
+    const headline = paceHeadline(provider);
     // A weekly-sized hatch under a month-bound card restates issue 109.
-    const showHatch = !monthlyBinds && wastePct !== null && wastePct !== undefined && Number.isFinite(wastePct) && wastePct >= 3;
+    const showHatch = headline?.hatch ?? false;
+    const quotaUsed = quotaUsedPct(provider);
     const label = provider.quota
-        ? `${provider.id}: ${provider.quota.weeklyPct}% used, ${badge}`
+        ? `${provider.id}: ${quotaUsed ?? provider.quota.weeklyPct}% used, ${badge}`
         : `${provider.id}: no readings, ${badge}`;
-    const forecast = showHatch && badge === "Behind pace" ? `${Math.round(wastePct)}% expires unused` : forecastLine(provider);
-    const kind = monthlyBinds
-        ? provider.advisory.bindingRemaining === 0 ? "cap" : "behind"
-        : outKind(badge);
-    return (_jsxs("div", { "data-testid": "pace-bar", role: "img", "aria-label": label, className: "trackwrap", children: [showHeadline && provider.quota && (_jsxs("div", { className: "tline", children: [_jsxs("span", { className: "used", children: [provider.quota.weeklyPct, "% used"] }), forecast && kind !== "none" ? (_jsxs("span", { className: `out out-${kind}`, children: ["\u2192 ", forecast] })) : forecast ? (_jsxs("span", { className: "out out-none", children: ["\u2192 ", forecast] })) : null] })), _jsxs("div", { className: "track", children: [_jsx("div", { "aria-hidden": "true", className: "fill", style: {
+    return (_jsxs("div", { "data-testid": "pace-bar", role: "img", "aria-label": label, className: "trackwrap", children: [showHeadline && provider.quota && (_jsxs("div", { className: "tline", children: [_jsxs("span", { className: "used", children: [quotaUsed ?? provider.quota.weeklyPct, "% used"] }), headline && headline.kind !== "none" ? (_jsxs("span", { className: `out out-${headline.kind}`, children: ["\u2192 ", headline.text] })) : headline ? (_jsxs("span", { className: "out out-none", children: ["\u2192 ", headline.text] })) : null] })), _jsxs("div", { className: "track", children: [_jsx("div", { "aria-hidden": "true", className: "fill", style: {
                             width: `${usedPct}%`,
                             background: fillToken(badge),
                             ["--fill-edge"]: edgeToken(badge),
@@ -392,16 +583,16 @@ export function forecastLine(provider) {
     }
     if (advisory.status === "at risk") {
         return advisory.daysToExhaust !== null && Number.isFinite(advisory.daysToExhaust)
-            ? `Cap risk · exhausts in ${advisory.daysToExhaust.toFixed(1)}d at current pace`
+            ? `Cap risk · exhausts in ${daysToDuration(advisory.daysToExhaust)} at current pace`
             : "Cap risk at current pace";
     }
     if (advisory.status === "watch") {
         return advisory.daysToExhaust !== null && Number.isFinite(advisory.daysToExhaust)
-            ? `Watch · exhausts in ${advisory.daysToExhaust.toFixed(1)}d at current pace`
+            ? `Watch · exhausts in ${daysToDuration(advisory.daysToExhaust)} at current pace`
             : "Watch at current pace";
     }
     if (advisory.wastePct !== null) {
-        return `${Math.round(advisory.wastePct)}% waste in ${advisory.daysLeft.toFixed(1)}d`;
+        return `${Math.round(advisory.wastePct)}% waste in ${daysToDuration(advisory.daysLeft)}`;
     }
     return "On track.";
 }

package/dist/web/src/components/PacingLegend.js

@@ -30,7 +30,7 @@ export function PacingLegend() {
             document.removeEventListener("keydown", onKey);
         };
     }, [open]);
-    return (_jsxs("div", { className: "legend-wrap", ref: rootRef, children: [_jsx("button", { type: "button", className: "legend-btn", "aria-expanded": open, "aria-controls": "pacing-legend", onClick: () => setOpen((v) => !v), children: "Pacing Legend \u25BE" }), open && (_jsxs("div", { id: "pacing-legend", className: "legend-popover", role: "dialog", "aria-label": "Pacing legend", children: [_jsxs("div", { className: "legend-head", children: [_jsx("b", { children: "Pacing Scale Legend" }), _jsx("button", { type: "button", className: "legend-close", "aria-label": "Close pacing legend", onClick: () => setOpen(false), children: "\u00D7" })] }), _jsx("p", { className: "legend-intro", children: "Pacing measures quota burn against elapsed window time:" }), _jsx("div", { className: "legend-rows", children: STATES.map((s) => (_jsxs("div", { className: "legend-row", children: [_jsx("span", { className: `pace ${s.cls}`, children: s.label }), _jsx("span", { children: s.meaning })] }, s.label))) }), _jsxs("div", { className: "legend-foot", children: [_jsx("code", { children: "\u2588" }), " allowance used \u00B7 ", _jsx("code", { children: "\u2502" }), " time elapsed \u00B7 ", _jsx("code", { children: "\u2591" }), " projected waste"] }), _jsx("div", { className: "legend-foot", children: "Avg = used \u00F7 days elapsed \u00B7 24h = burn over the last day \u00B7 Ideal = remaining \u00F7 days left" })] }))] }));
+    return (_jsxs("div", { className: "legend-wrap", ref: rootRef, children: [_jsx("button", { type: "button", className: "legend-btn", "aria-expanded": open, "aria-controls": "pacing-legend", onClick: () => setOpen((v) => !v), children: "Pacing Legend \u25BE" }), open && (_jsxs("div", { id: "pacing-legend", className: "legend-popover", role: "dialog", "aria-label": "Pacing legend", children: [_jsxs("div", { className: "legend-head", children: [_jsx("b", { children: "Pacing Scale Legend" }), _jsx("button", { type: "button", className: "legend-close", "aria-label": "Close pacing legend", onClick: () => setOpen(false), children: "\u00D7" })] }), _jsx("p", { className: "legend-intro", children: "Pacing measures quota burn against elapsed window time:" }), _jsx("div", { className: "legend-rows", children: STATES.map((s) => (_jsxs("div", { className: "legend-row", children: [_jsx("span", { className: `pace ${s.cls}`, children: s.label }), _jsx("span", { children: s.meaning })] }, s.label))) }), _jsxs("div", { className: "legend-foot", children: [_jsx("code", { children: "\u2588" }), " quota used \u00B7 ", _jsx("code", { children: "\u2502" }), " time elapsed \u00B7 ", _jsx("code", { children: "\u2591" }), " projected waste"] }), _jsx("div", { className: "legend-foot", children: "Avg = used \u00F7 days elapsed \u00B7 24h = burn over the last day \u00B7 Ideal = remaining \u00F7 days left" })] }))] }));
 }
 function servingHost() {
     try {

package/dist/web/src/components/ProviderCard.js

@@ -1,24 +1,21 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { ageDuration } from "../state.js";
-import { Badge, PACE_TIPS, PaceBar, isEstimated, paceCells, resetClock, resetCountdown, timeLeft, } from "./PaceBar.js";
+import { Badge, PaceBar, PaceStats, isMonthlyBound, quotaResetEstimated, quotaResetsAt, resetClock, resetCountdown, resetDateClock, } from "./PaceBar.js";
 import { ProviderIcon, providerTint } from "./ProviderIcon.js";
 import { lastClose } from "./ClosedWeeks.js";
 import { WindowsRow } from "./WindowsRow.js";
 function resetsDate(provider) {
-    if (!provider.quota)
+    const resetIso = quotaResetsAt(provider);
+    if (!resetIso)
         return null;
-    const clock = resetClock(provider.quota.resetsAt);
+    const clock = isMonthlyBound(provider) ? resetDateClock(resetIso) : resetClock(resetIso);
     if (!clock)
         return null;
-    return `Resets ${clock}${isEstimated(provider) ? " (est.)" : ""}`;
+    return `Resets ${clock}${quotaResetEstimated(provider) ? " (est.)" : ""}`;
 }
 export function ProviderCard({ provider, recommended, asOf, onSelect, }) {
-    const quota = provider.quota;
-    const advisory = provider.advisory;
-    const pace = paceCells(advisory);
     const asOfMs = Date.parse(asOf);
     const updated = ageDuration(provider.ageMs);
-    const resetsIn = quota ? timeLeft(quota.resetsAt, asOfMs) : null;
     const name = provider.displayName;
     const last = lastClose(provider);
     return (_jsxs("article", { "data-testid": `provider-card-${provider.id}`, role: "button", tabIndex: 0, "aria-label": `${name} details`, onClick: () => onSelect(provider.id), onKeyDown: (e) => {
@@ -27,5 +24,5 @@ export function ProviderCard({ provider, recommended, asOf, onSelect, }) {
                 e.preventDefault();
                 onSelect(provider.id);
             }
-        }, className: `pcard ${recommended ? "is-recommended is-top-pick" : ""}`, children: [_jsxs("div", { className: "pcard-head", children: [_jsx("span", { className: "picon", style: providerTint(provider.id), "aria-hidden": "true", children: _jsx(ProviderIcon, { id: provider.id, title: name }) }), _jsxs("div", { className: "who", children: [_jsxs("b", { children: [name, recommended && (_jsx("span", { className: "rec-icon", title: "Recommended for next session", role: "img", "aria-label": "recommended", children: _jsx("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.3", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": "true", children: _jsx("path", { d: "m12 3-1.9 5.8a2 2 0 0 1-1.3 1.3L3 12l5.8 1.9a2 2 0 0 1 1.3 1.3L12 21l1.9-5.8a2 2 0 0 1 1.3-1.3L21 12l-5.8-1.9a2 2 0 0 1-1.3-1.3z" }) }) }))] }), updated && _jsxs("span", { className: "src", children: ["Updated ", updated, " ago"] })] }), _jsx(Badge, { provider: provider })] }), _jsxs("div", { className: "pcard-body", children: [_jsx(PaceBar, { provider: provider, asOf: asOf }), _jsx(WindowsRow, { provider: provider, asOf: asOf, variant: "card" }), _jsxs("div", { className: "pstats", children: [_jsxs("div", { title: PACE_TIPS.avg, children: [_jsx("span", { className: "l", children: "Avg pace" }), _jsx("span", { className: "v", children: pace.avg })] }), _jsxs("div", { title: PACE_TIPS.recent, children: [_jsx("span", { className: "l", children: "24h pace" }), _jsx("span", { className: "v", children: pace.recent })] }), _jsxs("div", { title: PACE_TIPS.ideal, children: [_jsx("span", { className: "l", children: "Ideal pace" }), _jsx("span", { className: "v", children: advisory ? `${advisory.idealRate.toFixed(1)}%/day` : "—" })] }), _jsxs("div", { children: [_jsx("span", { className: "l", children: "Resets in" }), _jsx("span", { className: "v", children: resetsIn ? `${resetsIn}${isEstimated(provider) ? " (est.)" : ""}` : resetCountdown(provider, asOfMs) })] })] })] }), _jsxs("div", { className: "pcard-foot", children: [_jsxs("div", { className: "foot-meta", children: [_jsx("span", { children: resetsDate(provider) ?? resetCountdown(provider, asOfMs) }), last && (_jsxs("span", { className: "last-week", children: ["Last week ", last.leftoverPct, "% leftover", last.resetsAtEstimated ? " (est.)" : ""] }))] }), _jsx("span", { className: "rowbtn", "aria-hidden": "true", children: "Inspect" })] })] }));
+        }, className: `pcard ${recommended ? "is-recommended is-top-pick" : ""}`, children: [_jsxs("div", { className: "pcard-head", children: [_jsx("span", { className: "picon", style: providerTint(provider.id), "aria-hidden": "true", children: _jsx(ProviderIcon, { id: provider.id, title: name }) }), _jsxs("div", { className: "who", children: [_jsxs("b", { children: [name, recommended && (_jsx("span", { className: "rec-icon", title: "Recommended for next session", role: "img", "aria-label": "recommended", children: _jsx("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.3", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": "true", children: _jsx("path", { d: "m12 3-1.9 5.8a2 2 0 0 1-1.3 1.3L3 12l5.8 1.9a2 2 0 0 1 1.3 1.3L12 21l1.9-5.8a2 2 0 0 1 1.3-1.3L21 12l-5.8-1.9a2 2 0 0 1-1.3-1.3z" }) }) }))] }), updated && _jsxs("span", { className: "src", children: ["Updated ", updated, " ago"] })] }), _jsx(Badge, { provider: provider })] }), _jsxs("div", { className: "pcard-body", children: [_jsx(PaceBar, { provider: provider, asOf: asOf }), _jsx(WindowsRow, { provider: provider, asOf: asOf, variant: "card" }), _jsx(PaceStats, { provider: provider, asOf: asOf })] }), _jsxs("div", { className: "pcard-foot", children: [_jsxs("div", { className: "foot-meta", children: [_jsx("span", { children: resetsDate(provider) ?? resetCountdown(provider, asOfMs) }), last && (_jsxs("span", { className: "last-week", children: ["Last ", isMonthlyBound(provider) ? "month" : "week", " ", last.leftoverPct, "% leftover", last.resetsAtEstimated ? " (est.)" : ""] }))] }), _jsx("span", { className: "rowbtn", "aria-hidden": "true", children: "Inspect" })] })] }));
 }