xiaodcs-copilot-api 2.3.9-public.3 → 2.4.1-public.1

package/dist/{start-FFVCi8su.js → start-DCKDnLr6.js}

@@ -1,7 +1,7 @@
-import { F as ensurePaths, M as mergeConfigWithDefaults, i as listEnabledProviders } from "./config-SytZjLq8.js";
-import { K as state, S as initOpencodeVersion, _ as copilotModelsHeaders, h as copilotBaseUrl, i as setupCopilotToken, j as getMissingApiKeysMessage, m as readGitHubToken, q as HTTPError, t as logUser } from "./token-D9svRIYW.js";
-import { i as runProviderSetup } from "./auth-BiVetBYt.js";
-import { n as getLatestModelForFamily } from "./models-YMUf33c-.js";
+import { I as ensurePaths, N as mergeConfigWithDefaults, i as listEnabledProviders } from "./config-A1SyzmBJ.js";
+import { K as state, S as initOpencodeVersion, _ as copilotModelsHeaders, h as copilotBaseUrl, i as setupCopilotToken, j as getMissingApiKeysMessage, m as readGitHubToken, q as HTTPError, t as logUser } from "./token-CQyKjtuM.js";
+import { i as runProviderSetup } from "./auth-CZhugmTr.js";
+import { n as getLatestModelForFamily } from "./models-CmzVpYlg.js";
 import { defineCommand } from "citty";
 import consola from "consola";
 import { createHash, randomUUID } from "node:crypto";
