quotacap 0.0.4 → 0.0.6

package/dist/adapters/parse.js

@@ -21,22 +21,14 @@ function tryParseWithYear(raw, year) {
     }
     return null;
 }
-export function parseResetText(text, now) {
-    // Last "resets" match wins: claude output lists the session reset first and
-    // the weekly (period) reset last; manual pastes carry a single line.
-    const matches = [...text.matchAll(/resets\s+([^\n(]+?)\s*(?:\(|$)/gm)];
-    if (!matches.length)
-        return null;
-    const trimmed = matches[matches.length - 1][1].trim();
-    if (!trimmed)
-        return null;
+function parseAbsoluteReset(raw, now) {
     const yearStr = formatInTimeZone(now, BRISBANE_TZ, "yyyy");
     const year = parseInt(yearStr, 10);
-    let utc = tryParseWithYear(trimmed, year);
+    let utc = tryParseWithYear(raw, year);
     if (!utc)
         return null;
     if (utc.getTime() < now.getTime()) {
-        const utcNext = tryParseWithYear(trimmed, year + 1);
+        const utcNext = tryParseWithYear(raw, year + 1);
         if (utcNext) {
             const diff = utcNext.getTime() - now.getTime();
             if (diff >= 0 && diff < 8 * 86400000) {
@@ -52,5 +44,38 @@ export function parseResetText(text, now) {
         if (utc.getTime() < now.getTime())
             return null;
     }
-    return formatInTimeZone(utc, BRISBANE_TZ, "yyyy-MM-dd'T'HH:mm:ssXXX");
+    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/mcp/server.d.ts

@@ -37,5 +37,6 @@ export declare const tools: ({
         required: string[];
     };
 })[];
+export declare function recommendationTable(rec: any): string;
 export declare function handleTool(name: string, args: any): Promise<any>;
 export declare function runMcpServer(): Promise<void>;

package/dist/mcp/server.js

@@ -16,11 +16,28 @@ async function fetchJson(path) {
         throw new Error(`daemon not running, run quotacap web — ${e?.message ?? String(e)}`);
     }
 }
+export function recommendationTable(rec) {
+    const rows = (rec.advisories ?? []).map((a) => {
+        const q = (rec.alternatives ?? []).find((x) => x.provider === a.provider);
+        const used = Math.round(q?.usedPct ?? 0);
+        const resets = q?.resetsAt ? new Date(q.resetsAt).toLocaleString() : "—";
+        return `| ${a.provider} | ${used}% | ${100 - used}% | ${resets} | ${Math.round(a.wastePct)}% |`;
+    });
+    return [
+        "| Provider | Used | Remaining | Resets | Waste if unused |",
+        "|---|---|---|---|---|",
+        ...rows,
+    ].join("\n");
+}
 export async function handleTool(name, args) {
     if (name === "get_quotas")
         return fetchJson("/api/quotas");
-    if (name === "get_recommendation")
-        return fetchJson(`/api/recommendation?task=${args?.task ?? "any"}`);
+    if (name === "get_recommendation") {
+        const rec = await fetchJson(`/api/recommendation?task=${args?.task ?? "any"}`);
+        const table = recommendationTable(rec);
+        const json = JSON.stringify(rec, null, 2);
+        return { content: [{ type: "text", text: table }, { type: "text", text: json }] };
+    }
     if (name === "forecast") {
         if (!args?.provider)
             throw new Error("provider required");
@@ -72,7 +89,7 @@ export async function runMcpServer() {
                 const toolArgs = params?.arguments ?? {};
                 try {
                     const result = await handleTool(toolName, toolArgs);
-                    const content = [{ type: "text", text: JSON.stringify(result, null, 2) }];
+                    const content = Array.isArray(result?.content) ? result.content : [{ type: "text", text: JSON.stringify(result, null, 2) }];
                     if (!isNotification)
                         respond(id, { content });
                 }

package/dist/src/adapters/parse.js

@@ -21,22 +21,14 @@ function tryParseWithYear(raw, year) {
     }
     return null;
 }
-export function parseResetText(text, now) {
-    // Last "resets" match wins: claude output lists the session reset first and
-    // the weekly (period) reset last; manual pastes carry a single line.
-    const matches = [...text.matchAll(/resets\s+([^\n(]+?)\s*(?:\(|$)/gm)];
-    if (!matches.length)
-        return null;
-    const trimmed = matches[matches.length - 1][1].trim();
-    if (!trimmed)
-        return null;
+function parseAbsoluteReset(raw, now) {
     const yearStr = formatInTimeZone(now, BRISBANE_TZ, "yyyy");
     const year = parseInt(yearStr, 10);
-    let utc = tryParseWithYear(trimmed, year);
+    let utc = tryParseWithYear(raw, year);
     if (!utc)
         return null;
     if (utc.getTime() < now.getTime()) {
-        const utcNext = tryParseWithYear(trimmed, year + 1);
+        const utcNext = tryParseWithYear(raw, year + 1);
         if (utcNext) {
             const diff = utcNext.getTime() - now.getTime();
             if (diff >= 0 && diff < 8 * 86400000) {
@@ -52,5 +44,38 @@ export function parseResetText(text, now) {
         if (utc.getTime() < now.getTime())
             return null;
     }
-    return formatInTimeZone(utc, BRISBANE_TZ, "yyyy-MM-dd'T'HH:mm:ssXXX");
+    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/mcp/server.d.ts

@@ -37,5 +37,6 @@ export declare const tools: ({
         required: string[];
     };
 })[];
+export declare function recommendationTable(rec: any): string;
 export declare function handleTool(name: string, args: any): Promise<any>;
 export declare function runMcpServer(): Promise<void>;

package/dist/src/mcp/server.js

@@ -16,11 +16,28 @@ async function fetchJson(path) {
         throw new Error(`daemon not running, run quotacap web — ${e?.message ?? String(e)}`);
     }
 }
+export function recommendationTable(rec) {
+    const rows = (rec.advisories ?? []).map((a) => {
+        const q = (rec.alternatives ?? []).find((x) => x.provider === a.provider);
+        const used = Math.round(q?.usedPct ?? 0);
+        const resets = q?.resetsAt ? new Date(q.resetsAt).toLocaleString() : "—";
+        return `| ${a.provider} | ${used}% | ${100 - used}% | ${resets} | ${Math.round(a.wastePct)}% |`;
+    });
+    return [
+        "| Provider | Used | Remaining | Resets | Waste if unused |",
+        "|---|---|---|---|---|",
+        ...rows,
+    ].join("\n");
+}
 export async function handleTool(name, args) {
     if (name === "get_quotas")
         return fetchJson("/api/quotas");
-    if (name === "get_recommendation")
-        return fetchJson(`/api/recommendation?task=${args?.task ?? "any"}`);
+    if (name === "get_recommendation") {
+        const rec = await fetchJson(`/api/recommendation?task=${args?.task ?? "any"}`);
+        const table = recommendationTable(rec);
+        const json = JSON.stringify(rec, null, 2);
+        return { content: [{ type: "text", text: table }, { type: "text", text: json }] };
+    }
     if (name === "forecast") {
         if (!args?.provider)
             throw new Error("provider required");
@@ -72,7 +89,7 @@ export async function runMcpServer() {
                 const toolArgs = params?.arguments ?? {};
                 try {
                     const result = await handleTool(toolName, toolArgs);
-                    const content = [{ type: "text", text: JSON.stringify(result, null, 2) }];
+                    const content = Array.isArray(result?.content) ? result.content : [{ type: "text", text: JSON.stringify(result, null, 2) }];
                     if (!isNotification)
                         respond(id, { content });
                 }

package/dist/src/version.js

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

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

@@ -12,4 +12,17 @@ describe("manual", () => {
         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/tests/mcp/server.test.js

@@ -1,7 +1,26 @@
 import { describe, it, expect } from "vitest";
-import { tools } from "../../src/mcp/server.js";
+import { tools, recommendationTable } from "../../src/mcp/server.js";
 describe("mcp", () => {
     it("exposes three tools", () => {
         expect(tools.map(t => t.name)).toEqual(expect.arrayContaining(["get_quotas", "get_recommendation", "forecast"]));
     });
+    it("renders a markdown table with one row per provider", () => {
+        const rec = {
+            use: "kimi",
+            reason: "78% waste in 3.0d",
+            alternatives: [
+                { provider: "kimi", usedPct: 16, resetsAt: "2026-09-01T09:02:00+10:00" },
+                { provider: "claude", usedPct: 37, resetsAt: "2026-09-03T21:00:00+10:00" },
+            ],
+            advisories: [
+                { provider: "kimi", wastePct: 78.0 },
+                { provider: "claude", wastePct: 52.9 },
+            ],
+        };
+        const table = recommendationTable(rec);
+        expect(table).toMatch(/\| Provider \| Used \| Remaining \| Resets \| Waste if unused \|/);
+        expect(table).toMatch(/\| kimi \| 16% \| 84% \|/);
+        expect(table).toMatch(/\| claude \| 37% \| 63% \|/);
+        expect(table).toMatch(/\| 78% \|$/m);
+    });
 });

package/dist/version.js

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

package/package.json

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