@jeffreyjyz/opencode-command-code 0.1.2 → 0.1.4

package/dist/gating.d.ts

@@ -11,3 +11,7 @@ export declare const PLAN_RULES: Record<string, {
  * tracks category via serving lane, not per-model plan entitlements. */
 export declare const HARD_BLOCKED: Record<string, string[]>;
 export declare function canonicalizeModelId(model: string): string;
+/** Bare model id with any provider qualifier stripped: everything after the
+ * FIRST colon ("anthropic:claude-opus-5" → "claude-opus-5"). Matches
+ * cmduse-core's `bare_model`; a model id that itself contains ':' keeps it. */
+export declare function bareModel(blocked: string): string;

package/dist/index.js

@@ -325,6 +325,10 @@ function canonicalizeModelId(model) {
     return findKnown(aliased) ?? model;
   return findKnown(stripDate(model)) ?? model;
 }
+function bareModel(blocked) {
+  const i = blocked.indexOf(":");
+  return i >= 0 ? blocked.slice(i + 1) : blocked;
+}
 
 // src/access.ts
 function evaluateModelAccess(model, plan) {
@@ -342,10 +346,7 @@ function evaluateModelAccess(model, plan) {
   const category = MODEL_CATEGORIES[canonical] ?? siblingCategory(canonical);
   if (!category)
     return { allowed: true };
-  const blocked = rules.blockedModels.some((b) => {
-    const bare = b.includes(":") ? b.slice(b.indexOf(":") + 1) : b;
-    return bare.toLowerCase() === canonical.toLowerCase();
-  });
+  const blocked = rules.blockedModels.some((b) => bareModel(b).toLowerCase() === canonical.toLowerCase());
   if (blocked)
     return { allowed: false };
   if (!rules.allowedCategories.includes(category))
@@ -393,11 +394,11 @@ async function loadModels(key) {
         contextLength: m.context_length ?? 0
       }));
       cache = { at: Date.now(), models };
-    } catch {
+    } catch (e) {
       if (cache) {
         models = cache.models;
       } else {
-        throw new Error("Could not fetch Command Code model list (https://api.commandcode.ai/provider/v1/models). Check network/API key.");
+        throw new Error("Could not fetch Command Code model list (https://api.commandcode.ai/provider/v1/models). Check network/API key.", { cause: e });
       }
     }
   }
@@ -451,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)}`;
 }
@@ -487,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)
@@ -517,9 +564,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) {
@@ -562,14 +613,16 @@ async function renderUsage(key) {
   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 start = sub.currentPeriodStart ? parseIsoUtc(sub.currentPeriodStart) : undefined;
+    const dur = start !== undefined && resetAt !== undefined ? Math.max(Math.floor((resetAt - start) / 1000), 1) : undefined;
+    lines.push(windowLine("Monthly", { used, cap, resetAt }, nowSecs, dur));
   }
   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).
 `);
@@ -662,8 +715,14 @@ var CommandCodePlugin = async (_input) => {
       let openKey;
       try {
         openKey = await resolveKey();
-        split = await loadModels(openKey);
       } catch {}
+      if (openKey) {
+        try {
+          split = await loadModels(openKey);
+        } catch (e) {
+          console.warn("[command-code] model list unavailable:", e);
+        }
+      }
       const claudeDefs = split ? toModelDefs(split.claude, "command-code-anthropic", "@ai-sdk/anthropic") : {};
       const openDefs = split ? toModelDefs(split.open, "command-code-openai", "@ai-sdk/openai-compatible", { field: "reasoning_content" }) : {};
       const userAnthropic = existing("command-code-anthropic");

package/dist/usage.d.ts

@@ -1,14 +1,26 @@
 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;
 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,6 +1,6 @@
 {
 	"name": "@jeffreyjyz/opencode-command-code",
-	"version": "0.1.2",
+	"version": "0.1.4",
 	"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",