quotacap 0.0.3 → 0.0.5

package/dist/adapters/claude.js

@@ -1,63 +1,13 @@
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-import { parse, isValid } from "date-fns";
-import { fromZonedTime, formatInTimeZone } from "date-fns-tz";
+import { parseResetText } from "./parse.js";
 const exec = promisify(execFile);
-const BRISBANE_TZ = "Australia/Brisbane";
-const RESET_FORMATS = [
-    "MMM d 'at' h:mma yyyy",
-    "MMM d 'at' ha yyyy",
-    "MMM d 'at' h:mm a yyyy",
-    "MMM d 'at' h a yyyy",
-];
-function tryParseWithYear(raw, year) {
-    const withYear = `${raw.trim()} ${year}`;
-    const normalized = withYear.replace(/([ap]m)\b/gi, (m) => m.toUpperCase());
-    for (const fmt of RESET_FORMATS) {
-        const d = parse(normalized, fmt, new Date());
-        if (isValid(d)) {
-            return fromZonedTime(d, BRISBANE_TZ);
-        }
-    }
-    return null;
-}
-function parseBrisbaneReset(resetsRaw, now) {
-    const trimmed = resetsRaw.trim();
-    if (!trimmed)
-        return null;
-    const yearStr = formatInTimeZone(now, BRISBANE_TZ, "yyyy");
-    const year = parseInt(yearStr, 10);
-    let utc = tryParseWithYear(trimmed, year);
-    if (!utc)
-        return null;
-    if (utc.getTime() < now.getTime()) {
-        const utcNext = tryParseWithYear(trimmed, year + 1);
-        if (utcNext) {
-            const diff = utcNext.getTime() - now.getTime();
-            if (diff >= 0 && diff < 8 * 86400000) {
-                utc = utcNext;
-            }
-            else {
-                // stale / out-of-range (e.g. monthly-plan string) — fallback to now+7d
-                return null;
-            }
-        }
-        else {
-            return null;
-        }
-        // if utc was past and no valid next-year within window, treat as stale
-        if (utc.getTime() < now.getTime())
-            return null;
-    }
-    return formatInTimeZone(utc, BRISBANE_TZ, "yyyy-MM-dd'T'HH:mm:ssXXX");
-}
 export function parseClaudeUsage(result, now = new Date()) {
     const sessionMatch = result.match(/Current session:\s+(\d+)% used[^·]*·\s*resets\s+([^\n(]+?)\s*\(/);
     const weeklyMatch = result.match(/Current week \(all models\):\s+(\d+)% used[^·]*·\s*resets\s+([^\n(]+?)\s*\(/);
     const usedPct = weeklyMatch ? parseInt(weeklyMatch[1], 10) : 0;
     const sessionPct = sessionMatch ? parseInt(sessionMatch[1], 10) : undefined;
-    const resetsRaw = weeklyMatch?.[2].trim() ?? "";
-    let resetsAt = parseBrisbaneReset(resetsRaw, now);
+    let resetsAt = parseResetText(result, now);
     if (!resetsAt)
         resetsAt = new Date(now.getTime() + 7 * 86400000).toISOString();
     return {

package/dist/adapters/manual.js

@@ -1,7 +1,8 @@
+import { parseResetText } from "./parse.js";
 export function parseManualUsage(provider, text, now = new Date()) {
     const m = text.match(/(\d+)% used/);
     const usedPct = m ? parseInt(m[1], 10) : 0;
-    const resetsAt = new Date(now.getTime() + 3 * 86400000).toISOString();
+    const resetsAt = parseResetText(text, now) ?? new Date(now.getTime() + 3 * 86400000).toISOString();
     return {
         provider,
         plan: "unknown",

package/dist/adapters/parse.d.ts

@@ -0,0 +1 @@
+export declare function parseResetText(text: string, now: Date): string | null;

package/dist/adapters/parse.js

@@ -0,0 +1,81 @@
+import { parse, isValid } from "date-fns";
+import { fromZonedTime, formatInTimeZone } from "date-fns-tz";
+// Shared reset-date parsing for adapter raw text. Claude and manual pastes
+// both carry "resets Aug 29 at 11am" style strings; this resolves them to an
+// ISO instant in Brisbane time with a same-format next-year rollover.
+const BRISBANE_TZ = "Australia/Brisbane";
+const RESET_FORMATS = [
+    "MMM d 'at' h:mma yyyy",
+    "MMM d 'at' ha yyyy",
+    "MMM d 'at' h:mm a yyyy",
+    "MMM d 'at' h a yyyy",
+];
+function tryParseWithYear(raw, year) {
+    const withYear = `${raw.trim()} ${year}`;
+    const normalized = withYear.replace(/([ap]m)\b/gi, (m) => m.toUpperCase());
+    for (const fmt of RESET_FORMATS) {
+        const d = parse(normalized, fmt, new Date());
+        if (isValid(d)) {
+            return fromZonedTime(d, BRISBANE_TZ);
+        }
+    }
+    return null;
+}
+function parseAbsoluteReset(raw, now) {
+    const yearStr = formatInTimeZone(now, BRISBANE_TZ, "yyyy");
+    const year = parseInt(yearStr, 10);
+    let utc = tryParseWithYear(raw, year);
+    if (!utc)
+        return null;
+    if (utc.getTime() < now.getTime()) {
+        const utcNext = tryParseWithYear(raw, year + 1);
+        if (utcNext) {
+            const diff = utcNext.getTime() - now.getTime();
+            if (diff >= 0 && diff < 8 * 86400000) {
+                utc = utcNext;
+            }
+            else {
+                return null;
+            }
+        }
+        else {
+            return null;
+        }
+        if (utc.getTime() < now.getTime())
+            return null;
+    }
+    return utc;
+}
+function parseRelativeDuration(raw, now) {
+    const m = raw.match(/^in\s+(.+)$/);
+    if (!m)
+        return null;
+    const inner = m[1].trim();
+    const d = inner.match(/(\d+)d/)?.[1];
+    const h = inner.match(/(\d+)h/)?.[1];
+    const min = inner.match(/(\d+)m/)?.[1];
+    if (!d && !h && !min)
+        return null;
+    const ms = (parseInt(d ?? "0", 10) * 86400 + parseInt(h ?? "0", 10) * 3600 + parseInt(min ?? "0", 10) * 60) * 1000;
+    return new Date(now.getTime() + ms);
+}
+export function parseResetText(text, now) {
+    // Farthest future reset wins. Claude output lists the session reset before
+    // the weekly one; kimi lists the weekly window before its 5h rolling one —
+    // the period reset is always the farthest, so one rule serves both.
+    const matches = [...text.matchAll(/resets\s+([^\n(]+?)\s*(?:\(|$)/gm)];
+    let best = null;
+    for (const m of matches) {
+        const raw = m[1].trim();
+        if (!raw)
+            continue;
+        const candidates = [parseAbsoluteReset(raw, now), parseRelativeDuration(raw, now)];
+        for (const c of candidates) {
+            if (c && (!best || c.getTime() > best.getTime()))
+                best = c;
+        }
+    }
+    if (!best)
+        return null;
+    return formatInTimeZone(best, BRISBANE_TZ, "yyyy-MM-dd'T'HH:mm:ssXXX");
+}

package/dist/src/adapters/claude.js

@@ -1,63 +1,13 @@
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-import { parse, isValid } from "date-fns";
-import { fromZonedTime, formatInTimeZone } from "date-fns-tz";
+import { parseResetText } from "./parse.js";
 const exec = promisify(execFile);
-const BRISBANE_TZ = "Australia/Brisbane";
-const RESET_FORMATS = [
-    "MMM d 'at' h:mma yyyy",
-    "MMM d 'at' ha yyyy",
-    "MMM d 'at' h:mm a yyyy",
-    "MMM d 'at' h a yyyy",
-];
-function tryParseWithYear(raw, year) {
-    const withYear = `${raw.trim()} ${year}`;
-    const normalized = withYear.replace(/([ap]m)\b/gi, (m) => m.toUpperCase());
-    for (const fmt of RESET_FORMATS) {
-        const d = parse(normalized, fmt, new Date());
-        if (isValid(d)) {
-            return fromZonedTime(d, BRISBANE_TZ);
-        }
-    }
-    return null;
-}
-function parseBrisbaneReset(resetsRaw, now) {
-    const trimmed = resetsRaw.trim();
-    if (!trimmed)
-        return null;
-    const yearStr = formatInTimeZone(now, BRISBANE_TZ, "yyyy");
-    const year = parseInt(yearStr, 10);
-    let utc = tryParseWithYear(trimmed, year);
-    if (!utc)
-        return null;
-    if (utc.getTime() < now.getTime()) {
-        const utcNext = tryParseWithYear(trimmed, year + 1);
-        if (utcNext) {
-            const diff = utcNext.getTime() - now.getTime();
-            if (diff >= 0 && diff < 8 * 86400000) {
-                utc = utcNext;
-            }
-            else {
-                // stale / out-of-range (e.g. monthly-plan string) — fallback to now+7d
-                return null;
-            }
-        }
-        else {
-            return null;
-        }
-        // if utc was past and no valid next-year within window, treat as stale
-        if (utc.getTime() < now.getTime())
-            return null;
-    }
-    return formatInTimeZone(utc, BRISBANE_TZ, "yyyy-MM-dd'T'HH:mm:ssXXX");
-}
 export function parseClaudeUsage(result, now = new Date()) {
     const sessionMatch = result.match(/Current session:\s+(\d+)% used[^·]*·\s*resets\s+([^\n(]+?)\s*\(/);
     const weeklyMatch = result.match(/Current week \(all models\):\s+(\d+)% used[^·]*·\s*resets\s+([^\n(]+?)\s*\(/);
     const usedPct = weeklyMatch ? parseInt(weeklyMatch[1], 10) : 0;
     const sessionPct = sessionMatch ? parseInt(sessionMatch[1], 10) : undefined;
-    const resetsRaw = weeklyMatch?.[2].trim() ?? "";
-    let resetsAt = parseBrisbaneReset(resetsRaw, now);
+    let resetsAt = parseResetText(result, now);
     if (!resetsAt)
         resetsAt = new Date(now.getTime() + 7 * 86400000).toISOString();
     return {

package/dist/src/adapters/manual.js

@@ -1,7 +1,8 @@
+import { parseResetText } from "./parse.js";
 export function parseManualUsage(provider, text, now = new Date()) {
     const m = text.match(/(\d+)% used/);
     const usedPct = m ? parseInt(m[1], 10) : 0;
-    const resetsAt = new Date(now.getTime() + 3 * 86400000).toISOString();
+    const resetsAt = parseResetText(text, now) ?? new Date(now.getTime() + 3 * 86400000).toISOString();
     return {
         provider,
         plan: "unknown",

package/dist/src/adapters/parse.d.ts

@@ -0,0 +1 @@
+export declare function parseResetText(text: string, now: Date): string | null;

package/dist/src/adapters/parse.js

@@ -0,0 +1,81 @@
+import { parse, isValid } from "date-fns";
+import { fromZonedTime, formatInTimeZone } from "date-fns-tz";
+// Shared reset-date parsing for adapter raw text. Claude and manual pastes
+// both carry "resets Aug 29 at 11am" style strings; this resolves them to an
+// ISO instant in Brisbane time with a same-format next-year rollover.
+const BRISBANE_TZ = "Australia/Brisbane";
+const RESET_FORMATS = [
+    "MMM d 'at' h:mma yyyy",
+    "MMM d 'at' ha yyyy",
+    "MMM d 'at' h:mm a yyyy",
+    "MMM d 'at' h a yyyy",
+];
+function tryParseWithYear(raw, year) {
+    const withYear = `${raw.trim()} ${year}`;
+    const normalized = withYear.replace(/([ap]m)\b/gi, (m) => m.toUpperCase());
+    for (const fmt of RESET_FORMATS) {
+        const d = parse(normalized, fmt, new Date());
+        if (isValid(d)) {
+            return fromZonedTime(d, BRISBANE_TZ);
+        }
+    }
+    return null;
+}
+function parseAbsoluteReset(raw, now) {
+    const yearStr = formatInTimeZone(now, BRISBANE_TZ, "yyyy");
+    const year = parseInt(yearStr, 10);
+    let utc = tryParseWithYear(raw, year);
+    if (!utc)
+        return null;
+    if (utc.getTime() < now.getTime()) {
+        const utcNext = tryParseWithYear(raw, year + 1);
+        if (utcNext) {
+            const diff = utcNext.getTime() - now.getTime();
+            if (diff >= 0 && diff < 8 * 86400000) {
+                utc = utcNext;
+            }
+            else {
+                return null;
+            }
+        }
+        else {
+            return null;
+        }
+        if (utc.getTime() < now.getTime())
+            return null;
+    }
+    return utc;
+}
+function parseRelativeDuration(raw, now) {
+    const m = raw.match(/^in\s+(.+)$/);
+    if (!m)
+        return null;
+    const inner = m[1].trim();
+    const d = inner.match(/(\d+)d/)?.[1];
+    const h = inner.match(/(\d+)h/)?.[1];
+    const min = inner.match(/(\d+)m/)?.[1];
+    if (!d && !h && !min)
+        return null;
+    const ms = (parseInt(d ?? "0", 10) * 86400 + parseInt(h ?? "0", 10) * 3600 + parseInt(min ?? "0", 10) * 60) * 1000;
+    return new Date(now.getTime() + ms);
+}
+export function parseResetText(text, now) {
+    // Farthest future reset wins. Claude output lists the session reset before
+    // the weekly one; kimi lists the weekly window before its 5h rolling one —
+    // the period reset is always the farthest, so one rule serves both.
+    const matches = [...text.matchAll(/resets\s+([^\n(]+?)\s*(?:\(|$)/gm)];
+    let best = null;
+    for (const m of matches) {
+        const raw = m[1].trim();
+        if (!raw)
+            continue;
+        const candidates = [parseAbsoluteReset(raw, now), parseRelativeDuration(raw, now)];
+        for (const c of candidates) {
+            if (c && (!best || c.getTime() > best.getTime()))
+                best = c;
+        }
+    }
+    if (!best)
+        return null;
+    return formatInTimeZone(best, BRISBANE_TZ, "yyyy-MM-dd'T'HH:mm:ssXXX");
+}

package/dist/src/version.js

@@ -1,2 +1,2 @@
 // generated by scripts/build-embed.mjs — do not edit
-export const VERSION = "0.0.3";
+export const VERSION = "0.0.5";

package/dist/tests/adapters/manual.test.js

@@ -7,4 +7,22 @@ describe("manual", () => {
         expect(q.usedPct).toBe(22);
         expect(q.source).toBe("manual");
     });
+    it("parses the reset date from the text instead of guessing +3d", () => {
+        const now = new Date("2026-08-28T06:00:00+10:00");
+        const q = parseManualUsage("kimi", `Current week: 22% used · resets Aug 29 at 11am`, now);
+        expect(q.resetsAt).toMatch(/^2026-08-29/);
+    });
+    it("parses kimi's real dashboard format (relative duration, weekly window)", () => {
+        const now = new Date("2026-08-28T22:00:00Z");
+        const text = [
+            "Usage",
+            "Session usage: No active session.",
+            "Weekly limit  ███░░░░░░░░░░░░░░░░░  16% used  resets in 3d 1h 24m",
+            "5h limit      ░░░░░░░░░░░░░░░░░░░░  0% used   resets in 3h 24m",
+        ].join("\n");
+        const q = parseManualUsage("kimi", text, now);
+        expect(q.usedPct).toBe(16);
+        const expected = now.getTime() + ((3 * 24 + 1) * 3600 + 24 * 60) * 1000;
+        expect(new Date(q.resetsAt).getTime()).toBe(expected);
+    });
 });

package/dist/version.js

@@ -1,2 +1,2 @@
 // generated by scripts/build-embed.mjs — do not edit
-export const VERSION = "0.0.3";
+export const VERSION = "0.0.5";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quotacap",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "type": "module",
   "repository": {
     "type": "git",