@jeffreycao/copilot-api 1.10.0 → 1.10.1

package/dist/main.js

@@ -42,7 +42,7 @@ bindElectronFetch();
 const { auth } = await import("./auth-D7YCTWpx.js");
 const { checkUsage } = await import("./check-usage-Dgg0nNEw.js");
 const { debug } = await import("./debug-C_TBkyUw.js");
-const { start } = await import("./start-1KA2mHVS.js");
+const { start } = await import("./start-DDII-0ML.js");
 await runMain(defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server-BnKth1Jp.js → server-DpVPS3zt.js}

@@ -504,19 +504,14 @@ async function flushTokenUsageEvents() {
 }
 function getPeriodRange(period, now = /* @__PURE__ */ new Date()) {
 	const start = new Date(now);
+	start.setHours(0, 0, 0, 0);
 	switch (period) {
-		case "day":
-			start.setHours(0, 0, 0, 0);
-			break;
-		case "week": {
-			const daysSinceMonday = (start.getDay() + 6) % 7;
-			start.setDate(start.getDate() - daysSinceMonday);
-			start.setHours(0, 0, 0, 0);
+		case "day": break;
+		case "week":
+			start.setDate(start.getDate() - 6);
 			break;
-		}
 		case "month":
-			start.setDate(1);
-			start.setHours(0, 0, 0, 0);
+			start.setDate(start.getDate() - 29);
 			break;
 		default: break;
 	}
@@ -529,7 +524,7 @@ function getPeriodRange(period, now = /* @__PURE__ */ new Date()) {
 			end.setDate(end.getDate() + 7);
 			break;
 		case "month":
-			end.setMonth(end.getMonth() + 1);
+			end.setDate(end.getDate() + 30);
 			break;
 		default: break;
 	}
@@ -538,6 +533,26 @@ function getPeriodRange(period, now = /* @__PURE__ */ new Date()) {
 		startMs: start.getTime()
 	};
 }
