{/* Time */}
-
{/* User */}
@@ -286,95 +327,124 @@ export function VirtualizedLogsTable({
{log.keyName}
- {/* Provider */}
-
- {log.blockedBy ? (
-
-
+ {/* Session ID */}
+
+ {log.sessionId ? (
+
+
+
+
+ {log.sessionId}
+
+
+
+
+ {log.sessionId}
+
+
+
+
) : (
-
-
- {(() => {
- // 计算倍率，用于判断是否显示 Badge
- const successfulProvider =
- log.providerChain && log.providerChain.length > 0
- ? [...log.providerChain]
- .reverse()
- .find(
- (item) =>
- item.reason === "request_success" ||
- item.reason === "retry_success"
- )
- : null;
- const actualCostMultiplier =
- successfulProvider?.costMultiplier ?? log.costMultiplier;
- const multiplier = Number(actualCostMultiplier);
- const hasCostBadge =
- actualCostMultiplier !== "" &&
- actualCostMultiplier != null &&
- Number.isFinite(multiplier) &&
- multiplier !== 1;
-
- return (
- <>
-
-
0
- ? log.providerChain[log.providerChain.length - 1].name
- : null) ||
- log.providerName ||
- tChain("circuit.unknown")
- }
- hasCostBadge={hasCostBadge}
- />
-
- {/* Cost multiplier badge */}
- {hasCostBadge && (
-
1
- ? "text-xs bg-orange-50 text-orange-700 border-orange-200 dark:bg-orange-950/30 dark:text-orange-300 dark:border-orange-800 shrink-0"
- : "text-xs bg-green-50 text-green-700 border-green-200 dark:bg-green-950/30 dark:text-green-300 dark:border-green-800 shrink-0"
- }
- >
- x{multiplier.toFixed(2)}
-
- )}
-
- );
- })()}
-
- {log.providerChain &&
- log.providerChain.length > 0 &&
- formatProviderSummary(log.providerChain, tChain) && (
-
-
-
-
- {formatProviderSummary(log.providerChain, tChain)}
-
-
-
-
- {formatProviderSummary(log.providerChain, tChain)}
-
-
-
-
- )}
-
+
-
)}
+ {/* Provider */}
+ {hideProviderColumn ? null : (
+
+ {log.blockedBy ? (
+
+
+ ) : (
+
+
+ {(() => {
+ // 计算倍率，用于判断是否显示 Badge
+ const successfulProvider =
+ log.providerChain && log.providerChain.length > 0
+ ? [...log.providerChain]
+ .reverse()
+ .find(
+ (item) =>
+ item.reason === "request_success" ||
+ item.reason === "retry_success"
+ )
+ : null;
+ const actualCostMultiplier =
+ successfulProvider?.costMultiplier ?? log.costMultiplier;
+ const multiplier = Number(actualCostMultiplier);
+ const hasCostBadge =
+ actualCostMultiplier !== "" &&
+ actualCostMultiplier != null &&
+ Number.isFinite(multiplier) &&
+ multiplier !== 1;
+
+ return (
+ <>
+
+
0
+ ? log.providerChain[log.providerChain.length - 1].name
+ : null) ||
+ log.providerName ||
+ tChain("circuit.unknown")
+ }
+ hasCostBadge={hasCostBadge}
+ />
+
+ {/* Cost multiplier badge */}
+ {hasCostBadge && (
+
1
+ ? "text-xs bg-orange-50 text-orange-700 border-orange-200 dark:bg-orange-950/30 dark:text-orange-300 dark:border-orange-800 shrink-0"
+ : "text-xs bg-green-50 text-green-700 border-green-200 dark:bg-green-950/30 dark:text-green-300 dark:border-green-800 shrink-0"
+ }
+ >
+ x{multiplier.toFixed(2)}
+
+ )}
+
+ );
+ })()}
+
+ {log.providerChain &&
+ log.providerChain.length > 0 &&
+ formatProviderSummary(log.providerChain, tChain) && (
+
+
+
+
+ {formatProviderSummary(log.providerChain, tChain)}
+
+
+
+
+ {formatProviderSummary(log.providerChain, tChain)}
+
+
+
+
+ )}
+
+ )}
+
+ )}
+
{/* Model */}
@@ -613,7 +683,7 @@ export function VirtualizedLogsTable({
{/* Scroll to top button */}
- {showScrollToTop && (
+ {hideScrollToTop ? null : showScrollToTop ? (
{t("logs.table.scrollToTop")}
- )}
+ ) : null}
);
}
diff --git a/src/app/[locale]/dashboard/logs/_utils/logs-query.ts b/src/app/[locale]/dashboard/logs/_utils/logs-query.ts
new file mode 100644
index 000000000..4430f3854
--- /dev/null
+++ b/src/app/[locale]/dashboard/logs/_utils/logs-query.ts
@@ -0,0 +1,93 @@
+export interface LogsUrlFilters {
+ userId?: number;
+ keyId?: number;
+ providerId?: number;
+ sessionId?: string;
+ startTime?: number;
+ endTime?: number;
+ statusCode?: number;
+ excludeStatusCode200?: boolean;
+ model?: string;
+ endpoint?: string;
+ minRetryCount?: number;
+ page?: number;
+}
+
+function firstString(value: string | string[] | undefined): string | undefined {
+ if (Array.isArray(value)) return value[0];
+ return value;
+}
+
+function parseIntParam(value: string | string[] | undefined): number | undefined {
+ const raw = firstString(value);
+ if (!raw) return undefined;
+ const num = Number.parseInt(raw, 10);
+ return Number.isFinite(num) ? num : undefined;
+}
+
+function parseStringParam(value: string | string[] | undefined): string | undefined {
+ const raw = firstString(value);
+ const trimmed = raw?.trim();
+ return trimmed ? trimmed : undefined;
+}
+
+export function parseLogsUrlFilters(searchParams: {
+ [key: string]: string | string[] | undefined;
+}): LogsUrlFilters {
+ const statusCodeParam = parseStringParam(searchParams.statusCode);
+ const pageRaw = parseIntParam(searchParams.page);
+ const page = pageRaw && pageRaw >= 1 ? pageRaw : undefined;
+
+ const statusCode =
+ statusCodeParam && statusCodeParam !== "!200"
+ ? Number.parseInt(statusCodeParam, 10)
+ : undefined;
+
+ return {
+ userId: parseIntParam(searchParams.userId),
+ keyId: parseIntParam(searchParams.keyId),
+ providerId: parseIntParam(searchParams.providerId),
+ sessionId: parseStringParam(searchParams.sessionId),
+ startTime: parseIntParam(searchParams.startTime),
+ endTime: parseIntParam(searchParams.endTime),
+ statusCode: Number.isFinite(statusCode) ? statusCode : undefined,
+ excludeStatusCode200: statusCodeParam === "!200",
+ model: parseStringParam(searchParams.model),
+ endpoint: parseStringParam(searchParams.endpoint),
+ minRetryCount: parseIntParam(searchParams.minRetry),
+ page,
+ };
+}
+
+export function buildLogsUrlQuery(filters: LogsUrlFilters): URLSearchParams {
+ const query = new URLSearchParams();
+
+ if (filters.userId !== undefined) query.set("userId", filters.userId.toString());
+ if (filters.keyId !== undefined) query.set("keyId", filters.keyId.toString());
+ if (filters.providerId !== undefined) query.set("providerId", filters.providerId.toString());
+
+ const sessionId = filters.sessionId?.trim();
+ if (sessionId) query.set("sessionId", sessionId);
+
+ if (filters.startTime !== undefined) query.set("startTime", filters.startTime.toString());
+ if (filters.endTime !== undefined) query.set("endTime", filters.endTime.toString());
+
+ if (filters.excludeStatusCode200) {
+ query.set("statusCode", "!200");
+ } else if (filters.statusCode !== undefined) {
+ query.set("statusCode", filters.statusCode.toString());
+ }
+
+ if (filters.model) query.set("model", filters.model);
+ if (filters.endpoint) query.set("endpoint", filters.endpoint);
+
+ if (filters.minRetryCount !== undefined) {
+ query.set("minRetry", filters.minRetryCount.toString());
+ }
+
+ if (filters.page !== undefined && filters.page > 1) {
+ query.set("page", filters.page.toString());
+ }
+
+ return query;
+}
diff --git a/src/app/[locale]/dashboard/logs/_utils/time-range.ts b/src/app/[locale]/dashboard/logs/_utils/time-range.ts
new file mode 100644
index 000000000..2ccf628e8
--- /dev/null
+++ b/src/app/[locale]/dashboard/logs/_utils/time-range.ts
@@ -0,0 +1,49 @@
+export interface ClockParts {
+ hours: number;
+ minutes: number;
+ seconds: number;
+}
+
+export function parseClockString(clockStr: string): ClockParts {
+ const [hoursRaw, minutesRaw, secondsRaw] = clockStr.split(":");
+
+ const hours = Number(hoursRaw);
+ const minutes = Number(minutesRaw);
+ const seconds = Number(secondsRaw ?? "0");
+
+ return {
+ hours: Number.isFinite(hours) ? hours : 0,
+ minutes: Number.isFinite(minutes) ? minutes : 0,
+ seconds: Number.isFinite(seconds) ? seconds : 0,
+ };
+}
+
+export function formatClockFromTimestamp(timestamp: number): string {
+ const date = new Date(timestamp);
+ const hh = `${date.getHours()}`.padStart(2, "0");
+ const mm = `${date.getMinutes()}`.padStart(2, "0");
+ const ss = `${date.getSeconds()}`.padStart(2, "0");
+ return `${hh}:${mm}:${ss}`;
+}
+
+export function dateStringWithClockToTimestamp(
+ dateStr: string,
+ clockStr: string
+): number | undefined {
+ const [year, month, day] = dateStr.split("-").map(Number);
+ const { hours, minutes, seconds } = parseClockString(clockStr);
+
+ const date = new Date(year, month - 1, day, hours, minutes, seconds, 0);
+ const timestamp = date.getTime();
+ if (!Number.isFinite(timestamp)) return undefined;
+
+ if (date.getFullYear() !== year) return undefined;
+ if (date.getMonth() !== month - 1) return undefined;
+ if (date.getDate() !== day) return undefined;
+
+ return timestamp;
+}
+
+export function inclusiveEndTimestampFromExclusive(endExclusiveTimestamp: number): number {
+ return Math.max(0, endExclusiveTimestamp - 1000);
+}
diff --git a/src/app/[locale]/dashboard/providers/page.tsx b/src/app/[locale]/dashboard/providers/page.tsx
index dc5d2b2d8..250895d9f 100644
--- a/src/app/[locale]/dashboard/providers/page.tsx
+++ b/src/app/[locale]/dashboard/providers/page.tsx
@@ -1,5 +1,6 @@
import { BarChart3 } from "lucide-react";
import { getTranslations } from "next-intl/server";
+import { AutoSortPriorityDialog } from "@/app/[locale]/settings/providers/_components/auto-sort-priority-dialog";
import { ProviderManagerLoader } from "@/app/[locale]/settings/providers/_components/provider-manager-loader";
import { SchedulingRulesDialog } from "@/app/[locale]/settings/providers/_components/scheduling-rules-dialog";
import { Section } from "@/components/section";
@@ -50,6 +51,7 @@ export default async function DashboardProvidersPage({
{t("providers.section.leaderboard")}
+
}
diff --git a/src/app/[locale]/dashboard/users/users-page-client.tsx b/src/app/[locale]/dashboard/users/users-page-client.tsx
index d7997a207..faa78d1f9 100644
--- a/src/app/[locale]/dashboard/users/users-page-client.tsx
+++ b/src/app/[locale]/dashboard/users/users-page-client.tsx
@@ -7,7 +7,7 @@ import {
useQuery,
useQueryClient,
} from "@tanstack/react-query";
-import { Loader2, Plus, Search } from "lucide-react";
+import { Layers, Loader2, Plus, Search, ShieldCheck } from "lucide-react";
import { useTranslations } from "next-intl";
import { useCallback, useEffect, useMemo, useState } from "react";
import { getAllUserKeyGroups, getAllUserTags, getUsers, getUsersBatch } from "@/actions/users";
@@ -67,6 +67,8 @@ function UsersPageContent({ currentUser }: UsersPageClientProps) {
const tUserMgmt = useTranslations("dashboard.userManagement");
const tKeyList = useTranslations("dashboard.keyList");
const tCommon = useTranslations("common");
+ const tProviderGroup = useTranslations("myUsage.providerGroup");
+ const tRestrictions = useTranslations("myUsage.accessRestrictions");
const queryClient = useQueryClient();
const isAdmin = currentUser.role === "admin";
const [searchTerm, setSearchTerm] = useState("");
@@ -138,6 +140,7 @@ function UsersPageContent({ currentUser }: UsersPageClientProps) {
isFetching,
isError,
error,
+ refetch,
} = useInfiniteQuery({
queryKey,
queryFn: async ({ pageParam }) => {
@@ -434,9 +437,11 @@ function UsersPageContent({ currentUser }: UsersPageClientProps) {
group: tUserMgmt("table.keyRow.group"),
todayUsage: tUserMgmt("table.keyRow.todayUsage"),
todayCost: tUserMgmt("table.keyRow.todayCost"),
+ todayTokens: tUserMgmt("table.keyRow.todayTokens"),
lastUsed: tUserMgmt("table.keyRow.lastUsed"),
actions: tUserMgmt("table.keyRow.actions"),
callsLabel: tUserMgmt("table.keyRow.fields.callsLabel"),
+ tokensLabel: tUserMgmt("table.keyRow.fields.tokensLabel"),
costLabel: tUserMgmt("table.keyRow.fields.costLabel"),
},
actions: {
@@ -504,6 +509,55 @@ function UsersPageContent({ currentUser }: UsersPageClientProps) {
)}
+ {/* Provider Group & Access Restrictions block (non-admin users only) */}
+ {!isAdmin && selfUser && (
+
{/* Search input */}
@@ -628,7 +682,6 @@ function UsersPageContent({ currentUser }: UsersPageClientProps) {
)}
diff --git a/src/app/[locale]/internal/dashboard/big-screen/layout.tsx b/src/app/[locale]/internal/dashboard/big-screen/layout.tsx
index a82329010..e1b090446 100644
--- a/src/app/[locale]/internal/dashboard/big-screen/layout.tsx
+++ b/src/app/[locale]/internal/dashboard/big-screen/layout.tsx
@@ -1,9 +1,20 @@
import type { Metadata } from "next";
+import { getTranslations } from "next-intl/server";
-export const metadata: Metadata = {
- title: "实时数据大屏 - Claude Code Hub",
- description: "Claude Code Hub 实时监控数据大屏",
-};
+type BigScreenParams = { locale: string };
+
+export async function generateMetadata({
+ params,
+}: {
+ params: Promise