{loading && modelNames.length === 0 && Object.keys(modelPrices).length === 0 ? (
diff --git a/web/src/lib/api.test.ts b/web/src/lib/api.test.ts
index 1f7d74dd..a707d166 100644
--- a/web/src/lib/api.test.ts
+++ b/web/src/lib/api.test.ts
@@ -1,5 +1,5 @@
import { afterEach, describe, expect, it, vi } from 'vitest';
-import { fetchUsageEventFilterOptions, fetchUsageEvents, triggerSync } from './api';
+import { fetchUsageEventFilterOptions, fetchUsageEvents, fetchUsageIdentities, triggerSync } from './api';
describe('fetchUsageEvents', () => {
afterEach(() => {
@@ -7,7 +7,7 @@ describe('fetchUsageEvents', () => {
vi.unstubAllGlobals();
});
- it('loads stable filter options without event pagination or selected filters', async () => {
+ it('loads stable filter options without query params', async () => {
vi.stubGlobal('window', { __APP_BASE_PATH__: undefined });
const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue({
ok: true,
@@ -15,16 +15,17 @@ describe('fetchUsageEvents', () => {
} as Response);
const signal = new AbortController().signal;
- const response = await fetchUsageEventFilterOptions('custom', '2026-04-20T00:00:00Z', '2026-04-21T00:00:00Z', signal);
+ const response = await fetchUsageEventFilterOptions(signal);
const [url, init] = fetchMock.mock.calls[0];
const parsed = new URL(String(url), 'http://localhost');
expect(response.models).toEqual(['claude-sonnet']);
expect(parsed.pathname).toBe('/api/v1/usage/events/filters');
- expect(parsed.searchParams.get('range')).toBe('custom');
- expect(parsed.searchParams.get('start')).toBe('2026-04-20T00:00:00Z');
- expect(parsed.searchParams.get('end')).toBe('2026-04-21T00:00:00Z');
+ expect(parsed.search).toBe('');
+ expect(parsed.searchParams.get('range')).toBeNull();
+ expect(parsed.searchParams.get('start')).toBeNull();
+ expect(parsed.searchParams.get('end')).toBeNull();
expect(parsed.searchParams.get('page')).toBeNull();
expect(parsed.searchParams.get('page_size')).toBeNull();
expect(parsed.searchParams.get('model')).toBeNull();
@@ -65,6 +66,51 @@ describe('fetchUsageEvents', () => {
expect(init).toMatchObject({ credentials: 'include', signal });
});
+ it('loads unified usage identities for credential stats', async () => {
+ vi.stubGlobal('window', { __APP_BASE_PATH__: undefined });
+ const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue({
+ ok: true,
+ json: async () => ({
+ identities: [
+ {
+ id: 1,
+ name: 'Claude primary',
+ auth_type: 2,
+ auth_type_name: 'apikey',
+ identity: 'sk-a***1234',
+ type: 'claude',
+ provider: 'anthropic',
+ total_requests: 3,
+ success_count: 2,
+ failure_count: 1,
+ input_tokens: 10,
+ output_tokens: 20,
+ reasoning_tokens: 0,
+ cached_tokens: 0,
+ total_tokens: 30,
+ last_aggregated_usage_event_id: 9,
+ is_deleted: false,
+ created_at: '2026-05-04T00:00:00Z',
+ updated_at: '2026-05-04T00:00:00Z',
+ },
+ ],
+ }),
+ } as Response);
+ const signal = new AbortController().signal;
+
+ const response = await fetchUsageIdentities(signal);
+
+ const [url, init] = fetchMock.mock.calls[0];
+ const parsed = new URL(String(url), 'http://localhost');
+
+ expect(response.identities[0].identity).toBe('sk-a***1234');
+ expect(response.identities[0].auth_type).toBe(2);
+ expect(typeof response.identities[0].auth_type).toBe('number');
+ expect(parsed.pathname).toBe('/api/v1/usage/identities');
+ expect(parsed.search).toBe('');
+ expect(init).toMatchObject({ credentials: 'include', signal });
+ });
+
it('posts to the manual sync endpoint', async () => {
vi.stubGlobal('window', { __APP_BASE_PATH__: undefined });
const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue({
diff --git a/web/src/lib/api.ts b/web/src/lib/api.ts
index d86e8b92..30744abf 100644
--- a/web/src/lib/api.ts
+++ b/web/src/lib/api.ts
@@ -1,4 +1,4 @@
-import type { AuthSessionResponse, PricingEntry, PricingResponse, StatusResponse, UsageAnalysisResponse, UsageEventFilterOptionsResponse, UsedModelsResponse, UsageCredentialsResponse, UsageEventsResponse, UsageOverviewResponse } from './types'
+import type { AuthSessionResponse, PricingEntry, PricingResponse, StatusResponse, UsageAnalysisResponse, UsageEventFilterOptionsResponse, UsedModelsResponse, UsageIdentitiesResponse, UsageEventsResponse, UsageOverviewResponse } from './types'
export class ApiError extends Error {
status: number
@@ -96,17 +96,8 @@ export interface FetchUsageEventsOptions {
result?: string
}
-export async function fetchUsageEventFilterOptions(range: string, start?: string, end?: string, signal?: AbortSignal): Promise
{
- const params = new URLSearchParams()
- params.set('range', range)
- if (start) {
- params.set('start', start)
- }
- if (end) {
- params.set('end', end)
- }
- const query = params.toString()
- const response = await apiFetch(`${apiPath('/usage/events/filters')}${query ? `?${query}` : ''}`, { signal })
+export async function fetchUsageEventFilterOptions(signal?: AbortSignal): Promise {
+ const response = await apiFetch(apiPath('/usage/events/filters'), { signal })
if (!response.ok) {
await parseApiError(response, `Failed to load usage event filters: ${response.status}`)
}
@@ -148,19 +139,10 @@ export async function fetchUsageEvents(range: string, start?: string, end?: stri
return response.json()
}
-export async function fetchUsageCredentials(range: string, start?: string, end?: string, signal?: AbortSignal): Promise {
- const params = new URLSearchParams()
- params.set('range', range)
- if (start) {
- params.set('start', start)
- }
- if (end) {
- params.set('end', end)
- }
- const query = params.toString()
- const response = await apiFetch(`${apiPath('/usage/credentials')}${query ? `?${query}` : ''}`, { signal })
+export async function fetchUsageIdentities(signal?: AbortSignal): Promise {
+ const response = await apiFetch(apiPath('/usage/identities'), { signal })
if (!response.ok) {
- await parseApiError(response, `Failed to load usage credentials: ${response.status}`)
+ await parseApiError(response, `Failed to load usage identities: ${response.status}`)
}
return response.json()
}
diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts
index 1fbe4802..25245cb8 100644
--- a/web/src/lib/types.ts
+++ b/web/src/lib/types.ts
@@ -161,17 +161,36 @@ export interface UsageEventFilterOptionsResponse {
sources: UsageSourceFilterOption[]
}
-export interface UsageCredential {
- source: string
- source_type?: string
- source_key?: string
+export type UsageIdentityAuthType = 1 | 2
+
+export interface UsageIdentity {
+ id: number
+ name: string
+ auth_type: UsageIdentityAuthType
+ auth_type_name: string
+ identity: string
+ type: string
+ provider: string
+ total_requests: number
success_count: number
failure_count: number
- total_count: number
-}
-
-export interface UsageCredentialsResponse {
- credentials: UsageCredential[]
+ input_tokens: number
+ output_tokens: number
+ reasoning_tokens: number
+ cached_tokens: number
+ total_tokens: number
+ last_aggregated_usage_event_id: number
+ first_used_at?: string
+ last_used_at?: string
+ stats_updated_at?: string
+ is_deleted: boolean
+ created_at: string
+ updated_at: string
+ deleted_at?: string
+}
+
+export interface UsageIdentitiesResponse {
+ identities: UsageIdentity[]
}
export interface UsageAnalysisModel {
diff --git a/web/src/pages/UsagePage.logic.test.ts b/web/src/pages/UsagePage.logic.test.ts
index 027ffb04..9c2b744f 100644
--- a/web/src/pages/UsagePage.logic.test.ts
+++ b/web/src/pages/UsagePage.logic.test.ts
@@ -1,5 +1,6 @@
import { afterEach, describe, expect, it, vi } from 'vitest';
import { buildCustomDateRangeQuery, getOverviewChartEndMs, getOverviewDisplayLoading, getOverviewHourWindowHours, getTimeRangeOptions, getUsageTabOptions, refreshPageData, sanitizeRequestEventFilters, scheduleOverviewAutoRefresh, syncCpaData } from './UsagePage';
+import { ApiError } from '@/lib/api';
import { filterUsageByWindow, type UsageFilterWindow } from '@/utils/usage';
import type { StatusResponse, UsageSnapshot } from '@/lib/types';
@@ -334,4 +335,37 @@ describe('UsagePage sync action', () => {
expect(calls).toEqual(['sync', 'refresh', 'status', 'set-status']);
expect(receivedStatus).toBe(refreshedStatus);
});
+
+ it('reloads status and preserves the sync error when backend sync fails', async () => {
+ const calls: string[] = [];
+ let receivedStatus: StatusResponse | null = null;
+ const refreshedStatus: StatusResponse = {
+ running: true,
+ sync_running: false,
+ last_status: 'completed',
+ last_run_at: '2026-04-26T13:00:00.000Z',
+ };
+ const syncError = new ApiError('metadata sync failed', 500);
+
+ await expect(syncCpaData({
+ triggerBackendSync: async () => {
+ calls.push('sync');
+ throw syncError;
+ },
+ refreshActiveTab: async () => {
+ calls.push('refresh');
+ },
+ refreshStatus: async () => {
+ calls.push('status');
+ return refreshedStatus;
+ },
+ onStatus: (status) => {
+ calls.push('set-status');
+ receivedStatus = status;
+ },
+ })).rejects.toBe(syncError);
+
+ expect(calls).toEqual(['sync', 'status', 'set-status']);
+ expect(receivedStatus).toBe(refreshedStatus);
+ });
});
diff --git a/web/src/pages/UsagePage.module.scss b/web/src/pages/UsagePage.module.scss
index a8d91675..a142c75c 100644
--- a/web/src/pages/UsagePage.module.scss
+++ b/web/src/pages/UsagePage.module.scss
@@ -1135,6 +1135,14 @@
}
// Pricing Section (80%比例)
+.pricingFixedCard {
+ @include mobile {
+ height: auto;
+ min-height: 0;
+ overflow: visible;
+ }
+}
+
.pricingSection {
display: flex;
flex-direction: column;
@@ -1215,6 +1223,12 @@
overflow: auto;
-webkit-overflow-scrolling: touch;
overscroll-behavior: contain;
+
+ .pricingFixedCard & {
+ @include mobile {
+ overflow: visible;
+ }
+ }
}
.priceItem {
@@ -1264,6 +1278,15 @@
display: flex;
gap: 3px;
flex-shrink: 0;
+
+ @include mobile {
+ width: 100%;
+
+ :global(.btn) {
+ flex: 1 1 0;
+ justify-content: center;
+ }
+ }
}
.editModalBody {
diff --git a/web/src/pages/UsagePage.tsx b/web/src/pages/UsagePage.tsx
index dd9b8dad..b8ed4517 100644
--- a/web/src/pages/UsagePage.tsx
+++ b/web/src/pages/UsagePage.tsx
@@ -14,8 +14,8 @@ import {
Legend,
Filler
} from 'chart.js';
-import { ApiError, fetchStatus, fetchUsageAnalysis, fetchUsageCredentials, fetchUsageEventFilterOptions, fetchUsageEvents, triggerSync } from '@/lib/api';
-import type { StatusResponse, UsageAnalysisResponse, UsageCredential, UsageEvent, UsageSourceFilterOption } from '@/lib/types';
+import { ApiError, fetchStatus, fetchUsageAnalysis, fetchUsageEventFilterOptions, fetchUsageEvents, fetchUsageIdentities, triggerSync } from '@/lib/api';
+import type { StatusResponse, UsageAnalysisResponse, UsageEvent, UsageIdentity, UsageSourceFilterOption } from '@/lib/types';
import { Button } from '@/components/ui/Button';
import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
import { Select } from '@/components/ui/Select';
@@ -200,10 +200,22 @@ export const scheduleOverviewAutoRefresh = ({
};
export const syncCpaData = async ({ triggerBackendSync, refreshActiveTab, refreshStatus, onStatus }: SyncCpaDataOptions) => {
- await triggerBackendSync();
- await refreshActiveTab();
- const nextStatus = await refreshStatus();
- onStatus(nextStatus);
+ try {
+ await triggerBackendSync();
+ await refreshActiveTab();
+ const nextStatus = await refreshStatus();
+ onStatus(nextStatus);
+ } catch (error) {
+ if (!(error instanceof ApiError && error.status === 401)) {
+ try {
+ const nextStatus = await refreshStatus();
+ onStatus(nextStatus);
+ } catch {
+ // 忽略状态刷新失败，继续抛出原始同步错误。
+ }
+ }
+ throw error;
+ }
};
export const sanitizeRequestEventFilters = (
@@ -447,7 +459,7 @@ export function UsagePage({ onAuthRequired }: { onAuthRequired?: () => void }) {
const [manualSyncLoading, setManualSyncLoading] = useState(false);
const [credentialsLoading, setCredentialsLoading] = useState(false);
const [credentialsError, setCredentialsError] = useState('');
- const [credentialsData, setCredentialsData] = useState([]);
+ const [credentialsData, setCredentialsData] = useState([]);
const credentialsRequestControllerRef = useRef(null);
const [analysisLoading, setAnalysisLoading] = useState(false);
const [analysisError, setAnalysisError] = useState('');
@@ -672,17 +684,8 @@ export function UsagePage({ onAuthRequired }: { onAuthRequired?: () => void }) {
}, [customTimeRange.end, customTimeRange.start, timeRange]);
const loadEventFilterOptions = useCallback(async () => {
- const queryWindow = getEventQueryWindow();
- const optionsKey = `${timeRange}|${queryWindow.start ?? ''}|${queryWindow.end ?? ''}`;
+ const optionsKey = 'stable';
- if (!queryWindow.valid) {
- eventsFilterOptionsRequestControllerRef.current?.abort();
- eventsFilterOptionsRequestControllerRef.current = null;
- loadedEventsFilterOptionsKeyRef.current = '';
- setEventsModelOptions([]);
- setEventsSourceOptions([]);
- return;
- }
if (loadedEventsFilterOptionsKeyRef.current === optionsKey) {
return;
}
@@ -692,7 +695,7 @@ export function UsagePage({ onAuthRequired }: { onAuthRequired?: () => void }) {
eventsFilterOptionsRequestControllerRef.current = controller;
try {
- const response = await fetchUsageEventFilterOptions(timeRange, queryWindow.start, queryWindow.end, controller.signal);
+ const response = await fetchUsageEventFilterOptions(controller.signal);
if (eventsFilterOptionsRequestControllerRef.current !== controller) {
return;
}
@@ -716,7 +719,7 @@ export function UsagePage({ onAuthRequired }: { onAuthRequired?: () => void }) {
eventsFilterOptionsRequestControllerRef.current = null;
}
}
- }, [getEventQueryWindow, onAuthRequired, timeRange]);
+ }, [onAuthRequired]);
const loadEvents = useCallback(async () => {
const queryWindow = getEventQueryWindow();
@@ -802,27 +805,6 @@ export function UsagePage({ onAuthRequired }: { onAuthRequired?: () => void }) {
}, [resetEventsPage]);
const loadCredentials = useCallback(async () => {
- if (timeRange === 'custom') {
- if (!customTimeRange.start || !customTimeRange.end) {
- credentialsRequestControllerRef.current?.abort();
- credentialsRequestControllerRef.current = null;
- setCredentialsData([]);
- setCredentialsError('');
- setCredentialsLoading(false);
- return;
- }
- const startMs = parseCustomDateStart(customTimeRange.start);
- const endMs = parseCustomDateEnd(customTimeRange.end);
- if (startMs === undefined || endMs === undefined || startMs > endMs) {
- credentialsRequestControllerRef.current?.abort();
- credentialsRequestControllerRef.current = null;
- setCredentialsData([]);
- setCredentialsError('');
- setCredentialsLoading(false);
- return;
- }
- }
-
credentialsRequestControllerRef.current?.abort();
const controller = new AbortController();
credentialsRequestControllerRef.current = controller;
@@ -831,12 +813,11 @@ export function UsagePage({ onAuthRequired }: { onAuthRequired?: () => void }) {
setCredentialsError('');
setCredentialsData([]);
try {
- const queryWindow = timeRange === 'custom' ? buildCustomDateRangeQuery({ start: customTimeRange.start, end: customTimeRange.end }) : { start: undefined, end: undefined };
- const response = await fetchUsageCredentials(timeRange, queryWindow.start, queryWindow.end, controller.signal);
+ const response = await fetchUsageIdentities(controller.signal);
if (credentialsRequestControllerRef.current !== controller) {
return;
}
- setCredentialsData(response.credentials);
+ setCredentialsData(response.identities);
} catch (error) {
if (controller.signal.aborted) {
return;
@@ -848,14 +829,14 @@ export function UsagePage({ onAuthRequired }: { onAuthRequired?: () => void }) {
onAuthRequired?.();
return;
}
- setCredentialsError(error instanceof Error ? error.message : 'Failed to load usage credentials');
+ setCredentialsError(error instanceof Error ? error.message : 'Failed to load usage identities');
} finally {
if (credentialsRequestControllerRef.current === controller) {
setCredentialsLoading(false);
credentialsRequestControllerRef.current = null;
}
}
- }, [customTimeRange.end, customTimeRange.start, onAuthRequired, timeRange]);
+ }, [onAuthRequired]);
const refreshActiveTab = useCallback(async () => {
if (activeTab === 'events') {
diff --git a/web/src/services/api/authFiles.ts b/web/src/services/api/authFiles.ts
deleted file mode 100644
index b8eaab98..00000000
--- a/web/src/services/api/authFiles.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ApiError, apiPath } from '@/lib/api';
-import type { AuthFileItem } from '@/types/authFile';
-
-export async function fetchAuthFiles(signal?: AbortSignal): Promise<{ files: AuthFileItem[] }> {
- const response = await fetch(apiPath('/auth-files'), {
- credentials: 'include',
- signal,
- });
- if (!response.ok) {
- let message = `Failed to load auth files: ${response.status}`;
- try {
- const payload = await response.json() as { error?: string };
- if (payload.error) message = payload.error;
- } catch {
- // ignore invalid error payloads
- }
- throw new ApiError(message, response.status);
- }
- return response.json();
-}
-
-export const authFilesApi = {
- list: fetchAuthFiles,
-};
diff --git a/web/src/services/api/providerMetadata.ts b/web/src/services/api/providerMetadata.ts
deleted file mode 100644
index db651789..00000000
--- a/web/src/services/api/providerMetadata.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ApiError, apiPath } from '@/lib/api';
-import type { ProviderMetadataItem } from '@/types/providerMetadata';
-
-export async function fetchProviderMetadata(signal?: AbortSignal): Promise<{ items: ProviderMetadataItem[] }> {
- const response = await fetch(apiPath('/provider-metadata'), {
- credentials: 'include',
- signal,
- });
- if (!response.ok) {
- let message = `Failed to load provider metadata: ${response.status}`;
- try {
- const payload = (await response.json()) as { error?: string };
- if (payload.error) message = payload.error;
- } catch {
- // ignore invalid error payloads
- }
- throw new ApiError(message, response.status);
- }
- return response.json();
-}
-
-export const providerMetadataApi = {
- list: fetchProviderMetadata,
-};
diff --git a/web/src/types/authFile.ts b/web/src/types/authFile.ts
deleted file mode 100644
index a6e45ae2..00000000
--- a/web/src/types/authFile.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface AuthFileItem {
- auth_index?: string;
- authIndex?: string;
- name?: string;
- email?: string;
- type?: string;
- provider?: string;
-}
diff --git a/web/src/types/providerMetadata.ts b/web/src/types/providerMetadata.ts
deleted file mode 100644
index 03bf4443..00000000
--- a/web/src/types/providerMetadata.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface ProviderMetadataItem {
- lookup_key: string;
- provider_type?: string;
- display_name?: string;
- provider_key?: string;
-}
diff --git a/web/src/types/sourceInfo.ts b/web/src/types/sourceInfo.ts
deleted file mode 100644
index f5b2750a..00000000
--- a/web/src/types/sourceInfo.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface CredentialInfo {
- name: string;
- type: string;
- key?: string;
-}
diff --git a/web/src/utils/sourceResolver.ts b/web/src/utils/sourceResolver.ts
deleted file mode 100644
index 19a2a60a..00000000
--- a/web/src/utils/sourceResolver.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import type { GeminiKeyConfig, OpenAIProviderConfig, ProviderKeyConfig } from '@/types';
-import type { CredentialInfo } from '@/types/sourceInfo';
-
-interface SourceInfoInput {
- geminiApiKeys: GeminiKeyConfig[];
- claudeApiKeys: ProviderKeyConfig[];
- codexApiKeys: ProviderKeyConfig[];
- vertexApiKeys: ProviderKeyConfig[];
- openaiCompatibility: OpenAIProviderConfig[];
-}
-
-export interface ResolvedSourceDisplay {
- displayName: string;
- type: string;
- key: string;
-}
-
-function maskValue(value: string): string {
- const normalized = value.trim();
- if (!normalized || normalized === '-') return '-';
- if (normalized.length <= 4) return '*'.repeat(normalized.length);
- if (normalized.length <= 8) return `${normalized.slice(0, 1)}${'*'.repeat(normalized.length - 2)}${normalized.slice(-1)}`;
- return `${normalized.slice(0, 4)}${'*'.repeat(normalized.length - 8)}${normalized.slice(-4)}`;
-}
-
-function looksLikeEmail(value: string): boolean {
- const normalized = value.trim();
- return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(normalized);
-}
-
-function inferProviderType(sourceKey: string): string {
- const value = sourceKey.trim().toLowerCase();
- if (!value) return '';
- if (value.startsWith('sk-ant-') || value.includes('anthropic') || value.includes('claude')) return 'claude';
- if (value.startsWith('sk-proj-') || value.startsWith('sk-') || value.includes('openai') || value.includes('gpt')) return 'openai';
- if (value.startsWith('aiza') || value.includes('gemini')) return 'gemini';
- if (value.includes('vertex')) return 'vertex';
- if (value.includes('codex')) return 'codex';
- if (value.includes('ampcode')) return 'ampcode';
- return '';
-}
-
-function buildFallbackSource(sourceKey: string): ResolvedSourceDisplay {
- if (looksLikeEmail(sourceKey)) {
- return {
- displayName: sourceKey,
- type: '',
- key: `email:${sourceKey}`,
- };
- }
-
- const inferredType = inferProviderType(sourceKey);
- if (inferredType) {
- return {
- displayName: inferredType,
- type: inferredType,
- key: `provider:fallback:${inferredType}`,
- };
- }
-
- const masked = maskValue(sourceKey || '-');
- return {
- displayName: masked,
- type: '',
- key: `raw:${masked}`,
- };
-}
-
-export function buildSourceInfoMap({
- geminiApiKeys,
- claudeApiKeys,
- codexApiKeys,
- vertexApiKeys,
- openaiCompatibility
-}: SourceInfoInput): Map {
- const map = new Map();
-
- const addProviderEntries = (items: Array, type: string) => {
- items.forEach((item, index) => {
- const label = item.prefix?.trim() || item.name?.trim() || `${type} #${index + 1}`;
- const key = `${type}:${label}`;
- if (item.apiKey) map.set(item.apiKey, { name: label, type, key });
- if (item.prefix) map.set(item.prefix, { name: label, type, key });
- });
- };
-
- addProviderEntries(geminiApiKeys, 'gemini');
- addProviderEntries(claudeApiKeys, 'claude');
- addProviderEntries(codexApiKeys, 'codex');
- addProviderEntries(vertexApiKeys, 'vertex');
-
- openaiCompatibility.forEach((provider, index) => {
- const label = provider.name?.trim() || provider.prefix?.trim() || `openai #${index + 1}`;
- const key = `openai:${label}`;
- if (provider.prefix) map.set(provider.prefix, { name: label, type: 'openai', key });
- provider.apiKeyEntries?.forEach((entry) => {
- if (entry.apiKey) map.set(entry.apiKey, { name: label, type: 'openai', key });
- });
- });
-
- return map;
-}
-
-export function resolveSourceDisplay(
- sourceRaw: string,
- authIndex: unknown,
- sourceInfoMap: Map,
- authFileMap: Map,
- providerMetadataMap?: Map
-): ResolvedSourceDisplay {
- const sourceKey = sourceRaw?.trim();
- const normalizedAuthIndex =
- authIndex === null || authIndex === undefined || String(authIndex).trim() === ''
- ? ''
- : String(authIndex).trim();
-
- if (normalizedAuthIndex && authFileMap.has(normalizedAuthIndex)) {
- const source = authFileMap.get(normalizedAuthIndex)!;
- return {
- displayName: source.name,
- type: source.type,
- key: source.key || `auth:${normalizedAuthIndex}`,
- };
- }
-
- if (sourceKey && providerMetadataMap?.has(sourceKey)) {
- const source = providerMetadataMap.get(sourceKey)!;
- return {
- displayName: source.name,
- type: source.type,
- key: source.key || `provider:${source.type}:${source.name}`,
- };
- }
-
- if (sourceKey && sourceInfoMap.has(sourceKey)) {
- const source = sourceInfoMap.get(sourceKey)!;
- return {
- displayName: source.name,
- type: source.type,
- key: source.key || `provider:${source.type}:${source.name}`,
- };
- }
-
- return buildFallbackSource(sourceKey || '-');
-}