@jeffreyjyz/opencode-command-code 0.1.3 → 0.1.5

package/dist/index.js

@@ -452,6 +452,8 @@ var plans_default = {
 
 // src/usage.ts
 var BAR_WIDTH = 12;
+var FIVE_HOUR_SECS = 5 * 3600;
+var WEEKLY_SECS = 7 * 86400;
 function money(v) {
   return `$${v.toFixed(2)}`;
 }
@@ -488,6 +490,50 @@ function relTime(resetAtMs, nowSecs) {
     return `${m}m`;
   return "<1m";
 }
+function duration(secs) {
+  const d = Math.floor(secs / 86400);
+  const h = Math.floor(secs % 86400 / 3600);
+  const m = Math.floor(secs % 3600 / 60);
+  if (d > 0)
+    return `${d}d ${h}h`;
+  if (h > 0)
+    return `${h}h ${m}m`;
+  if (m > 0)
+    return `${m}m`;
+  return "<1m";
+}
+function elapsedPct(resetAtMs, durSecs, nowSecs) {
+  if (resetAtMs === undefined)
+    return;
+  const resetSecs = Math.floor(resetAtMs / 1000);
+  if (resetSecs < durSecs)
+    return;
+  const start = resetSecs - durSecs;
+  if (nowSecs < start)
+    return;
+  const pct = Math.min(Math.max((nowSecs - start) / durSecs * 100, 0), 100);
+  return Math.round(pct);
+}
+function paceEta(resetAtMs, durSecs, used, cap, nowSecs) {
+  if (resetAtMs === undefined)
+    return;
+  const resetSecs = Math.floor(resetAtMs / 1000);
+  if (resetSecs < durSecs)
+    return;
+  const start = resetSecs - durSecs;
+  if (nowSecs <= start || nowSecs >= resetSecs)
+    return;
+  const elapsed = nowSecs - start;
+  if (elapsed / durSecs < 0.1)
+    return;
+  const rate = used / elapsed;
+  if (rate <= 0 || used >= cap)
+    return;
+  const secsToCap = (cap - used) / rate;
+  if (secsToCap >= resetSecs - nowSecs)
+    return;
+  return secsToCap;
+}
 function parseIsoUtc(s) {
   const m = s.match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|[+-]\d{2}:?\d{2})?$/);
   if (!m)
@@ -503,6 +549,13 @@ function parseIsoUtc(s) {
   }
   return Date.UTC(+y, +mo - 1, +d, +h, +mi, Math.floor(+sec)) - offsetMs;
 }
+function monthlyWindow(cap, remaining, periodStart, periodEnd) {
+  const used = Math.min(Math.max(cap - remaining, 0), cap);
+  const resetAt = periodEnd ? parseIsoUtc(periodEnd) : undefined;
+  const start = periodStart ? parseIsoUtc(periodStart) : undefined;
+  const durSecs = start !== undefined && resetAt !== undefined ? Math.max(Math.floor((resetAt - start) / 1000), 1) : undefined;
+  return { window: { used, cap, resetAt }, durSecs };
+}
 var NAME_RULES = plans_default.nameRules;
 var DEFAULT_NAME = plans_default.defaultName;
 var CAPS = plans_default.caps;
@@ -518,9 +571,13 @@ function planName(planId) {
   }
   return DEFAULT_NAME;
 }