@@ -466,7 +466,7 @@ async function runServer(options) {
 	if (githubToken) await setupCopilotMode(githubToken, Boolean(options.githubToken), serverUrl, options.claudeCode);
 	else await setupProviderMode(serverUrl, options.claudeCode);
 	consola.box(`🌐 Usage Viewer: ${serverUrl}/usage-viewer?endpoint=${serverUrl}/usage`);
-	const { server } = await import("./server-CFQmvoAJ.js");
+	const { server } = await import("./server-wD8xXlqc.js");
 	serve({
 		fetch: server.fetch,
 		port: options.port,

package/dist/{token-D9svRIYW.js → token-CQyKjtuM.js}

@@ -1,4 +1,4 @@
-import { E as getResponsesTransportConfig, P as PATHS, c as setProviderConfig, j as isResponsesApiWebSocketEnabled, n as getRawProviderConfig, w as getConfig } from "./config-SytZjLq8.js";
+import { E as getResponsesTransportConfig, F as PATHS, M as isResponsesApiWebSocketEnabled, c as setProviderConfig, n as getRawProviderConfig, w as getConfig } from "./config-A1SyzmBJ.js";
 import consola from "consola";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import path from "node:path";
@@ -1754,6 +1754,10 @@ async function pollAccessToken(deviceCode) {
 //#region src/lib/token.ts
 let copilotRefreshLoopController = null;
 let codexRefreshLoopController = null;
+const defaultCopilotTokenDependencies = {
+	getCopilotToken,
+	getCopilotUsage
+};
 const stopCopilotRefreshLoop = () => {
 	if (!copilotRefreshLoopController) return;
 	copilotRefreshLoopController.abort();
@@ -1801,7 +1805,7 @@ const applyCopilotTokenResponse = (response) => {
 	state.copilotToken = response.token;
 	if (response.endpoints?.api) state.copilotApiUrl = response.endpoints.api;
 };
-const setupCopilotToken = async () => {
+const setupCopilotToken = async (dependencies = defaultCopilotTokenDependencies) => {
 	if (isOpencodeOauthApp()) {
 		if (!state.githubToken) throw new Error(`opencode token not found`);
 		state.copilotToken = state.githubToken;
@@ -1810,14 +1814,14 @@ const setupCopilotToken = async () => {
 		stopCopilotRefreshLoop();
 		return;
 	}
-	const response = await getCopilotToken();
+	const response = await dependencies.getCopilotToken();
 	applyCopilotTokenResponse(response);
 	consola.debug("GitHub Copilot Token fetched successfully!");
 	if (state.showToken) consola.info("Copilot token:", state.copilotToken);
 	stopCopilotRefreshLoop();
 	const controller = new AbortController();
 	copilotRefreshLoopController = controller;
-	runCopilotRefreshLoop(response.refresh_in, controller.signal).catch(() => {
+	runCopilotRefreshLoop(response.refresh_in, controller.signal, dependencies).catch(() => {
 		consola.warn("Copilot token refresh loop stopped");
 	}).finally(() => {
 		if (copilotRefreshLoopController === controller) copilotRefreshLoopController = null;
@@ -1856,7 +1860,7 @@ const RETRY_REFRESH_JITTER_MS = 15e3;
 const MIN_REFRESH_DELAY_MS = 1e3;
 const getRefreshDeadlineMs = (refreshIn, nowMs = Date.now()) => nowMs + Math.max(refreshIn * 1e3 - EARLY_REFRESH_BUFFER_MS, MIN_REFRESH_DELAY_MS);
 const getRefreshPollDelayMs = (refreshAtMs, nowMs = Date.now()) => Math.min(Math.max(refreshAtMs - nowMs, 0), REFRESH_POLL_INTERVAL_MS);
-const runCopilotRefreshLoop = async (refreshIn, signal) => {
+const runCopilotRefreshLoop = async (refreshIn, signal, dependencies) => {
 	let refreshAtMs = getRefreshDeadlineMs(refreshIn);
 	let retryDelayMs = RETRY_REFRESH_DELAY_MS;
 	while (!signal.aborted) {
@@ -1867,7 +1871,7 @@ const runCopilotRefreshLoop = async (refreshIn, signal) => {
 		}
 		consola.debug("Refreshing Copilot token");
 		try {
-			const response = await getCopilotToken();
+			const response = await dependencies.getCopilotToken();
 			applyCopilotTokenResponse(response);
 			refreshAtMs = getRefreshDeadlineMs(response.refresh_in);
 			retryDelayMs = RETRY_REFRESH_DELAY_MS;
@@ -1938,8 +1942,8 @@ async function setupGitHubToken(options) {
 		throw error;
 	}
 }
-async function logUser() {
-	const copilotUser = await getCopilotUsage();
+async function logUser(dependencies = defaultCopilotTokenDependencies) {
+	const copilotUser = await dependencies.getCopilotUsage();
 	if (!copilotUser) throw new Error("GitHub token not found");
 	state.userName = copilotUser.login;
 	consola.info(`Logged in as ${copilotUser.login}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "xiaodcs-copilot-api",
-  "version": "2.3.9-public.3",
+  "version": "2.4.1-public.1",
   "description": "XiaoDcs copilot-api package built from the same Edge source with Responses recovery and Codex integrations.",
   "keywords": [
     "github-copilot",
@@ -54,6 +54,8 @@
     "rolldown": "1.0.0-rc.18"
   },
   "dependencies": {
+    "@azure/identity": "^4.13.2",
+    "@clack/prompts": "^1.7.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "citty": "^0.1.6",
     "clipboardy": "^5.0.0",
@@ -93,5 +95,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "ea1d517754230221b0984334920ee45b4f3d2127"
+  "gitHead": "868bdbaa2bf5618ae13a26967059f65c3655a7b8"
 }

package/pages/index.html

@@ -423,9 +423,12 @@
                 id="token-usage-period"
                 class="select-control input-focus"
               >
-                <option value="day">Day</option>
-                <option value="week">Week</option>
-                <option value="month">Month</option>
+                <option value="today">Today</option>
+                <option value="this_week">This week</option>
+                <option value="last_7_days">Last 7 days</option>
+                <option value="this_month">This month</option>
+                <option value="last_30_days">Last 30 days</option>
+                <option value="lifetime">Lifetime</option>
               </select>
             </div>
             <button id="fetch-button" type="submit" class="primary-action">
@@ -463,13 +466,21 @@
         });
 
         const DEFAULT_ENDPOINT = "http://localhost:4141/usage";
-        const DEFAULT_TOKEN_USAGE_PERIOD = "day";
+        const DEFAULT_TOKEN_USAGE_PERIOD = "today";
         const DEFAULT_TOKEN_USAGE_EVENTS_PAGE_SIZE = 20;
+        const MAX_LIFETIME_TREND_POINTS = 180;
         const ALL_METRICS_VALUE = "__all__";
         const ALL_MODELS_VALUE = "__all__";
         const LEGACY_API_KEY_STORAGE_KEY = "copilot-api.usage-viewer.x-api-key";
         const CREDENTIAL_STORAGE_PREFIX = "copilot-api.usage-viewer.credential.";
-        const VALID_PERIODS = new Set(["day", "week", "month"]);
+        const VALID_PERIODS = new Set([
+          "today",
+          "this_week",
+          "last_7_days",
+          "this_month",
+          "last_30_days",
+          "lifetime",
+        ]);
         const EMPTY_TOKEN_USAGE_TOTALS = {
           cache_creation_input_tokens: 0,
           cache_read_input_tokens: 0,
@@ -495,7 +506,7 @@
           tokenUsageSummaryError: null,
           tokenUsageEventsError: null,
           tokenUsagePeriod: DEFAULT_TOKEN_USAGE_PERIOD,
-          tokenUsageTrendDayIndex: null,
+          tokenUsageTrendDay: null,
           tokenUsageTrendMetric: ALL_METRICS_VALUE,
           tokenUsageTrendModel: ALL_MODELS_VALUE,
         };
@@ -536,10 +547,17 @@
           );
         }
 
+        const LEGACY_PERIODS = {
+          day: "today",
+          week: "last_7_days",
+          month: "last_30_days",
+        };
+
         function normalizePeriod(value) {
-          return VALID_PERIODS.has(value)
-            ? value
-            : DEFAULT_TOKEN_USAGE_PERIOD;
+          if (VALID_PERIODS.has(value)) {
+            return value;
+          }
+          return LEGACY_PERIODS[value] || DEFAULT_TOKEN_USAGE_PERIOD;
         }
 
         function getSelectedPeriod() {
@@ -895,20 +913,40 @@
           return trimmed || "—";
         }
 
+        function formatRangeDate(value) {
+          const date = new Date(value);
+          if (!Number.isFinite(date.getTime())) {
+            return "N/A";
+          }
+          const options = { day: "numeric", month: "short" };
+          if (date.getFullYear() !== new Date().getFullYear()) {
+            options.year = "numeric";
+          }
+          return date.toLocaleDateString("en-US", options);
+        }
+
+        function formatRangeText(range) {
+          const start = formatRangeDate(range.start_ms);
+          const end = formatRangeDate(range.end_ms - 1);
+          return start === end ? start : `${start} - ${end}`;
+        }
+
         function renderTokenUsageRangeText(period, range) {
           const labels = {
-            day: "Day window",
-            week: "Last 7 days",
-            month: "Last 30 days",
+            today: "Today",
+            this_week: "This week",
+            last_7_days: "Last 7 days",
+            this_month: "This month",
+            last_30_days: "Last 30 days",
+            lifetime: "Lifetime",
           };
+          const label = labels[period] || labels.today;
 
-          if (!range) {
-            return labels[period] || labels.day;
+          if (!range || range.end_ms <= range.start_ms) {
+            return label;
           }
 
-          return `${labels[period] || labels.day}: ${formatDateTime(
-            range.start_ms
-          )} - ${formatDateTime(range.end_ms)}`;
+          return `${label}: ${formatRangeText(range)}`;
         }
 
         /**
@@ -1334,8 +1372,46 @@
           return parts.length === 3 ? `${parts[1]}/${parts[2]}` : value;
         }
 
+        function getTokenUsageTrendDays(dailySummary, selectedModel) {
+          const days = dailySummary?.days || [];
+          if (
+            state.tokenUsagePeriod !== "lifetime"
+            || days.length <= MAX_LIFETIME_TREND_POINTS
+          ) {
+            return days;
+          }
+
+          const usageIndexes = days.reduce((indexes, day, index) => {
+            if (getDailyTrendTotals(day, selectedModel).request_count > 0) {
+              indexes.push(index);
+            }
+            return indexes;
+          }, []);
+          if (usageIndexes.length >= MAX_LIFETIME_TREND_POINTS) {
+            const step =
+              (usageIndexes.length - 1) / (MAX_LIFETIME_TREND_POINTS - 1);
+            return Array.from(
+              { length: MAX_LIFETIME_TREND_POINTS },
+              (_, index) => days[usageIndexes[Math.round(index * step)]]
+            );
+          }
+          const indexes = new Set(usageIndexes);
+          const sampleCount = Math.max(
+            1,
+            MAX_LIFETIME_TREND_POINTS - usageIndexes.length
+          );
+          const step = (days.length - 1) / (sampleCount - 1 || 1);
+          for (let index = 0; index < sampleCount; index += 1) {
+            indexes.add(Math.round(index * step));
+          }
+          return [...indexes]
+            .sort((left, right) => left - right)
+            .slice(0, MAX_LIFETIME_TREND_POINTS)
+            .map((index) => days[index]);
+        }
+
         function renderTokenUsageDailyTrend(dailySummary, error) {
-          if (state.tokenUsagePeriod === "day") {
+          if (state.tokenUsagePeriod === "today") {
             return "";
           }
 
@@ -1435,7 +1511,6 @@
         }
 
         function renderTokenUsageTrendChart(dailySummary, selectedModel) {
-          const days = dailySummary?.days || [];
           const metrics = getTokenUsageTrendMetrics();
           const visibleMetrics =
             state.tokenUsageTrendMetric === ALL_METRICS_VALUE
@@ -1443,6 +1518,7 @@
               : metrics.filter(
                   (metric) => metric.key === state.tokenUsageTrendMetric
                 );
+          const days = getTokenUsageTrendDays(dailySummary, selectedModel);
           const hasUsage = days.some(
             (day) => getDailyTrendTotals(day, selectedModel).request_count > 0
           );
@@ -1451,11 +1527,12 @@
               ? index
               : latest;
           }, -1);
+          const selectedDayIndex = days.findIndex(
+            (day) => day.date === state.tokenUsageTrendDay
+          );
           const activeIndex =
-            Number.isInteger(state.tokenUsageTrendDayIndex)
-              && state.tokenUsageTrendDayIndex >= 0
-              && state.tokenUsageTrendDayIndex < days.length
-              ? state.tokenUsageTrendDayIndex
+            selectedDayIndex >= 0
+              ? selectedDayIndex
               : latestUsageIndex >= 0
                 ? latestUsageIndex
                 : Math.max(0, days.length - 1);
@@ -1544,7 +1621,7 @@
                     value
                   )}" r="2.5" fill="${
                     metric.color
-                  }" data-trend-day-index="${index}">
+                  }" data-trend-day="${escapeHtml(day.date)}">
                     <title>${escapeHtml(
                       `${formatChartDate(day.date)} ${metric.label}: ${formatNumber(
                         value
@@ -1588,7 +1665,7 @@
               ].join("\n");
               return `<rect x="${hitStart}" y="${padding.top}" width="${
                 hitEnd - hitStart
-              }" height="${plotHeight}" fill="transparent" style="cursor: pointer;" data-trend-day-index="${index}">
+              }" height="${plotHeight}" fill="transparent" style="cursor: pointer;" data-trend-day="${escapeHtml(day.date)}">
                 <title>${escapeHtml(title)}</title>
               </rect>`;
             })
@@ -2153,14 +2230,11 @@
             return;
           }
 
-          const trendPoint = event.target.closest("[data-trend-day-index]");
+          const trendPoint = event.target.closest("[data-trend-day]");
           if (trendPoint) {
-            const index = Number.parseInt(
-              trendPoint.getAttribute("data-trend-day-index") || "",
-              10
-            );
-            if (Number.isFinite(index) && index >= 0) {
-              state.tokenUsageTrendDayIndex = index;
+            const day = trendPoint.getAttribute("data-trend-day");
+            if (day) {
+              state.tokenUsageTrendDay = day;
               render();
             }
             return;

package/dist/auth-Bu4MXadr.js

@@ -1,2 +0,0 @@
-import { t as auth } from "./auth-BiVetBYt.js";
-export { auth };