ding113 · github-actions · Aug 1, 2026 · Aug 1, 2026 · Aug 1, 2026 · chatgpt-codex-connector
diff --git a/src/actions/active-sessions.ts b/src/actions/active-sessions.ts
@@ -425,8 +425,13 @@ export async function getAllSessions(
     if (cached) {
       logger.debug("[SessionCache] All sessions cache hit");
 
+      const { SessionTracker } = await import("@/lib/session-tracker");
+
       // 过滤：管理员可查看所有，普通用户只能查看自己的
       const filteredCached = isAdmin ? cached : cached.filter((s) => s.userId === currentUserId);
+      const concurrentCounts = await SessionTracker.getObservedConcurrentCountBatch(
+        filteredCached.map((s) => s.sessionId)
+      );
 
       // 分离活跃和非活跃（5 分钟内有请求为活跃）
       const now = Date.now();
@@ -437,6 +442,7 @@ export async function getAllSessions(
 
       for (const s of filteredCached) {
         const lastRequestTime = s.lastRequestAt ? new Date(s.lastRequestAt).getTime() : 0;
+        const concurrentCount = concurrentCounts.get(s.sessionId) ?? 0;
         const sessionInfo: ActiveSessionInfo = {
           sessionId: s.sessionId,
           sessionIdentityKind: s.sessionIdentityKind,
@@ -460,12 +466,14 @@ export async function getAllSessions(
             s.totalCacheCreationTokens +
             s.totalCacheReadTokens,
           costUsd: s.totalCostUsd,
-          status: "completed",
+          status: concurrentCount > 0 ? "in_progress" : "completed",
           durationMs: s.totalDurationMs,
           requestCount: s.requestCount,
+          concurrentCount,
         };
 
-        if (lastRequestTime >= fiveMinutesAgo) {
+        const isConcurrent = concurrentCount > 0;
+        if (isConcurrent || lastRequestTime >= fiveMinutesAgo) {
           active.push(sessionInfo);
         } else {
           inactive.push(sessionInfo);
@@ -520,6 +528,10 @@ export async function getAllSessions(
     const { aggregateMultipleSessionStats } = await import("@/repository/message");
     const sessionsData = await aggregateMultipleSessionStats(allSessionIds);
 
+    const concurrentCounts = await SessionTracker.getObservedConcurrentCountBatch(
+      sessionsData.map((s) => s.sessionId)
+    );
+
     // 4. 写入缓存
     setActiveSessionsCache(sessionsData, cacheKey);
 
@@ -537,6 +549,7 @@ export async function getAllSessions(
 
     for (const s of filteredSessions) {
       const lastRequestTime = s.lastRequestAt ? new Date(s.lastRequestAt).getTime() : 0;
+      const concurrentCount = concurrentCounts.get(s.sessionId) ?? 0;
       const sessionInfo: ActiveSessionInfo = {
         sessionId: s.sessionId,
         sessionIdentityKind: s.sessionIdentityKind,
@@ -560,12 +573,14 @@ export async function getAllSessions(
           s.totalCacheCreationTokens +
           s.totalCacheReadTokens,
         costUsd: s.totalCostUsd,
-        status: "completed",
+        status: concurrentCount > 0 ? "in_progress" : "completed",
         durationMs: s.totalDurationMs,
         requestCount: s.requestCount,
+        concurrentCount,
       };
 
-      if (lastRequestTime >= fiveMinutesAgo) {
+      const isConcurrent = concurrentCount > 0;
+      if (isConcurrent || lastRequestTime >= fiveMinutesAgo) {
         active.push(sessionInfo);
       } else {
         inactive.push(sessionInfo);

diff --git a/src/actions/usage-logs.ts b/src/actions/usage-logs.ts
@@ -157,7 +157,10 @@ async function buildUsageLogsExport(
     progress: Pick<UsageLogsExportStatus, "processedRows" | "totalRows" | "progressPercent">
   ) => Promise<void> | void
 ): Promise<string> {
-  const initialResult = await findUsageLogsWithDetails({ ...filters, page: 1, pageSize: 1 });
+  const initialResult = await findUsageLogsWithDetails(
+    { ...filters, page: 1, pageSize: 1 },
+    { includeSourceSessionIds: false }
+  );
   let estimatedTotalRows = initialResult.total;
 
   if (estimatedTotalRows === 0) {
@@ -178,6 +181,7 @@ async function buildUsageLogsExport(
       ...filters,
       cursor,
       limit: USAGE_LOGS_EXPORT_BATCH_SIZE,
+      includeSourceSessionIds: false,
     });
 
     if (batch.logs.length > 0) {

diff --git a/src/app/[locale]/dashboard/logs/_components/usage-logs-table.test.tsx b/src/app/[locale]/dashboard/logs/_components/usage-logs-table.test.tsx
@@ -24,7 +24,9 @@ vi.mock("@/components/ui/tooltip", () => ({
   TooltipProvider: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
   Tooltip: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
   TooltipTrigger: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
-  TooltipContent: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
+  TooltipContent: ({ children }: { children?: ReactNode }) => (
+    <div data-slot="tooltip-content">{children}</div>
+  ),
 }));
 
 vi.mock("@/components/ui/relative-time", () => ({
@@ -606,6 +608,57 @@ describe("usage-logs-table multiplier badge", () => {
     });
     container.remove();
   });
+
+  test("shows the client session ID and keeps the canonical prefix identity in the tooltip", () => {
+    const html = renderToStaticMarkup(
+      <UsageLogsTable
+        logs={[
+          makeLog({
+            sessionId: "pfx:scope:fingerprint",
+            sourceSessionId: "client-session-id",
+          }),
+        ]}
+        total={1}
+        page={1}
+        pageSize={50}
+        onPageChange={() => {}}
+        isPending={false}
+      />
+    );
+
+    expect(html).toContain('data-session-id="client-session-id"');
+    expect(html).toContain("client-session-id");
+    expect(html).toContain("pfx:scope:fingerprint");
+  });
+
+  test("does not duplicate the canonical identity when it is the source fallback", () => {
+    const html = renderToStaticMarkup(
+      <UsageLogsTable
+        logs={[
+          makeLog({
+            sessionId: "same-session-id",
+            sourceSessionId: "same-session-id",
+          }),
+        ]}
+        total={1}
+        page={1}
+        pageSize={50}
+        onPageChange={() => {}}
+        isPending={false}
+      />
+    );
+    const container = document.createElement("div");
+    container.innerHTML = html;
+    const tooltip = [...container.querySelectorAll('[data-slot="tooltip-content"]')].find((node) =>
+      node.textContent?.includes("same-session-id")
+    );
+
+    expect(
+      [...(tooltip?.querySelectorAll("span") ?? [])].filter(
+        (node) => node.textContent === "same-session-id"
+      )
+    ).toHaveLength(1);
+  });
 });
 
 describe("usage-logs-table pricing resolution", () => {

diff --git a/src/app/[locale]/dashboard/logs/_components/usage-logs-table.tsx b/src/app/[locale]/dashboard/logs/_components/usage-logs-table.tsx
@@ -161,6 +161,9 @@ export function UsageLogsTable({
                     : Number(actualCostMultiplier);
                 const hasCostBadge =
                   multiplier != null && Number.isFinite(multiplier) && multiplier !== 1;
+                const displayedSourceSessionIds = (
+                  log.sourceSessionIds?.length ? log.sourceSessionIds : [log.sourceSessionId]
+                ).filter((id): id is string => Boolean(id));
 
                 return (
                   <TableRow
@@ -186,15 +189,25 @@ export function UsageLogsTable({
                               <button
                                 type="button"
                                 className="w-full text-left truncate cursor-pointer hover:underline"
-                                data-session-id={log.sessionId}
+                                data-session-id={log.sourceSessionId ?? log.sessionId}
                                 onClick={handleCopySessionIdClick}
                               >
-                                {log.sessionId}
+                                {log.sourceSessionId ?? log.sessionId}
                               </button>
                             </TooltipTrigger>
                             <TooltipContent side="bottom" align="start" className="max-w-[500px]">
                               <p className="text-xs whitespace-normal break-words font-mono">
-                                {log.sessionId}
+                                {displayedSourceSessionIds.map((id) => (
+                                  <span className="block" key={id}>
+                                    {id}
+                                  </span>
+                                ))}
+                                {log.sessionId &&
+                                  !displayedSourceSessionIds.includes(log.sessionId) && (
+                                    <span className="mt-1 block text-muted-foreground">
+                                      {log.sessionId}
+                                    </span>
+                                  )}
                               </p>
                             </TooltipContent>
                           </Tooltip>

diff --git a/src/app/[locale]/dashboard/logs/_components/virtualized-logs-table.test.tsx b/src/app/[locale]/dashboard/logs/_components/virtualized-logs-table.test.tsx
@@ -8,6 +8,7 @@ import type { UsageLogRow } from "@/repository/usage-logs";
 import type { RoutingTraceV1 } from "@/types/routing-trace";
 
 let mockLogs: UsageLogRow[] = [];
+let mockSourceSessionIdsByIdentity: Record<string, string[]> = {};
 let mockIsLoading = false;
 let mockIsError = false;
 let mockError: unknown = null;
@@ -24,7 +25,16 @@ vi.mock("@tanstack/react-query", () => ({
   useInfiniteQuery: (options: unknown) => {
     useInfiniteQuerySpy(options);
     return {
-      data: { pages: [{ logs: mockLogs, nextCursor: null, hasMore: false }] },
+      data: {
+        pages: [
+          {
+            logs: mockLogs,
+            sourceSessionIdsByIdentity: mockSourceSessionIdsByIdentity,
+            nextCursor: null,
+            hasMore: false,
+          },
+        ],
+      },
       fetchNextPage: vi.fn(),
       hasNextPage: mockHasNextPage,
       isFetchingNextPage: mockIsFetchingNextPage,
@@ -192,10 +202,46 @@ function renderTableWithLog(overrides: Partial<UsageLogRow>) {
   mockHasNextPage = false;
   mockIsFetchingNextPage = false;
   mockLogs = [makeLog({ id: 1, ...overrides })];
+  mockSourceSessionIdsByIdentity = {};
 
   return renderToStaticMarkup(<VirtualizedLogsTable filters={{}} autoRefreshEnabled={false} />);
 }
 
+test("shows the client session ID and canonical prefix identity in the virtualized tooltip", () => {
+  renderTableWithLog({
+    sessionId: "pfx:scope:fingerprint",
+    sourceSessionId: "client-session-id",
+  });
+  mockSourceSessionIdsByIdentity = {
+    "pfx:scope:fingerprint": ["client-session-id", "client-session-id-2"],
+  };
+  const html = renderToStaticMarkup(
+    <VirtualizedLogsTable filters={{}} autoRefreshEnabled={false} />
+  );
+
+  expect(html).toContain("client-session-id");
+  expect(html).toContain("client-session-id-2");
+  expect(html).toContain("pfx:scope:fingerprint");
+});
+
+test("does not duplicate the canonical identity when it is the source fallback", () => {
+  const html = renderTableWithLog({
+    sessionId: "same-session-id",
+    sourceSessionId: "same-session-id",
+  });
+  const container = document.createElement("div");
+  container.innerHTML = html;
+  const tooltip = [...container.querySelectorAll('[data-slot="tooltip-content"]')].find((node) =>
+    node.textContent?.includes("same-session-id")
+  );
+
+  expect(
+    [...(tooltip?.querySelectorAll("span") ?? [])].filter(
+      (node) => node.textContent === "same-session-id"
+    )
+  ).toHaveLength(1);
+});
+
 function renderCostTooltipWithLog(overrides: Partial<UsageLogRow>) {
   const html = renderTableWithLog(overrides);
   const container = document.createElement("div");

diff --git a/src/app/[locale]/dashboard/logs/_components/virtualized-logs-table.tsx b/src/app/[locale]/dashboard/logs/_components/virtualized-logs-table.tsx
@@ -203,6 +203,13 @@ export function VirtualizedLogsTable({
   // Flatten all pages into a single array
   const pages = data?.pages;
   const allLogs = useMemo(() => pages?.flatMap((page) => page.logs) ?? [], [pages]);
+  const sourceSessionIdsByIdentity = useMemo<Record<string, string[]>>(
+    () =>
+      Object.fromEntries(
+        pages?.flatMap((page) => Object.entries(page.sourceSessionIdsByIdentity ?? {})) ?? []
+      ),
+    [pages]
+  );
   const filtersResetKey = useMemo(() => JSON.stringify(filters), [filters]);
   const previousFiltersResetKeyRef = useRef(filtersResetKey);
 
@@ -781,6 +788,16 @@ export function VirtualizedLogsTable({
                 }
 
                 const isNonBilling = isNonBillingEndpoint(log.endpoint);
+                const mappedSourceSessionIds = log.sessionId
+                  ? sourceSessionIdsByIdentity[log.sessionId]
+                  : undefined;
+                const displayedSourceSessionIds = (
+                  mappedSourceSessionIds?.length
+                    ? mappedSourceSessionIds
+                    : log.sourceSessionIds?.length
+                      ? log.sourceSessionIds
+                      : [log.sourceSessionId]
+                ).filter((id): id is string => Boolean(id));
                 const _isWarmupSkipped = log.blockedBy === "warmup";
                 return (
                   <div
@@ -838,15 +855,25 @@ export function VirtualizedLogsTable({
                                 <button
                                   type="button"
                                   className="w-full text-left font-mono text-xs truncate cursor-pointer hover:underline"
-                                  data-session-id={log.sessionId}
+                                  data-session-id={log.sourceSessionId ?? log.sessionId}
                                   onClick={handleCopySessionIdClick}
                                 >
-                                  {log.sessionId}
+                                  {log.sourceSessionId ?? log.sessionId}
                                 </button>
                               </TooltipTrigger>
                               <TooltipContent side="bottom" align="start" className="max-w-[500px]">
                                 <p className="text-xs whitespace-normal break-words font-mono">
-                                  {log.sessionId}
+                                  {displayedSourceSessionIds.map((id) => (
+                                    <span className="block" key={id}>
+                                      {id}
+                                    </span>
+                                  ))}
+                                  {log.sessionId &&
+                                    !displayedSourceSessionIds.includes(log.sessionId) && (
+                                      <span className="mt-1 block text-muted-foreground">
+                                        {log.sessionId}
+                                      </span>
+                                    )}
                                 </p>
                               </TooltipContent>
                             </Tooltip>

diff --git a/src/app/v1/[...route]/route.ts b/src/app/v1/[...route]/route.ts
@@ -1,4 +1,5 @@
 import "@/lib/polyfills/file";
+import "@/lib/polyfills/worker-threads";
 import { Hono } from "hono";
 import { handle } from "hono/vercel";
 import { registerCors } from "@/app/v1/_lib/cors";

diff --git a/src/app/v1beta/[...route]/route.ts b/src/app/v1beta/[...route]/route.ts
@@ -1,4 +1,5 @@
 import "@/lib/polyfills/file";
+import "@/lib/polyfills/worker-threads";
 import { Hono } from "hono";
 import { handle } from "hono/vercel";
 import { registerCors } from "@/app/v1/_lib/cors";

diff --git a/src/lib/api-client/v1/actions/usage-logs.ts b/src/lib/api-client/v1/actions/usage-logs.ts
@@ -112,6 +112,7 @@ function toLegacyUsageLogsPage(body: unknown): UsageLogsBatchResult {
   const page = body as {
     logs?: UsageLogsBatchResult["logs"];
     items?: UsageLogsBatchResult["logs"];
+    sourceSessionIdsByIdentity?: UsageLogsBatchResult["sourceSessionIdsByIdentity"];
     pageInfo?: {
       nextCursor?: UsageLogsBatchResult["nextCursor"] | string;
       hasMore?: boolean;
@@ -129,6 +130,7 @@ function toLegacyUsageLogsPage(body: unknown): UsageLogsBatchResult {
   };
   return {
     logs: page.logs ?? page.items ?? [],
+    sourceSessionIdsByIdentity: page.sourceSessionIdsByIdentity,
     nextCursor: normalizeLegacyCursor(page.nextCursor ?? page.pageInfo?.nextCursor),
     hasMore: page.hasMore ?? page.pageInfo?.hasMore ?? false,
     ...((page.total ?? page.pageInfo?.total !== undefined)

diff --git a/src/lib/polyfills/worker-threads.ts b/src/lib/polyfills/worker-threads.ts
@@ -0,0 +1,13 @@
+import { createRequire } from "node:module";
+
+const nodeRequire = createRequire(import.meta.url);
+const workerThreads = nodeRequire("node:worker_threads") as {
+  markAsUncloneable?: (...args: unknown[]) => void;
+};
+
+// undici >= 8 destructures markAsUncloneable from node:worker_threads without
+// a fallback. Bun (Docker build stage) does not implement this Node.js 23+ API,
+// so next build crashes during page data collection.
+if (typeof workerThreads.markAsUncloneable !== "function") {
+  workerThreads.markAsUncloneable = function markAsUncloneable() {};
+}
diff --git a/src/repository/_shared/usage-log-filters.ts b/src/repository/_shared/usage-log-filters.ts
@@ -142,7 +142,10 @@ export function buildUsageLogConditions(filters: UsageLogFilterParams): SQL[] {
   const trimmedSessionId = filters.sessionId?.trim();
   if (trimmedSessionId) {
     conditions.push(
-      sql`COALESCE(${messageRequest.sessionIdentity}, ${messageRequest.sessionId}) = ${trimmedSessionId}`
+      sql`(
+        COALESCE(${messageRequest.sessionIdentity}, ${messageRequest.sessionId}) = ${trimmedSessionId}
+        OR ${messageRequest.sessionId} = ${trimmedSessionId}
+      )`
     );
   }