-function windowLine(label, w, nowSecs) {
+function windowLine(label, w, nowSecs, durSecs) {
   const status = w.exceeded ? " \xB7 **LIMIT EXCEEDED**" : "";
-  return `**${label}** \`${bar(w.used, w.cap)}\` ${money(w.used)} of ${money(w.cap)} (${pctStr(w.used, w.cap)}) \xB7 resets in ${relTime(w.resetAt, nowSecs)}${status}
+  const elapsed = durSecs !== undefined ? elapsedPct(w.resetAt, durSecs, nowSecs) : undefined;
+  const thru = elapsed !== undefined ? ` \xB7 window ${elapsed}% elapsed` : "";
+  const eta = durSecs !== undefined ? paceEta(w.resetAt, durSecs, w.used, w.cap, nowSecs) : undefined;
+  const pace = eta !== undefined ? ` \xB7 **on pace to hit cap in ${duration(eta)}**` : "";
+  return `**${label}** \`${bar(w.used, w.cap)}\` ${money(w.used)} of ${money(w.cap)} (${pctStr(w.used, w.cap)}) \xB7 resets in ${relTime(w.resetAt, nowSecs)}${thru}${pace}${status}
 `;
 }
 function plansTable(current) {
@@ -561,16 +618,15 @@ async function renderUsage(key) {
   }
   lines.push("### Usage windows");
   if (cap) {
-    const used = Math.min(Math.max(cap - cr.credits.monthlyCredits, 0), cap);
-    const resetAt = sub.currentPeriodEnd ? parseIsoUtc(sub.currentPeriodEnd) : undefined;
-    lines.push(windowLine("Monthly", { used, cap, resetAt }, nowSecs));
+    const { window, durSecs } = monthlyWindow(cap, cr.credits.monthlyCredits, sub.currentPeriodStart, sub.currentPeriodEnd);
+    lines.push(windowLine("Monthly", { ...window, exceeded: false }, nowSecs, durSecs));
   }
   const five = cr.windowLimits?.fiveHour;
   const weekly = cr.windowLimits?.weekly;
   if (five)
-    lines.push(windowLine("5-hour", five, nowSecs));
+    lines.push(windowLine("5-hour", five, nowSecs, FIVE_HOUR_SECS));
   if (weekly)
-    lines.push(windowLine("Weekly", weekly, nowSecs));
+    lines.push(windowLine("Weekly", weekly, nowSecs, WEEKLY_SECS));
   if (!five && !weekly)
     lines.push(`No rolling windows on this plan (pay-as-you-go credits only).
 `);

package/dist/usage.d.ts

@@ -1,14 +1,37 @@
 import { type Window } from "./api";
+export declare const FIVE_HOUR_SECS: number;
+export declare const WEEKLY_SECS: number;
 export declare function money(v: number): string;
 export declare function compact(n: number): string;
 export declare function bar(used: number, cap: number): string;
 export declare function pctStr(used: number, cap: number): string;
 export declare function relTime(resetAtMs: number | undefined, nowSecs: number): string;
+/** Compact "Xh Ym" / "Xd Yh" for a span of seconds. Pure duration — use this
+ * (not relTime) for ETAs/countdowns. Mirrors cmduse_core::duration. */
+export declare function duration(secs: number): string;
+/** % of a rolling window elapsed; window length = durSecs, ends at resetAtMs.
+ * undefined when the window hasn't started or the reset is unknown. */
+export declare function elapsedPct(resetAtMs: number | undefined, durSecs: number, nowSecs: number): number | undefined;
+/** Seconds until spend hits cap at the current rate, if before the reset.
+ * Suppressed before 10% of the window has elapsed (flat-rate projection is
+ * unreliable that early). undefined = no warning. */
+export declare function paceEta(resetAtMs: number | undefined, durSecs: number, used: number, cap: number, nowSecs: number): number | undefined;
 /** ISO 8601 → epoch ms. Handles trailing Z or a ±HH:MM / ±HHMM offset. */
 export declare function parseIsoUtc(s: string): number | undefined;
+/** Assemble the monthly window from the plan cap + subscription period:
+ * used = cap − remaining (clamped), reset = period end, durSecs = period
+ * length. Mirrors cmduse_core::monthly_window (conformance-pinned). */
+export declare function monthlyWindow(cap: number, remaining: number, periodStart?: string, periodEnd?: string): {
+    window: {
+        used: number;
+        cap: number;
+        resetAt?: number;
+    };
+    durSecs?: number;
+};
 export declare function planMonthlyCap(planId: string): number | undefined;
 export declare function planName(planId: string): string;
-export declare function windowLine(label: string, w: Window, nowSecs: number): string;
+export declare function windowLine(label: string, w: Window, nowSecs: number, durSecs?: number): string;
 export declare function plansTable(current: string): string;
 /** Fetch billing data in parallel and render the markdown dashboard. */
 export declare function renderUsage(key: string): Promise<string>;

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "@jeffreyjyz/opencode-command-code",
-	"version": "0.1.3",
+	"version": "0.1.5",
 	"description": "Command Code provider + usage dashboard for opencode: two providers (Anthropic wire for Claude, OpenAI wire for everything else) against api.commandcode.ai, live model list, plan gating, /cmd-usage.",
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"scripts": {
-		"build": "bun build src/index.ts --outdir dist --target bun --external @opencode-ai/plugin --external @opencode-ai/sdk && tsc -p tsconfig.build.json",
+		"build": "bun build src/index.ts --outdir dist --target bun --external @opencode-ai/plugin && tsc -p tsconfig.build.json",
 		"test": "bun test",
 		"extract": "bun run scripts/extract-gating.ts",
 		"typecheck": "tsc --noEmit"