Skip to content

Improve provider attribution in request monitoring #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SHIJIU6 wants to merge 1 commit into from
Closed

Improve provider attribution in request monitoring #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions src/features/monitoring/accountOverviewState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,24 @@ export type MonitoringStatusRangeBounds = {
endMs: number;
};

const isMaskedUsageAccountLabel = (value: string) => {
const trimmed = value.trim();
return (
trimmed.startsWith('m:') ||
trimmed.startsWith('k:') ||
trimmed.includes('/m:') ||
trimmed.includes('/k:')
);
};

const getMonitoringAccountGroupKey = (row: MonitoringEventRow) => {
const accountKey = row.account || row.authLabel || row.source;
if (row.sourceKey && isMaskedUsageAccountLabel(accountKey)) {
return row.sourceKey;
}
return accountKey || row.sourceKey;
};

const ACCOUNT_SORT_KEYS = [
'totalCalls',
'successCalls',
Expand Down Expand Up @@ -465,6 +483,7 @@ export const buildMonitoringAccountStatusDataMap = (
) => {
const resolvedBounds = resolveMonitoringStatusRangeBounds(rows, bounds);
const grouped = new Map<string, MonitoringEventRow[]>();
const aliases = new Map<string, Set<string>>();

if (!resolvedBounds) {
return new Map<string, StatusBarData>();
Expand All @@ -475,18 +494,29 @@ export const buildMonitoringAccountStatusDataMap = (
return;
}

const accountKey = row.account || row.authLabel || row.source;
const accountKey = getMonitoringAccountGroupKey(row);
const existing = grouped.get(accountKey) ?? [];
existing.push(row);
grouped.set(accountKey, existing);

const accountAliases = aliases.get(accountKey) ?? new Set<string>();
[row.account, row.authLabel, row.source].forEach((value) => {
if (value) accountAliases.add(value);
});
aliases.set(accountKey, accountAliases);
});

return new Map(
Array.from(grouped.entries()).map(([accountKey, accountRows]) => [
accountKey,
buildStatusDataForRows(accountRows, resolvedBounds),
])
);
const result = new Map<string, StatusBarData>();
grouped.forEach((accountRows, accountKey) => {
const statusData = buildStatusDataForRows(accountRows, resolvedBounds);
result.set(accountKey, statusData);
aliases.get(accountKey)?.forEach((alias) => {
if (!result.has(alias)) {
result.set(alias, statusData);
}
});
});
return result;
};

const normalizeAccountIdentityValue = (value: unknown) =>
Expand Down
132 changes: 132 additions & 0 deletions src/features/monitoring/hooks/useMonitoringData.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ import {
buildAccountRows,
buildApiKeyDisplayMap,
buildMonitoringAuthMetaMap,
buildProviderInfoByUsageSource,
buildProviderPrefixByApiKeyHash,
buildProviderPrefixByUsageSource,
type MonitoringEventRow,
} from './useMonitoringData';
import { sha256Hex } from '@/utils/apiKeyHash';
import type { AuthFileItem } from '@/types';
import type { Config } from '@/types/config';

