@danypops/pi-jittor 0.8.0 → 0.9.0

package/extension/src/index.ts

@@ -26,7 +26,6 @@ import {
 	papyrusContextMetric,
 	type Route,
 	type RouterStatus,
-	type StoredMetricObservation,
 	TASK_DOMAINS,
 	TASK_TYPES,
 	type TextTokenCounter,
@@ -61,7 +60,7 @@ import {
 import { LocalRunTelemetry } from "./observability/model-run.ts";
 import { captureProviderContextSnapshot } from "./observability/provider-context-snapshot.ts";
 import { ProviderResponseTelemetry } from "./observability/provider-response.ts";
-import { buildFooterBudget, providerBudgetMetricQuery } from "./observability/status.ts";
+import { buildFooterBudget, fetchProviderBudgetMetrics } from "./observability/status.ts";
 import { showUsagePanel } from "./observability/usage.ts";
 import { candidateIdentityOf, decideAutoMode, newAutoModeSessionState, recordAutoModeDismissal } from "./optimization/auto-mode.ts";
 import { showAutoModeSuggestion } from "./optimization/auto-mode-dialog.ts";
@@ -158,8 +157,7 @@ async function recordMetrics(client: JittorExtensionClient, metrics: MetricObser
 
 async function refreshFooter(client: JittorExtensionClient, state: IntegratedFooterState, sessionId: string): Promise<void> {
 	const status = (await client.call("router.status", { session_id: sessionId })) as RouterStatus;
-	const query = providerBudgetMetricQuery(status);
-	const metrics = query ? ((await client.call("metrics.query", query)) as StoredMetricObservation[]) : [];
+	const metrics = await fetchProviderBudgetMetrics(client, status);
 	state.providerBudget = buildFooterBudget(status, metrics);
 	state.requestRender?.();
 }

package/extension/src/observability/footer.ts

@@ -48,7 +48,7 @@ interface FooterContext {
 }
 
 /** A bounded quota is explicitly remaining; unbounded values never receive a fabricated bar. */
-export type ProviderBudget =
+export type ProviderBudget = { availableResets?: { count: number; observedAt: number } } & (
 	| {
 			kind: "bounded";
 			label: string;
@@ -67,7 +67,21 @@ export type ProviderBudget =
 			kind: "unavailable";
 			label: string;
 			valueText: string;
-	  };
+	  }
+);
+
+export function resetAvailabilityText(budget: ProviderBudget | null | undefined, now: number): string | undefined {
+	const resets = budget?.availableResets;
+	if (
+		!resets ||
+		!Number.isSafeInteger(resets.count) ||
+		resets.count < 1 ||
+		resets.count > 10000 ||
+		now - resets.observedAt > TELEMETRY_STALE_AFTER_MS
+	)
+		return undefined;
+	return `${resets.count} reset${resets.count === 1 ? "" : "s"} available`;
+}
 
 /** Compact, always-visible state of Jittor's effort-based Auto mode -- the newer, effort-driven router, distinct from the existing budget-pressure route already reflected by the model/budget segments. */
 export interface RouterFooterInfo {
@@ -227,6 +241,18 @@ function budgetSegment(
 	width: number,
 	compact: boolean,
 	now: number,
+): string | undefined {
+	const quota = quotaSegment(budget, theme, width, compact, now);
+	const resets = resetAvailabilityText(budget, now);
+	return resets ? `${quota ?? "Codex"} · ${resets}` : quota;
+}
+
+function quotaSegment(
+	budget: ProviderBudget | null | undefined,
+	theme: FooterTheme,
+	width: number,
+	compact: boolean,
+	now: number,
 ): string | undefined {
 	if (budget === undefined) return undefined;
 	const w = barWidth(width);

package/extension/src/observability/status.ts

@@ -13,7 +13,7 @@ import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tu
 import { BorderedSelectPanel, type TextMeasure } from "malevich-tui-components";
 import { sessionSecretField } from "../session-identity.ts";
 import { showConfirmDialog, showRouteOverrideMenu } from "../tui-prompts.ts";
-import type { ProviderBudget } from "./footer.ts";
+import { type ProviderBudget, resetAvailabilityText } from "./footer.ts";
 
 export interface JittorPanelClient {
 	call(operation: string, input: unknown): Promise<any>;
@@ -136,6 +136,28 @@ export function buildFooterBudget(
 	metrics: StoredMetricObservation[],
 	now = Date.now(),
 ): ProviderBudget | null | undefined {
+	const budget = buildQuotaBudget(status, metrics, now);
+	if (status.currentRoute?.provider !== "openai-codex" || codexTelemetryState(status, now) !== "available") return budget;
+	const resets = latest(
+		metrics,
+		(row) => row.source === "codex-subscription" && row.scope === "codex:resets" && row.metric === "available-resets",
+	);
+	if (
+		!resets ||
+		typeof resets.value !== "number" ||
+		!Number.isSafeInteger(resets.value) ||
+		resets.value <= 0 ||
+		resets.value > 10000 ||
+		now - resets.observedAt > TELEMETRY_STALE_AFTER_MS
+	)
+		return budget;
+	return {
+		...(budget ?? { kind: "unavailable", label: "Codex", valueText: "usage unavailable" }),
+		availableResets: { count: resets.value, observedAt: resets.observedAt },
+	};
+}
+
+function buildQuotaBudget(status: RouterStatus, metrics: StoredMetricObservation[], now = Date.now()): ProviderBudget | null | undefined {
 	if (!status.currentRoute) return null;
 	if (status.currentRoute.provider === "openai-codex") {
 		const codex = codexWindowForModel(metrics, status.currentRoute.model);
@@ -238,8 +260,12 @@ export function formatFooterStatus(status: RouterStatus, metrics: StoredMetricOb
 	const budget = buildFooterBudget(status, metrics, now);
 	if (!budget) return "";
 	if (budget.kind === "unbounded") return budget.valueText;
-	if (budget.kind === "unavailable") return `${budget.label} ${budget.valueText}`;
-	return `${budget.label} ${(budget.remainingFraction * 100).toFixed(1)}% left`;
+	const resets = resetAvailabilityText(budget, now);
+	const quota =
+		budget.kind === "unavailable"
+			? `${budget.label} ${budget.valueText}`
+			: `${budget.label} ${(budget.remainingFraction * 100).toFixed(1)}% left`;
+	return resets ? `${quota} · ${resets}` : quota;
 }
 
 function nextAction(action: PolicyAction | undefined): string {
@@ -287,6 +313,8 @@ export function buildStatusView(status: RouterStatus, metrics: StoredMetricObser
 	const lines = [status.ready ? "Ready" : "Not ready"];
 	const codex = status.currentRoute?.provider === "openai-codex" ? codexWindowForModel(metrics, status.currentRoute.model) : undefined;
 	const budget = buildFooterBudget(status, metrics, now);
+	const resets = resetAvailabilityText(budget, now);
+	if (resets) lines.push(`Codex: ${resets}`);
 	if (codex && typeof codex.value === "number" && budget?.kind === "bounded") {
 		const seconds = Number(codex.attributes.windowSeconds ?? 0);
 		lines.push(`Codex ${windowName(seconds)}: ${((1 - codex.value) * 100).toFixed(1)}% left`);
@@ -343,9 +371,24 @@ export interface StatusPanelSnapshot {
 /** Shared by the standalone status panel below and the unified /jittor shell, so both fetch identically. */
 export async function fetchStatusSnapshot(client: JittorPanelClient, sessionId: string): Promise<StatusPanelSnapshot> {
 	const status = (await client.call("router.status", { session_id: sessionId })) as RouterStatus;
+	const metrics = await fetchProviderBudgetMetrics(client, status);
+	return { status, metrics };
+}
+
+export async function fetchProviderBudgetMetrics(client: JittorPanelClient, status: RouterStatus): Promise<StoredMetricObservation[]> {
 	const query = providerBudgetMetricQuery(status);
 	const metrics = query ? ((await client.call("metrics.query", query)) as StoredMetricObservation[]) : [];
-	return { status, metrics };
+	if (status.currentRoute?.provider === "openai-codex") {
+		const resets = (await client.call("metrics.query", {
+			source: "codex-subscription",
+			scope: "codex:resets",
+			metric: "available-resets",
+			order: "desc",
+			limit: 1,
+		})) as StoredMetricObservation[];
+		return [...metrics, ...resets];
+	}
+	return metrics;
 }
 
 async function chooseOverride(ctx: ExtensionCommandContext, routes: Route[]): Promise<Route | undefined> {

package/extension/src/service-client.ts

@@ -15,6 +15,8 @@ let retrying: RetryingClient<JittorClient> = createRetryingClient(() => connecto
  * is classified: only reads may be transparently invoked twice after a connection-shaped error.
  */
 const OPERATION_RETRY_MODE = {
+	"subscription.resets.list": "retry",
+	"subscription.resets.redeem": "once",
 	"metrics.record": "once",
 	"metrics.record_batch": "once",
 	"metrics.query": "retry",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-jittor",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Pi extension for Jittor token and context observability with optimization controls backed by the @danypops/jittor daemon",
   "license": "MIT",
   "type": "module",
@@ -16,7 +16,7 @@
     "@danypops/vehicle-client": "^0.10.1",
     "@danypops/vehicle-core": "^0.17.1",
     "@danypops/vehicle-server": "^0.25.1",
-    "@danypops/jittor": "^0.20.0",
+    "@danypops/jittor": "^0.22.0",
     "malevich-tui-components": "^0.28.0"
   },
   "peerDependencies": {