+function formatLocalDate(date) {
+	return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
+}
+function createDailyIntervals(range) {
+	const intervals = [];
+	const cursor = new Date(range.startMs);
+	while (cursor.getTime() < range.endMs) {
+		const startMs = cursor.getTime();
+		const next = new Date(cursor);
+		next.setDate(next.getDate() + 1);
+		const endMs = Math.min(next.getTime(), range.endMs);
+		intervals.push({
+			date: formatLocalDate(cursor),
+			endMs,
+			startMs
+		});
+		cursor.setTime(endMs);
+	}
+	return intervals;
+}
 function createEmptyTotals() {
 	return {
 		cache_creation_input_tokens: 0,
@@ -548,6 +563,14 @@ function createEmptyTotals() {
 		total_tokens: 0
 	};
 }
+function addTotals(target, next) {
+	target.cache_creation_input_tokens += next.cache_creation_input_tokens;
+	target.cache_read_input_tokens += next.cache_read_input_tokens;
+	target.input_tokens += next.input_tokens;
+	target.output_tokens += next.output_tokens;
+	target.request_count += next.request_count;
+	target.total_tokens += next.total_tokens;
+}
 function createEmptySummary(period) {
 	const range = getPeriodRange(period);
 	return {
@@ -562,6 +585,27 @@ function createEmptySummary(period) {
 		totals: createEmptyTotals()
 	};
 }
+function createEmptyDailySummary(period) {
+	const range = getPeriodRange(period);
+	return {
+		byModel: [],
+		days: createDailyIntervals(range).map((interval) => ({
+			byModel: [],
+			date: interval.date,
+			end_ms: interval.endMs,
+			start_ms: interval.startMs,
+			totals: createEmptyTotals()
+		})),
+		period,
+		range: {
+			end_ms: range.endMs,
+			end_utc: new Date(range.endMs).toISOString(),
+			start_ms: range.startMs,
+			start_utc: new Date(range.startMs).toISOString()
+		},
+		totals: createEmptyTotals()
+	};
+}
 function createEmptyEventsPage(input) {
 	const range = getPeriodRange(input.period);
 	return {
@@ -579,6 +623,14 @@ function createEmptyEventsPage(input) {
 		total_pages: 1
 	};
 }
+function rangePayload(range) {
+	return {
+		end_ms: range.endMs,
+		end_utc: new Date(range.endMs).toISOString(),
+		start_ms: range.startMs,
+		start_utc: new Date(range.startMs).toISOString()
+	};
+}
 function numberFromRow(row, key) {
 	const value = row?.[key];
 	return typeof value === "number" && Number.isFinite(value) ? value : 0;
@@ -593,6 +645,12 @@ function totalsFromRow(row) {
 		total_tokens: numberFromRow(row, "total_tokens")
 	};
 }
+function modelSummaryFromRow(row) {
+	return {
+		...totalsFromRow(row),
+		model: typeof row.model === "string" ? row.model : "unknown"
+	};
+}
 function stringFromRow(row, key) {
 	const value = row[key];
 	return typeof value === "string" ? value : "";
@@ -620,12 +678,8 @@ function usageEventFromRow(row) {
 		user_id: stringFromRow(row, "user_id")
 	};
 }
-async function getTokenUsageSummary(period) {
-	if (!isTokenUsageStorageEnabled()) return createEmptySummary(period);
-	await flushTokenUsageEvents();
-	const range = getPeriodRange(period);
-	const db = await getDb();
-	const totalsRow = db.prepare(`
+function getTotalsRow(db, range) {
+	return db.prepare(`
     SELECT
       COUNT(*) AS request_count,
       COALESCE(SUM(input_tokens), 0) AS input_tokens,
@@ -636,8 +690,9 @@ async function getTokenUsageSummary(period) {
     FROM token_usage_events
     WHERE created_at_ms >= ? AND created_at_ms < ?
   `).get(range.startMs, range.endMs);
-	return {
-		byModel: db.prepare(`
+}
+function getModelRows(db, range) {
+	return db.prepare(`
     SELECT
       model,
       COUNT(*) AS request_count,
@@ -652,20 +707,47 @@ async function getTokenUsageSummary(period) {
     ORDER BY
       total_tokens DESC,
       model ASC
-  `).all(range.startMs, range.endMs).map((row) => ({
-			...totalsFromRow(row),
-			model: typeof row.model === "string" ? row.model : "unknown"
-		})),
+  `).all(range.startMs, range.endMs);
+}
+function createDailyBucket(interval, rows) {
+	const byModel = rows.map((row) => modelSummaryFromRow(row));
+	const totals = createEmptyTotals();
+	for (const model of byModel) addTotals(totals, model);
+	return {
+		byModel,
+		date: interval.date,
+		end_ms: interval.endMs,
+		start_ms: interval.startMs,
+		totals
+	};
+}
+async function getTokenUsageSummary(period) {
+	if (!isTokenUsageStorageEnabled()) return createEmptySummary(period);
+	await flushTokenUsageEvents();
+	const range = getPeriodRange(period);
+	const db = await getDb();
+	const totalsRow = getTotalsRow(db, range);
+	return {
+		byModel: getModelRows(db, range).map((row) => modelSummaryFromRow(row)),
 		period,
-		range: {
-			end_ms: range.endMs,
-			end_utc: new Date(range.endMs).toISOString(),
-			start_ms: range.startMs,
-			start_utc: new Date(range.startMs).toISOString()
-		},
+		range: rangePayload(range),
 		totals: totalsFromRow(totalsRow)
 	};
 }
+async function getTokenUsageDailySummary(period) {
+	if (!isTokenUsageStorageEnabled()) return createEmptyDailySummary(period);
+	await flushTokenUsageEvents();
+	const range = getPeriodRange(period);
+	const db = await getDb();
+	const intervals = createDailyIntervals(range);
+	return {
+		byModel: getModelRows(db, range).map((row) => modelSummaryFromRow(row)),
+		days: intervals.map((interval) => createDailyBucket(interval, getModelRows(db, interval))),
+		period,
+		range: rangePayload(range),
+		totals: totalsFromRow(getTotalsRow(db, range))
+	};
+}
 async function getTokenUsageEventsPage(input) {
 	if (!isTokenUsageStorageEnabled()) return createEmptyEventsPage(input);
 	await flushTokenUsageEvents();
@@ -4580,6 +4662,10 @@ tokenUsageRoute.get("/", async (c) => {
 	const summary = await getTokenUsageSummary(parsePeriod(c.req.query("period")));
 	return c.json(summary);
 });
+tokenUsageRoute.get("/daily", async (c) => {
+	const summary = await getTokenUsageDailySummary(parsePeriod(c.req.query("period")));
+	return c.json(summary);
+});
 tokenUsageRoute.get("/events", async (c) => {
 	const period = parsePeriod(c.req.query("period"));
 	const eventsPage = await getTokenUsageEventsPage({
@@ -4649,4 +4735,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-BnKth1Jp.js.map
+//# sourceMappingURL=server-DpVPS3zt.js.map