const createMonitoringEventRow = (
overrides: Partial<MonitoringEventRow> = {}
Expand All @@ -32,6 +36,7 @@ const createMonitoringEventRow = (
apiKeyLabel: overrides.apiKeyLabel ?? 'ak********sh',
apiKeyMasked: overrides.apiKeyMasked ?? 'ak********sh',
provider: overrides.provider ?? 'codex',
providerDetail: overrides.providerDetail,
planType: overrides.planType ?? 'pro',
channel: overrides.channel ?? 'codex',
channelHost: overrides.channelHost ?? 'example.com',
Expand Down Expand Up @@ -64,6 +69,73 @@ describe('buildAccountRows', () => {
expect(rows).toHaveLength(1);
expect(rows[0].authIndices).toEqual(['auth-123456', 'auth-999999']);
});

it('keeps provider prefixes visible for masked API key usage sources', () => {
const rows = buildAccountRows([
createMonitoringEventRow({
account: 'test1/m:fe_o...8599',
accountMasked: 'test1/m:fe_o...8599',
authLabel: 'test1/m:fe_o...8599',
channel: 'codex',
source: 'test1/m:fe_o...8599',
sourceMasked: 'test1/m:fe_o...8599',
}),
]);

expect(rows).toHaveLength(1);
expect(rows[0].account).toBe('test1/m:fe_o...8599');
expect(rows[0].displayAccount).toBe('test1/m:fe_o...8599');
});

it('merges prefixed and unprefixed rows for the same provider source', () => {
const rows = buildAccountRows([
createMonitoringEventRow({
id: 'row-unprefixed',
sourceKey: 'codex:0',
account: 'm:m:******ca',
accountMasked: 'm:m:******ca',
source: 'm:m:******ca',
sourceMasked: 'm:m:******ca',
}),
createMonitoringEventRow({
id: 'row-prefixed',
sourceKey: 'codex:0',
account: 'misaki-su/m:m:******ca',
accountMasked: 'misaki-su/m:m:******ca',
source: 'misaki-su/m:m:******ca',
sourceMasked: 'misaki-su/m:m:******ca',
timestampMs: Date.parse('2026-05-09T02:12:43.000Z'),
}),
]);

expect(rows).toHaveLength(1);
expect(rows[0].totalCalls).toBe(2);
expect(rows[0].account).toBe('misaki-su/m:m:******ca');
expect(rows[0].displayAccount).toBe('misaki-su/m:m:******ca');
});

it('stores provider detail text for provider key account subtitles', () => {
const rows = buildAccountRows([
createMonitoringEventRow({
account: 'misaki-su/m:sk-9...1dca',
accountMasked: 'misaki-su/m:sk-9...1dca',
providerDetail: {
prefix: 'misaki-su',
provider: 'Codex',
baseUrl: 'https://sub.swyel.codes',
},
}),
]);

expect(rows).toHaveLength(1);
expect(rows[0].providerDetails).toEqual([
{
prefix: 'misaki-su',
provider: 'Codex',
baseUrl: 'https://sub.swyel.codes',
},
]);
});
});

describe('buildMonitoringAuthMetaMap', () => {
Expand Down Expand Up @@ -95,3 +167,63 @@ describe('buildApiKeyDisplayMap', () => {
expect(map.get(apiKeyHash)?.masked).toMatch(/^sk/);
});
});

describe('buildProviderPrefixByApiKeyHash', () => {
it('maps configured provider API keys to their routing prefixes', () => {
const apiKey = 'fe_openai_1234567899';
const config: Config = {
codexApiKeys: [
{
apiKey,
prefix: 'test1',
},
],
};

const map = buildProviderPrefixByApiKeyHash(config);

expect(map.get(sha256Hex(apiKey).toLowerCase())).toBe('test1');
});
});

describe('buildProviderPrefixByUsageSource', () => {
it('maps masked usage sources back to configured provider prefixes', () => {
const apiKey = 'sk-9435efa6ebfface4e5be9846607be52b76d9b045c840d5468661a03be5051dca';
const config: Config = {
codexApiKeys: [
{
apiKey,
prefix: 'misaki-su',
},
],
};

const map = buildProviderPrefixByUsageSource(config);

expect(map.get('m:sk-9...1dca')).toBe('misaki-su');
});
});

describe('buildProviderInfoByUsageSource', () => {
it('maps masked usage sources back to provider type and base url details', () => {
const apiKey = 'sk-9435efa6ebfface4e5be9846607be52b76d9b045c840d5468661a03be5051dca';
const config: Config = {
codexApiKeys: [
{
apiKey,
prefix: 'misaki-su',
baseUrl: 'https://sub.swyel.codes',
},
],
};

const map = buildProviderInfoByUsageSource(config);

expect(map.get('m:sk-9...1dca')).toEqual({
prefix: 'misaki-su',
provider: 'Codex',
baseUrl: 'https://sub.swyel.codes',
});
expect(map.get('m:m:******ca')?.baseUrl).toBe('https://sub.swyel.codes');
});
});
Loading
Loading