Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

feat(desktop): add provider usage history for shared providers (#6279)

Lizi7aabec38682f
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
index 44574302a1..1d6ceea5bf 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
@@ -2,6 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ipcMain } from 'electron';
import type { ProviderShareManagementCommand } from '../../../shared/providerManagement';
+import type { ProviderUsageHistoryView } from '../../../shared/providerShare';
const state = vi.hoisted(() => ({ owner: 'owner-a', boundaryPending: false }));
const api = vi.hoisted(() => ({ createLink: vi.fn(), approve: vi.fn(), reject: vi.fn(), setMember: vi.fn() }));
@@ -11,6 +12,7 @@ const host = vi.hoisted(() => ({
const listProviders = vi.hoisted(() => vi.fn());
const identityCard = vi.hoisted(() => vi.fn());
const remember = vi.hoisted(() => vi.fn());
+const usageStores = vi.hoisted(() => ({ ownHistory: vi.fn(), memberHistory: vi.fn(), pricing: vi.fn() }));
vi.mock('../../appSessionState.js', () => ({
activeOwnerScopeKey: () => state.owner,
@@ -26,10 +28,15 @@ vi.mock('../../maker-host/remote-provider-access-store.js', () => ({ isRemotePro
vi.mock('../../textClipboard.js', () => ({ rememberIssuedClipboardText: remember }));
vi.mock('../../security/trustedAppRenderer.js', () => ({ assertTrustedAppRendererEvent: vi.fn() }));
vi.mock('../../usage/ledgerCurrency.js', () => ({ currentLedgerCurrency: vi.fn() }));
-vi.mock('../../usage/modelPricing.js', () => ({ getGatewayModelPricing: vi.fn(), getModelPriceQuote: vi.fn() }));
+vi.mock('../../usage/modelPricing.js', () => ({ getGatewayModelPricing: usageStores.pricing, getModelPriceQuote: vi.fn() }));
vi.mock('../../usage/turnCostCalculator.js', () => ({ computePriceQuoteTurnMoney: vi.fn(), normalizeModelIdForPricing: vi.fn() }));
-vi.mock('../../usage/providerPartyUsageStore.js', () => ({ currentProviderPartyUsageStore: vi.fn() }));
-vi.mock('../providerShareUsageStore.js', () => ({ getProviderShareUsageStore: vi.fn() }));
+vi.mock('../../usage/providerPartyUsageStore.js', () => ({
+ currentProviderPartyUsageStore: () => ({ history: usageStores.ownHistory }),
+}));
+vi.mock('../providerShareUsageStore.js', () => ({
+ getProviderShareUsageStore: () => ({ history: usageStores.memberHistory }),
+ providerUsageLocalDay: () => '2026-10-17',
+}));
vi.mock('../settings-store.js', () => ({ readDeviceLinkSettings: () => ({ remoteControlEnabled: true }), readLastKnownDeviceNames: vi.fn() }));
vi.mock('../providerShareApi.js', () => ({
providerShareApi: api,
@@ -53,7 +60,13 @@ vi.mock('../providerShareGuest.js', () => ({ startProviderShareGuest: vi.fn(), s
vi.mock('../providerShareGuestPrefs.js', () => ({ configureProviderShareGuestPrefs: vi.fn(), invalidateProviderShareGuestPrefsCache: vi.fn() }));
vi.mock('../providerShareGuestPrefsIpc.js', () => ({ setProviderShareCredentialConsentFromIpc: vi.fn() }));
-import { executeProviderShareManagementCommand, registerProviderShareIpc, startProviderShareRuntime, stopProviderShareRuntime } from '../providerShareRuntime';
+import {
+ executeProviderShareManagementCommand,
+ registerProviderShareIpc,
+ startProviderShareRuntime,
+ stopProviderShareRuntime,
+ trimProviderUsageHistory,
+} from '../providerShareRuntime';
const createLink: ProviderShareManagementCommand = { action: 'create-link', providerId: 'anthropic' };
const LINK_ID = 'a'.repeat(64);
@@ -75,16 +88,76 @@ beforeEach(() => {
api.setMember.mockResolvedValue({ status: 'removed' });
host.refresh.mockResolvedValue(undefined);
host.snapshot.mockReturnValue([{ requests: [{ requestId: 'r1' }], members: [{ memberId: 'm1' }] }]);
+ usageStores.ownHistory.mockReturnValue({ self: { lastUsedAt: null, days: [] }, relays: [] });
+ usageStores.memberHistory.mockReturnValue([]);
startProviderShareRuntime(vi.fn());
});
afterEach(() => stopProviderShareRuntime());
+const historyRow = (index: number, model = 'model-' + index): ProviderUsageHistoryView['self']['days'][number] => ({
+ day: '2026-10-17',
+ kind: 'claude-code',
+ providerId: 'anthropic',
+ memberKey: 'local',
+ model,
+ turns: 1,
+ inputTokens: 1,
+ outputTokens: 1,
+ cacheReadTokens: 0,
+ cacheCreateTokens: 0,
+ amount: null,
+});
+
+const historyWithRows = (rows: ProviderUsageHistoryView['self']['days']): ProviderUsageHistoryView => ({
+ providerId: 'anthropic',
+ todayKey: '2026-10-17',
+ coverageStart: null,
+ self: { lastUsedAt: null, days: rows },
+ relays: [],
+ members: [],
+});
+
+describe('provider share usage history wire budget', () => {
+ it('caps the global row count even when the newest day alone has more rows', () => {
+ const trimmed = trimProviderUsageHistory(historyWithRows(Array.from({ length: 5_001 }, (_, index) => historyRow(index))));
+ expect(trimmed.self.days).toHaveLength(5_000);
+ expect(trimmed.coverageStart).toBe('2026-10-17');
+ });
+
+ it('also trims by UTF-8 JSON bytes and reports the retained date', () => {
+ const rows = Array.from({ length: 4_000 }, (_, index) => '模型-' + index + '-' + '很'.repeat(600))
+ .map((model, index) => historyRow(index, model));
+ const trimmed = trimProviderUsageHistory(historyWithRows(rows));
+ expect(trimmed.self.days.length).toBeLessThan(rows.length);
+ expect(Buffer.byteLength(JSON.stringify(trimmed), 'utf8')).toBeLessThanOrEqual(2 * 1024 * 1024 - 1_024);
+ expect(trimmed.coverageStart).toBe('2026-10-17');
+ });
+
+ it('bounds ledger expansion and prices only the globally retained rows, preserving SDK costs and truncation', async () => {
+ const rawRows = Array.from({ length: 5_001 }, (_, index) => {
+ return { ...historyRow(index), sdkCostUsd: 0.25 };
+ });
+ usageStores.ownHistory.mockReturnValue({ self: { lastUsedAt: null, days: rawRows }, relays: [] });
+ host.snapshot.mockReturnValue([{ providerId: 'anthropic', shareId: 's', members: [{ memberId: 'm1' }] }]);
+ const result = await executeProviderShareManagementCommand({ action: 'usage-history', providerId: 'anthropic' }) as ProviderUsageHistoryView;
+ expect(usageStores.memberHistory).toHaveBeenCalledWith(new Set(['s']), {
+ maxRows: 5_001, memberKeys: new Set([JSON.stringify(['s', 'm1'])]),
+ });
+ expect(usageStores.pricing).toHaveBeenCalledTimes(5_000);
+ expect(result.self.days).toHaveLength(5_000);
+ expect(result.self.days[0]?.amount).toEqual({ amount: 0.25, currency: 'USD' });
+ expect(result.self.days[0]).not.toHaveProperty('sdkCostUsd');
+ expect(result.coverageStart).toBe('2026-10-17');
+ });
+});
+
describe('same-account share management during account transitions', () => {
it.each([
createLink, ...mutations,
{ action: 'owned', range: '7d' },
{ action: 'own-usage', providerId: 'anthropic', range: '7d' },
+ { action: 'usage-history', providerId: 'anthropic' },
] satisfies ProviderShareManagementCommand[])('refuses $action at entry while teardown is pending', async (command) => {
state.boundaryPending = true;
await expect(executeProviderShareManagementCommand(command)).rejects.toThrow(/PRECONDITION_FAILED/);
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts
index cef374ea2b..57aaa874ee 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts
@@ -75,6 +75,70 @@ describe('provider share usage store', () => {
expect(after.find((model) => model.memberKey === null)).toMatchObject({ turns: 5, inputTokens: 50 });
});
+ // 「用量」块按天筛选(provider-groups.md §7):每天按组内电脑拆开,拆法与 query 相同。
+ it('lists daily usage per member split by computer, newest day first and only for requested shares', () => {
+ let now = new Date(2026, 9, 10, 12).getTime();
+ const file = path.join(dir, 'usage.json');
+ fs.writeFileSync(file, JSON.stringify({
+ version: 1,
+ rows: [{
+ day: '2026-10-09', shareId: 's', memberId: 'm', kind: 'claude-code', providerId: 'anthropic', model: 'opus',
+ turns: 3, inputTokens: 30, outputTokens: 3, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0, lastAt: 1,
+ }],
+ }));
+ const store = createProviderShareUsageStore(file, { now: () => now });
+ store.record('s', 'm', { kind: 'claude-code', providerId: 'anthropic', memberKey: 'local', samples: [sample('opus', 10, 1)] });
+ store.record('s', 'm', { kind: 'claude-code', providerId: 'anthropic', memberKey: 'device:studio:a2', samples: [sample('opus', 20, 2)] });
+ now = new Date(2026, 9, 11, 12).getTime();
+ store.record('s', 'm', { kind: 'claude-code', providerId: 'anthropic', memberKey: 'local', samples: [sample('opus', 5, 5)] });
+ store.record('other', 'x', { kind: 'codex', providerId: 'openai', memberKey: 'local', samples: [sample('gpt', 1, 1)] });
+
+ const history = store.history(new Set(['s']));
+ expect(history).toHaveLength(1);
+ expect(history[0]).toMatchObject({ shareId: 's', memberId: 'm', lastUsedAt: now });
+ expect(history[0]!.days.map((row) => [row.day, row.memberKey, row.inputTokens])).toEqual([
+ ['2026-10-11', 'local', 5],
+ ['2026-10-10', 'local', 10],
+ ['2026-10-10', 'device:studio:a2', 20],
+ // 加组内电脑之前记的:没有区分电脑。
+ ['2026-10-09', null, 30],
+ ]);
+ });
+
+ it('bounds daily expansion before splitting every stored computer distribution', () => {
+ let now = new Date(2026, 9, 12, 12).getTime();
+ const file = path.join(dir, 'bounded-history.json');
+ const store = createProviderShareUsageStore(file, { now: () => now });
+ store.record('s', 'm', { kind: 'claude-code', providerId: 'anthropic', memberKey: 'device:new', samples: [sample('new', 1, 1)] });
+ now = new Date(2026, 9, 11, 12).getTime();
+ store.record('s', 'm', { kind: 'claude-code', providerId: 'anthropic', memberKey: 'device:old', samples: [sample('old', 1, 1)] });
+ const history = store.history(new Set(['s']), { maxRows: 1 });
+ expect(history[0]).toMatchObject({ shareId: 's', memberId: 'm', lastUsedAt: new Date(2026, 9, 12, 12).getTime() });
+ expect(history[0]?.days).toHaveLength(1);
+ expect(history[0]?.days[0]).toMatchObject({ day: '2026-10-12', model: 'new', memberKey: 'device:new' });
+ });
+
+ it('applies the split-row budget across members after excluding removed members', () => {
+ let now = new Date(2026, 9, 10, 12).getTime();
+ const store = createProviderShareUsageStore(path.join(dir, 'split-history.json'), { now: () => now });
+ const record = (memberId: string, memberKey: string) => store.record('s', memberId, {
+ kind: 'claude-code', providerId: 'anthropic', memberKey, samples: [sample('opus', 1, 1)],
+ });
+ record('m', 'device:old');
+ now = new Date(2026, 9, 11, 12).getTime();
+ for (let index = 0; index < 512; index++) record('m', `device:d${index}`);
+ now = new Date(2026, 9, 12, 12).getTime();
+ record('removed', 'local');
+ const history = store.history(new Set(['s']), {
+ maxRows: 3, memberKeys: new Set([JSON.stringify(['s', 'm'])]),
+ });
+ expect(history).toHaveLength(1);
+ expect(history[0]?.days).toHaveLength(3);
+ expect(history[0]?.days.every((row) => row.day === '2026-10-11')).toBe(true);
+ expect(history[0]?.days.map((row) => row.memberKey)).toEqual(['device:d0', 'device:d1', 'device:d2']);
+ expect(history[0]?.lastUsedAt).toBe(new Date(2026, 9, 11, 12).getTime());
+ });
+
it('keeps existing computer distributions and all counters after exceeding the per-row capacity and restarting', async () => {
const now = new Date(2026, 9, 11, 12).getTime();
const file = path.join(dir, 'usage.json');
diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.ts
index 45ee2cf38d..d8ed40a9fd 100644
--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts
+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts
@@ -8,6 +8,7 @@ import {
PROVIDER_SHARE_LINK_TTL_MS,
PROVIDER_SHARE_NEUTRAL_DEVICE_NAME,
PROVIDER_SHARE_RECEIVED_CATALOGS_CHANNEL,
+ MAX_FRAME_BYTES,
parseProviderSharePeer,
scrubProviderShareLabel,
scrubSharedProviderCatalog,
@@ -27,6 +28,8 @@ import {
type ProviderShareUsageRange,
type ProviderOwnUsageView,
type ProviderPartyUsageView,
+ type ProviderUsageDayView,
+ type ProviderUsageHistoryView,
} from '../../shared/providerShare.js';
import { getDeviceId } from '../authManager.js';
import { isDataOwnerPushStamp } from '../../shared/dataOwnerPush.js';
@@ -100,7 +103,7 @@ import {
type ProviderShareReshareEvents,
type ProviderShareReshareRecord,
} from './providerShareReshare.js';
-import { getProviderShareUsageStore } from './providerShareUsageStore.js';
+import { getProviderShareUsageStore, providerUsageLocalDay } from './providerShareUsageStore.js';
import { readDeviceLinkSettings, readLastKnownDeviceNames } from './settings-store.js';
import { currentProviderPartyUsageStore, type ProviderPartyUsage } from '../usage/providerPartyUsageStore.js';
@@ -332,6 +335,8 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {
return { action: 'owned', range: usageRange(value.range) };
case 'own-usage':
return { action: 'own-usage', providerId: text(value.providerId, 'providerId'), range: usageRange(value.range) };
+ case 'usage-history':
+ return { action: 'usage-history', providerId: text(value.providerId, 'providerId') };
case 'create-link':
return { action: 'create-link', providerId: text(value.providerId, 'providerId') };
case 'approve':
@@ -475,6 +480,152 @@ async function ownUsage(providerId: string, range: ProviderShareUsageRange): Pro
};
}
+/**
+ * 按天明细的预算:远程管理时整份经设备互联回包(单帧 2MB)。行数预算先保留最新的行,
+ * 再按实际 UTF-8 JSON 大小预留 invoke 信封空间;两种裁剪都会通过 coverageStart 告知界面。
+ */
+const USAGE_HISTORY_MAX_ROWS = 5_000;
+const USAGE_HISTORY_FRAME_SAFETY_BYTES = 1_024;
+const USAGE_HISTORY_MAX_BYTES = MAX_FRAME_BYTES - USAGE_HISTORY_FRAME_SAFETY_BYTES;
+
+type UsageHistoryRowRef =
+ | { group: 'self'; row: number; day: string; order: number }
+ | { group: 'relay'; party: number; row: number; day: string; order: number }
+ | { group: 'member'; party: number; row: number; day: string; order: number };
+
+/**
+ * 让 usage-history 回包同时满足行数和物理帧预算。按日期从新到旧选行;同一天保持 self、relay、member
+ * 及各自账本的既有顺序。二分查找保留前 N 行,避免每删一行都重新序列化整份历史。
+ */
+export function trimProviderUsageHistory(history: ProviderUsageHistoryView): ProviderUsageHistoryView {
+ const refs: UsageHistoryRowRef[] = [];
+ let order = 0;
+ history.self.days.forEach((row, index) => refs.push({ group: 'self', row: index, day: row.day, order: order++ }));
+ history.relays.forEach((party, partyIndex) => {
+ party.days.forEach((row, rowIndex) => refs.push({ group: 'relay', party: partyIndex, row: rowIndex, day: row.day, order: order++ }));
+ });
+ history.members.forEach((party, partyIndex) => {
+ party.days.forEach((row, rowIndex) => refs.push({ group: 'member', party: partyIndex, row: rowIndex, day: row.day, order: order++ }));
+ });
+ refs.sort((a, b) => b.day.localeCompare(a.day) || a.order - b.order);
+
+ const materialize = (count: number): ProviderUsageHistoryView => {
+ const kept = refs.slice(0, count);
+ const selfRows = new Set(kept.filter((ref) => ref.group === 'self').map((ref) => ref.row));
+ const relayRows = new Map<number, Set<number>>();
+ const memberRows = new Map<number, Set<number>>();
+ for (const ref of kept) {
+ if (ref.group === 'relay') {
+ const rows = relayRows.get(ref.party) ?? new Set<number>();
+ rows.add(ref.row);
+ relayRows.set(ref.party, rows);
+ } else if (ref.group === 'member') {
+ const rows = memberRows.get(ref.party) ?? new Set<number>();
+ rows.add(ref.row);
+ memberRows.set(ref.party, rows);
+ }
+ }
+ const truncated = count < refs.length;
+ // 二次裁剪(估价后)若没有再删行,保留第一次裁剪已经记录的覆盖起点。
+ const coverageStart = truncated && kept.length > 0
+ ? kept.reduce((day, ref) => day < ref.day ? day : ref.day, kept[0]!.day)
+ : history.coverageStart;
+ return {
+ ...history,
+ coverageStart,
+ self: { ...history.self, days: history.self.days.filter((_, index) => selfRows.has(index)) },
+ relays: history.relays.map((party, partyIndex) => ({
+ ...party,
+ days: party.days.filter((_, rowIndex) => relayRows.get(partyIndex)?.has(rowIndex) ?? false),
+ })),
+ members: history.members.map((party, partyIndex) => ({
+ ...party,
+ days: party.days.filter((_, rowIndex) => memberRows.get(partyIndex)?.has(rowIndex) ?? false),
+ })),
+ };
+ };
+
+ const fits = (count: number): boolean => Buffer.byteLength(JSON.stringify(materialize(count)), 'utf8') <= USAGE_HISTORY_MAX_BYTES;
+ let count = Math.min(refs.length, USAGE_HISTORY_MAX_ROWS);
+ if (!fits(count)) {
+ let low = 0;
+ let high = count;
+ while (low < high) {
+ const middle = Math.ceil((low + high) / 2);
+ if (fits(middle)) low = middle;
+ else high = middle - 1;
+ }
+ count = low;
+ }
+ return materialize(count);
+}
+
+/**
+ * 这个供应商的用量按天明细(provider-groups.md §7):你自己与经其他电脑转来的读本机账本,分享的人读分享账本
+ * (只含这个供应商的分享里现在的成员)。时间段、人与组内电脑由界面筛选。
+ */
+async function usageHistory(providerId: string): Promise<ProviderUsageHistoryView> {
+ const own = currentProviderPartyUsageStore().history(providerId);
+ const shares = running ? getProviderShareHostSnapshot().filter((share) => share.providerId === providerId) : [];
+ const memberKeys = new Set(shares.flatMap((share) => share.members.map((member) => JSON.stringify([share.shareId, member.memberId]))));
+ // 多取一行作为裁剪哨兵,使上层知道历史未完整展开;删除的成员在展开前就排除。
+ const members = getProviderShareUsageStore()?.history(new Set(shares.map((share) => share.shareId)), {
+ maxRows: USAGE_HISTORY_MAX_ROWS + 1,
+ memberKeys,
+ }) ?? [];
+ const lastKnownNames = readLastKnownDeviceNames();
+ const history = trimProviderUsageHistory({
+ providerId,
+ todayKey: providerUsageLocalDay(Date.now()),
+ coverageStart: null,
+ self: {
+ ...own.self,
+ days: own.self.days.map((row) => ({ ...row, providerId, amount: null })),
+ },
+ relays: own.relays.map((relay) => ({
+ ...relay,
+ deviceName: getControllerDisplayName(relay.deviceId) ?? lastKnownNames[relay.deviceId] ?? null,
+ days: relay.days.map((row) => ({ ...row, providerId, amount: null })),
+ })),
+ members: members.map((member) => ({
+ ...member,
+ days: member.days.map((row) => ({ ...row, amount: null })),
+ })),
+ });
+
+ const days = async (
+ rows: ReadonlyArray<ProviderUsageDayView & { sdkCostUsd?: number }>,
+ ): Promise<ProviderUsageDayView[]> =>
+ Promise.all(rows.map(async (row) => {
+ const usage = { ...row, sdkCostUsd: row.sdkCostUsd ?? 0 };
+ return {
+ day: usage.day,
+ kind: usage.kind,
+ providerId: usage.providerId,
+ memberKey: usage.memberKey,
+ model: usage.model,
+ turns: usage.turns,
+ inputTokens: usage.inputTokens,
+ outputTokens: usage.outputTokens,
+ cacheReadTokens: usage.cacheReadTokens,
+ cacheCreateTokens: usage.cacheCreateTokens,
+ amount: await estimate(usage),
+ };
+ }));
+ return trimProviderUsageHistory({
+ ...history,
+ self: { ...history.self, days: await days(history.self.days) },
+ relays: await Promise.all(history.relays.map(async (relay) => ({
+ ...relay,
+ days: await days(relay.days),
+ }))),
+ members: await Promise.all(history.members.map(async (member) => ({
+ ...member,
+ days: await days(member.days),
+ }))),
+ });
+}
+
async function createLink(
providerId: string,
assertCurrent: () => void = () => undefined,
@@ -522,6 +673,8 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => void
return ownerState(command.range);
case 'own-usage':
return ownUsage(command.providerId, command.range);
+ case 'usage-history':
+ return usageHistory(command.providerId);
case 'create-link': {
const created = await createLink(command.providerId, assertCurrent);
await clearProviderShareRequestQuiet(command.providerId);
diff --git a/apps/desktop/src/main/device-link/providerShareUsageStore.ts b/apps/desktop/src/main/device-link/providerShareUsageStore.ts
index c3dd9008e1..e15b165736 100644
--- a/apps/desktop/src/main/device-link/providerShareUsageStore.ts
+++ b/apps/desktop/src/main/device-link/providerShareUsageStore.ts
@@ -55,12 +55,33 @@ export interface ProviderShareMemberUsage {
models: ProviderShareModelUsage[];
}
-function localDay(at: number): string {
+/** 一个受邀者按天的用量:每天按(Agent、供应商、模型、组内电脑)分行。 */
+export interface ProviderShareMemberDailyUsage {
+ shareId: string;
+ memberId: string;
+ lastUsedAt: number | null;
+ days: Array<ProviderShareModelUsage & { day: string }>;
+}
+
+export interface ProviderShareUsageHistoryOptions {
+ /**
+ * 最多展开多少条按电脑拆分后的明细。按日期从新到旧遍历原始行,
+ * 防止一个长期账本在生成回包前膨胀成数百万条中间对象。
+ */
+ maxRows?: number;
+ /** 仅展开仍在当前分享里的成员;JSON 编码的 [shareId, memberId]。 */
+ memberKeys?: ReadonlySet<string>;
+}
+
+/** 账本用的本地日期(YYYY-MM-DD)。 */
+export function providerUsageLocalDay(at: number): string {
const date = new Date(at);
const pad = (value: number) => String(value).padStart(2, '0');
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
}
+const localDay = providerUsageLocalDay;
+
/** 时间段的起始日期(含);all 返回 null。 */
export function providerShareUsageRangeStart(range: ProviderShareUsageRange, now = Date.now()): string | null {
if (range === 'all') return null;
@@ -93,6 +114,26 @@ function parseByMember(value: unknown): Record<string, Counters> | undefined {
return out;
}
+/**
+ * 一行按组内电脑拆开:各台的部分,加上合计比各台之和多出来、记为没区分电脑(null)的部分。各台之和不超过合计
+ * (降级期间旧版本只加合计;防止损坏的文件让某台超过合计)。没有用量的部分不返回。
+ */
+function splitByMember(row: ProviderShareUsageRow): Array<[string | null, Counters]> {
+ const parts: Array<[string | null, Counters]> = [];
+ const rest: Counters = Object.fromEntries(COUNTERS.map((field) => [field, row[field]])) as Counters;
+ for (const [key, counters] of Object.entries(row.byMember ?? {})) {
+ const capped = Object.fromEntries(
+ COUNTERS.map((field) => [field, Math.min(counters[field], rest[field])]),
+ ) as Counters;
+ for (const field of COUNTERS) rest[field] -= capped[field];
+ parts.push([key, capped]);
+ }
+ parts.push([null, rest]);
+ // 金额相减会留下浮点零头:只有轮次、token 或像样的金额才算有用量。
+ return parts.filter(([, counters]) =>
+ COUNTERS.some((field) => (field === 'sdkCostUsd' ? counters[field] > 1e-9 : counters[field] > 0)));
+}
+
function parseRow(value: unknown): ProviderShareUsageRow | null {
if (!value || typeof value !== 'object') return null;
const row = value as Record<string, unknown>;
@@ -103,7 +144,9 @@ function parseRow(value: unknown): ProviderShareUsageRow | null {
&& [...COUNTERS, 'lastAt'].every((key) => isCount(row[key]));
if (!valid) return null;
const byMember = parseByMember(row.byMember);
- const { byMember: _raw, ...rest } = row as unknown as ProviderShareUsageRow;
+ const { byMember: storedByMember, ...rest } = row as unknown as ProviderShareUsageRow;
+ // 先丢掉文件里的原始值,再写回经过校验的版本;旧行没有该字段。
+ void storedByMember;
return byMember ? { ...rest, byMember } : rest;
}
@@ -210,17 +253,6 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:
query(shareIds: ReadonlySet<string>, range: ProviderShareUsageRange): ProviderShareMemberUsage[] {
const start = providerShareUsageRangeStart(range, now());
const members = new Map<string, ProviderShareMemberUsage>();
- const add = (member: ProviderShareMemberUsage, row: ProviderShareUsageRow, memberKey: string | null, counters: Counters) => {
- // 金额相减会留下浮点零头:只有轮次、token 或像样的金额才算有用量。
- const used = COUNTERS.some((field) => (field === 'sdkCostUsd' ? counters[field] > 1e-9 : counters[field] > 0));
- if (!used) return;
- const model = member.models.find(
- (item) => item.model === row.model && item.kind === row.kind && item.providerId === row.providerId
- && item.memberKey === memberKey,
- );
- if (model) addCounters(model, counters);
- else member.models.push({ kind: row.kind, providerId: row.providerId, memberKey, model: row.model, ...counters });
- };
for (const row of load().values()) {
if (!shareIds.has(row.shareId)) continue;
const memberKey = JSON.stringify([row.shareId, row.memberId]);
@@ -228,21 +260,67 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:
members.set(memberKey, member);
member.lastUsedAt = Math.max(member.lastUsedAt ?? 0, row.lastAt);
if (start && row.day < start) continue;
- const rest: Counters = Object.fromEntries(COUNTERS.map((field) => [field, row[field]])) as Counters;
- for (const [key, counters] of Object.entries(row.byMember ?? {})) {
- // 各台之和不超过合计(降级期间旧版本只加合计;防止损坏的文件让某台超过合计)。
- const capped = Object.fromEntries(
- COUNTERS.map((field) => [field, Math.min(counters[field], rest[field])]),
- ) as Counters;
- for (const field of COUNTERS) rest[field] -= capped[field];
- add(member, row, key, capped);
+ for (const [key, counters] of splitByMember(row)) {
+ const model = member.models.find(
+ (item) => item.model === row.model && item.kind === row.kind && item.providerId === row.providerId
+ && item.memberKey === key,
+ );
+ if (model) addCounters(model, counters);
+ else member.models.push({ kind: row.kind, providerId: row.providerId, memberKey: key, model: row.model, ...counters });
}
- add(member, row, null, rest);
}
for (const member of members.values()) member.models.sort((a, b) => b.turns - a.turns || a.model.localeCompare(b.model));
return [...members.values()];
},
+ /**
+ * 按受邀者、按天的明细(只含 shareIds 里的分享):「用量」块在界面上按时间段、组内电脑筛选。
+ * 每天按(Agent、供应商、模型、组内电脑)分行,组内电脑的拆法与 query 相同;新的日子在前。
+ */
+ history(shareIds: ReadonlySet<string>, options: ProviderShareUsageHistoryOptions = {}): ProviderShareMemberDailyUsage[] {
+ const members = new Map<string, ProviderShareMemberDailyUsage>();
+ const maxRows = options.maxRows === undefined
+ ? Number.POSITIVE_INFINITY
+ : Number.isFinite(options.maxRows) ? Math.max(0, Math.floor(options.maxRows)) : 0;
+ let expandedRows = 0;
+ const sourceRows = [...load().values()]
+ .filter((row) => shareIds.has(row.shareId)
+ && (!options.memberKeys || options.memberKeys.has(JSON.stringify([row.shareId, row.memberId]))))
+ .sort((a, b) => b.day.localeCompare(a.day) || b.lastAt - a.lastAt);
+ const lastUsedAt = new Map<string, number>();
+ for (const row of sourceRows) {
+ const key = JSON.stringify([row.shareId, row.memberId]);
+ lastUsedAt.set(key, Math.max(lastUsedAt.get(key) ?? 0, row.lastAt));
+ }
+ for (const row of sourceRows) {
+ if (expandedRows >= maxRows) break;
+ const memberKey = JSON.stringify([row.shareId, row.memberId]);
+ const member = members.get(memberKey) ?? {
+ shareId: row.shareId,
+ memberId: row.memberId,
+ lastUsedAt: lastUsedAt.get(memberKey) ?? null,
+ days: [],
+ };
+ members.set(memberKey, member);
+ const parts = splitByMember(row);
+ for (const [key, counters] of parts) {
+ if (expandedRows >= maxRows) break;
+ member.days.push({ day: row.day, kind: row.kind, providerId: row.providerId, memberKey: key, model: row.model, ...counters });
+ expandedRows++;
+ }
+ }
+ // 保留只有较早记录、因预算未展开到的成员,供管理页显示其最近使用时间。
+ for (const [memberKey, latest] of lastUsedAt) {
+ if (members.has(memberKey)) continue;
+ const [shareId, memberId] = JSON.parse(memberKey) as [string, string];
+ members.set(memberKey, { shareId, memberId, lastUsedAt: latest, days: [] });
+ }
+ for (const member of members.values()) {
+ member.days.sort((a, b) => (a.day < b.day ? 1 : a.day > b.day ? -1 : b.turns - a.turns));
+ }
+ return [...members.values()];
+ },
+
async flush(): Promise<void> {
if (timer) {
clearTimeout(timer);
diff --git a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts
index 246bc72e68..8ecad569b8 100644
--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts
@@ -565,6 +565,13 @@ describe('provider management receiver account boundary', () => {
.toThrow(/PERMISSION_DENIED/);
});
+ // 「用量」块的按天明细(provider-groups.md §7):只读的分享者查询,和 own-usage 一样经管理通道转交。
+ it('accepts the daily usage query as an owner operation', () => {
+ const command = { action: 'usage-history', providerId: 'anthropic' } as const;
+ vi.mocked(parseProviderShareCommand).mockReturnValueOnce(command);
+ expect(parseProviderManagementRequest({ action: 'manage-share', command })).toEqual({ action: 'manage-share', command });
+ });
+
it.each([
{ action: 'manage-group', command: { action: 'get', providerId: 'anthropic' } },
{ action: 'manage-share', command: { action: 'owned', range: '7d' } },
diff --git a/apps/desktop/src/main/provider-group/__tests__/managementClient.test.ts b/apps/desktop/src/main/provider-group/__tests__/managementClient.test.ts
index ff9eac7780..fe709c3eb0 100644
--- a/apps/desktop/src/main/provider-group/__tests__/managementClient.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/managementClient.test.ts
@@ -180,6 +180,14 @@ describe('provider management client', () => {
expect(host.watch).not.toHaveBeenCalled();
});
+ // 旧版组所在电脑不认识按天明细:明确拒绝成「需要更新」,管理页据此退回所有时间的合计,不重试。
+ it('reports a share command an old group computer does not know as needing an update', async () => {
+ const old = vi.fn(async () => ({ ok: false, error: { code: 'IPC_ERROR', message: '[INVALID_PARAMS] Unknown command' } })) as unknown as ProviderGroupRemoteInvoke;
+ const request: ProviderManagementRequest = { action: 'manage-share', command: { action: 'usage-history', providerId: 'anthropic' } };
+ await expect(invokeProviderManagement(old, 'group-host', request)).rejects.toThrow(/UNSUPPORTED_CAPABILITY/);
+ expect(old).toHaveBeenCalledTimes(1);
+ });
+
it('forwards conditional writes and never retries a conflict or falls back to an unconditional old-host write', async () => {
const request: ProviderManagementRequest = {
action: 'manage-group', command: { action: 'delete-if-current', providerId: 'anthropic', expectedConfig: null },
diff --git a/apps/desktop/src/main/provider-group/management.ts b/apps/desktop/src/main/provider-group/management.ts
index 5d8b3256dc..c8b4739c45 100644
--- a/apps/desktop/src/main/provider-group/management.ts
+++ b/apps/desktop/src/main/provider-group/management.ts
@@ -20,7 +20,7 @@ export function parseProviderManagementRequest(raw: unknown): ProviderManagement
return { action: 'manage-group', command: command as ProviderGroupManagementCommand };
}
const command = parseProviderShareCommand(raw.command);
- if (!['owned', 'own-usage', 'create-link', 'approve', 'reject', 'set-member', 'reshare-decide'].includes(command.action)) {
+ if (!['owned', 'own-usage', 'usage-history', 'create-link', 'approve', 'reject', 'set-member', 'reshare-decide'].includes(command.action)) {
throwIpcError('PERMISSION_DENIED', 'Only owner operations are available through management');
}
return { action: 'manage-share', command: command as ProviderShareManagementCommand };
diff --git a/apps/desktop/src/main/provider-group/managementClient.ts b/apps/desktop/src/main/provider-group/managementClient.ts
index c64e2bf75f..778d6625eb 100644
--- a/apps/desktop/src/main/provider-group/managementClient.ts
+++ b/apps/desktop/src/main/provider-group/managementClient.ts
@@ -23,7 +23,12 @@ export async function invokeProviderManagement(
assertOwner();
if (!response.ok) {
const message = response.error?.message ?? '';
- if (response.error?.code === 'CHANNEL_NOT_ALLOWED' || /unknown provider group action/.test(message)) {
+ // 旧版组所在电脑不认识新的分享命令(如 usage-history)时回 `[INVALID_PARAMS] Unknown command`:同样是需要更新。
+ if (
+ response.error?.code === 'CHANNEL_NOT_ALLOWED'
+ || /unknown provider group action/.test(message)
+ || (request.action === 'manage-share' && /\[INVALID_PARAMS\] Unknown command/.test(message))
+ ) {
throwIpcError('UNSUPPORTED_CAPABILITY', 'Provider management requires an update on the computer with the group');
}
throw new Error(/^\[[A-Z_]+\]/.test(message) ? message : '[REMOTE_AGENT_UNAVAILABLE] Provider management failed');
diff --git a/apps/desktop/src/main/usage/__tests__/providerPartyUsageStore.test.ts b/apps/desktop/src/main/usage/__tests__/providerPartyUsageStore.test.ts
index f6bb342959..13447df686 100644
--- a/apps/desktop/src/main/usage/__tests__/providerPartyUsageStore.test.ts
+++ b/apps/desktop/src/main/usage/__tests__/providerPartyUsageStore.test.ts
@@ -21,7 +21,8 @@ const sample = (model: string, input: number, output: number, turns = 1) => ({
const reportRow = (day: string, memberKey: string, input: number) => ({
day, providerId: 'anthropic', memberKey, kind: 'claude-code', model: 'opus',
- turns: 1, inputTokens: input, outputTokens: 1, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0, lastAt: 5,
+ turns: 1, inputTokens: input, outputTokens: 1, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0,
+ lastAt: new Date(`${day}T12:00:00`).getTime(),
});
describe('provider party usage store', () => {
@@ -108,7 +109,9 @@ describe('provider party usage store', () => {
expect(store.groupReport('mini', null)).toEqual([
expect.objectContaining({ day: '2026-10-11', providerId: 'anthropic', memberKey: 'device:studio:a2', inputTokens: 40 }),
]);
- expect(store.groupReport('mini', '2026-10-12')).toEqual([]);
+ // 报告端与组所在电脑可能跨时区,边界前两天也要带上供接收端按时间戳归一。
+ expect(store.groupReport('mini', '2026-10-12')).toHaveLength(1);
+ expect(store.groupReport('mini', '2026-10-14')).toEqual([]);
expect(store.groupReport('other', null)).toEqual([]);
// 组所在电脑这边:laptop 报来的整体替换它从那天起的行,并进 laptop 那台。
@@ -119,11 +122,49 @@ describe('provider party usage store', () => {
expect(laptop).toHaveLength(1);
expect(laptop[0]?.models).toEqual(expect.arrayContaining([
expect.objectContaining({ memberKey: 'local', inputTokens: 1 }),
- expect.objectContaining({ memberKey: 'device:studio:a2', inputTokens: 13 }),
+ expect.objectContaining({ memberKey: 'device:studio:a2', inputTokens: 8 }),
]));
// 再报一次同样的一份不会多算。
store.replaceReported('laptop', '2026-10-10', [reportRow('2026-10-10', 'device:studio:a2', 8)]);
- expect(store.query('anthropic', 'all').devices[0]?.models.find((model) => model.memberKey !== 'local')).toMatchObject({ inputTokens: 13 });
+ expect(store.query('anthropic', 'all').devices[0]?.models.find((model) => model.memberKey !== 'local')).toMatchObject({ inputTokens: 8 });
+ });
+
+ // 「用量」块按天筛选(provider-groups.md §7):你自己(本机、我的其他电脑与报告来的)合成一份,转来的按那台分开。
+ it('lists daily usage for one provider with you combined across your computers and relays kept apart', () => {
+ const file = path.join(dir, 'usage.json');
+ let now = new Date(2026, 9, 10, 9).getTime();
+ const store = createProviderPartyUsageStore(file, { now: () => now });
+ store.record({ kind: 'local' }, { kind: 'claude-code', providerId: 'anthropic', memberKey: 'local', samples: [sample('opus', 10, 1)] });
+ now = new Date(2026, 9, 11, 9).getTime();
+ store.record({ kind: 'local' }, { kind: 'claude-code', providerId: 'anthropic', memberKey: 'local', samples: [sample('opus', 20, 2)] });
+ store.record({ kind: 'device', deviceId: 'studio' }, { kind: 'claude-code', providerId: 'anthropic', memberKey: 'local', samples: [sample('opus', 5, 5)] });
+ store.record({ kind: 'relay', deviceId: 'mini' }, { kind: 'claude-code', providerId: 'anthropic', memberKey: 'local', samples: [sample('opus', 2, 2)] });
+ // 要报告给另一台的组的不算;别的供应商不混进来。
+ store.record({ kind: 'group', deviceId: 'mini' }, { kind: 'claude-code', providerId: 'anthropic', memberKey: 'device:studio:a2', samples: [sample('opus', 40, 2)] });
+ store.record({ kind: 'local' }, { kind: 'codex', providerId: 'openai', memberKey: 'local', samples: [sample('gpt', 1, 1)] });
+ store.replaceReported('laptop', null, [reportRow('2026-10-11', 'device:studio:a2', 6)]);
+
+ const history = store.history('anthropic');
+ // 新的日子在前;本机与 studio 同一天、同一台组内电脑的合成一行。
+ expect(history.self.days.map((row) => [row.day, row.memberKey, row.turns, row.inputTokens])).toEqual([
+ ['2026-10-11', 'local', 2, 25],
+ ['2026-10-11', 'device:studio:a2', 1, 6],
+ ['2026-10-10', 'local', 1, 10],
+ ]);
+ // 报告行的 lastAt 由接收端按本地时区归一;这份 fixture 的报告时刻是当天 12 点。
+ expect(history.self.lastUsedAt).toBe(new Date(2026, 9, 11, 12).getTime());
+ expect(history.relays).toEqual([
+ expect.objectContaining({ deviceId: 'mini', days: [expect.objectContaining({ day: '2026-10-11', inputTokens: 2 })] }),
+ ]);
+ expect(store.history('xai')).toEqual({ self: { lastUsedAt: null, days: [] }, relays: [] });
+ });
+
+ it('normalizes reported history to the receiving computer local day', () => {
+ const store = createProviderPartyUsageStore(path.join(dir, 'timezone.json'));
+ const row = reportRow('2026-10-10', 'device:studio:a2', 6);
+ row.lastAt = new Date(2026, 9, 11, 0, 30).getTime();
+ store.replaceReported('laptop', null, [row]);
+ expect(store.history('anthropic').self.days[0]?.day).toBe('2026-10-11');
});
it('keeps one ledger per account', async () => {
diff --git a/apps/desktop/src/main/usage/providerPartyUsageStore.ts b/apps/desktop/src/main/usage/providerPartyUsageStore.ts
index 109dc35f16..3d6c94e329 100644
--- a/apps/desktop/src/main/usage/providerPartyUsageStore.ts
+++ b/apps/desktop/src/main/usage/providerPartyUsageStore.ts
@@ -30,6 +30,7 @@ const FILE_VERSION = 1;
const RETAIN_DAYS = 400;
const MAX_ROWS = 20_000;
const FLUSH_DELAY_MS = 1_000;
+const REPORT_DAY_CUSHION = 2;
/**
* 谁用的:本机自己的任务,同账号另一台电脑自己的任务,同账号的组所在电脑替受邀者转来的任务,
@@ -93,12 +94,29 @@ export interface ProviderPartyUsageQuery {
relays: ProviderPartyUsage[];
}
+/** 按天的明细:每天按(Agent、模型、组内电脑)分行,新的日子在前。 */
+export interface ProviderPartyDailyUsage {
+ lastUsedAt: number | null;
+ days: Array<ProviderPartyUsage['models'][number] & { day: string }>;
+}
+
+export interface ProviderPartyUsageHistory {
+ /** 你自己:本机、我的其他电脑与它们报告来的合成一份。 */
+ self: ProviderPartyDailyUsage;
+ /** 经其他电脑转来的,每台组所在电脑一项。 */
+ relays: Array<ProviderPartyDailyUsage & { deviceId: string }>;
+}
+
function localDay(at: number): string {
const date = new Date(at);
const pad = (value: number) => String(value).padStart(2, '0');
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
}
+function shiftDay(day: string, delta: number): string {
+ return localDay(new Date(`${day}T12:00:00`).getTime() + delta * 86_400_000);
+}
+
/**
* 读盘时校验并补齐一行。最早的行没有 `party` 与 `memberKey`:按 deviceId 推出本机 / 我的其他电脑,
* 组内电脑记为没区分(null)。
@@ -229,10 +247,15 @@ export function createProviderPartyUsageStore(filePath: string, options: { now?:
/** 要报告给某台组所在电脑的行(sinceDay 起,含当天;null = 全部)。 */
groupReport(ownerDeviceId: string, sinceDay: string | null): ProviderGroupUsageReportRow[] {
const out: ProviderGroupUsageReportRow[] = [];
+ // 报告端与组所在电脑可能跨时区;多带两天,由接收端按 lastAt 的本地日期归一。
+ const reportSinceDay = sinceDay ? shiftDay(sinceDay, -REPORT_DAY_CUSHION) : null;
for (const row of load().values()) {
if (row.party !== 'group' || row.deviceId !== ownerDeviceId || !row.memberKey) continue;
- if (sinceDay && row.day < sinceDay) continue;
- const { party: _party, deviceId: _deviceId, memberKey, ...rest } = row;
+ if (reportSinceDay && row.day < reportSinceDay) continue;
+ const { party, deviceId, memberKey, ...rest } = row;
+ // 报告格式不携带来源方和设备字段;这里只保留按组内电脑的成员键。
+ void party;
+ void deviceId;
out.push({ ...rest, memberKey });
}
return out.sort((a, b) => (a.day < b.day ? 1 : a.day > b.day ? -1 : 0));
@@ -242,12 +265,15 @@ export function createProviderPartyUsageStore(filePath: string, options: { now?:
replaceReported(deviceId: string, sinceDay: string | null, incoming: readonly ProviderGroupUsageReportRow[]): void {
if (!deviceId) return;
const map = load();
+ const replaceSinceDay = sinceDay ? shiftDay(sinceDay, -REPORT_DAY_CUSHION) : null;
for (const [key, row] of map) {
- if (row.party === 'reported' && row.deviceId === deviceId && (!sinceDay || row.day >= sinceDay)) map.delete(key);
+ if (row.party === 'reported' && row.deviceId === deviceId && (!replaceSinceDay || row.day >= replaceSinceDay)) map.delete(key);
}
for (const item of incoming) {
- if (sinceDay && item.day < sinceDay) continue;
- const row: PartyUsageRow = { ...item, party: 'reported', deviceId };
+ // day 是报告端的本地日期;lastAt 是共享协议里的 unix ms,以接收端时区为准重算。
+ const day = item.lastAt > 0 ? localDay(item.lastAt) : item.day;
+ if (replaceSinceDay && day < replaceSinceDay) continue;
+ const row: PartyUsageRow = { ...item, day, party: 'reported', deviceId };
const key = keyOf(row);
const existing = map.get(key);
if (existing) {
@@ -315,6 +341,60 @@ export function createProviderPartyUsageStore(filePath: string, options: { now?:
return { local: local[0] ?? null, devices: devices.sort(recent), relays: relays.sort(recent) };
},
+ /**
+ * 某个供应商按天的明细(「用量」块在界面上按时间段、组内电脑筛选):你自己(本机与我的其他电脑,
+ * 含报告来的)合成一份,经其他电脑转来的按那台分开。本机要报告出去的不算,与 query 同口径。
+ */
+ history(providerId: string): ProviderPartyUsageHistory {
+ const self: ProviderPartyDailyUsage = { lastUsedAt: null, days: [] };
+ const relays = new Map<string, ProviderPartyDailyUsage & { deviceId: string }>();
+ const selfDays = new Map<string, ProviderPartyDailyUsage['days'][number]>();
+ for (const row of load().values()) {
+ if (row.providerId !== providerId || row.party === 'group') continue;
+ const day = {
+ day: row.day,
+ kind: row.kind,
+ model: row.model,
+ memberKey: row.memberKey,
+ turns: row.turns,
+ inputTokens: row.inputTokens,
+ outputTokens: row.outputTokens,
+ cacheReadTokens: row.cacheReadTokens,
+ cacheCreateTokens: row.cacheCreateTokens,
+ sdkCostUsd: row.sdkCostUsd,
+ };
+ if (row.party === 'relay' && row.deviceId) {
+ const relay = relays.get(row.deviceId) ?? { deviceId: row.deviceId, lastUsedAt: null, days: [] };
+ relays.set(row.deviceId, relay);
+ relay.lastUsedAt = Math.max(relay.lastUsedAt ?? 0, row.lastAt);
+ relay.days.push(day);
+ continue;
+ }
+ self.lastUsedAt = Math.max(self.lastUsedAt ?? 0, row.lastAt);
+ // 本机与我的其他电脑同一天、同一模型、同一台组内电脑的合成一行。
+ const key = JSON.stringify([row.day, row.kind, row.model, row.memberKey]);
+ const existing = selfDays.get(key);
+ if (!existing) {
+ selfDays.set(key, day);
+ continue;
+ }
+ existing.turns += day.turns;
+ existing.inputTokens += day.inputTokens;
+ existing.outputTokens += day.outputTokens;
+ existing.cacheReadTokens += day.cacheReadTokens;
+ existing.cacheCreateTokens += day.cacheCreateTokens;
+ existing.sdkCostUsd += day.sdkCostUsd;
+ }
+ const newestFirst = (a: { day: string; turns: number }, b: { day: string; turns: number }) =>
+ a.day < b.day ? 1 : a.day > b.day ? -1 : b.turns - a.turns;
+ self.days = [...selfDays.values()].sort(newestFirst);
+ for (const relay of relays.values()) relay.days.sort(newestFirst);
+ return {
+ self,
+ relays: [...relays.values()].sort((a, b) => (b.lastUsedAt ?? 0) - (a.lastUsedAt ?? 0)),
+ };
+ },
+
async flush(): Promise<void> {
if (timer) {
clearTimeout(timer);
diff --git a/apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx b/apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx
index 909791bd75..76662c249b 100644
--- a/apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx
+++ b/apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx
@@ -20,9 +20,10 @@ import { usageHistoryAgentColor, usageHistoryModelColor } from './usageHistoryCo
import { formatUsagePercent } from './formatUsagePercent';
const UNKNOWN_VALUE = '—';
-const TH_CLASS =
+// 表格样式、色块与占比格也给「远程与分享」页的用量表复用(provider-groups.md §7),两处保持同一套。
+export const TH_CLASS =
'whitespace-nowrap border-b border-[var(--border-default)] pb-2 pl-3 text-right text-12 font-medium text-[var(--text-secondary)]';
-const TD_CLASS =
+export const TD_CLASS =
'whitespace-nowrap border-b border-[var(--border-default)] py-2 pl-3 text-right text-13 tabular-nums';
/**
@@ -31,9 +32,9 @@ const TD_CLASS =
* 其余列分完后剩下的空间, 内层的 truncate 由此生效 (见 #3393 的同一段分析)。
* pl-3 是列间距, 否则相邻两列的数字会贴到一起; 首列自身取 pl-0。
*/
-const FIRST_COL_CLASS = 'w-full max-w-0 pl-0';
+export const FIRST_COL_CLASS = 'w-full max-w-0 pl-0';
-function Swatch({ color }: { color: string }): React.JSX.Element {
+export function Swatch({ color }: { color: string }): React.JSX.Element {
return <span className="size-2 shrink-0 rounded-[2px]" style={{ backgroundColor: color }} />;
}
@@ -41,7 +42,7 @@ function HitRateCell({ value }: { value: number | null }): React.JSX.Element {
return <td className={TD_CLASS}>{value === null ? UNKNOWN_VALUE : formatUsagePercent(value)}</td>;
}
-function ShareCell({ share, color }: { share: number; color: string }): React.JSX.Element {
+export function ShareCell({ share, color }: { share: number; color: string }): React.JSX.Element {
return (
<td className={cn(TD_CLASS, 'text-[var(--text-tertiary)]')}>
<span
diff --git a/apps/desktop/src/renderer/components/settings/usage/UsageFilterSelect.tsx b/apps/desktop/src/renderer/components/settings/usage/UsageFilterSelect.tsx
new file mode 100644
index 0000000000..256404e4d8
--- /dev/null
+++ b/apps/desktop/src/renderer/components/settings/usage/UsageFilterSelect.tsx
@@ -0,0 +1,86 @@
+/**
+ * UsageFilterSelect — 用量页的胶囊下拉(时间范围、使用方、组内电脑)。外观与设置 → 用量的时间范围、
+ * 设备选择器一致(usage-history-charts.md「设备范围」):36px 胶囊触发器,面板与触发器等宽,长名称截断,
+ * 选项下方的说明 12px tertiary、在面板内换行。
+ */
+
+import React from 'react';
+import * as Select from '@radix-ui/react-select';
+import { Check, ChevronDown } from 'lucide-react';
+
+import { cn } from '@/lib/utils';
+
+export interface UsageFilterOption {
+ value: string;
+ label: string;
+ /** 选项下方的一行说明。 */
+ detail?: string | null;
+}
+
+const itemClassName =
+ 'flex w-full cursor-pointer select-none items-center justify-between gap-2 rounded-lg px-3 py-2 text-left text-13 text-[var(--text-primary)] outline-none data-[highlighted]:bg-[var(--surface-hover)] data-[state=checked]:bg-[var(--settings-menu-bg-selected)] data-[state=checked]:font-medium data-[state=checked]:text-[var(--settings-menu-text-selected)] data-[disabled]:cursor-default data-[disabled]:opacity-50';
+
+export function UsageFilterSelect({
+ value,
+ options,
+ onValueChange,
+ ariaLabel,
+ disabled = false,
+ className,
+}: {
+ value: string;
+ options: readonly UsageFilterOption[];
+ onValueChange: (value: string) => void;
+ ariaLabel: string;
+ disabled?: boolean;
+ /** 触发器宽度;缺省与设置 → 用量的时间范围选择器同宽(190px)。 */
+ className?: string;
+}): React.JSX.Element {
+ return (
+ <Select.Root value={value} onValueChange={onValueChange} disabled={disabled}>
+ <Select.Trigger
+ aria-label={ariaLabel}
+ className={cn(
+ 'flex h-9 w-[190px] max-w-full items-center justify-between gap-2 rounded-full border border-[var(--border-default)] bg-[var(--surface-elevated)] px-3 text-13 text-[var(--text-primary)] outline-none focus:ring-2 focus:ring-[var(--focus-ring-soft)] disabled:cursor-default disabled:opacity-50',
+ className,
+ )}
+ >
+ <span className="min-w-0 truncate">
+ <Select.Value />
+ </span>
+ <Select.Icon asChild>
+ <ChevronDown size={15} className="shrink-0 text-[var(--text-tertiary)]" />
+ </Select.Icon>
+ </Select.Trigger>
+ <Select.Portal>
+ <Select.Content
+ position="popper"
+ side="bottom"
+ align="end"
+ sideOffset={4}
+ className="z-[10010] max-h-[var(--radix-select-content-available-height)] w-[var(--radix-select-trigger-width)] overflow-hidden rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-1"
+ >
+ <Select.Viewport>
+ {options.map((option) => (
+ <Select.Item key={option.value} value={option.value} className={itemClassName}>
+ <span className="flex min-w-0 flex-col">
+ <span className="truncate">
+ <Select.ItemText>{option.label}</Select.ItemText>
+ </span>
+ {option.detail ? (
+ <span className="whitespace-normal break-words text-12 font-normal text-[var(--text-tertiary)]">
+ {option.detail}
+ </span>
+ ) : null}
+ </span>
+ <Select.ItemIndicator>
+ <Check size={14} strokeWidth={2.25} />
+ </Select.ItemIndicator>
+ </Select.Item>
+ ))}
+ </Select.Viewport>
+ </Select.Content>
+ </Select.Portal>
+ </Select.Root>
+ );
+}
diff --git a/apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx b/apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx
index 67b86a6538..2727718e5d 100644
--- a/apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx
+++ b/apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx
@@ -15,7 +15,7 @@
* 不再用原生 title —— 原生提示无法排版配色, 也不给每根柱子各挂一个 Radix 实例。
*/
-import React, { useEffect, useId, useMemo, useReducer, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useId, useMemo, useReducer, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { formatCompactTokens } from '@/lib/usageFormat';
@@ -65,23 +65,62 @@ function niceTicks(max: number): number[] {
return ticks;
}
+/** 柱图的一行来源数据:某天某个分段(模型、人或电脑)的 token;key 决定配色顺序与合并。 */
+export interface UsageSeriesDay {
+ day: string;
+ key: string;
+ tokens: number;
+}
+
+interface UsageBarsProps {
+ todayKey: string;
+ selectedDay?: string | null;
+ /** Visual emphasis only; a multi-day range does not select individual buttons. */
+ highlightRecentWeek?: boolean;
+ onDayClick?: (day: string) => void;
+}
+
export function UsageTokenBars({
modelDaily,
colorOrder,
+ ...props
+}: UsageBarsProps & {
+ modelDaily: UsageHistoryModelDay[];
+ /** 完整历史的模型 key(按 token 排序),决定分段与表格配色。 */
+ colorOrder: string[];
+}): React.JSX.Element {
+ const daily = useMemo(
+ () => modelDaily.map((row) => ({ day: row.day, key: usageModelKey(row.agentKind, row.model), tokens: row.tokens })),
+ [modelDaily],
+ );
+ const labels = useMemo(
+ () => new Map(modelDaily.map((row) => [usageModelKey(row.agentKind, row.model), row.model])),
+ [modelDaily],
+ );
+ const labelOf = useCallback((key: string) => labels.get(key) ?? key, [labels]);
+ return <UsageSeriesBars {...props} daily={daily} order={colorOrder} labelOf={labelOf} />;
+}
+
+/**
+ * 按任意分段堆叠的近 30 天每日 token 柱图:设置 → 用量按模型;「远程与分享」页的用量还可按人、按电脑
+ * (provider-groups.md §7)。几何、交互、浮层与配色规则与模型柱图完全相同(usage-history-charts.md)。
+ */
+export function UsageSeriesBars({
+ daily,
+ order,
+ labelOf,
todayKey,
selectedDay,
highlightRecentWeek = false,
onDayClick,
-}: {
- modelDaily: UsageHistoryModelDay[];
- /** 完整历史的模型 key(按 token 排序),决定分段与表格配色。 */
- colorOrder: string[];
- todayKey: string;
- selectedDay?: string | null;
- /** Visual emphasis only; a multi-day range does not select individual buttons. */
- highlightRecentWeek?: boolean;
- onDayClick?: (day: string) => void;
+}: UsageBarsProps & {
+ daily: readonly UsageSeriesDay[];
+ /** 分段 key 的固定顺序,决定堆叠次序与配色;不在里面的合并成「其它」。 */
+ order: readonly string[];
+ /** 分段在浮层与读屏文本里的名字。 */
+ labelOf: (key: string) => string;
}): React.JSX.Element {
+ const colorOrder = order;
const { t, i18n } = useTranslation();
const dateFormatter = useMemo(
() =>
@@ -96,9 +135,9 @@ export function UsageTokenBars({
const bars = useMemo(() => {
const ranks = new Map(colorOrder.map((key, rank) => [key, rank]));
const segsByDay = new Map<string, Map<number, DaySegment>>();
- for (const row of modelDaily) {
+ for (const row of daily) {
if (row.tokens <= 0) continue;
- const rank = ranks.get(usageModelKey(row.agentKind, row.model)) ?? colorOrder.length;
+ const rank = ranks.get(row.key) ?? colorOrder.length;
let daySegs = segsByDay.get(row.day);
if (!daySegs) {
daySegs = new Map();
@@ -113,7 +152,7 @@ export function UsageTokenBars({
} else {
daySegs.set(rank, {
rank,
- label: rank >= colorOrder.length ? t('usageDashboard.othersLegend') : row.model,
+ label: rank >= colorOrder.length ? t('usageDashboard.othersLegend') : labelOf(row.key),
tokens: row.tokens,
});
}
@@ -130,7 +169,7 @@ export function UsageTokenBars({
});
}
return { list, max: Math.max(...list.map((b) => b.tokens), 0) };
- }, [modelDaily, colorOrder, todayKey, t]);
+ }, [daily, colorOrder, labelOf, todayKey, t]);
const plotRef = useRef<HTMLDivElement>(null);
const descriptionIdBase = useId();
diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
index 7a91a8dcf4..229efab05d 100644
--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
@@ -409,7 +409,7 @@ function MemberRow({
onClick={() => setQuotaOpen((open) => !open)}
className="group -m-1 flex min-w-[200px] flex-1 items-center gap-3 rounded-lg p-1 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"
>
- {/* 组内电脑用设备图标;人像头像留给下方「分享」块里真实的人。账号行的图标在电脑那一层。 */}
+ {/* 组内电脑用设备图标;人像头像留给下方「用量」里真实的人。账号行的图标在电脑那一层。 */}
{accountName === null && (
<span
aria-hidden="true"
diff --git a/apps/desktop/src/renderer/features/provider-group/providerManagement.ts b/apps/desktop/src/renderer/features/provider-group/providerManagement.ts
index 8ec3e24531..d04cf9ac32 100644
--- a/apps/desktop/src/renderer/features/provider-group/providerManagement.ts
+++ b/apps/desktop/src/renderer/features/provider-group/providerManagement.ts
@@ -20,6 +20,11 @@ export function providerShareManagementCommand<C extends ProviderShareManagement
: window.electronAPI.providerShare.command(command);
}
+/** 远程管理时那台电脑是旧版本、明确不认识这个命令(Main 已统一成 UNSUPPORTED_CAPABILITY)。 */
+export function isProviderManagementOutdated(error: unknown): boolean {
+ return extractIpcError(error)?.code === 'UNSUPPORTED_CAPABILITY';
+}
+
export function providerManagementErrorKey(error: unknown, remote: boolean): string {
const code = extractIpcError(error)?.code;
if (remote && code === 'UNSUPPORTED_CAPABILITY') return 'providerGroup.management.unsupported';
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
index 20a6c85b70..366f558476 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
@@ -2,31 +2,32 @@
* 「{供应商} · 远程与分享」页(供应商分享 §7.2;供应商组 §10)。从设置 → 模型供应商「允许被远程调用」一行的
* 「远程与分享」入口进入,可返回。本机或同账号组所在电脑共用这一页,设置、分享与用量始终读取管理对象所在电脑。
*
- * 打开期间每次 OWNED_CHANGED 都按当前时间段重读(main 因此保持快速拉取,申请能尽快出现);
- * 关闭、恢复、删除、同意、拒绝都立即生效,结果以 toast 说明。
+ * 打开期间每次 OWNED_CHANGED 都重读(main 因此保持快速拉取,申请能尽快出现);
+ * 关闭、恢复、删除、同意、拒绝都立即生效,结果以 toast 说明。用量读管理对象所在电脑的按天明细,
+ * 时间段、人与电脑由「用量」块自己筛选;打开、分享变化时与每分钟各读一次。
+ *
+ * 分享的人不再单列「已分享的人」:状态与关闭、删除并进「用量」块里这个人的那一行(2026-10-16 用户要求)。
+ * 同日用户反馈页面底部的「生成分享链接」太难找:它放到标题右侧,待处理紧跟标题,不再单设「分享」块;
+ * 分享前要知道的(Agent 在哪运行、用量算谁的)由申请弹窗的同意说明在审批时讲清。
*/
-import { ArrowLeft, ChevronRight, CircleMinus, MoreHorizontal } from 'lucide-react';
-import { useCallback, useEffect, useId, useMemo, useRef, useState, type ReactNode } from 'react';
+import { ArrowLeft } from 'lucide-react';
+import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
import type { ProviderView } from '@cindy/model-providers';
import { Button } from '@/components/ui/button';
-import { Collapse } from '@/components/ui/collapse';
import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Tip } from '@/components/ui/tooltip';
import { useDeviceLinkDeviceList } from '@/features/device-link/useDeviceLinkDeviceList';
import { useDeviceProviders } from '@/hooks/useDeviceProviders';
import { useProviders } from '@/hooks/useProviders';
import { toast } from '@/lib/toast';
import { cn } from '@/lib/utils';
import { ProviderGroupSection } from '@/features/provider-group/ProviderGroupSection';
-import { providerManagementErrorKey, providerShareManagementCommand } from '@/features/provider-group/providerManagement';
+import {
+ isProviderManagementOutdated,
+ providerManagementErrorKey,
+ providerShareManagementCommand,
+} from '@/features/provider-group/providerManagement';
import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
import type { ProviderGroupConfig } from '../../../shared/providerGroup';
@@ -35,13 +36,14 @@ import type {
ProviderShareMemberView,
ProviderShareOwnerState,
ProviderShareReshareView,
- ProviderShareUsageRange,
+ ProviderUsageHistoryView,
} from '../../../shared/providerShare';
import { ProviderShareLinkDialog } from './ProviderShareLinkDialog';
import { pendingResharesFromOwned, sharesClaudeLoginEmail, type ProviderShareGate, type ProviderSharePendingRequest } from './providerShareFormat';
-import { ProviderUsageSection } from './ProviderUsageSection';
+import { ProviderUsageSection, type ProviderUsageStatus } from './ProviderUsageSection';
import { presentProviderShareApproval, publishProviderShareOwnerState, removeProviderSharePendingRequest } from './providerShareStore';
import { ShareAvatar } from './ShareAvatar';
+import type { ProviderShareMemberActions } from './ShareMemberControls';
import { useShareTimeFormat } from './useShareTimeFormat';
export type { ProviderShareGate };
@@ -76,70 +78,110 @@ export function ProviderShareManagePage({
const selfDeviceName = deviceId ? deviceName ?? devices?.find((device) => device.deviceId === deviceId)?.name ?? null
: devices?.find((device) => device.isSelf)?.name ?? null;
const [remoteGroup, setRemoteGroup] = useState<ProviderGroupConfig | null>(initialGroup ?? null);
- const [range, setRange] = useState<ProviderShareUsageRange>('month');
const [state, setState] = useState<ProviderShareOwnerState | null>(null);
const [loadFailed, setLoadFailed] = useState(false);
const [loadErrorKey, setLoadErrorKey] = useState<string | null>(null);
- const [own, setOwn] = useState<ProviderOwnUsageView | null>(null);
- const [ownFailed, setOwnFailed] = useState(false);
+ const [history, setHistory] = useState<ProviderUsageHistoryView | null>(null);
+ const [usageStatus, setUsageStatus] = useState<ProviderUsageStatus>('loading');
+ const [legacyOwn, setLegacyOwn] = useState<ProviderOwnUsageView | null>(null);
const [linkOpen, setLinkOpen] = useState(false);
const [approvalRequestId, setApprovalRequestId] = useState<string | null>(null);
const approvalTriggerRef = useRef<HTMLElement | null>(null);
const [busy, setBusy] = useState<ReadonlySet<string>>(() => new Set());
const loadSeq = useRef(0);
- const remoteLoadRange = useRef<ProviderShareUsageRange | null>(null);
- const rangeRef = useRef(range);
- rangeRef.current = range;
+ const remoteLoading = useRef(false);
+ const historySeq = useRef(0);
+ const historyLoading = useRef(false);
const load = useCallback(async () => {
- const range = rangeRef.current;
- if (deviceId && remoteLoadRange.current === range) return;
- remoteLoadRange.current = range;
+ if (deviceId && remoteLoading.current) return;
+ remoteLoading.current = true;
const seq = ++loadSeq.current;
const owner = getDataOwnerGeneration();
- // 本机与我的其他电脑的用量读这台电脑自己的账本,不依赖分享服务,与分享的成员一起按同一个时间段读。
- const [owned, ownUsage] = await Promise.allSettled([
- providerShareManagementCommand({ action: 'owned', range }, deviceId),
- providerShareManagementCommand({ action: 'own-usage', providerId, range }, deviceId),
- ]);
+ // 成员的用量由「用量」块从按天明细里取;这里按所有时间读,只在那台电脑是旧版本时当作合计用。
+ const owned = await providerShareManagementCommand({ action: 'owned', range: 'all' }, deviceId)
+ .then((value) => ({ ok: true as const, value }), (reason: unknown) => ({ ok: false as const, reason }));
if (seq !== loadSeq.current) return;
- remoteLoadRange.current = null;
+ remoteLoading.current = false;
if (!isDataOwnerGenerationCurrent(owner)) return;
- if (owned.status === 'fulfilled') {
+ if (owned.ok) {
setState(owned.value);
setLoadFailed(false);
setLoadErrorKey(null);
- if (!deviceId) publishProviderShareOwnerState(owned.value);
+ publishProviderShareOwnerState(owned.value, deviceId ? { hostDeviceId: deviceId } : undefined);
} else {
setLoadFailed(true);
setLoadErrorKey(providerManagementErrorKey(owned.reason, Boolean(deviceId)));
}
- if (ownUsage.status === 'fulfilled') {
- setOwn(ownUsage.value);
- setOwnFailed(false);
- } else {
- setOwnFailed(true);
+ }, [deviceId]);
+
+ /**
+ * 用量的按天明细(你自己、转来的与分享的人)。读不到时保留上次读到的;那台电脑是旧版本、不认识这个命令时
+ * 退回所有时间的合计(你自己读 own-usage,分享的人用 owned 里的成员用量)。
+ */
+ const loadHistory = useCallback(async () => {
+ if (historyLoading.current) return;
+ historyLoading.current = true;
+ const seq = ++historySeq.current;
+ const owner = getDataOwnerGeneration();
+ const current = () => seq === historySeq.current && isDataOwnerGenerationCurrent(owner);
+ try {
+ const result = await providerShareManagementCommand({ action: 'usage-history', providerId }, deviceId);
+ if (!current()) return;
+ setHistory(result);
+ setLegacyOwn(null);
+ setUsageStatus('ready');
+ } catch (error) {
+ if (!current()) return;
+ if (deviceId && isProviderManagementOutdated(error)) {
+ const legacy = await providerShareManagementCommand({ action: 'own-usage', providerId, range: 'all' }, deviceId)
+ .catch(() => null);
+ if (!current()) return;
+ if (legacy) {
+ setHistory(null);
+ setLegacyOwn(legacy);
+ setUsageStatus('legacy');
+ return;
+ }
+ }
+ setUsageStatus('failed');
+ } finally {
+ if (seq === historySeq.current) historyLoading.current = false;
}
}, [providerId, deviceId]);
useEffect(() => {
void load();
- }, [load, range]);
+ void loadHistory();
+ }, [load, loadHistory]);
useEffect(() => {
- const off = window.electronAPI.providerShare.onOwnedChanged(() => void load());
+ const off = window.electronAPI.providerShare.onOwnedChanged(() => {
+ void load();
+ void loadHistory();
+ });
return () => {
off();
+ // 作废在途的读取;它们回来后不再写状态,也不再挡住下一次读取。
loadSeq.current += 1;
+ historySeq.current += 1;
+ remoteLoading.current = false;
+ historyLoading.current = false;
};
- }, [load]);
+ }, [load, loadHistory]);
+ // 远程管理时 5 秒读一次分享(申请尽快出现);用量每分钟读一次,本机与远程相同。
useEffect(() => {
if (!deviceId) return;
const timer = window.setInterval(() => { if (document.visibilityState !== 'hidden') void load(); }, 5_000);
return () => window.clearInterval(timer);
}, [deviceId, load]);
+ useEffect(() => {
+ const timer = window.setInterval(() => { if (document.visibilityState !== 'hidden') void loadHistory(); }, 60_000);
+ return () => window.clearInterval(timer);
+ }, [loadHistory]);
+
// 同一个供应商在这台电脑上只应有一条分享;稳妥起见合并同供应商的全部记录。
const { members, requests, reshares } = useMemo(() => {
const shares = state?.ready ? state.shares.filter((share) => share.providerId === providerId) : [];
@@ -149,7 +191,7 @@ export function ProviderShareManagePage({
pending.push({
request,
share: { shareId: share.shareId, providerId: share.providerId, providerLabel: share.providerLabel },
- ...(deviceId ? { hostDeviceId: deviceId } : {}),
+ hostDeviceId: deviceId,
});
}
}
@@ -160,7 +202,7 @@ export function ProviderShareManagePage({
// 转分享请求(provider-sharing.md §4.3):成员想经自己的供应商组把这里分享的供应商转给别人用。
reshares: pendingResharesFromOwned(shares),
};
- }, [providerId, deviceId, state]);
+ }, [deviceId, providerId, state]);
const approvalItem = requests.find((item) => item.request.requestId === approvalRequestId);
const closeApproval = useCallback(() => {
@@ -188,20 +230,24 @@ export function ProviderShareManagePage({
}
}, []);
- const reject = useCallback(
- (item: ProviderSharePendingRequest) =>
+ const decide = useCallback(
+ (item: ProviderSharePendingRequest, action: 'approve' | 'reject') =>
withBusy(item.request.requestId, async () => {
try {
- await providerShareManagementCommand({ action: 'reject', requestId: item.request.requestId }, deviceId);
+ await providerShareManagementCommand({ action, requestId: item.request.requestId }, deviceId);
// 远程管理时,本机生成链接带来的申请也在待审批里(由本机弹窗),一并移除。
removeProviderSharePendingRequest(item.request.requestId);
- toast.success(t('providerShare.toast.rejected', { name: item.request.displayName }));
+ toast.success(
+ action === 'approve'
+ ? t('providerShare.toast.approved', { name: item.request.displayName, provider: providerName })
+ : t('providerShare.toast.rejected', { name: item.request.displayName }),
+ );
} catch (error) {
toast.error(t(providerManagementErrorKey(error, Boolean(deviceId))));
}
void load();
}),
- [load, deviceId, t, withBusy],
+ [load, providerName, deviceId, t, withBusy],
);
const setMember = useCallback(
@@ -272,6 +318,13 @@ export function ProviderShareManagePage({
// 审批只用当前目录中的目标供应商分类;进入管理页时的旧投影不能证明它仍然存在。
const providerClassificationReady = providerForApproval !== undefined
&& (!deviceId || (!remoteCatalog.loading && remoteCatalog.error === null));
+ const memberActions = useMemo<ProviderShareMemberActions>(() => ({
+ busy: (id) => loadFailed || busy.has(id),
+ canApproveReshare: providerClassificationReady,
+ onTogglePause: (member) => void setMember(member, member.status === 'paused' ? 'resume' : 'pause'),
+ onRemove: (member) => void removeMember(member),
+ onReshare: (member, reshare, decision) => void decideReshare(reshare, member.displayName, decision),
+ }), [busy, decideReshare, loadFailed, providerClassificationReady, removeMember, setMember]);
return (
// 这一页自己滚动(设置页外层在「模型供应商」分区不滚)。始终预留滚动条槽位:展开组内电脑的配额、
@@ -311,6 +364,7 @@ export function ProviderShareManagePage({
{t('providerGroup.management.note', { device: selfDeviceName ?? deviceId })}
</p>
)}
+
{(gate !== 'on' || (state && !ready) || loadFailed) && (
<p
role="status"
@@ -371,7 +425,7 @@ export function ProviderShareManagePage({
size="sm"
compact
disabled={loadFailed || busy.has(item.request.requestId)}
- onClick={() => void reject(item)}
+ onClick={() => void decide(item, 'reject')}
>
{t('providerShare.approve.reject')}
</Button>
@@ -446,55 +500,17 @@ export function ProviderShareManagePage({
<ProviderUsageSection
providerId={providerId}
- providerName={providerName}
- own={own}
- ownFailed={ownFailed}
+ history={history}
+ status={usageStatus}
+ legacyOwn={legacyOwn}
members={members}
- membersLoading={!state && !loadFailed}
+ memberActions={memberActions}
selfDeviceName={selfDeviceName}
ownerDeviceId={deviceId}
groupConfig={deviceId ? remoteGroup : undefined}
- range={range}
- onRangeChange={setRange}
time={time}
/>
- <section className="mt-6 shrink-0" aria-labelledby="provider-share-members-title">
- <div className="mb-2 flex flex-wrap items-center gap-2">
- <h3 id="provider-share-members-title" className="text-13 font-medium text-[var(--settings-section-title)]">
- {t('providerShare.manage.members.title')}
- </h3>
- {members.length > 0 && <span className="text-13 text-[var(--text-tertiary)]">{members.length}</span>}
- </div>
- <div className="overflow-hidden rounded-xl border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)]">
- {members.length === 0 ? (
- <p className="px-4 py-7 text-center text-13 leading-[1.5] text-[var(--text-secondary)]">
- {/* 分享服务未就绪时列表为空不代表没分享给任何人:上方提示已说明原因。 */}
- {state?.ready
- ? t('providerShare.manage.members.empty')
- : state || loadFailed
- ? '—'
- : t('providerShare.manage.loading')}
- </p>
- ) : (
- members.map((member, index) => (
- <MemberRow
- key={member.memberId}
- member={member}
- first={index === 0}
- busy={loadFailed || busy.has(member.memberId)}
- time={time}
- onPause={() => void setMember(member, member.status === 'paused' ? 'resume' : 'pause')}
- onRemove={() => void removeMember(member)}
- reshareBusy={(id) => loadFailed || busy.has(id)}
- canApproveReshare={providerClassificationReady}
- onReshare={(reshare, decision) => void decideReshare(reshare, member.displayName, decision)}
- />
- ))
- )}
- </div>
- </section>
-
{linkOpen && (
<ProviderShareLinkDialog
deviceId={deviceId}
@@ -506,204 +522,3 @@ export function ProviderShareManagePage({
</div>
);
}
-
-function MemberRow({
- member,
- first,
- busy,
- time,
- onPause,
- onRemove,
- reshareBusy,
- canApproveReshare,
- onReshare,
-}: {
- member: ProviderShareMemberView;
- first: boolean;
- busy: boolean;
- time: ReturnType<typeof useShareTimeFormat>;
- onPause: () => void;
- onRemove: () => void;
- reshareBusy: (id: string) => boolean;
- canApproveReshare: boolean;
- onReshare: (reshare: ProviderShareReshareView, decision: 'approve' | 'reject') => void;
-}) {
- const { t } = useTranslation();
- const paused = member.status === 'paused';
- // 转分享里已处理过的人(待处理的在上方「待处理」一栏):可以撤回已同意的,或改为同意。
- const decided = (member.reshares ?? []).filter((reshare) => reshare.state !== 'pending');
- const approvedCount = decided.filter((reshare) => reshare.state === 'approved').length;
- const declinedCount = decided.length - approvedCount;
- // 这些人默认收起成一行摘要,点开才逐人列出(2026-10-16 用户要求可折叠)。
- const [reshareOpen, setReshareOpen] = useState(false);
- const reshareListId = useId();
- const statusText = paused
- ? t('providerShare.manage.members.statusPaused')
- : member.runningTasks > 0
- ? t('providerShare.manage.members.statusRunning', { count: member.runningTasks })
- : t('providerShare.manage.members.statusActive');
- const moreLabel = t('providerGroup.member.moreAria', { name: member.displayName });
- // 用量在上方「用量」块里按人列出(供应商组 §10),这里只管分享本身。
- return (
- <div className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}>
- {/* 有转分享摘要时信息列多一行,头像和操作贴着第一行;没有时保持居中。 */}
- <div
- data-testid="provider-share-member-row"
- className={cn('flex flex-wrap gap-3 px-4 py-3', decided.length > 0 ? 'items-start' : 'items-center')}
- >
- <ShareAvatar
- displayName={member.displayName}
- avatarUrl={member.avatarUrl}
- className={cn(paused && 'opacity-70')}
- />
- <div className="flex min-w-[180px] flex-1 flex-col gap-0.5">
- <div className={cn('flex flex-wrap items-center gap-2 text-13', paused && 'opacity-70')}>
- <span className="font-medium text-[var(--text-primary)]">{member.displayName}</span>
- <span className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]">
- <span
- aria-hidden="true"
- className={cn(
- 'h-1.5 w-1.5 shrink-0 rounded-full',
- paused ? 'bg-[var(--remote-status-disconnected)]' : 'bg-[var(--remote-status-ready)]',
- )}
- />
- {statusText}
- </span>
- </div>
- <div className={cn('flex flex-wrap gap-1.5 text-12 text-[var(--text-secondary)]', paused && 'opacity-70')}>
- <span>{t('providerShare.manage.members.joined', { date: time.date(Date.parse(member.joinedAt)) })}</span>
- <span aria-hidden="true">·</span>
- <span>
- {member.lastUsedAt
- ? t('providerShare.manage.members.lastUsed', { time: time.relative(member.lastUsedAt) })
- : t('providerShare.manage.members.neverUsed')}
- </span>
- </div>
- {decided.length > 0 && (
- // 经这个成员的供应商组转给别人用的人(provider-sharing.md §4.3):收起时只是一行摘要,挂在这个成员名下。
- <button
- type="button"
- data-testid="provider-share-reshare-toggle"
- aria-expanded={reshareOpen}
- aria-controls={reshareOpen ? reshareListId : undefined}
- onClick={() => setReshareOpen((open) => !open)}
- className="group -ml-1 mt-1.5 flex w-fit max-w-full items-center gap-2 rounded-full py-0.5 pl-1 pr-2 text-left text-12 text-[var(--text-secondary)] transition-colors motion-reduce:transition-none hover:bg-[var(--surface-hover)] hover:text-[var(--text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"
- >
- <ChevronRight
- size={14}
- aria-hidden="true"
- className={cn(
- 'shrink-0 text-[var(--text-tertiary)] transition-transform duration-150 motion-reduce:transition-none group-hover:text-[var(--text-secondary)]',
- reshareOpen && 'rotate-90',
- )}
- />
- <span aria-hidden="true" className="flex shrink-0">
- {decided.slice(0, 3).map((reshare, index) => (
- <ShareAvatar
- key={reshare.id}
- displayName={reshare.name}
- avatarUrl={reshare.avatarUrl}
- size="xs"
- className={cn('ring-2 ring-[var(--settings-theme-card-bg)]', index > 0 && '-ml-1.5')}
- />
- ))}
- </span>
- <span className="min-w-0 truncate">
- {approvedCount > 0
- ? t('providerShare.manage.reshare.summaryUsing', { count: approvedCount, owner: member.displayName })
- : t('providerShare.manage.reshare.summaryOwner', { owner: member.displayName })}
- {declinedCount > 0 && ` · ${t('providerShare.manage.reshare.summaryDeclined', { count: declinedCount })}`}
- </span>
- </button>
- )}
- </div>
- <div className="flex shrink-0 items-center gap-1.5">
- <Button variant="secondary" size="sm" compact disabled={busy} onClick={onPause}>
- {t(paused ? 'providerShare.manage.members.resume' : 'providerShare.manage.members.pause')}
- </Button>
- {/* 删除不可撤销且要二次确认:收进「⋯」,与供应商组里移除电脑同一写法,行内不再挂红字。 */}
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Tip text={moreLabel}>
- <button
- type="button"
- aria-label={moreLabel}
- disabled={busy}
- className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-[var(--text-tertiary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)] disabled:opacity-50"
- >
- <MoreHorizontal size={18} />
- </button>
- </Tip>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem
- variant="danger"
- disabled={busy}
- aria-label={t('providerShare.manage.members.removeAria', { name: member.displayName })}
- onClick={onRemove}
- >
- <CircleMinus size={18} className="mr-2.5" />
- {t('providerShare.manage.members.remove')}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- </div>
- {decided.length > 0 && (
- <Collapse open={reshareOpen} id={reshareListId}>
- {/* 与昵称一列左对齐(px-4 + 头像 32 + gap-3 = ml-11 之后),浅底小框把这几个人圈成一组。 */}
- <div className="px-4 pb-3">
- <div
- data-testid="provider-share-reshare-list"
- className="ml-11 overflow-hidden rounded-lg border border-[var(--border-default)] bg-[var(--surface)]"
- >
- {decided.map((reshare, index) => {
- const approved = reshare.state === 'approved';
- return (
- <div
- key={reshare.id}
- data-testid="provider-share-reshare-item"
- className={cn(
- 'flex items-center gap-2.5 py-2 pl-3 pr-2',
- index > 0 && 'border-t border-[var(--border-default)]',
- )}
- >
- <ShareAvatar
- displayName={reshare.name}
- avatarUrl={reshare.avatarUrl}
- size="sm"
- className={cn(!approved && 'opacity-70')}
- />
- <span className="flex min-w-0 flex-1 items-baseline gap-2 text-13">
- <span className={cn('truncate text-[var(--text-primary)]', !approved && 'opacity-70')}>
- {reshare.name}
- </span>
- <span className="shrink-0 text-12 text-[var(--text-secondary)]">
- {t(approved ? 'providerShare.manage.reshare.stateApproved' : 'providerShare.manage.reshare.stateRejected')}
- </span>
- </span>
- {/* 撤回后还能改回同意,不是破坏性操作:用安静按钮,红色只留给删除分享。 */}
- <Button
- variant="secondary"
- tone="quiet"
- size="sm"
- compact
- disabled={reshareBusy(reshare.id) || (!approved && !canApproveReshare)}
- aria-label={t(
- approved ? 'providerShare.manage.reshare.revokeAria' : 'providerShare.manage.reshare.approveAria',
- { name: reshare.name },
- )}
- onClick={() => onReshare(reshare, approved ? 'reject' : 'approve')}
- >
- {t(approved ? 'providerShare.manage.reshare.revoke' : 'providerShare.manage.reshare.approve')}
- </Button>
- </div>
- );
- })}
- </div>
- </div>
- </Collapse>
- )}
- </div>
- );
-}
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
index 250dc6da53..1e6c5d841b 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
@@ -1,17 +1,32 @@
/**
- * 「远程与分享」页的「用量」块(供应商组 §7、§10):按人列出这个供应商的用量——你自己(当前登录的账号,
- * 本机与你其他电脑的合计)、分享的人(按人分开),共用一个时间段切换。收起时是这个人的总量;展开后按电脑分开
- * (每台下面列模型)。没有组的供应商当成只有本机一台的组,与建了组的走同一套显示(2026-10-12 用户要求):
- * 账本里不经组、就在本机运行的用量本来就记在本机(`local`)上。
+ * 「远程与分享」页的「用量」块(供应商组 §7、§10):与设置 → 用量同一套版式(2026-10-17 用户确认原型)——
+ * 右上筛选(使用方、组内电脑、时间范围与日期),下面依次是概览、按人、近 30 天每日 token、活跃热力图、
+ * 按电脑、按模型。默认是所有人、所有组内电脑的合计;选某个人或某台电脑后整块跟着变,点表格里的一行也一样。
*
- * 自己的用量来自这台电脑的账本(main 的 own-usage,含你其他电脑经组在别的组内电脑上运行、报告过来的部分),
- * 分享的人来自分享服务的成员用量。
+ * 数据是管理对象所在电脑的按天明细(usage-history):你自己 = 本机与你其他电脑的合计,分享的人按人,经另一台
+ * 电脑转来的看不到具体的人、按那台电脑一行。没有组的供应商当成只有本机一台的组(2026-10-12),只是不出现组内
+ * 电脑的筛选与「按电脑」(只有一台)。那台电脑是旧版本、不认识按天明细时只有所有时间的合计:时间固定为所有时间,
+ * 不显示两张图。
+ *
+ * 分享的人那一行同时管分享本身(2026-10-16 用户要求:原来下方单列的「已分享的人」并进来,同一个人只占一行):
+ * 名字旁是分享状态,第二行带上加入时间与最近使用,行尾 `···` 关闭/恢复或删除,下方列出经他的组转给别人用的人。
*/
-import { ChevronRight, History, Monitor } from 'lucide-react';
-import { useCallback, useMemo, useState } from 'react';
+import '@/components/settings/usage/usageCharts.css';
+
+import { History, Monitor, RefreshCw } from 'lucide-react';
+import { Fragment, useCallback, useMemo, useState, type ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
+import { UsageHeatmap } from '@/components/new-chat/UsageHeatmap';
+import { FIRST_COL_CLASS, ShareCell, Swatch, TD_CLASS, TH_CLASS } from '@/components/settings/usage/UsageBreakdownTables';
+import { UsageFilterSelect, type UsageFilterOption } from '@/components/settings/usage/UsageFilterSelect';
+import { UsageSeriesBars } from '@/components/settings/usage/UsageTokenBars';
+import { formatUsagePercent } from '@/components/settings/usage/formatUsagePercent';
+import { usageHistoryModelColor } from '@/components/settings/usage/usageHistoryColors';
+import { isUsageHistorySingleDay, usageRangeDay, type UsageHistoryRange } from '@/components/settings/usage/usageHistoryStats';
+import { Input } from '@/components/ui/input';
import { SegmentedControl } from '@/components/ui/segmented-control';
+import { Spinner } from '@/components/ui/spinner';
import { Tip } from '@/components/ui/tooltip';
import { useOptionalAuthUser } from '@/contexts/AuthContext';
import { useDeviceLinkDeviceList } from '@/features/device-link/useDeviceLinkDeviceList';
@@ -23,70 +38,92 @@ import { providerGroupPhysicalDeviceKey, PROVIDER_GROUP_LOCAL_MEMBER_KEY, type P
import type {
ProviderOwnUsageView,
ProviderShareMemberView,
- ProviderShareModelUsageView,
- ProviderShareUsageRange,
+ ProviderUsageHistoryView,
} from '../../../shared/providerShare';
-import { formatShareMoney, formatShareTokens, summarizeShareUsage } from './providerShareFormat';
+import { DEFAULT_USAGE_CURRENCY, type RegionalMoney } from '../../../shared/regionalMoney';
+import { formatShareMoney, formatShareTokens } from './providerShareFormat';
import { providerShareComputerName, useProviderShareOwnerNameOf } from './providerShareNames';
+import { deviceIdOfMemberKey, shareAgentDeviceIdOfMemberKey } from './providerUsageBreakdown';
import {
- deviceIdOfMemberKey,
- groupUsageByMember,
- mergeModelUsage,
- shareAgentDeviceIdOfMemberKey,
- type MemberUsageGroup,
-} from './providerUsageBreakdown';
+ computerOrder,
+ filterUsageRows,
+ groupUsageRows,
+ keysByTokens,
+ memberParty,
+ modelKeyOf,
+ relayParty,
+ rowsFromHistory,
+ rowsFromLegacy,
+ SELF_PARTY,
+ summarizeUsageRows,
+ usageRowsByDay,
+ type ProviderUsageFilter,
+ type ProviderUsageRow,
+} from './providerUsageStats';
import { ShareAvatar } from './ShareAvatar';
+import {
+ ShareMemberMenu,
+ ShareMemberReshares,
+ ShareMemberStatus,
+ type ProviderShareMemberActions,
+} from './ShareMemberControls';
import type { ShareTimeFormat } from './useShareTimeFormat';
-const RANGES: readonly ProviderShareUsageRange[] = ['7d', 'month', 'all'];
+/** 读取状态:legacy = 那台电脑是旧版本,只有所有时间的合计。 */
+export type ProviderUsageStatus = 'loading' | 'ready' | 'failed' | 'legacy';
+
+type StackBy = 'party' | 'computer' | 'model';
+
+/** 热力图与「设置 → 用量」共用;这里只按 token 着色,金额占位不显示。 */
+const HEATMAP_WINDOW_DAYS = 140;
+const ZERO_MONEY: RegionalMoney = { amount: 0, currency: DEFAULT_USAGE_CURRENCY, approximate: false, kind: 'actual-cost' };
+/** 「更早的记录」(当时没有区分电脑)在柱图里的分段键。 */
+const UNATTRIBUTED = '\u0000unattributed';
+const NONE = '—';
interface UsageParty {
key: string;
name: string;
- /** 名字旁的说明:你 / 分享的人。 */
- tag: string | null;
+ tag: string;
/** 人用头像;经另一台电脑转来的(看不到具体的人)用设备图标。 */
person?: { displayName: string; avatarUrl?: string | null };
+ /** 分享的人:这一行同时显示分享状态与操作。 */
+ member?: ProviderShareMemberView;
lastUsedAt: number | null;
- models: ProviderShareModelUsageView[];
}
-interface MemberLabel {
+interface ComputerLabel {
name: string;
source: string | null;
}
export function ProviderUsageSection({
providerId,
- providerName,
- own,
- ownFailed,
+ history,
+ status,
+ legacyOwn,
members,
- membersLoading,
+ memberActions,
selfDeviceName,
ownerDeviceId,
groupConfig,
- range,
- onRangeChange,
time,
}: {
providerId: string;
- providerName: string;
- /** null = 还没读到。 */
- own: ProviderOwnUsageView | null;
- ownFailed: boolean;
+ /** 按天明细;还没读到、读失败或旧版本时为 null。 */
+ history: ProviderUsageHistoryView | null;
+ status: ProviderUsageStatus;
+ /** 旧版本电脑:你自己所有时间的合计(own-usage)。 */
+ legacyOwn: ProviderOwnUsageView | null;
members: readonly ProviderShareMemberView[];
- /** 分享服务的成员还没读到。 */
- membersLoading: boolean;
+ memberActions: ProviderShareMemberActions;
selfDeviceName: string | null;
ownerDeviceId?: string;
/** 远程管理时由页面传入建组电脑上的组;不传时读本机组设置。 */
groupConfig?: ProviderGroupConfig | null;
- range: ProviderShareUsageRange;
- onRangeChange: (range: ProviderShareUsageRange) => void;
time: ShareTimeFormat;
}) {
- const { t } = useTranslation();
+ const { t, i18n } = useTranslation();
const user = useOptionalAuthUser();
const devices = useDeviceLinkDeviceList();
const ownerNameOf = useProviderShareOwnerNameOf();
@@ -96,68 +133,90 @@ export function ProviderUsageSection({
() => group ? [...new Set(group.members.map(providerGroupPhysicalDeviceKey))] : [PROVIDER_GROUP_LOCAL_MEMBER_KEY],
[group],
);
- const memberKeyAliases = useMemo(
+ const aliases = useMemo(
() => group ? new Map(group.members.map((member) => [member.key, providerGroupPhysicalDeviceKey(member)])) : undefined,
[group],
);
- const [expanded, setExpanded] = useState<ReadonlySet<string>>(() => new Set());
+
+ // 旧版本电脑读到合计后,后续刷新失败仍保留这份合计,并继续锁定为「所有时间」。
+ const legacy = status === 'legacy' || (status === 'failed' && history === null && legacyOwn !== null);
+ const [rangeChoice, setRange] = useState<UsageHistoryRange>('30d');
+ // 旧版本电脑没有按天的数据:只能看所有时间。
+ const range: UsageHistoryRange = legacy ? 'all' : rangeChoice;
+ const [partyChoice, setParty] = useState('all');
+ const [computerChoice, setComputer] = useState('all');
+ const [stackChoice, setStack] = useState<StackBy>('party');
+ const stack: StackBy = !group && stackChoice === 'computer' ? 'party' : stackChoice;
+ const [heatmapWeeks, setHeatmapWeeks] = useState(20);
+ const todayKey = history?.todayKey ?? '';
+
+ const rows = useMemo<ProviderUsageRow[]>(() => {
+ if (history) {
+ // owned 刷新比按日历史快;成员删除后先从旧快照排除,避免总量和页面上的成员行短暂不一致。
+ const activeMemberIds = new Set(members.map((member) => member.memberId));
+ return rowsFromHistory({
+ ...history,
+ members: history.members.filter((member) => activeMemberIds.has(member.memberId)),
+ }, aliases);
+ }
+ if (legacy) return rowsFromLegacy(legacyOwn, members, aliases);
+ return [];
+ }, [aliases, history, legacy, legacyOwn, members]);
const parties = useMemo<UsageParty[]>(() => {
- const rows: UsageParty[] = [];
+ const selfName = user?.name?.trim() || t('settings.userProfile.local.name');
+ const legacySelfLast = [legacyOwn?.local, ...(legacyOwn?.devices ?? [])]
+ .reduce<number | null>((latest, part) => (part ? Math.max(latest ?? 0, part.lastUsedAt) : latest), null);
// 你自己一行总在,没用过也写出来:本机与你其他电脑的合计,和分享的人同样按人显示。
- if (own || ownFailed) {
- const selfName = user?.name?.trim() || t('settings.userProfile.local.name');
- const parts = [own?.local, ...(own?.devices ?? [])].filter(
- (part): part is NonNullable<typeof part> => part != null,
- );
- const lastUsedAt = parts.reduce<number | null>((latest, part) => Math.max(latest ?? 0, part.lastUsedAt), null);
- rows.push({
- key: 'self',
- name: selfName,
- tag: t('providerGroup.usage.selfTag'),
- person: { displayName: selfName, avatarUrl: user?.avatar ?? null },
- lastUsedAt,
- models: mergeModelUsage(parts.map((part) => part.models)),
- });
- }
+ const list: UsageParty[] = [{
+ key: SELF_PARTY,
+ name: selfName,
+ tag: t('providerGroup.usage.selfTag'),
+ person: { displayName: selfName, avatarUrl: user?.avatar ?? null },
+ lastUsedAt: history ? history.self.lastUsedAt : legacySelfLast,
+ }];
for (const member of members) {
- rows.push({
- key: `member:${member.memberId}`,
+ const usage = history?.members.find((item) => item.memberId === member.memberId);
+ list.push({
+ key: memberParty(member.memberId),
name: member.displayName,
tag: t('providerGroup.usage.shareSource'),
person: { displayName: member.displayName, avatarUrl: member.avatarUrl },
- lastUsedAt: member.lastUsedAt,
- models: member.models,
+ member,
+ lastUsedAt: usage?.lastUsedAt ?? member.lastUsedAt,
});
}
// 同账号的组所在电脑替它的受邀者转来的:这台电脑看不到具体的人,按那台电脑一行。
- for (const relay of own?.relays ?? []) {
- if (!relay.deviceId) continue;
- const device =
- devices?.find((item) => item.deviceId === relay.deviceId)?.name ||
- relay.deviceName ||
- t('providerGroup.usage.unknownDevice');
- rows.push({
- key: `relay:${relay.deviceId}`,
+ const relays = history?.relays ?? (legacyOwn?.relays ?? []).flatMap((relay) => relay.deviceId
+ ? [{ deviceId: relay.deviceId, deviceName: relay.deviceName, lastUsedAt: relay.lastUsedAt }]
+ : []);
+ for (const relay of relays) {
+ const device = devices?.find((item) => item.deviceId === relay.deviceId)?.name
+ || relay.deviceName
+ || t('providerGroup.usage.unknownDevice');
+ list.push({
+ key: relayParty(relay.deviceId),
name: t('providerGroup.usage.relayName', { device }),
tag: t('providerGroup.usage.shareSource'),
lastUsedAt: relay.lastUsedAt,
- models: relay.models,
});
}
- return rows;
- }, [devices, members, own, ownFailed, t, user?.avatar, user?.name]);
-
- const memberLabel = useCallback(
- (memberKey: string | null, inGroup: boolean): MemberLabel => {
- if (memberKey === null) return { name: t('providerGroup.usage.unattributed'), source: t('providerGroup.usage.unattributedSource') };
- const removed = inGroup ? null : t('providerGroup.usage.removedMember');
- if (memberKey === PROVIDER_GROUP_LOCAL_MEMBER_KEY) {
- return { name: ownerDeviceId ? selfDeviceName ?? t('providerGroup.usage.unknownDevice') : t('providerGroup.member.local'), source: removed ?? (ownerDeviceId ? null : selfDeviceName) };
+ return list;
+ }, [devices, history, legacyOwn, members, t, user?.avatar, user?.name]);
+
+ const computerLabel = useCallback(
+ (key: string | null): ComputerLabel => {
+ if (key === null) return { name: t('providerGroup.usage.unattributed'), source: t('providerGroup.usage.unattributedSource') };
+ const removed = memberKeys.includes(key) ? null : t('providerGroup.usage.removedMember');
+ if (key === PROVIDER_GROUP_LOCAL_MEMBER_KEY) {
+ return {
+ name: ownerDeviceId ? selfDeviceName ?? t('providerGroup.usage.unknownDevice') : t('providerGroup.member.local'),
+ source: removed ?? (ownerDeviceId ? null : selfDeviceName),
+ };
}
- const member = group?.members.find((item) => item.key === memberKey)
- ?? group?.members.find((item) => providerGroupPhysicalDeviceKey(item) === memberKey);
- const deviceId = member?.kind === 'device' ? member.agentDeviceId : deviceIdOfMemberKey(memberKey);
+ const member = group?.members.find((item) => item.key === key)
+ ?? group?.members.find((item) => providerGroupPhysicalDeviceKey(item) === key);
+ const deviceId = member?.kind === 'device' ? member.agentDeviceId : deviceIdOfMemberKey(key);
if (deviceId) {
return {
name: devices?.find((device) => device.deviceId === deviceId)?.name || member?.label || t('providerGroup.usage.unknownDevice'),
@@ -165,329 +224,692 @@ export function ProviderUsageSection({
};
}
// 分享来的电脑只用分享者的昵称称呼,不用电脑名(provider-sharing.md §6)。
- const shareDevice = member?.kind === 'share' ? member.agentDeviceId : shareAgentDeviceIdOfMemberKey(memberKey);
+ const shareDevice = member?.kind === 'share' ? member.agentDeviceId : shareAgentDeviceIdOfMemberKey(key);
const owner = shareDevice ? ownerNameOf(shareDevice) : null;
return {
name: shareDevice ? providerShareComputerName(t, owner) : t('providerGroup.usage.unknownDevice'),
source: removed ?? (owner ? t('providerGroup.member.sourceShare', { name: owner }) : null),
};
},
- [devices, group, ownerNameOf, ownerDeviceId, selfDeviceName, t],
+ [devices, group, memberKeys, ownerDeviceId, ownerNameOf, selfDeviceName, t],
+ );
+
+ const computers = useMemo(() => computerOrder(memberKeys, rows), [memberKeys, rows]);
+ const modelOrder = useMemo(() => keysByTokens(rows, modelKeyOf), [rows]);
+ const modelNames = useMemo(() => new Map(rows.map((row) => [modelKeyOf(row), row.model])), [rows]);
+
+ // 选中的人被删除、选中的电脑移出组后回到全部,不停在一个不存在的选项上。
+ const party = parties.some((item) => item.key === partyChoice) ? partyChoice : 'all';
+ const computer = group && computers.includes(computerChoice) ? computerChoice : 'all';
+ const filter: ProviderUsageFilter = { range, todayKey, party, computer };
+ const selectedDay = usageRangeDay(range, todayKey || undefined);
+ const singleDay = isUsageHistorySingleDay(range);
+ const showToday = !legacy && !singleDay;
+
+ const rangeLabel = useMemo(() => {
+ if (selectedDay) {
+ return new Intl.DateTimeFormat(i18n.language, { year: 'numeric', month: 'short', day: 'numeric' })
+ .format(new Date(`${selectedDay}T12:00:00`));
+ }
+ return t(`usageHistory.range.${range}`);
+ }, [i18n.language, range, selectedDay, t]);
+
+ const partyColor = (key: string) => usageHistoryModelColor(parties.findIndex((item) => item.key === key), parties.length);
+ const computerColor = (key: string | null) => usageHistoryModelColor(computers.indexOf(key), computers.length);
+ const modelColor = (key: string) => usageHistoryModelColor(modelOrder.indexOf(key), modelOrder.length);
+
+ const inRange = filterUsageRows(rows, filter);
+ const summary = summarizeUsageRows(inRange);
+ const todayFilter: ProviderUsageFilter = { ...filter, range: 'today' };
+ const todayTokens = showToday ? summarizeUsageRows(filterUsageRows(rows, todayFilter)).tokens : 0;
+ const tokensOf = (list: readonly ProviderUsageRow[]) => summarizeUsageRows(list).tokens;
+ const usedParties = [...groupUsageRows(inRange, (row) => row.party).values()].filter((list) => tokensOf(list) > 0).length;
+ const usedComputers = [...groupUsageRows(inRange, (row) => row.computer).entries()]
+ .filter(([key, list]) => key !== null && tokensOf(list) > 0).length;
+ const usedModels = new Set(inRange.map(modelKeyOf)).size;
+
+ const toggleParty = (key: string) => setParty((current) => (current === key ? 'all' : key));
+ const toggleComputer = (key: string) => setComputer((current) => (current === key ? 'all' : key));
+ const handleDayClick = (day: string) => setRange(`day:${day}` as UsageHistoryRange);
+
+ const partyOptions: UsageFilterOption[] = [
+ { value: 'all', label: t('providerGroup.usage.filter.allParties') },
+ ...parties.map((item) => ({
+ value: item.key,
+ label: item.name,
+ detail: item.key === SELF_PARTY
+ ? t('providerGroup.usage.filter.selfDetail')
+ : item.member
+ ? item.member.status === 'paused'
+ ? `${item.tag} · ${t('providerShare.manage.members.statusPaused')}`
+ : item.tag
+ : t('providerGroup.usage.filter.relayDetail'),
+ })),
+ ];
+ const computerOptions: UsageFilterOption[] = [
+ { value: 'all', label: t('providerGroup.usage.filter.allComputers') },
+ ...computers.flatMap((key) => {
+ if (key === null) return [];
+ const label = computerLabel(key);
+ return [{ value: key, label: label.name, detail: label.source }];
+ }),
+ ];
+ const rangeOptions: UsageFilterOption[] = [
+ ...(['all', '30d', '7d', 'today'] as const).map((value) => ({ value, label: t(`usageHistory.range.${value}`) })),
+ ...(range.startsWith('day:') ? [{ value: range, label: rangeLabel }] : []),
+ ];
+
+ // 两张图:按使用方与组内电脑筛,不按时间段(固定窗口,与设置 → 用量相同)。
+ const chartRows = useMemo(
+ () => filterUsageRows(rows, { range: 'all', todayKey: '', party, computer }, { range: true }),
+ [computer, party, rows],
+ );
+ const series = useMemo(() => chartRows.flatMap((row) => row.day === null ? [] : [{
+ day: row.day,
+ key: stack === 'party' ? row.party : stack === 'computer' ? row.computer ?? UNATTRIBUTED : modelKeyOf(row),
+ tokens: row.inputTokens + row.outputTokens,
+ }]), [chartRows, stack]);
+ const seriesOrder = useMemo(() => stack === 'party'
+ ? parties.map((item) => item.key)
+ : stack === 'computer'
+ ? computers.map((key) => key ?? UNATTRIBUTED)
+ : modelOrder, [computers, modelOrder, parties, stack]);
+ const seriesLabel = useCallback(
+ (key: string) => stack === 'party'
+ ? parties.find((item) => item.key === key)?.name ?? key
+ : stack === 'computer'
+ ? computerLabel(key === UNATTRIBUTED ? null : key).name
+ : formatModelShort(modelNames.get(key) ?? key),
+ [computerLabel, modelNames, parties, stack],
);
+ const heatDays = useMemo(() => usageRowsByDay(chartRows).map((day) => ({ ...day, money: ZERO_MONEY })), [chartRows]);
- const toggle = (key: string) =>
- setExpanded((current) => {
- const next = new Set(current);
- if (next.has(key)) next.delete(key);
- else next.add(key);
- return next;
- });
-
- // 和设置 → 用量历史的摘要卡保持同一阅读顺序:先看总量,再看分布。
- // 这里只汇总已经读到的使用方;读失败的自己的账本不会被当成 0。
- const summary = useMemo(() => {
- const totals = summarizeShareUsage(parties.flatMap((party) => party.models));
- const usedParties = parties.filter((party) => {
- const partyTotals = summarizeShareUsage(party.models);
- return partyTotals.tokens > 0 || party.models.some((model) => model.turns > 0);
- }).length;
- const models = new Set(
- parties
- .flatMap((party) => party.models)
- .filter((model) => model.turns > 0 || model.inputTokens > 0 || model.outputTokens > 0)
- .map((model) => `${model.kind}:${model.providerId ?? ''}:${model.model}`),
- );
- return { ...totals, usedParties, modelCount: models.size };
- }, [parties]);
+ const charts = Boolean(history) && rows.length > 0;
+ const stackOptions = [
+ { value: 'party' as const, label: t('providerGroup.usage.stack.party') },
+ ...(group ? [{ value: 'computer' as const, label: t('providerGroup.usage.stack.computer') }] : []),
+ { value: 'model' as const, label: t('providerGroup.usage.stack.model') },
+ ];
return (
- <section className="mt-8 shrink-0" aria-labelledby="provider-usage-title">
- <div className="mb-3 flex flex-wrap items-start gap-3">
- <div className="flex min-w-[240px] flex-1 flex-col gap-1">
- <h3 id="provider-usage-title" className="text-13 font-medium text-[var(--settings-section-title)]">
- {t('providerGroup.usage.title')}
- </h3>
- <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">
- {t(group ? 'providerGroup.usage.descriptionGroup' : 'providerGroup.usage.description', { provider: providerName })}
- </p>
+ <section className="usage-history-charts mt-8 shrink-0" aria-labelledby="provider-usage-title">
+ {/* 标题在左、筛选在右;放不下时筛选整组换到下一行、靠左。下拉本身写着「所有人」「所有组内电脑」,不另加说明文字。 */}
+ <div className="mb-3 flex flex-wrap items-center justify-between gap-x-4 gap-y-2">
+ <h3 id="provider-usage-title" className="text-13 font-medium text-[var(--settings-section-title)]">
+ {t('providerGroup.usage.title')}
+ </h3>
+ <div className="flex min-w-0 flex-wrap items-center gap-2" data-testid="provider-usage-filters">
+ <UsageFilterSelect
+ value={party}
+ options={partyOptions}
+ onValueChange={setParty}
+ ariaLabel={t('providerGroup.usage.filter.partyAria')}
+ className="w-[168px]"
+ />
+ {group && (
+ <UsageFilterSelect
+ value={computer}
+ options={computerOptions}
+ onValueChange={setComputer}
+ ariaLabel={t('providerGroup.usage.filter.computerAria')}
+ className="w-[168px]"
+ />
+ )}
+ {/* 旧版本电脑只有所有时间的合计:选不了时间,就不摆出时间与日期。 */}
+ {!legacy && (
+ <>
+ <UsageFilterSelect
+ value={range}
+ options={rangeOptions}
+ onValueChange={(value) => setRange(value as UsageHistoryRange)}
+ ariaLabel={t('usageHistory.range.ariaLabel')}
+ className="w-[148px]"
+ />
+ <Input
+ type="date"
+ size="md"
+ aria-label={t('usageHistory.range.date')}
+ className="w-[148px] max-w-full"
+ value={selectedDay ?? ''}
+ max={todayKey || undefined}
+ disabled={!todayKey}
+ onChange={(day) => {
+ if (!todayKey) return;
+ if (/^\d{4}-\d{2}-\d{2}$/.test(day) && day <= todayKey) handleDayClick(day);
+ else if (!day) setRange('30d');
+ }}
+ />
+ </>
+ )}
</div>
- <SegmentedControl
- value={range}
- onValueChange={onRangeChange}
- aria-label={t('providerShare.manage.members.rangeAria')}
- options={RANGES.map((value) => ({ value, label: t(`providerShare.manage.members.range.${value}`) }))}
- />
</div>
- {parties.length > 0 && (
- <div className="mb-3 grid grid-cols-2 gap-2 sm:grid-cols-4" data-testid="provider-usage-summary">
- <UsageSummaryCell
- value={summary.tokens > 0 ? formatShareTokens(summary.tokens) : '—'}
- label={t('providerGroup.usage.summary.total')}
- />
- <UsageSummaryCell
- value={summary.amount ? formatShareMoney(summary.amount) : '—'}
- label={t('providerGroup.usage.summary.amount')}
- />
- <UsageSummaryCell
- value={summary.usedParties > 0 ? String(summary.usedParties) : '—'}
- label={t('providerGroup.usage.summary.people')}
- />
- <UsageSummaryCell
- value={summary.modelCount > 0 ? String(summary.modelCount) : '—'}
- label={t('providerGroup.usage.summary.models')}
+
+ {status === 'loading' && !history ? (
+ <p role="status" className="-mt-1 mb-3 inline-flex items-center gap-1.5 text-12 text-[var(--text-tertiary)]">
+ <Spinner icon={RefreshCw} size={11} className="opacity-70" />
+ {t('providerShare.manage.loading')}
+ </p>
+ ) : status === 'failed' && !history ? (
+ <p role="alert" className="-mt-1 mb-3 text-12 text-[var(--error-fg)]">{t('providerGroup.usage.loadFailed')}</p>
+ ) : legacy ? (
+ <p role="status" className="-mt-1 mb-3 text-12 text-[var(--text-tertiary)]">
+ {t('providerGroup.usage.legacyNote', { device: selfDeviceName ?? t('providerGroup.usage.unknownDevice') })}
+ </p>
+ ) : history?.coverageStart ? (
+ <p className="-mt-1 mb-3 text-12 text-[var(--text-tertiary)]">
+ {t('providerGroup.usage.coverage', { date: time.date(Date.parse(`${history.coverageStart}T12:00:00`)) })}
+ </p>
+ ) : null}
+
+ <UsageCard title={t('usageHistory.summary.title')}>
+ <div className="flex flex-wrap gap-2" data-testid="provider-usage-summary">
+ {showToday && (
+ <StatCell value={todayTokens > 0 ? formatShareTokens(todayTokens) : NONE} label={t('usageHistory.stats.todayTokens')} />
+ )}
+ <StatCell
+ value={summary.tokens > 0 ? formatShareTokens(summary.tokens) : NONE}
+ label={t('usageHistory.stats.totalTokensInRange', { range: rangeLabel })}
/>
+ <StatCell value={summary.amount ? formatShareMoney(summary.amount) : NONE} label={t('providerGroup.usage.summary.amount')} />
+ <StatCell value={usedParties > 0 ? String(usedParties) : NONE} label={t('providerGroup.usage.summary.people')} />
+ {group && (
+ <StatCell value={usedComputers > 0 ? String(usedComputers) : NONE} label={t('providerGroup.usage.summary.computers')} />
+ )}
+ <StatCell value={usedModels > 0 ? String(usedModels) : NONE} label={t('usageHistory.stats.models')} />
</div>
+ </UsageCard>
+
+ <PartyTable
+ parties={parties}
+ rows={rows}
+ filter={filter}
+ rangeLabel={rangeLabel}
+ showToday={showToday}
+ showComputers={Boolean(group)}
+ colorOf={partyColor}
+ selected={party}
+ onToggle={toggleParty}
+ memberActions={memberActions}
+ time={time}
+ subtitle={computer === 'all' ? rangeLabel : `${rangeLabel} · ${computerLabel(computer).name}`}
+ />
+
+ {history && rows.length === 0 && (
+ <p className="mb-3.5 text-center text-13 text-[var(--text-tertiary)]">{t('usageHistory.empty')}</p>
)}
- <div className="overflow-hidden rounded-xl border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)]">
- {parties.length === 0 ? (
- <p className="px-4 py-7 text-center text-13 leading-[1.5] text-[var(--text-secondary)]">
- {membersLoading || !own ? t('providerShare.manage.loading') : '—'}
- </p>
- ) : (
- parties.map((party, index) => (
- <UsagePartyRow
- key={party.key}
- party={party}
- first={index === 0}
- open={expanded.has(party.key)}
- unavailable={party.key === 'self' && ownFailed && !own}
- totalTokens={summary.tokens}
- memberKeys={memberKeys}
- memberKeyAliases={memberKeyAliases}
- showComputerCount={Boolean(group)}
- memberLabel={memberLabel}
- time={time}
- onToggle={() => toggle(party.key)}
+
+ {charts && (
+ <>
+ {/* 分色由右侧的切换说明,不再写「按人堆叠」之类的副标题。 */}
+ <UsageCard
+ title={t('usageHistory.daily.title')}
+ right={(
+ <SegmentedControl
+ value={stack}
+ onValueChange={setStack}
+ aria-label={t('providerGroup.usage.stack.aria')}
+ options={stackOptions}
+ height={28}
+ optionHeight={24}
+ />
+ )}
+ >
+ <UsageSeriesBars
+ daily={series}
+ order={seriesOrder}
+ labelOf={seriesLabel}
+ todayKey={todayKey}
+ selectedDay={selectedDay}
+ highlightRecentWeek={range === '7d'}
+ onDayClick={handleDayClick}
/>
- ))
- )}
- </div>
+ </UsageCard>
+
+ <UsageCard title={t('usageHistory.heatmap.title')} subtitle={t('usageHistory.heatmap.subtitle', { count: heatmapWeeks })}>
+ <UsageHeatmap
+ days={heatDays}
+ todayKey={todayKey}
+ windowDays={HEATMAP_WINDOW_DAYS}
+ metric="tokens"
+ selectedDay={selectedDay}
+ onDayClick={handleDayClick}
+ onVisibleWeeksChange={setHeatmapWeeks}
+ />
+ </UsageCard>
+ </>
+ )}
+
+ {group && rows.length > 0 && (
+ <ComputerTable
+ computers={computers}
+ groupKeys={memberKeys}
+ rows={rows}
+ filter={filter}
+ rangeLabel={rangeLabel}
+ showToday={showToday}
+ labelOf={computerLabel}
+ colorOf={computerColor}
+ selected={computer}
+ onToggle={toggleComputer}
+ subtitle={party === 'all' ? rangeLabel : `${rangeLabel} · ${parties.find((item) => item.key === party)?.name ?? ''}`}
+ />
+ )}
+
+ {rows.length > 0 && (
+ <UsageCard title={t('usageHistory.byModel.title')} subtitle={rangeLabel}>
+ <ModelTable rows={inRange} order={modelOrder} colorOf={modelColor} rangeLabel={rangeLabel} />
+ <p className="mt-2 text-12 text-[var(--text-tertiary)]">{t('providerShare.manage.members.estimateNote')}</p>
+ </UsageCard>
+ )}
</section>
);
}
-function UsageSummaryCell({ value, label }: { value: string; label: string }) {
+function UsageCard({
+ title,
+ subtitle,
+ right,
+ children,
+}: {
+ title: string;
+ subtitle?: string;
+ right?: ReactNode;
+ children: ReactNode;
+}) {
+ return (
+ <div className="mb-3.5 rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-4">
+ <div className="mb-3 flex min-h-6 flex-wrap items-center gap-x-2 gap-y-1">
+ <span className="text-14 font-medium text-[var(--text-primary)]">{title}</span>
+ {subtitle ? <span className="text-12 text-[var(--text-tertiary)]">{subtitle}</span> : null}
+ {right ? <div className="ml-auto">{right}</div> : null}
+ </div>
+ {children}
+ </div>
+ );
+}
+
+function StatCell({ value, label }: { value: string; label: string }) {
return (
- <div className="flex min-w-0 flex-col gap-0.5 rounded-lg bg-[var(--surface-chip)] px-3 py-2">
+ <div className="flex min-w-[96px] flex-1 flex-col gap-0.5 rounded-lg bg-[var(--surface-chip)] px-3 py-2">
<span className="break-words text-16 font-medium leading-[1.4] tabular-nums text-[var(--text-primary)]">{value}</span>
<span className="mt-auto break-words text-12 leading-[1.5] text-[var(--text-secondary)]">{label}</span>
</div>
);
}
-function UsagePartyRow({
- party,
- first,
- open,
- unavailable,
- totalTokens,
- memberKeys,
- memberKeyAliases,
- showComputerCount,
- memberLabel,
- time,
+/** 表格顶部的占比条:与各行色块同色、同顺序。 */
+function ShareStrip({ items }: { items: Array<{ key: string; tokens: number; color: string }> }) {
+ const total = items.reduce((sum, item) => sum + item.tokens, 0);
+ if (!(total > 0)) return null;
+ return (
+ <div aria-hidden="true" className="mb-3 flex h-2 overflow-hidden rounded-[2px]">
+ {items.filter((item) => item.tokens > 0).map((item) => (
+ <div key={item.key} style={{ width: `${(item.tokens / total) * 100}%`, backgroundColor: item.color }} />
+ ))}
+ </div>
+ );
+}
+
+const ROW_CLASS = 'cursor-pointer transition-colors motion-reduce:transition-none hover:bg-[var(--surface-hover)]';
+const NAME_BUTTON_CLASS =
+ 'min-w-0 truncate rounded-sm text-left font-medium text-[var(--text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]';
+
+/** 按人:你自己、分享的人(带分享状态与操作)、经另一台电脑转来的。点一行只看这个人,再点回到所有人。 */
+function PartyTable({
+ parties,
+ rows,
+ filter,
+ rangeLabel,
+ showToday,
+ showComputers,
+ colorOf,
+ selected,
onToggle,
+ memberActions,
+ time,
+ subtitle,
}: {
- party: UsageParty;
- first: boolean;
- open: boolean;
- /** 自己的账本没读出来:不写 0,免得被当成没用过。 */
- unavailable: boolean;
- /** 所选时间段所有已读使用方的 token 总量,用来画轻量占比条。 */
- totalTokens: number;
- /** 组内电脑(按组里的顺序);没有组时只有本机。 */
- memberKeys: readonly string[];
- /** 同一台电脑上的多个账号映射到一个物理电脑键。 */
- memberKeyAliases?: ReadonlyMap<string, string>;
- /** 收起时写「用了几台电脑」:没有组时只有本机一台,这句没有信息量。 */
- showComputerCount: boolean;
- memberLabel: (memberKey: string | null, inGroup: boolean) => MemberLabel;
+ parties: readonly UsageParty[];
+ rows: readonly ProviderUsageRow[];
+ filter: ProviderUsageFilter;
+ rangeLabel: string;
+ showToday: boolean;
+ showComputers: boolean;
+ colorOf: (key: string) => string;
+ selected: string;
+ onToggle: (key: string) => void;
+ memberActions: ProviderShareMemberActions;
time: ShareTimeFormat;
- onToggle: () => void;
+ subtitle: string;
}) {
const { t } = useTranslation();
- const totals = summarizeShareUsage(party.models);
- const share = totals.tokens > 0 && totalTokens > 0 ? Math.max(3, Math.round((totals.tokens / totalTokens) * 100)) : 0;
- const breakdown = useMemo(
- () => groupUsageByMember(party.models, memberKeys, memberKeyAliases),
- [memberKeyAliases, memberKeys, party.models],
- );
- const usedOn = showComputerCount
- ? breakdown.filter((item) => item.memberKey !== null && summarizeShareUsage(item.models).tokens > 0).length
- : 0;
- const breakdownId = `provider-usage-${party.key}`;
- const toggleLabel = t(open ? 'providerGroup.usage.collapseAria' : 'providerGroup.usage.expandAria', { name: party.name });
- const lastUsed = unavailable
- ? t('providerShare.manage.loadFailed')
- : party.lastUsedAt
- ? t('providerShare.manage.members.lastUsed', { time: time.relative(party.lastUsedAt) })
- : t('providerShare.manage.members.neverUsed');
+ const byParty = groupUsageRows(filterUsageRows(rows, filter, { party: true }), (row) => row.party);
+ const todayByParty = groupUsageRows(filterUsageRows(rows, { ...filter, range: 'today' }, { party: true }), (row) => row.party);
+ const items = parties.map((party) => {
+ const list = byParty.get(party.key) ?? [];
+ return {
+ party,
+ list,
+ totals: summarizeUsageRows(list),
+ today: summarizeUsageRows(todayByParty.get(party.key) ?? []).tokens,
+ computers: new Set(list.filter((row) => row.computer !== null && row.inputTokens + row.outputTokens > 0).map((row) => row.computer)).size,
+ color: colorOf(party.key),
+ };
+ });
+ const total = items.reduce((sum, item) => sum + item.totals.tokens, 0);
+ const actionColumn = parties.some((party) => party.member);
+ const columns = 4 + (showToday ? 1 : 0) + (showComputers ? 1 : 0) + (actionColumn ? 1 : 0);
return (
- <div
- data-testid="provider-usage-row"
- data-usage-party={party.key}
- className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}
- >
- <div className="flex flex-wrap items-center gap-3 px-4 py-3.5 transition-colors motion-reduce:transition-none hover:bg-[var(--surface-hover)]">
- <Tip text={toggleLabel}>
- <button
- type="button"
- onClick={onToggle}
- disabled={unavailable}
- aria-expanded={open}
- aria-controls={breakdownId}
- aria-label={toggleLabel}
- className="-ml-1 flex h-6 w-6 shrink-0 items-center justify-center rounded-full text-[var(--text-secondary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)] disabled:opacity-50"
- >
- <ChevronRight
- size={14}
- aria-hidden
- className={cn('transition-transform duration-150 motion-reduce:transition-none', open && 'rotate-90')}
- />
- </button>
- </Tip>
- {party.person ? (
- <ShareAvatar displayName={party.person.displayName} avatarUrl={party.person.avatarUrl} />
- ) : (
- <span
- aria-hidden="true"
- className="inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-[var(--surface-chip)] text-[var(--text-secondary)]"
- >
- <Monitor size={16} />
- </span>
- )}
- <div className="flex min-w-[180px] flex-1 flex-col gap-0.5">
- <div className="flex flex-wrap items-baseline gap-2 text-13">
- <span className="font-medium text-[var(--text-primary)]">{party.name}</span>
- {party.tag && <span className="text-12 text-[var(--text-secondary)]">{party.tag}</span>}
- </div>
- <span className="text-12 text-[var(--text-secondary)]">
- {usedOn > 0 && !unavailable
- ? t('providerGroup.usage.lastUsedOn', { lastUsed, computers: t('providerGroup.usage.computerCount', { count: usedOn }) })
- : lastUsed}
- </span>
- </div>
- {!unavailable && (
- <div className="flex min-w-[108px] shrink-0 flex-col items-end text-12 text-[var(--text-secondary)]">
- <span className="text-13 font-medium text-[var(--text-primary)] [font-variant-numeric:tabular-nums]">
- {t('providerShare.manage.members.tokens', { tokens: formatShareTokens(totals.tokens) })}
- </span>
- {totals.amount && (
- <span className="[font-variant-numeric:tabular-nums]">
- {t('providerShare.manage.members.amount', { amount: formatShareMoney(totals.amount) })}
- </span>
- )}
- {share > 0 && (
- <span aria-hidden="true" className="mt-1.5 h-1 w-16 overflow-hidden rounded-full bg-[var(--surface-chip)]">
- <span
- className="block h-full rounded-full bg-[var(--text-secondary)]"
- style={{ width: `${share}%` }}
- />
- </span>
- )}
- </div>
- )}
+ <UsageCard title={t('providerGroup.usage.byParty.title')} subtitle={subtitle}>
+ <ShareStrip items={items.map((item) => ({ key: item.party.key, tokens: item.totals.tokens, color: item.color }))} />
+ <div className="overflow-x-auto">
+ <table className="w-full min-w-[600px] border-collapse">
+ <thead>
+ <tr>
+ <th className={cn(TH_CLASS, FIRST_COL_CLASS, 'text-left')}>{t('providerGroup.usage.byParty.col.party')}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byAgent.col.totalInRange', { range: rangeLabel })}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byAgent.col.share')}</th>
+ {showToday && <th className={TH_CLASS}>{t('usageHistory.byAgent.col.today')}</th>}
+ <th className={TH_CLASS}>{t('providerShare.manage.members.table.amount')}</th>
+ {showComputers && <th className={TH_CLASS}>{t('providerGroup.usage.byParty.col.computers')}</th>}
+ {actionColumn && <th className={cn(TH_CLASS, 'w-10')} aria-label={t('providerGroup.usage.byParty.col.actions')} />}
+ </tr>
+ </thead>
+ <tbody>
+ {items.map(({ party, totals, today, computers, color }) => {
+ const { member } = party;
+ const paused = member?.status === 'paused';
+ const used = totals.tokens > 0;
+ const isSelected = selected === party.key;
+ const hasReshares = (member?.reshares ?? []).some((reshare) => reshare.state !== 'pending');
+ const lastUsed = party.lastUsedAt
+ ? t('providerShare.manage.members.lastUsed', { time: time.relative(party.lastUsedAt) })
+ : t('providerShare.manage.members.neverUsed');
+ const toggleLabel = isSelected
+ ? t('providerGroup.usage.focus.clear')
+ : t('providerGroup.usage.focus.only', { name: party.name });
+ const tdClass = cn(TD_CLASS, hasReshares && 'border-b-0');
+ return (
+ <Fragment key={party.key}>
+ <tr
+ data-testid="provider-usage-row"
+ data-usage-party={party.key}
+ data-selected={isSelected || undefined}
+ className={cn(ROW_CLASS, isSelected && 'bg-[var(--surface-chip)]')}
+ onClick={() => onToggle(party.key)}
+ >
+ <td className={cn(tdClass, FIRST_COL_CLASS, 'text-left')}>
+ <div className="flex min-w-0 items-center gap-2.5">
+ <Swatch color={color} />
+ {party.person ? (
+ <ShareAvatar
+ displayName={party.person.displayName}
+ avatarUrl={party.person.avatarUrl}
+ size="sm"
+ className={cn(paused && 'opacity-70')}
+ />
+ ) : (
+ <span
+ aria-hidden="true"
+ className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-[var(--surface-chip)] text-[var(--text-secondary)]"
+ >
+ <Monitor size={14} />
+ </span>
+ )}
+ <div className={cn('flex min-w-0 flex-col gap-0.5', paused && 'opacity-70')}>
+ <div className="flex min-w-0 flex-wrap items-baseline gap-x-2">
+ <Tip text={toggleLabel}>
+ <button
+ type="button"
+ aria-pressed={isSelected}
+ onClick={(event) => {
+ event.stopPropagation();
+ onToggle(party.key);
+ }}
+ className={NAME_BUTTON_CLASS}
+ >
+ {party.name}
+ </button>
+ </Tip>
+ <span className="text-12 text-[var(--text-secondary)]">{party.tag}</span>
+ {member && <ShareMemberStatus member={member} />}
+ </div>
+ <span className="truncate text-12 text-[var(--text-secondary)]">
+ {member
+ ? `${t('providerShare.manage.members.joined', { date: time.date(Date.parse(member.joinedAt)) })} · ${lastUsed}`
+ : lastUsed}
+ </span>
+ </div>
+ </div>
+ </td>
+ <td className={cn(tdClass, used && 'text-[var(--text-primary)]')}>{used ? formatShareTokens(totals.tokens) : NONE}</td>
+ {used && total > 0 ? <ShareCell share={totals.tokens / total} color={color} /> : <td className={tdClass}>{NONE}</td>}
+ {showToday && (
+ <td className={cn(tdClass, 'text-[var(--text-tertiary)]')}>{today > 0 ? formatShareTokens(today) : NONE}</td>
+ )}
+ <td className={cn(tdClass, used && 'text-[var(--text-primary)]')}>
+ {used && totals.amount ? formatShareMoney(totals.amount) : NONE}
+ </td>
+ {showComputers && (
+ <td className={cn(tdClass, 'text-[var(--text-tertiary)]')}>{computers > 0 ? computers : NONE}</td>
+ )}
+ {actionColumn && (
+ // 行尾菜单的点击(含 portal 里的菜单项)不当成「只看这个人」。
+ <td className={cn(tdClass, 'w-10 pl-1')} onClick={(event) => event.stopPropagation()}>
+ {member && (
+ <ShareMemberMenu
+ member={member}
+ disabled={memberActions.busy(member.memberId)}
+ onTogglePause={() => memberActions.onTogglePause(member)}
+ onRemove={() => memberActions.onRemove(member)}
+ />
+ )}
+ </td>
+ )}
+ </tr>
+ {member && hasReshares && (
+ <tr data-usage-party-extra={party.key}>
+ {/* 与昵称一列左对齐:色块 8 + gap 10 + 头像 28 + gap 10 = 56px。 */}
+ <td colSpan={columns} className="border-b border-[var(--border-default)] pb-3 pl-14 pr-3">
+ <ShareMemberReshares member={member} actions={memberActions} />
+ </td>
+ </tr>
+ )}
+ </Fragment>
+ );
+ })}
+ </tbody>
+ </table>
</div>
- {/* 明细表与头像左缘对齐:px-4 + 展开按钮(24 - 4) + gap-3 = 48px。 */}
- {open && !unavailable && (
- <div
- id={breakdownId}
- className="border-t border-[var(--border-default)] bg-[var(--surface)] px-3 py-3.5 sm:ml-12 sm:mr-3 sm:rounded-lg sm:border"
- >
- <div className="overflow-x-auto">
- <table className="w-full min-w-[560px] border-collapse text-12">
- <thead>
- <tr className="border-b border-[var(--border-default)] text-left text-[var(--text-secondary)]">
- <th scope="col" className="py-1.5 pr-3 font-medium">{t('providerGroup.usage.table.member')}</th>
- <th scope="col" className="w-[72px] py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.turns')}</th>
- <th scope="col" className="w-[88px] py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.input')}</th>
- <th scope="col" className="w-[88px] py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.output')}</th>
- <th scope="col" className="w-[96px] py-1.5 text-right font-medium">{t('providerShare.manage.members.table.amount')}</th>
+ </UsageCard>
+ );
+}
+
+/** 按电脑:组里每台(按组里的顺序,这段时间没用过的变淡),已移出组的,以及更早没有区分电脑的记录。 */
+function ComputerTable({
+ computers,
+ groupKeys,
+ rows,
+ filter,
+ rangeLabel,
+ showToday,
+ labelOf,
+ colorOf,
+ selected,
+ onToggle,
+ subtitle,
+}: {
+ computers: ReadonlyArray<string | null>;
+ /** 现在还在组里的电脑:这段时间没用过也列出。 */
+ groupKeys: readonly string[];
+ rows: readonly ProviderUsageRow[];
+ filter: ProviderUsageFilter;
+ rangeLabel: string;
+ showToday: boolean;
+ labelOf: (key: string | null) => ComputerLabel;
+ colorOf: (key: string | null) => string;
+ selected: string;
+ onToggle: (key: string) => void;
+ subtitle: string;
+}) {
+ const { t } = useTranslation();
+ const byComputer = groupUsageRows(filterUsageRows(rows, filter, { computer: true }), (row) => row.computer);
+ const todayByComputer = groupUsageRows(filterUsageRows(rows, { ...filter, range: 'today' }, { computer: true }), (row) => row.computer);
+ const items = computers
+ .map((key) => {
+ const list = byComputer.get(key) ?? [];
+ return {
+ key,
+ totals: summarizeUsageRows(list),
+ today: summarizeUsageRows(todayByComputer.get(key) ?? []).tokens,
+ parties: new Set(list.filter((row) => row.inputTokens + row.outputTokens > 0).map((row) => row.party)).size,
+ color: colorOf(key),
+ };
+ })
+ // 组里的电脑都列;移出组的与更早的记录只在这段时间用过时列。
+ .filter((item) => item.totals.tokens > 0 || (item.key !== null && groupKeys.includes(item.key)));
+ const total = items.reduce((sum, item) => sum + item.totals.tokens, 0);
+ return (
+ <UsageCard title={t('providerGroup.usage.byComputer.title')} subtitle={subtitle}>
+ <ShareStrip items={items.map((item) => ({ key: item.key ?? UNATTRIBUTED, tokens: item.totals.tokens, color: item.color }))} />
+ <div className="overflow-x-auto">
+ <table className="w-full min-w-[560px] border-collapse">
+ <thead>
+ <tr>
+ <th className={cn(TH_CLASS, FIRST_COL_CLASS, 'text-left')}>{t('providerGroup.usage.byComputer.col.computer')}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byAgent.col.totalInRange', { range: rangeLabel })}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byAgent.col.share')}</th>
+ {showToday && <th className={TH_CLASS}>{t('usageHistory.byAgent.col.today')}</th>}
+ <th className={TH_CLASS}>{t('providerShare.manage.members.table.amount')}</th>
+ <th className={TH_CLASS}>{t('providerGroup.usage.byComputer.col.parties')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {items.map(({ key, totals, today, parties, color }) => {
+ const label = labelOf(key);
+ const used = totals.tokens > 0;
+ const isSelected = key !== null && selected === key;
+ const Icon = key === null ? History : Monitor;
+ return (
+ <tr
+ key={key ?? UNATTRIBUTED}
+ data-testid="provider-usage-computer"
+ data-computer-key={key ?? ''}
+ data-selected={isSelected || undefined}
+ className={cn(
+ key !== null && ROW_CLASS,
+ isSelected && 'bg-[var(--surface-chip)]',
+ !used && 'text-[var(--text-tertiary)]',
+ )}
+ onClick={key === null ? undefined : () => onToggle(key)}
+ >
+ <td className={cn(TD_CLASS, FIRST_COL_CLASS, 'text-left')}>
+ <span className="flex min-w-0 items-center gap-2">
+ <Swatch color={color} />
+ <Icon size={14} aria-hidden className="shrink-0 text-[var(--text-secondary)]" />
+ {key === null ? (
+ <span className="truncate">{label.name}</span>
+ ) : (
+ <Tip text={isSelected ? t('providerGroup.usage.focus.clear') : t('providerGroup.usage.focus.only', { name: label.name })}>
+ <button
+ type="button"
+ aria-pressed={isSelected}
+ onClick={(event) => {
+ event.stopPropagation();
+ onToggle(key);
+ }}
+ className={cn(NAME_BUTTON_CLASS, !used && 'font-normal text-[var(--text-tertiary)]')}
+ >
+ {label.name}
+ </button>
+ </Tip>
+ )}
+ {label.source && <span className="shrink-0 text-12 text-[var(--text-secondary)]">{label.source}</span>}
+ </span>
+ </td>
+ <td className={cn(TD_CLASS, used && 'text-[var(--text-primary)]')}>{used ? formatShareTokens(totals.tokens) : NONE}</td>
+ {used && total > 0 ? <ShareCell share={totals.tokens / total} color={color} /> : <td className={TD_CLASS}>{NONE}</td>}
+ {showToday && (
+ <td className={cn(TD_CLASS, 'text-[var(--text-tertiary)]')}>{today > 0 ? formatShareTokens(today) : NONE}</td>
+ )}
+ <td className={cn(TD_CLASS, used && 'text-[var(--text-primary)]')}>
+ {used && totals.amount ? formatShareMoney(totals.amount) : NONE}
+ </td>
+ <td className={cn(TD_CLASS, 'text-[var(--text-tertiary)]')}>{used ? parties : NONE}</td>
</tr>
- </thead>
- {breakdown.map((item, index) => (
- <MemberUsageRows
- key={item.memberKey ?? '\u0000unattributed'}
- item={item}
- first={index === 0}
- label={memberLabel(item.memberKey, item.inGroup)}
- partyTokens={totals.tokens}
- />
- ))}
- </table>
- </div>
- <p className="mt-2 text-12 text-[var(--text-tertiary)]">{t('providerShare.manage.members.estimateNote')}</p>
- </div>
- )}
- </div>
+ );
+ })}
+ </tbody>
+ </table>
+ </div>
+ </UsageCard>
);
}
-/** 组内一台电脑:一行这台的合计(带占这个人总量的比例),下面每个模型一行。这段时间没用过的整行变淡。 */
-function MemberUsageRows({
- item,
- first,
- label,
- partyTokens,
+/** 按模型:与设置 → 用量的按模型表同一套列,另加估算金额。 */
+function ModelTable({
+ rows,
+ order,
+ colorOf,
+ rangeLabel,
}: {
- item: MemberUsageGroup;
- first: boolean;
- label: MemberLabel;
- partyTokens: number;
+ rows: readonly ProviderUsageRow[];
+ order: readonly string[];
+ colorOf: (key: string) => string;
+ rangeLabel: string;
}) {
- const totals = summarizeShareUsage(item.models);
- const turns = item.models.reduce((sum, model) => sum + model.turns, 0);
- const input = item.models.reduce((sum, model) => sum + model.inputTokens, 0);
- const output = item.models.reduce((sum, model) => sum + model.outputTokens, 0);
- const used = totals.tokens > 0 || turns > 0;
- const share = used && partyTokens > 0 ? Math.round((totals.tokens / partyTokens) * 100) : null;
- const Icon = item.memberKey === null ? History : Monitor;
+ const { t } = useTranslation();
+ const items = [...groupUsageRows(rows, modelKeyOf).entries()]
+ .map(([key, list]) => ({ key, kind: list[0]!.kind, model: list[0]!.model, totals: summarizeUsageRows(list) }))
+ .filter((item) => item.totals.tokens > 0 || item.totals.turns > 0)
+ .sort((a, b) => b.totals.tokens - a.totals.tokens || order.indexOf(a.key) - order.indexOf(b.key));
+ const total = items.reduce((sum, item) => sum + item.totals.tokens, 0);
+ if (items.length === 0) {
+ return <p className="py-5 text-center text-13 text-[var(--text-tertiary)]">{t('providerGroup.usage.emptyRange')}</p>;
+ }
return (
- <tbody
- data-testid="provider-usage-member"
- data-member-key={item.memberKey ?? ''}
- // 模型行收紧、整组底部留一点空:一眼看出这几行属于上面那台电脑。
- className={cn(
- '[font-variant-numeric:tabular-nums] [&>tr:last-child>td]:pb-2.5',
- !first && 'border-t border-[var(--border-default)]',
- )}
- >
- <tr className={used ? 'text-[var(--text-primary)]' : 'text-[var(--text-tertiary)]'}>
- <td className="pb-1 pr-3 pt-2.5">
- <span className="flex min-w-0 items-center gap-2">
- <Icon size={14} aria-hidden className="shrink-0 text-[var(--text-secondary)]" />
- <span className={cn('truncate', used && 'font-medium')}>{label.name}</span>
- {label.source && <span className="shrink-0 text-[var(--text-secondary)]">{label.source}</span>}
- {share !== null && (
- <span className="ml-auto flex shrink-0 items-center gap-1.5 pl-2 text-[var(--text-secondary)]">
- <span aria-hidden="true" className="h-1 w-12 overflow-hidden rounded-full bg-[var(--surface-chip)]">
- <span
- className="block h-full rounded-full bg-[var(--text-secondary)]"
- style={{ width: `${Math.max(share, 2)}%` }}
- />
- </span>
- <span className="w-8 text-right">{`${share}%`}</span>
- </span>
- )}
- </span>
- </td>
- <td className={cn('pb-1 pr-3 pt-2.5 text-right', used && 'font-medium')}>{used ? turns : '—'}</td>
- <td className={cn('pb-1 pr-3 pt-2.5 text-right', used && 'font-medium')}>{used ? formatShareTokens(input) : '—'}</td>
- <td className={cn('pb-1 pr-3 pt-2.5 text-right', used && 'font-medium')}>{used ? formatShareTokens(output) : '—'}</td>
- <td className={cn('pb-1 pt-2.5 text-right', used && 'font-medium')}>
- {used && totals.amount ? formatShareMoney(totals.amount) : '—'}
- </td>
- </tr>
- {item.models.map((model) => (
- <tr key={`${model.kind}:${model.providerId ?? ''}:${model.model}`} className="text-[var(--text-secondary)]">
- {/* 模型行收紧(py-1),缩进与上一行的电脑名对齐:图标 14 + gap-2。 */}
- <td className="py-1 pl-[22px] pr-3">{formatModelShort(model.model)}</td>
- <td className="py-1 pr-3 text-right">{model.turns}</td>
- <td className="py-1 pr-3 text-right">{formatShareTokens(model.inputTokens)}</td>
- <td className="py-1 pr-3 text-right">{formatShareTokens(model.outputTokens)}</td>
- <td className="py-1 text-right">{model.amount ? formatShareMoney(model.amount) : '—'}</td>
- </tr>
- ))}
- </tbody>
+ <div className="overflow-x-auto">
+ <table className="w-full min-w-[720px] border-collapse">
+ <thead>
+ <tr>
+ <th className={cn(TH_CLASS, FIRST_COL_CLASS, 'text-left')}>{t('usageHistory.byModel.col.model')}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byModel.col.totalInRange', { range: rangeLabel })}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byModel.col.share')}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byModel.col.input')}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byModel.col.output')}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byModel.col.cacheRead')}</th>
+ <th className={TH_CLASS}>{t('usageHistory.byModel.col.cacheCreate')}</th>
+ <th className={TH_CLASS} title={t('usageHistory.cacheHitTooltip')}>{t('usageHistory.byModel.col.hitRate')}</th>
+ <th className={TH_CLASS}>{t('providerShare.manage.members.table.amount')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {items.map(({ key, kind, model, totals }) => {
+ const color = colorOf(key);
+ return (
+ <tr key={key} data-testid="provider-usage-model">
+ <td className={cn(TD_CLASS, FIRST_COL_CLASS, 'text-left')}>
+ <span className="flex min-w-0 items-center gap-2">
+ <Swatch color={color} />
+ <span className="truncate font-medium" title={model}>{formatModelShort(model)}</span>
+ <span className="shrink-0 rounded border border-[var(--border-default)] px-1 py-px text-11 leading-[1.4] text-[var(--text-tertiary)]">
+ {kind}
+ </span>
+ </span>
+ </td>
+ <td className={TD_CLASS}>{formatShareTokens(totals.tokens)}</td>
+ <ShareCell share={total > 0 ? totals.tokens / total : 0} color={color} />
+ <td className={TD_CLASS}>{formatShareTokens(totals.inputTokens)}</td>
+ <td className={TD_CLASS}>{formatShareTokens(totals.outputTokens)}</td>
+ <td className={TD_CLASS}>{formatShareTokens(totals.cacheReadTokens)}</td>
+ <td className={TD_CLASS}>{formatShareTokens(totals.cacheCreateTokens)}</td>
+ <td className={TD_CLASS}>{totals.cacheHitRate === null ? NONE : formatUsagePercent(totals.cacheHitRate)}</td>
+ <td className={TD_CLASS}>{totals.amount ? formatShareMoney(totals.amount) : NONE}</td>
+ </tr>
+ );
+ })}
+ </tbody>
+ </table>
+ </div>
);
}
diff --git a/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx b/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx
new file mode 100644
index 0000000000..183d7f4343
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx
@@ -0,0 +1,148 @@
+/**
+ * 「用量」块里分享的人那一行的分享部分(2026-10-16 用户要求:「已分享的人」并进「用量」,同一个人只占一行):
+ * 分享状态、关闭/恢复与删除(收进行内 `···`,与组内电脑一行的「移出组」同一模式),以及经这个人的供应商组
+ * 转给别人用、已处理过的人(provider-sharing.md §4.3)。操作由「远程与分享」页执行,结果以 toast 说明。
+ */
+import { CirclePause, CirclePlay, MoreHorizontal, Trash2 } from 'lucide-react';
+import { useTranslation } from 'react-i18next';
+
+import { Button } from '@/components/ui/button';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
+import { Tip } from '@/components/ui/tooltip';
+import { cn } from '@/lib/utils';
+
+import type { ProviderShareMemberView, ProviderShareReshareView } from '../../../shared/providerShare';
+import { ShareAvatar } from './ShareAvatar';
+
+export interface ProviderShareMemberActions {
+ /** 这个成员(或转分享记录)的操作正在进行,或分享没读出来:不能再点。 */
+ busy: (id: string) => boolean;
+ /** 供应商目录确认之前不能同意转分享。 */
+ canApproveReshare: boolean;
+ onTogglePause: (member: ProviderShareMemberView) => void;
+ onRemove: (member: ProviderShareMemberView) => void;
+ onReshare: (member: ProviderShareMemberView, reshare: ProviderShareReshareView, decision: 'approve' | 'reject') => void;
+}
+
+/** 名字旁的分享状态:正常(有任务在跑时带上几个)、已暂停。 */
+export function ShareMemberStatus({ member }: { member: ProviderShareMemberView }) {
+ const { t } = useTranslation();
+ const paused = member.status === 'paused';
+ return (
+ <span className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]">
+ <span
+ aria-hidden="true"
+ className={cn(
+ 'h-1.5 w-1.5 shrink-0 rounded-full',
+ paused ? 'bg-[var(--remote-status-disconnected)]' : 'bg-[var(--remote-status-ready)]',
+ )}
+ />
+ {paused
+ ? t('providerShare.manage.members.statusPaused')
+ : member.runningTasks > 0
+ ? t('providerShare.manage.members.statusRunning', { count: member.runningTasks })
+ : t('providerShare.manage.members.statusActive')}
+ </span>
+ );
+}
+
+/** 行尾 `···`:关闭/恢复分享、删除(删除前由页面二次确认)。 */
+export function ShareMemberMenu({
+ member,
+ disabled,
+ onTogglePause,
+ onRemove,
+}: {
+ member: ProviderShareMemberView;
+ disabled: boolean;
+ onTogglePause: () => void;
+ onRemove: () => void;
+}) {
+ const { t } = useTranslation();
+ const paused = member.status === 'paused';
+ const label = t('providerShare.manage.members.moreAria', { name: member.displayName });
+ const PauseIcon = paused ? CirclePlay : CirclePause;
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Tip text={label}>
+ <button
+ type="button"
+ aria-label={label}
+ className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-[var(--text-tertiary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"
+ >
+ <MoreHorizontal size={18} />
+ </button>
+ </Tip>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem disabled={disabled} onClick={onTogglePause}>
+ <PauseIcon size={18} className="mr-2.5" />
+ {t(paused ? 'providerShare.manage.members.resume' : 'providerShare.manage.members.pause')}
+ </DropdownMenuItem>
+ <DropdownMenuItem variant="danger" disabled={disabled} onClick={onRemove}>
+ <Trash2 size={18} className="mr-2.5" />
+ {t('providerShare.manage.members.remove')}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
+
+/**
+ * 经这个人的供应商组转给别人用、已处理过的人(待处理的在页面标题下的「待处理」里):已同意的可以撤回,
+ * 拒绝的可以改为同意。缩进到昵称一列,看得出属于上面这个人。
+ */
+export function ShareMemberReshares({
+ member,
+ actions,
+ className,
+}: {
+ member: ProviderShareMemberView;
+ actions: ProviderShareMemberActions;
+ className?: string;
+}) {
+ const { t } = useTranslation();
+ const decided = (member.reshares ?? []).filter((reshare) => reshare.state !== 'pending');
+ if (decided.length === 0) return null;
+ return (
+ <div className={cn('flex flex-col gap-1.5', className)} data-testid="provider-share-reshare-list">
+ <span className="text-12 text-[var(--text-tertiary)]">
+ {t('providerShare.manage.reshare.listTitle', { owner: member.displayName })}
+ </span>
+ {decided.map((reshare) => {
+ const approved = reshare.state === 'approved';
+ return (
+ <div key={reshare.id} data-testid="provider-share-reshare-item" className="flex flex-wrap items-center gap-2">
+ <ShareAvatar
+ displayName={reshare.name}
+ avatarUrl={reshare.avatarUrl}
+ size="sm"
+ className={cn(!approved && 'opacity-70')}
+ />
+ <span className={cn('min-w-0 flex-1 truncate text-13 text-[var(--text-primary)]', !approved && 'opacity-70')}>
+ {reshare.name}
+ <span className="ml-2 text-12 text-[var(--text-secondary)]">
+ {t(approved ? 'providerShare.manage.reshare.stateApproved' : 'providerShare.manage.reshare.stateRejected')}
+ </span>
+ </span>
+ <Button
+ variant="secondary"
+ size="sm"
+ compact
+ tone={approved ? 'danger' : undefined}
+ disabled={actions.busy(reshare.id) || (!approved && !actions.canApproveReshare)}
+ aria-label={t(
+ approved ? 'providerShare.manage.reshare.revokeAria' : 'providerShare.manage.reshare.approveAria',
+ { name: reshare.name },
+ )}
+ onClick={() => actions.onReshare(member, reshare, approved ? 'reject' : 'approve')}
+ >
+ {t(approved ? 'providerShare.manage.reshare.revoke' : 'providerShare.manage.reshare.approve')}
+ </Button>
+ </div>
+ );
+ })}
+ </div>
+ );
+}
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
index 560f978c5f..87202c1501 100644
--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
@@ -1,17 +1,17 @@
// @vitest-environment jsdom
-import { act, cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
+import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import type { ReactNode } from 'react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ProviderView } from '@cindy/model-providers';
import type { ProviderGroupConfig } from '../../../../shared/providerGroup';
-import type { ProviderOwnUsageView, ProviderShareOwnerState, ProviderShareRequestedEvent } from '../../../../shared/providerShare';
+import type { ProviderOwnUsageView, ProviderShareOwnerState, ProviderUsageHistoryView } from '../../../../shared/providerShare';
import { __testing as localGroupsTesting } from '../../provider-group/useLocalProviderGroups';
import { ProviderShareManagePage } from '../ProviderShareManagePage';
-import { ProviderShareGlobalHost } from '../ProviderShareGlobalHost';
import {
getProviderSharePendingRequests,
getProviderSharePendingReshares,
+ publishProviderShareOwnerState,
resetProviderShareStoreForTests,
} from '../providerShareStore';
@@ -34,7 +34,7 @@ const localCatalog = vi.hoisted(() => ({
providers: [] as Array<{ id: string; source: string; auth: { method: string; native?: string } }>,
}));
const remoteCatalog = vi.hoisted(() => ({
- providers: [] as Array<{ id: string; source: string; auth: { method: string; native?: string }; group?: unknown }>,
+ providers: [] as Array<{ id: string; source: string; auth: { method: string; native?: string } }>,
loading: false,
error: null as string | null,
}));
@@ -42,11 +42,21 @@ vi.mock('@/hooks/useProviders', () => ({ useProviders: () => localCatalog }));
vi.mock('@/hooks/useDeviceProviders', () => ({ useDeviceProviders: () => remoteCatalog }));
vi.mock('@/contexts/AuthContext', async (importOriginal) => ({
...(await importOriginal<typeof import('@/contexts/AuthContext')>()),
- useAuth: () => ({ dataOwnerId: null, dataOwnerGeneration: 0 }),
useOptionalAuthUser: () => ({ name: 'Magi', avatar: null }),
}));
const confirmSpy = vi.hoisted(() => vi.fn(async () => true));
vi.mock('@/components/ui/confirm-dialog-provider', () => ({ useConfirmDialog: () => ({ confirm: confirmSpy }) }));
+// 分享的人一行的 `···` 菜单在 jsdom 里不好驱动 Radix 开合:摊平成普通按钮。
+vi.mock('@/components/ui/dropdown-menu', () => ({
+ DropdownMenu: ({ children }: { children: ReactNode }) => <>{children}</>,
+ DropdownMenuTrigger: ({ children }: { children: ReactNode }) => <>{children}</>,
+ DropdownMenuContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+ DropdownMenuItem: ({ children, onClick, disabled }: { children: ReactNode; onClick?: () => void; disabled?: boolean }) => (
+ <button type="button" onClick={onClick} disabled={disabled}>
+ {children}
+ </button>
+ ),
+}));
const owned = (): ProviderShareOwnerState => ({
ready: true,
@@ -126,6 +136,36 @@ const ownUsage = (): ProviderOwnUsageView => ({
relays: [],
});
+const TODAY = '2026-10-17';
+const usageDay = (day: string, model: string, inputTokens: number, amount: number, memberKey: string | null = 'local') => ({
+ ...usageModel(model, inputTokens, amount, memberKey),
+ day,
+});
+
+/** 按天明细(与 ownUsage / owned 同样的数):你自己今天在本机、昨天经 Studio;Lizi 前天经 Studio。 */
+const usageHistory = (): ProviderUsageHistoryView => ({
+ providerId: 'xd',
+ todayKey: TODAY,
+ coverageStart: null,
+ self: {
+ lastUsedAt: Date.now() - 120_000,
+ days: [
+ usageDay(TODAY, 'claude-sonnet-5', 41_000, 2.5),
+ usageDay('2026-10-16', 'claude-fable-5-1', 9_000, 1.25, 'device:studio:xd-2'),
+ ],
+ },
+ relays: [],
+ members: [{
+ shareId: 'share-1',
+ memberId: 'mem-1',
+ lastUsedAt: Date.now() - 60_000,
+ days: [{ ...usageDay('2026-10-15', 'claude-opus-5-5', 1_310_000, 31.2, 'device:studio:xd-2'), turns: 96, outputTokens: 188_000 }],
+ }],
+});
+
+/** 「用量」块里第 index 行(按人表)的文字。 */
+const usageRowText = (index: number) => screen.getAllByTestId('provider-usage-row')[index]!.textContent ?? '';
+
/** 这台电脑上 xd 的供应商组:本机、Studio、一台分享来的电脑。 */
const xdGroup: ProviderGroupConfig = {
strategy: 'least',
@@ -139,17 +179,11 @@ const xdGroup: ProviderGroupConfig = {
let localGroups: Record<string, ProviderGroupConfig> = {};
const command = vi.fn();
-let currentOwned: ProviderShareOwnerState;
-const ownedListeners = new Set<() => void>();
-const requestedListeners = new Set<(event: ProviderShareRequestedEvent) => void>();
beforeEach(() => {
resetProviderShareStoreForTests();
localGroupsTesting.reset();
localGroups = {};
- currentOwned = owned();
- ownedListeners.clear();
- requestedListeners.clear();
localCatalog.providers = [{ id: 'xd', source: 'builtin', auth: { method: 'apiKey' } }];
remoteCatalog.providers = [];
remoteCatalog.loading = false;
@@ -157,30 +191,16 @@ beforeEach(() => {
confirmSpy.mockClear();
command.mockReset();
command.mockImplementation(async (cmd: { action: string }) => {
- if (cmd.action === 'owned') return currentOwned;
+ if (cmd.action === 'owned') return owned();
if (cmd.action === 'own-usage') return ownUsage();
+ if (cmd.action === 'usage-history') return usageHistory();
if (cmd.action === 'received') return [];
- if (cmd.action === 'received-snapshot') return { ownerStamp: { dataOwnerId: null, ownerGeneration: 0 }, received: [], confirmedRegions: [] };
- if (cmd.action === 'set-member') return { ok: true };
- if (cmd.action === 'approve' || cmd.action === 'reject') {
- currentOwned = { ...currentOwned, shares: currentOwned.shares.map((share) => ({ ...share, requests: [] })) };
- return { ok: true };
- }
+ if (cmd.action === 'set-member' || cmd.action === 'approve' || cmd.action === 'reject') return { ok: true };
throw new Error(`unexpected ${cmd.action}`);
});
Object.assign(window, {
electronAPI: {
- providerShare: {
- command,
- onOwnedChanged: (listener: () => void) => { ownedListeners.add(listener); return () => ownedListeners.delete(listener); },
- onRequested: (listener: (event: ProviderShareRequestedEvent) => void) => {
- requestedListeners.add(listener); return () => requestedListeners.delete(listener);
- },
- onReceivedChanged: () => () => undefined,
- onSettled: () => () => undefined,
- onOpenJoin: () => () => undefined,
- onOpenManage: () => () => undefined,
- },
+ providerShare: { command, onOwnedChanged: () => () => undefined, onReceivedChanged: () => () => undefined },
// 页面上方的供应商组一块(由 ProviderGroupSection 自己的测试覆盖):这里只给一个空组。
providerGroup: {
command: async (cmd: {
@@ -191,12 +211,10 @@ beforeEach(() => {
if (cmd.action === 'list') return localGroups;
if (cmd.action === 'remote-manage') {
const action = cmd.request?.command?.action;
- if (action === 'owned') return currentOwned;
+ if (action === 'owned') return owned();
if (action === 'own-usage') return ownUsage();
- if (action === 'approve' || action === 'reject') {
- currentOwned = { ...currentOwned, shares: currentOwned.shares.map((share) => ({ ...share, requests: [] })) };
- return { ok: true };
- }
+ if (action === 'usage-history') return usageHistory();
+ if (action === 'approve' || action === 'reject') return { ok: true };
}
return { providerId: cmd.providerId, config: null, members: [] };
},
@@ -208,238 +226,203 @@ beforeEach(() => {
afterEach(() => cleanup());
+/** 「你自己」一行先出来;分享的人等分享读到后才有。 */
+async function findMemberRow(memberId = 'mem-1'): Promise<HTMLElement> {
+ return waitFor(() => {
+ const row = screen.getAllByTestId('provider-usage-row')
+ .find((item) => item.getAttribute('data-usage-party') === `member:${memberId}`);
+ if (!row) throw new Error(`no usage row for ${memberId}`);
+ return row;
+ });
+}
+
function renderPage(
gate: 'on' | 'remote-off' | 'invocation-off' = 'on',
- options: { deviceId?: string; remoteProvider?: ProviderView; globalHost?: boolean; manualOnly?: boolean } = {},
+ options: { deviceId?: string; remoteProvider?: ProviderView } = {},
) {
const onBack = vi.fn();
const view = render(
- <MemoryRouter>
- {options.globalHost && <ProviderShareGlobalHost manualOnly={options.manualOnly} />}
- <ProviderShareManagePage
- providerId="xd"
- providerName="Cindy AI"
- providerIcon={null}
- gate={gate}
- deviceId={options.deviceId}
- remoteProvider={options.remoteProvider}
- onBack={onBack}
- />
- </MemoryRouter>,
+ <ProviderShareManagePage
+ providerId="xd"
+ providerName="Cindy AI"
+ providerIcon={null}
+ gate={gate}
+ deviceId={options.deviceId}
+ remoteProvider={options.remoteProvider}
+ onBack={onBack}
+ />,
);
return { onBack, ...view };
}
describe('ProviderShareManagePage', () => {
- it('supports manual approval in secondary windows without automatic share subscriptions', async () => {
- renderPage('on', { globalHost: true, manualOnly: true });
- const row = await screen.findByTestId('provider-share-pending-row');
- expect(screen.queryByTestId('provider-share-approve-dialog')).toBeNull();
- expect(requestedListeners.size).toBe(0);
- // The management page reads owned once; a secondary host must not seed its own automatic queue.
- expect(command.mock.calls.filter(([cmd]) => cmd.action === 'owned')).toHaveLength(1);
- fireEvent.click(within(row).getByRole('button', { name: 'providerShare.approve.approve' }));
- const dialog = await screen.findByTestId('provider-share-approve-dialog');
- expect(dialog.textContent).toContain('providerShare.approve.callout');
- fireEvent.click(within(dialog).getByRole('button', { name: 'providerShare.approve.approve' }));
- await waitFor(() => expect(screen.queryByTestId('provider-share-pending-row')).toBeNull());
- expect(command).toHaveBeenCalledWith({ action: 'approve', requestId: 'req-1' });
- });
-
- // §4.1/§7.2: management approval must show the same disclosure and route as automatic approval.
- // Existing host tests do not click this entry; keep the host real to catch duplicate modal ownership.
- it.each([
- { deviceId: undefined, grouped: true, callout: 'providerShare.approve.calloutGroup' },
- { deviceId: 'studio', grouped: true, callout: 'providerShare.approve.calloutGroup' },
- { deviceId: undefined, grouped: false, callout: 'providerShare.approve.callout:' },
- { deviceId: 'studio', grouped: false, callout: 'providerShare.approve.calloutRemote' },
- ])('shows approval disclosure before submitting on the provider’s computer ($deviceId, grouped=$grouped)', async ({ deviceId, grouped, callout }) => {
- currentOwned.quietRequestIds = ['req-1'];
- localGroups = !deviceId && grouped ? { xd: xdGroup } : {};
- remoteCatalog.providers = [{ id: 'xd', source: 'builtin', auth: { method: 'apiKey' }, ...(grouped ? { group: xdGroup } : {}) }];
- const remoteCommand = vi.spyOn(window.electronAPI.providerGroup, 'command');
- renderPage('on', { deviceId, globalHost: true });
- const row = await screen.findByTestId('provider-share-pending-row');
- fireEvent.click(within(row).getByRole('button', { name: 'providerShare.approve.approve' }));
- const dialog = await screen.findByTestId('provider-share-approve-dialog');
- expect(dialog.textContent).toContain(callout);
- const approval = { action: 'approve', requestId: 'req-1' };
- expect(command).not.toHaveBeenCalledWith(approval);
- expect(remoteCommand).not.toHaveBeenCalledWith(expect.objectContaining({
- request: { action: 'manage-share', command: approval },
- }));
- fireEvent.click(within(dialog).getByRole('button', { name: 'providerShare.approve.approve' }));
- await waitFor(() => expect(screen.queryByTestId('provider-share-approve-dialog')).toBeNull());
- await waitFor(() => expect(screen.queryByTestId('provider-share-pending-row')).toBeNull());
- if (deviceId) {
- expect(remoteCommand).toHaveBeenCalledWith({
- action: 'remote-manage', deviceId, request: { action: 'manage-share', command: approval },
- });
- expect(command).not.toHaveBeenCalledWith(approval);
- } else expect(command).toHaveBeenCalledWith(approval);
+ it('lists pending requests and members for this provider only, and publishes pending requests', async () => {
+ renderPage();
+ await findMemberRow();
+ const rows = screen.getAllByTestId('provider-usage-row');
+ expect(rows.filter((row) => row.getAttribute('data-usage-party')?.startsWith('member:'))).toHaveLength(1);
+ expect(screen.getAllByTestId('provider-share-pending-row')).toHaveLength(1);
+ expect(command).toHaveBeenCalledWith({ action: 'owned', range: 'all' });
+ expect(getProviderSharePendingRequests().map((item) => item.request.requestId)).toEqual(['req-1']);
+ expect(screen.getByText(/providerShare\.manage\.members\.statusRunning/)).toBeTruthy();
});
- it('keeps a postponed request pending and closes a selected request removed by a fresh list', async () => {
- currentOwned.quietRequestIds = ['req-1'];
- renderPage('on', { globalHost: true });
- const row = await screen.findByTestId('provider-share-pending-row');
- const approve = within(row).getByRole('button', { name: 'providerShare.approve.approve' });
- for (const close of ['later', 'escape']) {
- approve.focus();
- fireEvent.click(approve);
- const dialog = await screen.findByTestId('provider-share-approve-dialog');
- if (close === 'later') fireEvent.click(screen.getByRole('button', { name: 'providerShare.approve.later' }));
- else {
- // Escape from an action, after leaving the close icon's nested tooltip.
- act(() => { within(dialog).getByRole('button', { name: 'providerShare.approve.reject' }).focus(); });
- await waitFor(() => expect(screen.queryByRole('tooltip')).toBeNull());
- fireEvent.keyDown(document.activeElement!, { key: 'Escape' });
- }
- await waitFor(() => expect(screen.queryByTestId('provider-share-approve-dialog')).toBeNull());
- await waitFor(() => expect(document.activeElement).toBe(approve));
- expect(getProviderSharePendingRequests().map((item) => item.request.requestId)).toEqual(['req-1']);
- }
- fireEvent.click(within(row).getByRole('button', { name: 'providerShare.approve.approve' }));
- await screen.findByTestId('provider-share-approve-dialog');
- currentOwned = owned();
- currentOwned.shares[0]!.requests = [];
- act(() => { for (const listener of ownedListeners) listener(); });
- await waitFor(() => expect(screen.queryByTestId('provider-share-approve-dialog')).toBeNull());
- expect(screen.queryByTestId('provider-share-pending-row')).toBeNull();
- expect(command).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'approve' }));
- expect(command).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'reject' }));
+ /*
+ * 测试价值
+ * - 生产入口与可观察结果:远程管理页构造待审批项;审批弹窗必须把决定发回目标电脑。
+ * - Bug/规则依据:Greptile Review #6279 P1;供应商分享 §4 的跨电脑审批。
+ * - 现有覆盖缺口:全局宿主覆盖了弹窗转发,但页面把待审批项交给弹窗前的 hostDeviceId 还没有断言。
+ * - 最小失败输入:deviceId=studio 且有一条待审批申请。
+ * - tier:unit;验证本地页面状态与跨电脑路由字段。
+ * - 实测耗时:本文件单独运行约 3 秒。
+ */
+ it('keeps the managed computer on pending approvals', async () => {
+ renderPage('on', { deviceId: 'studio' });
+ await screen.findByTestId('provider-share-pending-row');
+ expect(getProviderSharePendingRequests()[0]?.hostDeviceId).toBe('studio');
});
- it('holds management approval while the local group list is pending', async () => {
- currentOwned.quietRequestIds = ['req-1'];
- let finish!: (groups: Record<string, ProviderGroupConfig>) => void;
- const original = window.electronAPI.providerGroup.command;
- vi.spyOn(window.electronAPI.providerGroup, 'command').mockImplementation((cmd) =>
- cmd.action === 'list' ? new Promise((resolve) => { finish = resolve; }) : original(cmd));
- renderPage('on', { globalHost: true });
- const row = await screen.findByTestId('provider-share-pending-row');
- fireEvent.click(within(row).getByRole('button', { name: 'providerShare.approve.approve' }));
- const dialog = await screen.findByTestId('provider-share-approve-dialog');
- expect((within(dialog).getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement).disabled).toBe(true);
- expect(command).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'approve' }));
- await act(async () => { finish({ xd: xdGroup }); });
- expect(dialog.textContent).toContain('providerShare.approve.calloutGroup');
- expect((within(dialog).getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement).disabled).toBe(false);
+ it("does not import another computer's watched approval into the managed computer snapshot", () => {
+ const snapshot = {
+ ...owned(),
+ watchedRequests: [{
+ request: {
+ requestId: 'watched-on-other-host',
+ displayName: 'Other',
+ avatarUrl: null,
+ region: 'global' as const,
+ pairingCode: '1234',
+ createdAt: new Date().toISOString(),
+ expiresAt: new Date(Date.now() + 86_400_000).toISOString(),
+ },
+ share: { shareId: 'other-share', providerId: 'xd', providerLabel: 'Cindy AI' },
+ hostDeviceId: 'other-host',
+ }],
+ };
+ publishProviderShareOwnerState(snapshot, { hostDeviceId: 'studio' });
+ publishProviderShareOwnerState(snapshot, { hostDeviceId: 'studio' });
+ expect(getProviderSharePendingRequests().map((item) => [item.request.requestId, item.hostDeviceId])).toEqual([['req-1', 'studio']]);
});
- it('uses one approval dialog for a management selection, a late startup list and repeated requests', async () => {
- let finishStartup!: (state: ProviderShareOwnerState) => void;
- const original = command.getMockImplementation()!;
- let first = true;
- command.mockImplementation((cmd: { action: string }) => {
- if (cmd.action === 'owned' && first) {
- first = false;
- return new Promise((resolve) => { finishStartup = resolve; });
- }
- return original(cmd);
- });
- renderPage('on', { globalHost: true });
- const row = await screen.findByTestId('provider-share-pending-row');
- fireEvent.click(within(row).getByRole('button', { name: 'providerShare.approve.approve' }));
- await screen.findByTestId('provider-share-approve-dialog');
- await act(async () => { finishStartup(currentOwned); });
- const event = { request: currentOwned.shares[0]!.requests[0]!, share: { shareId: 'share-1', providerId: 'xd', providerLabel: 'Cindy AI' } };
- act(() => { for (const listener of requestedListeners) { listener(event); listener(event); } });
- expect(screen.getAllByTestId('provider-share-approve-dialog')).toHaveLength(1);
- fireEvent.click(screen.getByRole('button', { name: 'providerShare.approve.later' }));
- await waitFor(() => expect(screen.queryByTestId('provider-share-approve-dialog')).toBeNull());
- act(() => { for (const listener of requestedListeners) listener(event); });
- expect(screen.queryByTestId('provider-share-approve-dialog')).toBeNull();
- expect(command).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'approve' }));
+ // 2026-10-16 用户反馈页面底部的「生成分享链接」太难找:它在标题一行,待处理紧跟标题,不再有底部的「分享」块。
+ it('puts link creation in the title row and pending requests above the usage list', async () => {
+ renderPage();
+ const usageRow = (await screen.findAllByTestId('provider-usage-row'))[0]!;
+ const heading = screen.getByRole('heading', { name: 'providerGroup.page.title:{"provider":"Cindy AI"}' });
+ const create = screen.getByRole('button', { name: 'providerShare.manage.createLink' });
+ expect(create.parentElement).toBe(heading.parentElement);
+ const pending = screen.getAllByTestId('provider-share-pending-row')[0]!;
+ expect(pending.compareDocumentPosition(usageRow) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+ expect(screen.queryByText(/providerShare\.manage\.description/)).toBeNull();
});
- it('places link creation in the title row and pending requests before group and usage', async () => {
+ // 2026-10-16 用户要求:「已分享的人」并进「用量」,同一个人只占一行。
+ it('shows each person’s share status and actions on their usage row instead of a separate list', async () => {
renderPage();
- await screen.findAllByTestId('provider-share-member-row');
- const title = screen.getByRole('heading', { name: /providerGroup\.page\.title/ });
- expect(within(title.parentElement!).getByRole('button', { name: 'providerShare.manage.createLink' })).toBeTruthy();
- expect(screen.queryByText('providerGroup.page.shareTitle')).toBeNull();
- expect(screen.queryByText(/providerShare\.manage\.description/)).toBeNull();
- const pending = screen.getByRole('region', { name: 'providerShare.manage.pending.title' });
- const usage = screen.getByRole('heading', { name: 'providerGroup.usage.title' });
- expect(pending.compareDocumentPosition(usage) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
- const group = screen.getByRole('heading', { name: 'providerGroup.section.title' });
- expect(pending.compareDocumentPosition(group) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+ const member = await findMemberRow();
+ expect(member.textContent).toContain('Lizi');
+ expect(member.textContent).toContain('providerShare.manage.members.statusRunning:{"count":1}');
+ expect(member.textContent).toContain('providerShare.manage.members.joined');
+ await waitFor(() => expect(usageRowText(1)).toContain('1.5M'));
+ expect(within(member).getByRole('button', { name: /providerShare\.manage\.members\.moreAria.*Lizi/ })).toBeTruthy();
+ expect(within(member).getByRole('button', { name: 'providerShare.manage.members.pause' })).toBeTruthy();
+ expect(within(member).getByRole('button', { name: 'providerShare.manage.members.remove' })).toBeTruthy();
+ // 你自己一行没有分享操作。
+ const self = screen.getAllByTestId('provider-usage-row')[0]!;
+ expect(within(self).queryByRole('button', { name: /members\.moreAria/ })).toBeNull();
+ expect(self.textContent).not.toMatch(/members\.(statusActive|joined)/);
+ expect(screen.queryByTestId('provider-share-member-row')).toBeNull();
+ expect(screen.queryByText('providerShare.manage.members.title')).toBeNull();
});
- it('lists pending requests and members for this provider only, and publishes pending requests', async () => {
+ it('dims a paused member and offers to resume sharing', async () => {
+ command.mockImplementation(async (cmd: { action: string }) => {
+ if (cmd.action === 'owned') {
+ const state = owned();
+ state.shares[0]!.members[0]!.status = 'paused';
+ return state;
+ }
+ if (cmd.action === 'usage-history') return usageHistory();
+ if (cmd.action === 'received') return [];
+ if (cmd.action === 'set-member') return { ok: true };
+ throw new Error(`unexpected ${cmd.action}`);
+ });
renderPage();
- expect(await screen.findAllByTestId('provider-share-member-row')).toHaveLength(1);
- expect(screen.getAllByTestId('provider-share-pending-row')).toHaveLength(1);
- expect(command).toHaveBeenCalledWith({ action: 'owned', range: 'month' });
- expect(getProviderSharePendingRequests().map((item) => item.request.requestId)).toEqual(['req-1']);
- expect(screen.getByText(/providerShare\.manage\.members\.statusRunning/)).toBeTruthy();
- expect(screen.queryByText(/providerShare\.manage\.descriptionWithDevice/)).toBeNull();
+ const member = await findMemberRow();
+ expect(member.textContent).toContain('providerShare.manage.members.statusPaused');
+ fireEvent.click(within(member).getByRole('button', { name: 'providerShare.manage.members.resume' }));
+ await waitFor(() =>
+ expect(command).toHaveBeenCalledWith({ action: 'set-member', memberId: 'mem-1', status: 'resume' }),
+ );
});
it('lists usage by person: you first (this computer and your other computers together), then the people shared with', async () => {
renderPage();
- const rows = await screen.findAllByTestId('provider-usage-row');
+ await findMemberRow();
+ const rows = screen.getAllByTestId('provider-usage-row');
expect(rows.map((row) => row.getAttribute('data-usage-party'))).toEqual(['self', 'member:mem-1']);
- expect(command).toHaveBeenCalledWith({ action: 'own-usage', providerId: 'xd', range: 'month' });
+ expect(command).toHaveBeenCalledWith({ action: 'usage-history', providerId: 'xd' });
+ // 所有时间的合计只在那台电脑是旧版本时才读。
+ expect(command).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'own-usage' }));
// 自己按人显示:当前登录账号的昵称,合计本机与 Studio(41k + 1k + 9k + 1k)。
- expect(rows[0]!.textContent).toContain('Magi');
- expect(rows[0]!.textContent).toContain('providerGroup.usage.selfTag');
- expect(rows[0]!.textContent).toContain('"tokens":"52.0k"');
- expect(rows[0]!.textContent).toContain('$3.75');
- // 用量从已分享的人一行移到了「用量」块。
- expect(screen.getByTestId('provider-share-member-row').textContent).not.toMatch(/members\.tokens/);
+ await waitFor(() => expect(usageRowText(0)).toContain('52.0k'));
+ expect(usageRowText(0)).toContain('Magi');
+ expect(usageRowText(0)).toContain('providerGroup.usage.selfTag');
+ expect(usageRowText(0)).toContain('$3.75');
+ // 分享的人的用量与分享状态在同一行。
+ expect(usageRowText(1)).toContain('1.5M');
+ expect(usageRowText(1)).toMatch(/members\.statusRunning/);
});
- it('expands each person by computer in the group, listing every computer in group order', async () => {
+ // 2026-10-17 用户确认原型:与设置 → 用量同一套,默认合计,可以只看一个人或一台电脑。
+ it('splits usage by computer in the group and narrows everything to one person when their row is picked', async () => {
localGroups = { xd: xdGroup };
- const usage = ownUsage();
- usage.relays = [
- { deviceId: 'studio', deviceName: null, lastUsedAt: Date.now() - 600_000, models: [usageModel('claude-sonnet-5', 4_000, 0.5)] },
+ const history = usageHistory();
+ history.relays = [
+ { deviceId: 'studio', deviceName: null, lastUsedAt: Date.now() - 600_000, days: [usageDay(TODAY, 'claude-sonnet-5', 4_000, 0.5)] },
];
+ // 加组内电脑之前记的用量:没有区分电脑。
+ history.members[0]!.days.push(usageDay('2026-10-01', 'claude-sonnet-5', 2_000, 0.1, null));
command.mockImplementation(async (cmd: { action: string }) => {
- if (cmd.action === 'owned') {
- const state = owned();
- // 加这个字段之前记的用量:没有区分电脑。
- state.shares[0]!.members[0]!.models.push({ ...usageModel('claude-sonnet-5', 2_000, 0.1, null) });
- return state;
- }
- if (cmd.action === 'own-usage') return usage;
+ if (cmd.action === 'owned') return owned();
+ if (cmd.action === 'usage-history') return history;
if (cmd.action === 'received') return [];
throw new Error(`unexpected ${cmd.action}`);
});
renderPage();
- await waitFor(() => expect(screen.getByText(/providerGroup\.usage\.descriptionGroup/)).toBeTruthy());
- const rows = await screen.findAllByTestId('provider-usage-row');
+ // 建了组:多一个组内电脑的筛选;标题下不再有说明文字。
+ await waitFor(() => expect(screen.getByRole('combobox', { name: 'providerGroup.usage.filter.computerAria' })).toBeTruthy());
+ expect(screen.queryByText(/providerGroup\.usage\.description/)).toBeNull();
// 经 Studio 的组转来的受邀者任务:看不到具体的人,按那台电脑一行。
- expect(rows.map((row) => row.getAttribute('data-usage-party'))).toEqual(['self', 'member:mem-1', 'relay:studio']);
- expect(rows[2]!.textContent).toContain('providerGroup.usage.relayName:{"device":"Studio"}');
- // 收起时写用了几台电脑。
- expect(rows[0]!.textContent).toContain('providerGroup.usage.computerCount:{\\"count\\":2}');
+ await waitFor(() => expect(screen.getAllByTestId('provider-usage-row').map((row) => row.getAttribute('data-usage-party')))
+ .toEqual(['self', 'member:mem-1', 'relay:studio']));
+ expect(usageRowText(2)).toContain('providerGroup.usage.relayName:{"device":"Studio"}');
- fireEvent.click(screen.getByRole('button', { name: /providerGroup\.usage\.expandAria.*Magi/ }));
- const self = screen.getAllByTestId('provider-usage-row')[0]!;
- const members = within(self).getAllByTestId('provider-usage-member');
- expect(members.map((member) => member.getAttribute('data-member-key'))).toEqual([
+ const computers = () => screen.getAllByTestId('provider-usage-computer');
+ expect(computers().map((row) => row.getAttribute('data-computer-key'))).toEqual([
'local',
'device:studio',
'share:share:share-9',
+ '',
]);
- expect(members[0]!.textContent).toContain('providerGroup.member.local');
- expect(members[0]!.textContent).toContain("Magi's Mac Mini");
- expect(members[0]!.textContent).toContain('81%');
- expect(members[0]!.textContent).toContain('claude-sonnet-5');
- expect(members[1]!.textContent).toContain('Studio');
- expect(members[1]!.textContent).toContain('19%');
+ expect(computers()[0]!.textContent).toContain('providerGroup.member.local');
+ expect(computers()[0]!.textContent).toContain("Magi's Mac Mini");
+ expect(computers()[1]!.textContent).toContain('Studio');
// 这段时间没用过的那台也列出来,只是没有数字。
- expect(members[2]!.textContent).toContain('providerGroup.member.shareComputerUnknown');
- expect(members[2]!.textContent).not.toContain('%');
-
- fireEvent.click(screen.getByRole('button', { name: /providerGroup\.usage\.expandAria.*Lizi/ }));
- const lizi = screen.getAllByTestId('provider-usage-row')[1]!;
- const keys = within(lizi).getAllByTestId('provider-usage-member').map((member) => member.getAttribute('data-member-key'));
- expect(keys).toEqual(['local', 'device:studio', 'share:share:share-9', '']);
- expect(lizi.textContent).toContain('providerGroup.usage.unattributed');
+ expect(computers()[2]!.textContent).toContain('providerGroup.member.shareComputerUnknown');
+ expect(computers()[2]!.textContent).not.toContain('%');
+ expect(computers()[3]!.textContent).toContain('providerGroup.usage.unattributed');
+ expect(computers()[0]!.textContent).toContain('%');
+
+ // 点 Lizi:整块只看他,按电脑表跟着变(他没在本机上用过)。
+ fireEvent.click(screen.getByRole('button', { name: 'Lizi' }));
+ expect(screen.getByRole('button', { name: 'Lizi' }).getAttribute('aria-pressed')).toBe('true');
+ expect(computers()[0]!.textContent).not.toContain('%');
+ expect(computers()[1]!.textContent).toContain('%');
+ // 再点一次回到所有人。
+ fireEvent.click(screen.getByRole('button', { name: 'Lizi' }));
+ expect(screen.getByRole('button', { name: 'Lizi' }).getAttribute('aria-pressed')).toBe('false');
+ expect(computers()[0]!.textContent).toContain('%');
});
it('counts usage from multiple accounts on one physical computer once', async () => {
@@ -459,87 +442,100 @@ describe('ProviderShareManagePage', () => {
],
},
};
- const usage = ownUsage();
- usage.local!.models.push(
- usageModel('claude-sonnet-5', 2_000, 0.2, 'share:share-9:xd'),
- usageModel('claude-sonnet-5', 3_000, 0.3, 'share:share-10:xd'),
+ const history = usageHistory();
+ history.self.days.push(
+ usageDay(TODAY, 'claude-sonnet-5', 2_000, 0.2, 'share:share-9:xd'),
+ usageDay(TODAY, 'claude-sonnet-5', 3_000, 0.3, 'share:share-10:xd'),
);
command.mockImplementation(async (cmd: { action: string }) => {
if (cmd.action === 'owned') return owned();
- if (cmd.action === 'own-usage') return usage;
+ if (cmd.action === 'usage-history') return history;
if (cmd.action === 'received') return [];
throw new Error('unexpected action');
});
renderPage();
- const rows = await screen.findAllByTestId('provider-usage-row');
- expect(rows[0]!.textContent).toContain('providerGroup.usage.computerCount:{\\"count\\":3}');
- fireEvent.click(screen.getByRole('button', { name: /providerGroup\.usage\.expandAria.*Magi/ }));
-
- const members = within(screen.getAllByTestId('provider-usage-row')[0]!).getAllByTestId('provider-usage-member');
- expect(members.map((member) => member.getAttribute('data-member-key'))).toEqual([
- 'local',
- 'device:studio',
- 'share-host:kai-pc',
- ]);
+ await waitFor(() => expect(screen.getAllByTestId('provider-usage-computer').map((row) => row.getAttribute('data-computer-key')))
+ .toEqual(['local', 'device:studio', 'share-host:kai-pc']));
+ // 两个账号合成一台:2k + 1k + 3k + 1k。
+ expect(screen.getAllByTestId('provider-usage-computer')[2]!.textContent).toContain('7.0k');
});
- it('re-reads usage when the period changes', async () => {
+ it('filters by a picked day on the same daily data without reading it again', async () => {
renderPage();
- await screen.findAllByTestId('provider-usage-row');
- fireEvent.click(screen.getByRole('radio', { name: 'providerShare.manage.members.range.7d' }));
- await waitFor(() => expect(command).toHaveBeenCalledWith({ action: 'owned', range: '7d' }));
- expect(command).toHaveBeenCalledWith({ action: 'own-usage', providerId: 'xd', range: '7d' });
+ await waitFor(() => expect(usageRowText(0)).toContain('52.0k'));
+ const reads = () => command.mock.calls.filter(([cmd]) => (cmd as { action: string }).action === 'usage-history').length;
+ const before = reads();
+ fireEvent.change(screen.getByLabelText('usageHistory.range.date'), { target: { value: '2026-10-16' } });
+ // 那天只有经 Studio 的 9k + 1k;Lizi 那天没用,不写 0。
+ await waitFor(() => expect(usageRowText(0)).toContain('10.0k'));
+ expect(usageRowText(1)).not.toContain('1.5M');
+ expect(reads()).toBe(before);
});
it('shows a provider without a group as a group of just this computer', async () => {
renderPage();
- const rows = await screen.findAllByTestId('provider-usage-row');
- expect(screen.getByText(/providerGroup\.usage\.description:/)).toBeTruthy();
- // 和建了组的一样有摘要与占比,只是收起时不写用了几台电脑(只有一台)。
+ await waitFor(() => expect(screen.getAllByTestId('provider-usage-model').length).toBeGreaterThan(0));
expect(screen.getByTestId('provider-usage-summary')).toBeTruthy();
- expect(rows[0]!.textContent).not.toMatch(/computerCount/);
-
- fireEvent.click(screen.getByRole('button', { name: /providerGroup\.usage\.expandAria.*Magi/ }));
- const self = screen.getAllByTestId('provider-usage-row')[0]!;
- const members = within(self).getAllByTestId('provider-usage-member');
- // 本机一行在前;以前经组在 Studio 上运行的那部分排在后面,写已移出组。
- expect(members.map((member) => member.getAttribute('data-member-key'))).toEqual(['local', 'device:studio:xd-2']);
- expect(members[0]!.textContent).toContain('providerGroup.member.local');
- expect(members[0]!.textContent).toContain("Magi's Mac Mini");
- expect(members[1]!.textContent).toContain('providerGroup.usage.removedMember');
-
- fireEvent.click(screen.getByRole('button', { name: /providerGroup\.usage\.expandAria.*Lizi/ }));
- const lizi = screen.getAllByTestId('provider-usage-row')[1]!;
- expect(within(lizi).getByText('Opus 5.5')).toBeTruthy();
- expect(within(lizi).getAllByText('$31.20').length).toBeGreaterThan(0);
- expect(within(lizi).getByText('providerShare.manage.members.estimateNote')).toBeTruthy();
+ // 只有一台:没有组内电脑的筛选与「按电脑」。
+ expect(screen.queryByRole('combobox', { name: 'providerGroup.usage.filter.computerAria' })).toBeNull();
+ expect(screen.queryByTestId('provider-usage-computer')).toBeNull();
+ expect(screen.getAllByTestId('provider-usage-model').map((row) => row.textContent)).toEqual(
+ expect.arrayContaining([expect.stringContaining('Opus 5.5')]),
+ );
+ expect(screen.getAllByText('$31.20').length).toBeGreaterThan(0);
+ expect(screen.getByText('providerShare.manage.members.estimateNote')).toBeTruthy();
});
- it('does not show zero for this computer when its usage could not be read', async () => {
+ it('does not show zero when usage could not be read', async () => {
command.mockImplementation(async (cmd: { action: string }) => {
if (cmd.action === 'owned') return owned();
if (cmd.action === 'received') return [];
throw new Error('boom');
});
renderPage();
- const rows = await screen.findAllByTestId('provider-usage-row');
+ expect((await screen.findByRole('alert')).textContent).toBe('providerGroup.usage.loadFailed');
+ const rows = screen.getAllByTestId('provider-usage-row');
expect(rows[0]!.getAttribute('data-usage-party')).toBe('self');
- expect(rows[0]!.textContent).toContain('providerShare.manage.loadFailed');
- expect(rows[0]!.textContent).not.toMatch(/members\.tokens/);
+ expect(rows[0]!.textContent).not.toMatch(/\d(\.\d)?[kM]/);
+ });
+
+ // 那台电脑还没更新、不认识按天明细:退回所有时间的合计,时间固定为所有时间,不显示两张图。
+ it('falls back to all-time totals when the provider computer has not been updated', async () => {
+ const remoteCommand = vi.spyOn(window.electronAPI.providerGroup, 'command');
+ remoteCommand.mockImplementation(async (cmd) => {
+ if (cmd.action === 'remote-manage' && cmd.request.action === 'manage-share') {
+ const action = cmd.request.command.action;
+ if (action === 'usage-history') throw new Error('[UNSUPPORTED_CAPABILITY] Provider management requires an update');
+ if (action === 'own-usage') return ownUsage();
+ return command(cmd.request.command);
+ }
+ return { providerId: 'xd', config: null, members: [] };
+ });
+ renderPage('on', { deviceId: 'studio' });
+ await waitFor(() => expect(remoteCommand).toHaveBeenCalledWith({
+ action: 'remote-manage',
+ deviceId: 'studio',
+ request: { action: 'manage-share', command: { action: 'own-usage', providerId: 'xd', range: 'all' } },
+ }));
+ expect(await screen.findByText(/providerGroup\.usage\.legacyNote/)).toBeTruthy();
+ await waitFor(() => expect(usageRowText(0)).toContain('52.0k'));
+ // 分享的人所有时间的合计来自 owned。
+ expect(usageRowText(1)).toContain('1.5M');
+ // 选不了时间:不摆出时间范围与日期。
+ expect(screen.queryByRole('combobox', { name: 'usageHistory.range.ariaLabel' })).toBeNull();
+ expect(screen.queryByLabelText('usageHistory.range.date')).toBeNull();
+ expect(screen.queryByText('usageHistory.daily.title')).toBeNull();
});
it('pauses and removes a member after confirmation', async () => {
renderPage();
- await screen.findAllByTestId('provider-share-member-row');
- fireEvent.click(screen.getByRole('button', { name: 'providerShare.manage.members.pause' }));
+ const member = await findMemberRow();
+ fireEvent.click(within(member).getByRole('button', { name: 'providerShare.manage.members.pause' }));
await waitFor(() =>
expect(command).toHaveBeenCalledWith({ action: 'set-member', memberId: 'mem-1', status: 'pause' }),
);
- // 删除收在「⋯」里,行内没有直接的删除按钮。
- expect(screen.queryByRole('button', { name: /providerShare\.manage\.members\.removeAria/ })).toBeNull();
- fireEvent.keyDown(screen.getByRole('button', { name: /providerGroup\.member\.moreAria/ }), { key: 'Enter' });
- fireEvent.click(await screen.findByRole('menuitem', { name: /providerShare\.manage\.members\.removeAria/ }));
+ fireEvent.click(within(await findMemberRow()).getByRole('button', { name: 'providerShare.manage.members.remove' }));
await waitFor(() =>
expect(command).toHaveBeenCalledWith({ action: 'set-member', memberId: 'mem-1', status: 'remove' }),
);
@@ -558,7 +554,7 @@ describe('ProviderShareManagePage', () => {
];
return state;
}
- if (cmd.action === 'own-usage') return ownUsage();
+ if (cmd.action === 'usage-history') return usageHistory();
if (cmd.action === 'received') return [];
if (cmd.action === 'reshare-decide') return { ok: true };
throw new Error(`unexpected ${cmd.action}`);
@@ -593,52 +589,23 @@ describe('ProviderShareManagePage', () => {
fireEvent.click(within(pending).getByRole('button', { name: 'providerShare.manage.reshare.approve' }));
await expectDecision('rs-pending', 'approve');
- // 处理过的人挂在这个成员下方,默认收起成一行摘要:几个人在用、几个人没同意。
- const toggle = screen.getByTestId('provider-share-reshare-toggle');
- expect(toggle.getAttribute('aria-expanded')).toBe('false');
- expect(toggle.textContent).toContain(
- 'providerShare.manage.reshare.summaryUsing:{"count":1,"owner":"Lizi"} · providerShare.manage.reshare.summaryDeclined:{"count":1}',
- );
- expect(screen.queryAllByTestId('provider-share-reshare-item')).toHaveLength(0);
-
- // 点开后逐人列出:已同意的可撤回,拒绝的可改为同意。
- fireEvent.click(toggle);
- expect(toggle.getAttribute('aria-expanded')).toBe('true');
- const decided = await screen.findAllByTestId('provider-share-reshare-item');
- expect(document.getElementById(toggle.getAttribute('aria-controls')!)).not.toBeNull();
+ // 处理过的人列在这个成员那一行下方:已同意的可撤回,拒绝的可改为同意。
+ await findMemberRow();
+ const extra = document.querySelector('[data-usage-party-extra="member:mem-1"]') as HTMLElement;
+ const decided = within(extra).getAllByTestId('provider-share-reshare-item');
expect(decided.map((item) => item.textContent)).toEqual([
expect.stringContaining('Dave'),
expect.stringContaining('Erin'),
]);
- fireEvent.click(await within(decided[0]!).findByRole('button', { name: /providerShare\.manage\.reshare\.revokeAria/ }));
+ fireEvent.click(within(decided[0]!).getByRole('button', { name: /providerShare\.manage\.reshare\.revokeAria/ }));
await expectDecision('rs-approved', 'reject');
fireEvent.click(within(decided[1]!).getByRole('button', { name: /providerShare\.manage\.reshare\.approveAria/ }));
await expectDecision('rs-rejected', 'approve');
});
- it('summarizes reshares that were all declined without saying anyone uses it', async () => {
- command.mockImplementation(async (cmd: { action: string }) => {
- if (cmd.action === 'owned') {
- const state = owned();
- state.shares[0]!.members[0]!.reshares = [
- { id: 'rs-rejected', name: 'Erin', avatarUrl: null, state: 'rejected', requestedAt: Date.now() - 9_000, decidedAt: Date.now() - 5_000 },
- ];
- return state;
- }
- if (cmd.action === 'own-usage') return ownUsage();
- if (cmd.action === 'received') return [];
- throw new Error(`unexpected ${cmd.action}`);
- });
- renderPage();
- const toggle = await screen.findByTestId('provider-share-reshare-toggle');
- expect(toggle.textContent).toContain(
- 'providerShare.manage.reshare.summaryOwner:{"owner":"Lizi"} · providerShare.manage.reshare.summaryDeclined:{"count":1}',
- );
- });
-
it('disables link creation and explains why when sharing is gated', async () => {
renderPage('invocation-off');
- await screen.findAllByTestId('provider-share-member-row');
+ await findMemberRow();
const create = screen.getByRole('button', { name: 'providerShare.manage.createLink' }) as HTMLButtonElement;
expect(create.disabled).toBe(true);
expect(screen.getByRole('status').textContent).toBe('providerShare.manage.gateInvocation');
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.ts b/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.ts
index 523a595ffe..dd0a42be64 100644
--- a/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.ts
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.ts
@@ -1,87 +1,6 @@
import { describe, expect, it } from 'vitest';
-import type { ProviderShareModelUsageView } from '../../../../shared/providerShare';
-import {
- deviceIdOfMemberKey,
- groupUsageByMember,
- mergeModelUsage,
- shareAgentDeviceIdOfMemberKey,
-} from '../providerUsageBreakdown';
-
-const usage = (partial: Partial<ProviderShareModelUsageView>): ProviderShareModelUsageView => ({
- kind: 'claude-code',
- providerId: 'xd',
- memberKey: 'local',
- model: 'opus',
- turns: 1,
- inputTokens: 10,
- outputTokens: 1,
- cacheReadTokens: 0,
- cacheCreateTokens: 0,
- amount: { amount: 1, currency: 'USD' },
- ...partial,
-});
-
-describe('mergeModelUsage', () => {
- it('adds the same model on the same computer and keeps computers apart', () => {
- const merged = mergeModelUsage([
- [usage({}), usage({ memberKey: 'device:studio:xd' })],
- [usage({ turns: 2, inputTokens: 5, amount: { amount: 0.5, currency: 'USD' } })],
- ]);
- expect(merged).toEqual([
- expect.objectContaining({ memberKey: 'local', turns: 3, inputTokens: 15, amount: { amount: 1.5, currency: 'USD' } }),
- expect.objectContaining({ memberKey: 'device:studio:xd', turns: 1 }),
- ]);
- });
-
- it('never adds amounts in different currencies', () => {
- const merged = mergeModelUsage([[usage({}), usage({ amount: { amount: 7, currency: 'CNY' } })]]);
- expect(merged).toEqual([expect.objectContaining({ memberKey: 'local', turns: 2, inputTokens: 20, amount: null })]);
- });
-});
-
-describe('groupUsageByMember', () => {
- it('lists every computer in the group in order, then removed ones, then earlier unattributed usage', () => {
- const groups = groupUsageByMember(
- [usage({ memberKey: null }), usage({ memberKey: 'device:gone:xd' }), usage({ memberKey: 'device:studio:xd' })],
- ['local', 'device:studio:xd'],
- );
- expect(groups.map((group) => [group.memberKey, group.inGroup, group.models.length])).toEqual([
- ['local', true, 0],
- ['device:studio:xd', true, 1],
- ['device:gone:xd', false, 1],
- [null, false, 1],
- ]);
- });
-
- it('treats a provider without a group as a group of just this computer', () => {
- const groups = groupUsageByMember([usage({}), usage({ memberKey: null, model: 'sonnet' })], ['local']);
- expect(groups.map((group) => [group.memberKey, group.inGroup, group.models.length])).toEqual([
- ['local', true, 1],
- [null, false, 1],
- ]);
- });
-
- it('merges accounts that share one physical computer', () => {
- const aliases = new Map([
- ['share:kai-1:xd', 'share-host:kai-pc'],
- ['share:kai-2:xd', 'share-host:kai-pc'],
- ]);
- const groups = groupUsageByMember(
- [
- usage({ memberKey: 'share:kai-1:xd' }),
- usage({ memberKey: 'share:kai-2:xd', providerId: 'xd-2', turns: 2, inputTokens: 20 }),
- ],
- ['local', 'share-host:kai-pc'],
- aliases,
- );
- expect(groups.map((group) => [group.memberKey, group.models.length])).toEqual([
- ['local', 0],
- ['share-host:kai-pc', 1],
- ]);
- expect(groups[1]!.models[0]).toMatchObject({ turns: 3, inputTokens: 30, memberKey: 'share-host:kai-pc' });
- });
-});
+import { deviceIdOfMemberKey, shareAgentDeviceIdOfMemberKey } from '../providerUsageBreakdown';
describe('member keys', () => {
it('reads the computer out of a group member key', () => {
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageStats.test.ts b/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageStats.test.ts
new file mode 100644
index 0000000000..4879631573
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageStats.test.ts
@@ -0,0 +1,130 @@
+import { describe, expect, it } from 'vitest';
+
+import type { ProviderUsageDayView, ProviderUsageHistoryView } from '../../../../shared/providerShare';
+import {
+ computerOrder,
+ filterUsageRows,
+ keysByTokens,
+ modelKeyOf,
+ rowsFromHistory,
+ rowsFromLegacy,
+ summarizeUsageRows,
+ usageRowsByDay,
+} from '../providerUsageStats';
+
+const day = (partial: Partial<ProviderUsageDayView>): ProviderUsageDayView => ({
+ day: '2026-10-17',
+ kind: 'claude-code',
+ providerId: 'xd',
+ memberKey: 'local',
+ model: 'opus',
+ turns: 1,
+ inputTokens: 10,
+ outputTokens: 1,
+ cacheReadTokens: 0,
+ cacheCreateTokens: 0,
+ amount: { amount: 1, currency: 'USD' },
+ ...partial,
+});
+
+const history = (): ProviderUsageHistoryView => ({
+ providerId: 'xd',
+ todayKey: '2026-10-17',
+ coverageStart: null,
+ self: {
+ lastUsedAt: 1,
+ days: [
+ day({}),
+ day({ day: '2026-10-12', memberKey: 'device:studio:xd', inputTokens: 100, outputTokens: 0 }),
+ day({ day: '2026-09-01', memberKey: null, model: 'sonnet' }),
+ ],
+ },
+ relays: [{ deviceId: 'mini', deviceName: null, lastUsedAt: 1, days: [day({ inputTokens: 4, outputTokens: 0 })] }],
+ members: [{ shareId: 's', memberId: 'm1', lastUsedAt: 1, days: [day({ day: '2026-10-16', memberKey: 'share:kai-1:xd' })] }],
+});
+
+describe('provider usage rows', () => {
+ it('flattens daily usage by party and merges accounts on one physical computer', () => {
+ const rows = rowsFromHistory(history(), new Map([['share:kai-1:xd', 'share-host:kai-pc']]));
+ expect(rows.map((row) => [row.party, row.day, row.computer])).toEqual([
+ ['self', '2026-10-17', 'local'],
+ ['self', '2026-10-12', 'device:studio:xd'],
+ ['self', '2026-09-01', null],
+ ['member:m1', '2026-10-16', 'share-host:kai-pc'],
+ ['relay:mini', '2026-10-17', 'local'],
+ ]);
+ });
+
+ it('filters by period, person and computer, skipping the dimension a table lists', () => {
+ const rows = rowsFromHistory(history());
+ const filter = { range: '7d' as const, todayKey: '2026-10-17', party: 'self', computer: 'all' };
+ expect(filterUsageRows(rows, filter).map((row) => row.day)).toEqual(['2026-10-17', '2026-10-12']);
+ // 按人表不按使用方筛:所有人都在。
+ expect(filterUsageRows(rows, filter, { party: true }).map((row) => row.party)).toEqual(['self', 'self', 'member:m1', 'relay:mini']);
+ expect(filterUsageRows(rows, { ...filter, range: 'today', party: 'all', computer: 'local' }).map((row) => row.party))
+ .toEqual(['self', 'relay:mini']);
+ expect(filterUsageRows(rows, { ...filter, range: 'day:2026-09-01' })).toHaveLength(1);
+ // 图表不按时间段筛。
+ expect(filterUsageRows(rows, filter, { range: true })).toHaveLength(3);
+ });
+
+ it('sums tokens as input plus output, keeps cache hit rate and never adds amounts in different currencies', () => {
+ const rows = rowsFromHistory(history());
+ const totals = summarizeUsageRows([
+ ...rows.slice(0, 2),
+ { ...rows[0]!, cacheReadTokens: 30, inputTokens: 10, outputTokens: 0, amount: null },
+ ]);
+ expect(totals).toMatchObject({ tokens: 121, inputTokens: 120, turns: 3, amount: { amount: 2, currency: 'USD' } });
+ expect(totals.cacheHitRate).toBeCloseTo(30 / 150);
+ expect(summarizeUsageRows([rows[0]!, { ...rows[1]!, amount: { amount: 7, currency: 'CNY' } }]).amount).toBeNull();
+ expect(summarizeUsageRows([]).cacheHitRate).toBeNull();
+ });
+
+ it('orders computers as the group lists them, then removed ones by usage, then earlier unattributed usage', () => {
+ const rows = rowsFromHistory({
+ ...history(),
+ self: {
+ lastUsedAt: 1,
+ days: [
+ day({ memberKey: 'device:gone:xd', inputTokens: 1 }),
+ day({ memberKey: 'device:old:xd', inputTokens: 50 }),
+ day({ memberKey: null }),
+ ],
+ },
+ relays: [],
+ members: [],
+ });
+ expect(computerOrder(['local', 'device:studio:xd'], rows)).toEqual([
+ 'local', 'device:studio:xd', 'device:old:xd', 'device:gone:xd', null,
+ ]);
+ });
+
+ it('ranks models by tokens across the whole history and totals each day for the heatmap', () => {
+ const rows = rowsFromHistory(history());
+ expect(keysByTokens(rows, modelKeyOf)).toEqual(['claude-code opus', 'claude-code sonnet']);
+ expect(usageRowsByDay(rows)).toEqual(expect.arrayContaining([
+ { day: '2026-10-17', tokens: 15 },
+ { day: '2026-10-12', tokens: 100 },
+ ]));
+ });
+
+ it('turns an old computer’s all-time totals into undated rows that only count for all time', () => {
+ const rows = rowsFromLegacy(
+ {
+ providerId: 'xd',
+ local: { deviceId: null, deviceName: null, lastUsedAt: 1, models: [day({})] },
+ devices: [{ deviceId: 'studio', deviceName: null, lastUsedAt: 1, models: [day({ memberKey: 'device:studio:xd' })] }],
+ relays: [{ deviceId: 'mini', deviceName: null, lastUsedAt: 1, models: [day({})] }],
+ },
+ [],
+ );
+ expect(rows.map((row) => [row.party, row.day, row.computer])).toEqual([
+ ['self', null, 'local'],
+ ['self', null, 'device:studio:xd'],
+ ['relay:mini', null, 'local'],
+ ]);
+ const filter = { range: 'all' as const, todayKey: '', party: 'all', computer: 'all' };
+ expect(filterUsageRows(rows, filter)).toHaveLength(3);
+ expect(filterUsageRows(rows, { ...filter, range: '7d' })).toHaveLength(0);
+ });
+});
diff --git a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts b/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
index 97e8ea6c08..e64c30f3bd 100644
--- a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
+++ b/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
@@ -231,9 +231,23 @@ function setPendingReshares(next: readonly ProviderSharePendingReshare[]): void
}
/** 一份 owned 快照是本机待审批申请(含转分享请求)的权威来源:整体替换。 */
-export function publishProviderShareOwnerState(state: ProviderShareOwnerState): void {
- setPendingReshares(state.ready ? pendingResharesFromOwned(state.shares) : []);
- setPending(pendingRequestsFromOwnerState(state));
+export function publishProviderShareOwnerState(state: ProviderShareOwnerState, options: { hostDeviceId?: string } = {}): void {
+ // 远程管理页只把审批申请交给本机审批宿主;转分享请求仍由管理对象本机维护。
+ if (!options.hostDeviceId) setPendingReshares(state.ready ? pendingResharesFromOwned(state.shares) : []);
+ const pending = pendingRequestsFromOwnerState(state);
+ if (!options.hostDeviceId) {
+ setPending(pending);
+ return;
+ }
+ // 远程快照只覆盖这台被管理电脑,不能抹掉本机或其他被管理电脑的待审批申请。
+ // watchedRequests 属于另一台电脑的审批宿主;远程快照只发布当前被管理电脑自己的申请。
+ const remotePending = pending
+ .filter((item) => !item.hostDeviceId || item.hostDeviceId === options.hostDeviceId)
+ .map((item) => item.hostDeviceId ? item : { ...item, hostDeviceId: options.hostDeviceId });
+ setPending([
+ ...pendingRequests.filter((item) => item.hostDeviceId !== options.hostDeviceId),
+ ...remotePending,
+ ]);
}
export function getProviderSharePendingReshares(): readonly ProviderSharePendingReshare[] {
diff --git a/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts b/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts
index 63a9cfdc88..39c20fdc34 100644
--- a/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts
+++ b/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts
@@ -1,93 +1,6 @@
/**
- * 「用量」块的纯函数(供应商组 §7):把同一个人的几份用量合成一份,再按组内电脑分开。
- * 不读 window、不碰 i18n,便于单测。
+ * 组内电脑稳定键的解析(供应商组 §7):「用量」块据此给组内电脑起名字。不读 window、不碰 i18n,便于单测。
*/
-import type { ProviderShareModelUsageView, ProviderShareMoney } from '../../../shared/providerShare';
-
-function addMoney(a: ProviderShareMoney | null, b: ProviderShareMoney | null): ProviderShareMoney | null | 'mixed' {
- if (!a) return b;
- if (!b) return a;
- if (a.currency !== b.currency) return 'mixed';
- return { amount: a.amount + b.amount, currency: a.currency };
-}
-
-/**
- * 合并几份按模型的用量:同一 Agent、供应商、模型、组内电脑的行相加。
- * 金额币种不一致的那一行不给金额,不伪造合计。
- */
-export function mergeModelUsage(
- lists: ReadonlyArray<readonly ProviderShareModelUsageView[]>,
- mergeAcrossProviders = false,
-): ProviderShareModelUsageView[] {
- const merged = new Map<string, ProviderShareModelUsageView>();
- const mixedKeys = new Set<string>();
- for (const list of lists) {
- for (const row of list) {
- const key = JSON.stringify([row.kind, mergeAcrossProviders ? null : row.providerId, row.model, row.memberKey]);
- const existing = merged.get(key);
- if (!existing) {
- merged.set(key, { ...row, amount: row.amount ? { ...row.amount } : null });
- continue;
- }
- existing.turns += row.turns;
- existing.inputTokens += row.inputTokens;
- existing.outputTokens += row.outputTokens;
- existing.cacheReadTokens += row.cacheReadTokens;
- existing.cacheCreateTokens += row.cacheCreateTokens;
- if (mixedKeys.has(key)) continue;
- const amount = addMoney(existing.amount, row.amount);
- if (amount === 'mixed') {
- mixedKeys.add(key);
- existing.amount = null;
- } else {
- existing.amount = amount;
- }
- }
- }
- return [...merged.values()]
- .sort((a, b) => b.turns - a.turns || a.model.localeCompare(b.model));
-}
-
-export interface MemberUsageGroup {
- /** 组内电脑的稳定键;null = 更早的、没有区分电脑的用量。 */
- memberKey: string | null;
- /** 现在还在组里。 */
- inGroup: boolean;
- models: ProviderShareModelUsageView[];
-}
-
-/**
- * 按组内电脑分开:组里每台都列出(这段时间没用过的也列,好看出全组的分布),按组里的顺序;
- * 之后是已经移出组、但这段时间用过的电脑;最后是没有区分电脑的更早记录。
- */
-export function groupUsageByMember(
- models: readonly ProviderShareModelUsageView[],
- memberKeys: readonly string[],
- memberKeyAliases?: ReadonlyMap<string, string>,
-): MemberUsageGroup[] {
- const byKey = new Map<string | null, ProviderShareModelUsageView[]>();
- for (const row of models) {
- const memberKey = row.memberKey === null ? null : memberKeyAliases?.get(row.memberKey) ?? row.memberKey;
- const normalized = memberKey === row.memberKey ? row : { ...row, memberKey };
- const list = byKey.get(memberKey);
- if (list) list.push(normalized);
- else byKey.set(memberKey, [normalized]);
- }
- const groups: MemberUsageGroup[] = memberKeys.map((memberKey) => ({
- memberKey,
- inGroup: true,
- // 展开按物理电脑展示:同一台电脑上的多个账号,同一个 Agent/模型只保留一行。
- models: mergeModelUsage([byKey.get(memberKey) ?? []], true),
- }));
- const known = new Set(memberKeys);
- for (const [memberKey, list] of byKey) {
- if (memberKey === null || known.has(memberKey)) continue;
- groups.push({ memberKey, inGroup: false, models: mergeModelUsage([list], true) });
- }
- const unattributed = byKey.get(null);
- if (unattributed?.length) groups.push({ memberKey: null, inGroup: false, models: mergeModelUsage([unattributed], true) });
- return groups;
-}
/** 组内电脑的稳定键里那台电脑的设备 id(`device:<deviceId>:<providerId>`);不是同账号电脑时为 null。 */
export function deviceIdOfMemberKey(memberKey: string): string | null {
diff --git a/apps/desktop/src/renderer/features/provider-share/providerUsageStats.ts b/apps/desktop/src/renderer/features/provider-share/providerUsageStats.ts
new file mode 100644
index 0000000000..f04f6a529f
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/providerUsageStats.ts
@@ -0,0 +1,182 @@
+/**
+ * 「远程与分享」页「用量」块的纯函数(供应商组 §7):把按天明细摊成一张表,再按时间段、使用方与组内电脑
+ * 筛选、汇总。与设置 → 用量同一种做法:数据一次读来,筛选都在界面上做。不读 window、不碰 i18n,便于单测。
+ */
+import { isUsageDayInRange, type UsageHistoryRange } from '@/components/settings/usage/usageHistoryStats';
+import { usageModelKey } from '@/components/new-chat/usagePalette';
+
+import type {
+ ProviderOwnUsageView,
+ ProviderShareMemberView,
+ ProviderShareModelUsageView,
+ ProviderShareMoney,
+ ProviderUsageHistoryView,
+} from '../../../shared/providerShare';
+
+/** 使用方的键:你自己、分享的人(按成员)、经另一台电脑转来的(按那台电脑)。 */
+export const SELF_PARTY = 'self';
+export const memberParty = (memberId: string) => `member:${memberId}`;
+export const relayParty = (deviceId: string) => `relay:${deviceId}`;
+
+export interface ProviderUsageRow extends ProviderShareModelUsageView {
+ party: string;
+ /** 那台电脑的本地日期;null = 旧版电脑只给了所有时间的合计。 */
+ day: string | null;
+ /** 组内电脑(同一台电脑上的多个账号已合成一台);null = 当时没有区分电脑。 */
+ computer: string | null;
+}
+
+export interface ProviderUsageFilter {
+ range: UsageHistoryRange;
+ todayKey: string;
+ /** 'all' 或使用方的键。 */
+ party: string;
+ /** 'all' 或组内电脑的键。 */
+ computer: string;
+}
+
+export interface ProviderUsageTotals {
+ /** 输入 + 输出 token,与分享用量同口径。 */
+ tokens: number;
+ turns: number;
+ inputTokens: number;
+ outputTokens: number;
+ cacheReadTokens: number;
+ cacheCreateTokens: number;
+ /** 估算金额;没有可估算的行、或币种不一致时为 null(不换算、不伪造合计)。 */
+ amount: ProviderShareMoney | null;
+ /** 缓存读取 ÷(输入 + 缓存读取 + 缓存写入),与设置 → 用量同口径;没有输入时为 null。 */
+ cacheHitRate: number | null;
+}
+
+function computerOf(memberKey: string | null, aliases?: ReadonlyMap<string, string>): string | null {
+ return memberKey === null ? null : aliases?.get(memberKey) ?? memberKey;
+}
+
+/** 按天明细摊成一张表(你自己、分享的人、转来的)。 */
+export function rowsFromHistory(
+ history: ProviderUsageHistoryView,
+ aliases?: ReadonlyMap<string, string>,
+): ProviderUsageRow[] {
+ const rows: ProviderUsageRow[] = [];
+ const push = (party: string, days: ProviderUsageHistoryView['self']['days']) => {
+ for (const day of days) rows.push({ ...day, party, computer: computerOf(day.memberKey, aliases) });
+ };
+ push(SELF_PARTY, history.self.days);
+ for (const member of history.members) push(memberParty(member.memberId), member.days);
+ for (const relay of history.relays) push(relayParty(relay.deviceId), relay.days);
+ return rows;
+}
+
+/**
+ * 旧版电脑(不认识按天明细):只有所有时间的合计——你自己读 own-usage,分享的人读 owned 里的成员用量,
+ * 都按 range=all 读来。没有日期,界面只能看「所有时间」。
+ */
+export function rowsFromLegacy(
+ own: ProviderOwnUsageView | null,
+ members: readonly ProviderShareMemberView[],
+ aliases?: ReadonlyMap<string, string>,
+): ProviderUsageRow[] {
+ const rows: ProviderUsageRow[] = [];
+ const push = (party: string, models: readonly ProviderShareModelUsageView[]) => {
+ for (const model of models) rows.push({ ...model, party, day: null, computer: computerOf(model.memberKey, aliases) });
+ };
+ for (const part of [own?.local, ...(own?.devices ?? [])]) if (part) push(SELF_PARTY, part.models);
+ for (const member of members) push(memberParty(member.memberId), member.models);
+ for (const relay of own?.relays ?? []) if (relay.deviceId) push(relayParty(relay.deviceId), relay.models);
+ return rows;
+}
+
+export function inRange(row: ProviderUsageRow, filter: Pick<ProviderUsageFilter, 'range' | 'todayKey'>): boolean {
+ return row.day === null ? filter.range === 'all' : isUsageDayInRange(row.day, filter.todayKey, filter.range);
+}
+
+/**
+ * 按条件筛选。每张表都按「其他维度」筛:按人表不按使用方筛(分享的管理操作一直在),按电脑表不按电脑筛,
+ * 图表不按时间段筛(固定窗口),由 skip 指明不筛的维度。
+ */
+export function filterUsageRows(
+ rows: readonly ProviderUsageRow[],
+ filter: ProviderUsageFilter,
+ skip: { party?: boolean; computer?: boolean; range?: boolean } = {},
+): ProviderUsageRow[] {
+ return rows.filter((row) =>
+ (skip.party || filter.party === 'all' || row.party === filter.party)
+ && (skip.computer || filter.computer === 'all' || row.computer === filter.computer)
+ && (skip.range || inRange(row, filter)));
+}
+
+export function summarizeUsageRows(rows: readonly ProviderUsageRow[]): ProviderUsageTotals {
+ const totals: ProviderUsageTotals = {
+ tokens: 0,
+ turns: 0,
+ inputTokens: 0,
+ outputTokens: 0,
+ cacheReadTokens: 0,
+ cacheCreateTokens: 0,
+ amount: null,
+ cacheHitRate: null,
+ };
+ let mixedCurrency = false;
+ for (const row of rows) {
+ totals.inputTokens += Math.max(0, row.inputTokens);
+ totals.outputTokens += Math.max(0, row.outputTokens);
+ totals.cacheReadTokens += Math.max(0, row.cacheReadTokens);
+ totals.cacheCreateTokens += Math.max(0, row.cacheCreateTokens);
+ totals.turns += Math.max(0, row.turns);
+ if (!row.amount) continue;
+ if (!totals.amount) totals.amount = { ...row.amount };
+ else if (totals.amount.currency === row.amount.currency) totals.amount.amount += row.amount.amount;
+ else mixedCurrency = true;
+ }
+ totals.tokens = totals.inputTokens + totals.outputTokens;
+ if (mixedCurrency) totals.amount = null;
+ const prompt = totals.inputTokens + totals.cacheReadTokens + totals.cacheCreateTokens;
+ totals.cacheHitRate = prompt > 0 ? totals.cacheReadTokens / prompt : null;
+ return totals;
+}
+
+export function groupUsageRows<K>(rows: readonly ProviderUsageRow[], keyOf: (row: ProviderUsageRow) => K): Map<K, ProviderUsageRow[]> {
+ const groups = new Map<K, ProviderUsageRow[]>();
+ for (const row of rows) {
+ const key = keyOf(row);
+ const list = groups.get(key);
+ if (list) list.push(row);
+ else groups.set(key, [row]);
+ }
+ return groups;
+}
+
+/** 模型的键:Agent × 完整模型名(与设置 → 用量的配色身份相同)。 */
+export const modelKeyOf = (row: Pick<ProviderUsageRow, 'kind' | 'model'>) => usageModelKey(row.kind, row.model);
+
+/** 按 token 从多到少排的键:配色按完整历史排一次,筛选与时间段变化不重新分配颜色。 */
+export function keysByTokens(rows: readonly ProviderUsageRow[], keyOf: (row: ProviderUsageRow) => string): string[] {
+ const tokens = new Map<string, number>();
+ for (const row of rows) tokens.set(keyOf(row), (tokens.get(keyOf(row)) ?? 0) + row.inputTokens + row.outputTokens);
+ return [...tokens.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([key]) => key);
+}
+
+/**
+ * 组内电脑的顺序:组里每台按组里的顺序(这段时间没用过的也列),之后是已经移出组、用过的电脑(用量多的在前),
+ * 最后是当时没有区分电脑的更早记录(null)。
+ */
+export function computerOrder(
+ memberKeys: readonly string[],
+ rows: readonly ProviderUsageRow[],
+): Array<string | null> {
+ const known = new Set(memberKeys);
+ const removed = keysByTokens(rows.filter((row) => row.computer !== null && !known.has(row.computer)), (row) => row.computer!);
+ const hasUnattributed = rows.some((row) => row.computer === null);
+ return [...memberKeys, ...removed, ...(hasUnattributed ? [null] : [])];
+}
+
+/** 热力图:每天的 token 合计。 */
+export function usageRowsByDay(rows: readonly ProviderUsageRow[]): Array<{ day: string; tokens: number }> {
+ const byDay = new Map<string, number>();
+ for (const row of rows) {
+ if (row.day === null) continue;
+ byDay.set(row.day, (byDay.get(row.day) ?? 0) + row.inputTokens + row.outputTokens);
+ }
+ return [...byDay.entries()].map(([day, tokens]) => ({ day, tokens }));
+}
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 3d6356449d..e4d2229f48 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -252,7 +252,8 @@
"output": "Output",
"amount": "Est. Cost"
},
- "estimateNote": "Amounts are estimated from local unit prices and don’t reflect the provider’s actual bill."
+ "estimateNote": "Amounts are estimated from local unit prices and don’t reflect the provider’s actual bill.",
+ "moreAria": "More actions for {{name}}"
},
"removeConfirm": {
"title": "Remove Sharing with {{name}}?",
@@ -277,7 +278,8 @@
"approveAria": "Agree to {{name}} using it",
"toastApproved": "{{name}} can now use {{provider}} through {{owner}}’s provider group",
"toastRejected": "Declined {{name}}’s request",
- "toastRevoked": "Withdrew agreement for {{name}}. Running sessions were stopped."
+ "toastRevoked": "Withdrew agreement for {{name}}. Running sessions were stopped.",
+ "listTitle": "Using it through {{owner}}’s provider group"
}
},
"toast": {
@@ -471,7 +473,8 @@
"total": "Total usage",
"amount": "Estimated cost",
"people": "People",
- "models": "Models"
+ "models": "Models",
+ "computers": "Computers used"
},
"selfTag": "You",
"relayName": "Via {{device}}",
@@ -485,7 +488,44 @@
"collapseAria": "Hide usage details for {{name}}",
"table": {
"member": "Computer / model"
- }
+ },
+ "filter": {
+ "partyAria": "Filter by person",
+ "allParties": "Everyone",
+ "selfDetail": "This computer and your other computers combined",
+ "relayDetail": "Individual people aren’t visible",
+ "computerAria": "Filter by computer in the group",
+ "allComputers": "All computers in the group"
+ },
+ "focus": {
+ "clear": "Show all",
+ "only": "Show only {{name}}"
+ },
+ "byParty": {
+ "title": "By person",
+ "col": {
+ "party": "Person",
+ "computers": "Computers used",
+ "actions": "Actions"
+ }
+ },
+ "byComputer": {
+ "title": "By computer",
+ "col": {
+ "computer": "Computer in the group",
+ "parties": "People"
+ }
+ },
+ "stack": {
+ "aria": "Color the bars by",
+ "party": "Person",
+ "computer": "Computer",
+ "model": "Model"
+ },
+ "loadFailed": "Couldn’t read usage right now. It will try again automatically.",
+ "legacyNote": "Cindy on {{device}} needs an update. Showing all-time totals for now.",
+ "coverage": "Daily stats start on {{date}}",
+ "emptyRange": "No usage in this period"
},
"section": {
"title": "Provider Group",
@@ -9830,7 +9870,17 @@
"mergeBusy": "One of the Cindys is still replying. Merge once it finishes",
"mergePaused": "One of the Cindys is paused. Resume it in its settings, then merge",
"mergeOffline": "Can’t reach “{{device}}”. Merge once it’s online",
- "mergeOutdated": "“{{device}}” runs an older Cindy. Update it first"
+ "mergeOutdated": "“{{device}}” runs an older Cindy. Update it first",
+ "homeOfflineShort": "Main computer offline",
+ "homeReadOnly": "Main computer: {{device}}",
+ "moveTo": "Move to “{{device}}”",
+ "transferTitle": "Move {{name}} to “{{device}}”?",
+ "transferDescription": "From now on {{name}} runs on “{{device}}”. The working directory and connections stay on this computer, and the conversation here becomes history.",
+ "transferAction": "Move to “{{device}}”",
+ "transferred": "{{name}} moved to “{{device}}”",
+ "transferConflict": "{{name}}’s main computer has already changed, so it wasn’t moved",
+ "transferOffline": "Can’t reach the server. {{name}} still runs on this computer",
+ "transferFailed": "Couldn’t move {{name}} to “{{device}}”"
}
},
"common": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index a16547d418..6b8f29cebb 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -250,7 +250,8 @@
"output": "出力",
"amount": "推定金額"
},
- "estimateNote": "金額はローカルの単価に基づく推定で、プロバイダーの実際の請求額ではありません。"
+ "estimateNote": "金額はローカルの単価に基づく推定で、プロバイダーの実際の請求額ではありません。",
+ "moreAria": "{{name}} の他の操作"
},
"removeConfirm": {
"title": "{{name}} との共有を削除しますか?",
@@ -273,7 +274,8 @@
"approveAria": "{{name}} の利用に同意する",
"toastApproved": "{{name}} が {{owner}} のプロバイダーグループ経由で {{provider}} を使えるようにしました",
"toastRejected": "{{name}} のリクエストを拒否しました",
- "toastRevoked": "{{name}} への同意を取り消しました。実行中のセッションは停止しました"
+ "toastRevoked": "{{name}} への同意を取り消しました。実行中のセッションは停止しました",
+ "listTitle": "{{owner}} のプロバイダーグループ経由で利用"
}
},
"toast": {
@@ -467,7 +469,8 @@
"total": "合計使用量",
"amount": "推定金額",
"people": "利用者",
- "models": "モデル"
+ "models": "モデル",
+ "computers": "使ったパソコン"
},
"selfTag": "あなた",
"relayName": "{{device}} 経由",
@@ -480,7 +483,44 @@
"collapseAria": "{{name}} の使用量の内訳を閉じる",
"table": {
"member": "パソコン / モデル"
- }
+ },
+ "filter": {
+ "partyAria": "利用者で絞り込む",
+ "allParties": "全員",
+ "selfDetail": "このパソコンとほかのパソコンの合計",
+ "relayDetail": "個々の利用者は見えません",
+ "computerAria": "グループ内のパソコンで絞り込む",
+ "allComputers": "グループ内のすべてのパソコン"
+ },
+ "focus": {
+ "clear": "すべて表示",
+ "only": "{{name}} だけ表示"
+ },
+ "byParty": {
+ "title": "人別",
+ "col": {
+ "party": "利用者",
+ "computers": "使ったパソコン",
+ "actions": "操作"
+ }
+ },
+ "byComputer": {
+ "title": "パソコン別",
+ "col": {
+ "computer": "グループ内のパソコン",
+ "parties": "利用者"
+ }
+ },
+ "stack": {
+ "aria": "棒の色分け",
+ "party": "人",
+ "computer": "パソコン",
+ "model": "モデル"
+ },
+ "loadFailed": "使用量を読み込めませんでした。しばらくすると自動で再試行します。",
+ "legacyNote": "{{device}} の Cindy のアップデートが必要です。今は全期間の合計だけを表示しています。",
+ "coverage": "日別の集計は {{date}} から",
+ "emptyRange": "この期間の使用量はありません"
},
"section": {
"title": "プロバイダーグループ",
@@ -9784,7 +9824,17 @@
"mergeBusy": "まだ返信中の Cindy があります。返信が終わってから統合してください",
"mergePaused": "一時停止中の Cindy があります。設定で再開してから統合してください",
"mergeOffline": "「{{device}}」に接続できません。オンラインになってから統合してください",
- "mergeOutdated": "「{{device}}」の Cindy が古いバージョンです。先に更新してください"
+ "mergeOutdated": "「{{device}}」の Cindy が古いバージョンです。先に更新してください",
+ "homeOfflineShort": "メインのパソコンがオフライン",
+ "homeReadOnly": "メインのパソコン:{{device}}",
+ "moveTo": "「{{device}}」に移す",
+ "transferTitle": "{{name}} を「{{device}}」に移しますか?",
+ "transferDescription": "これから {{name}} は「{{device}}」で動作します。作業ディレクトリと接続はこのパソコンに残り、このパソコンの会話は履歴になります。",
+ "transferAction": "「{{device}}」に移す",
+ "transferred": "{{name}} を「{{device}}」に移しました",
+ "transferConflict": "{{name}} のメインのパソコンはすでに変わっているため、移しませんでした",
+ "transferOffline": "サーバーに接続できません。{{name}} は引き続きこのパソコンで動作します",
+ "transferFailed": "{{name}} を「{{device}}」に移せませんでした"
}
},
"common": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 6003396199..bfe5e6423d 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -250,7 +250,8 @@
"output": "출력",
"amount": "예상 금액"
},
- "estimateNote": "금액은 로컬 단가로 추정한 값이며 제공자의 실제 청구액이 아닙니다."
+ "estimateNote": "금액은 로컬 단가로 추정한 값이며 제공자의 실제 청구액이 아닙니다.",
+ "moreAria": "{{name}} 추가 작업"
},
"removeConfirm": {
"title": "{{name}}님과의 공유를 삭제할까요?",
@@ -273,7 +274,8 @@
"approveAria": "{{name}}님의 사용에 동의",
"toastApproved": "{{name}}님이 {{owner}}님의 제공자 그룹을 통해 {{provider}}을(를) 사용할 수 있게 되었습니다",
"toastRejected": "{{name}}님의 요청을 거절했습니다",
- "toastRevoked": "{{name}}님에 대한 동의를 철회했습니다. 실행 중인 세션은 중지되었습니다"
+ "toastRevoked": "{{name}}님에 대한 동의를 철회했습니다. 실행 중인 세션은 중지되었습니다",
+ "listTitle": "{{owner}}님의 제공자 그룹을 통해 사용"
}
},
"toast": {
@@ -467,7 +469,8 @@
"total": "총 사용량",
"amount": "예상 금액",
"people": "사용자",
- "models": "모델"
+ "models": "모델",
+ "computers": "사용한 컴퓨터"
},
"selfTag": "나",
"relayName": "{{device}} 경유",
@@ -480,7 +483,44 @@
"collapseAria": "{{name}}의 사용량 내역 접기",
"table": {
"member": "컴퓨터 / 모델"
- }
+ },
+ "filter": {
+ "partyAria": "사용자로 필터",
+ "allParties": "모든 사람",
+ "selfDetail": "이 컴퓨터와 내 다른 컴퓨터의 합계",
+ "relayDetail": "개별 사용자는 보이지 않음",
+ "computerAria": "그룹 안 컴퓨터로 필터",
+ "allComputers": "그룹 안 모든 컴퓨터"
+ },
+ "focus": {
+ "clear": "전체 보기",
+ "only": "{{name}}만 보기"
+ },
+ "byParty": {
+ "title": "사람별",
+ "col": {
+ "party": "사용자",
+ "computers": "사용한 컴퓨터",
+ "actions": "작업"
+ }
+ },
+ "byComputer": {
+ "title": "컴퓨터별",
+ "col": {
+ "computer": "그룹 안 컴퓨터",
+ "parties": "사용자"
+ }
+ },
+ "stack": {
+ "aria": "막대 색 기준",
+ "party": "사람",
+ "computer": "컴퓨터",
+ "model": "모델"
+ },
+ "loadFailed": "사용량을 읽지 못했습니다. 잠시 후 자동으로 다시 시도합니다.",
+ "legacyNote": "{{device}}의 Cindy를 업데이트해야 합니다. 지금은 전체 기간 합계만 볼 수 있습니다.",
+ "coverage": "일별 통계는 {{date}}부터",
+ "emptyRange": "이 기간에는 사용량이 없습니다"
},
"section": {
"title": "제공자 그룹",
@@ -9784,7 +9824,17 @@
"mergeBusy": "아직 답장 중인 Cindy가 있습니다. 답장이 끝난 뒤 합쳐 주세요",
"mergePaused": "일시 중지된 Cindy가 있습니다. 설정에서 다시 시작한 뒤 합쳐 주세요",
"mergeOffline": "“{{device}}”에 연결할 수 없습니다. 온라인이 되면 합치세요",
- "mergeOutdated": "“{{device}}”의 Cindy가 이전 버전입니다. 먼저 업데이트하세요"
+ "mergeOutdated": "“{{device}}”의 Cindy가 이전 버전입니다. 먼저 업데이트하세요",
+ "homeOfflineShort": "주 컴퓨터 오프라인",
+ "homeReadOnly": "주 컴퓨터: {{device}}",
+ "moveTo": "'{{device}}'(으)로 옮기기",
+ "transferTitle": "{{name}}을(를) '{{device}}'(으)로 옮길까요?",
+ "transferDescription": "이제부터 {{name}}은(는) '{{device}}'에서 실행됩니다. 작업 디렉터리와 연결은 이 컴퓨터에 남고, 이 컴퓨터의 대화는 기록이 됩니다.",
+ "transferAction": "'{{device}}'(으)로 옮기기",
+ "transferred": "{{name}}을(를) '{{device}}'(으)로 옮겼습니다",
+ "transferConflict": "{{name}}의 주 컴퓨터가 이미 바뀌어 옮기지 않았습니다",
+ "transferOffline": "서버에 연결할 수 없습니다. {{name}}은(는) 계속 이 컴퓨터에서 실행됩니다",
+ "transferFailed": "{{name}}을(를) '{{device}}'(으)로 옮기지 못했습니다"
}
},
"common": {
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 8e1aeb61cd..904b91740a 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -250,7 +250,8 @@
"output": "输出",
"amount": "估算金额"
},
- "estimateNote": "金额按本地单价估算,不代表供应商实际账单。"
+ "estimateNote": "金额按本地单价估算,不代表供应商实际账单。",
+ "moreAria": "{{name}} 的更多操作"
},
"removeConfirm": {
"title": "删除对 {{name}} 的分享?",
@@ -273,7 +274,8 @@
"approveAria": "同意 {{name}} 使用",
"toastApproved": "已同意 {{name}} 经 {{owner}} 的供应商组使用 {{provider}}",
"toastRejected": "已拒绝 {{name}} 的请求",
- "toastRevoked": "已撤回对 {{name}} 的同意,正在运行的任务已停止"
+ "toastRevoked": "已撤回对 {{name}} 的同意,正在运行的任务已停止",
+ "listTitle": "经 {{owner}} 的供应商组使用"
}
},
"toast": {
@@ -467,7 +469,8 @@
"total": "总用量",
"amount": "估算金额",
"people": "使用方",
- "models": "模型"
+ "models": "模型",
+ "computers": "用到的电脑"
},
"selfTag": "你",
"relayName": "经 {{device}} 转来",
@@ -480,7 +483,44 @@
"collapseAria": "收起 {{name}} 的用量明细",
"table": {
"member": "电脑 / 模型"
- }
+ },
+ "filter": {
+ "partyAria": "筛选使用方",
+ "allParties": "所有人",
+ "selfDetail": "本机和你其他电脑的合计",
+ "relayDetail": "看不到具体是谁",
+ "computerAria": "筛选组内电脑",
+ "allComputers": "所有组内电脑"
+ },
+ "focus": {
+ "clear": "看全部",
+ "only": "只看 {{name}}"
+ },
+ "byParty": {
+ "title": "按人",
+ "col": {
+ "party": "使用方",
+ "computers": "用到的电脑",
+ "actions": "操作"
+ }
+ },
+ "byComputer": {
+ "title": "按电脑",
+ "col": {
+ "computer": "组内电脑",
+ "parties": "使用方"
+ }
+ },
+ "stack": {
+ "aria": "柱子按什么分色",
+ "party": "按人",
+ "computer": "按电脑",
+ "model": "按模型"
+ },
+ "loadFailed": "暂时读不到用量,稍后会自动重试。",
+ "legacyNote": "{{device}} 的 Cindy 需要更新,暂时只能看所有时间的合计。",
+ "coverage": "按天统计从 {{date}} 起",
+ "emptyRange": "这段时间没有用量"
},
"section": {
"title": "供应商组",
@@ -9784,7 +9824,17 @@
"mergeBusy": "有一个 Cindy 还在回复,等它回复完再合并",
"mergePaused": "有一个 Cindy 已暂停,先在它的设置里恢复,再合并",
"mergeOffline": "「{{device}}」现在连不上,它上线后再合并",
- "mergeOutdated": "「{{device}}」上的 Cindy 版本较旧,请先更新它再合并"
+ "mergeOutdated": "「{{device}}」上的 Cindy 版本较旧,请先更新它再合并",
+ "homeOfflineShort": "主力电脑离线",
+ "homeReadOnly": "主力电脑:{{device}}",
+ "moveTo": "交给「{{device}}」",
+ "transferTitle": "把 {{name}} 交给「{{device}}」?",
+ "transferDescription": "从现在起 {{name}} 在「{{device}}」上运行。工作目录和连接留在这台电脑,这台电脑上的对话变为历史记录。",
+ "transferAction": "交给「{{device}}」",
+ "transferred": "{{name}} 已交给「{{device}}」",
+ "transferConflict": "{{name}} 的主力电脑已经变了,这次没有交出",
+ "transferOffline": "连不上服务器,{{name}} 仍在这台电脑运行",
+ "transferFailed": "未能把 {{name}} 交给「{{device}}」"
}
},
"common": {
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 0f73335de9..5fc5c33f1d 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -250,7 +250,8 @@
"output": "輸出",
"amount": "估算金額"
},
- "estimateNote": "金額按本機單價估算,不代表供應商實際帳單。"
+ "estimateNote": "金額按本機單價估算,不代表供應商實際帳單。",
+ "moreAria": "{{name}} 的更多操作"
},
"removeConfirm": {
"title": "刪除對 {{name}} 的分享?",
@@ -273,7 +274,8 @@
"approveAria": "同意 {{name}} 使用",
"toastApproved": "已同意 {{name}} 經 {{owner}} 的供應商組使用 {{provider}}",
"toastRejected": "已拒絕 {{name}} 的請求",
- "toastRevoked": "已撤回對 {{name}} 的同意,正在執行的任務已停止"
+ "toastRevoked": "已撤回對 {{name}} 的同意,正在執行的任務已停止",
+ "listTitle": "經 {{owner}} 的供應商組使用"
}
},
"toast": {
@@ -467,7 +469,8 @@
"total": "總用量",
"amount": "估算金額",
"people": "使用方",
- "models": "模型"
+ "models": "模型",
+ "computers": "用到的電腦"
},
"selfTag": "你",
"relayName": "經 {{device}} 轉來",
@@ -480,7 +483,44 @@
"collapseAria": "收起 {{name}} 的用量明細",
"table": {
"member": "電腦 / 模型"
- }
+ },
+ "filter": {
+ "partyAria": "篩選使用方",
+ "allParties": "所有人",
+ "selfDetail": "本機和你其他電腦的合計",
+ "relayDetail": "看不到具體是誰",
+ "computerAria": "篩選組內電腦",
+ "allComputers": "所有組內電腦"
+ },
+ "focus": {
+ "clear": "看全部",
+ "only": "只看 {{name}}"
+ },
+ "byParty": {
+ "title": "按人",
+ "col": {
+ "party": "使用方",
+ "computers": "用到的電腦",
+ "actions": "操作"
+ }
+ },
+ "byComputer": {
+ "title": "按電腦",
+ "col": {
+ "computer": "組內電腦",
+ "parties": "使用方"
+ }
+ },
+ "stack": {
+ "aria": "柱子按什麼分色",
+ "party": "按人",
+ "computer": "按電腦",
+ "model": "按模型"
+ },
+ "loadFailed": "暫時讀不到用量,稍後會自動重試。",
+ "legacyNote": "{{device}} 的 Cindy 需要更新,暫時只能看所有時間的合計。",
+ "coverage": "按天統計從 {{date}} 起",
+ "emptyRange": "這段時間沒有用量"
},
"section": {
"title": "供應商組",
@@ -9784,7 +9824,17 @@
"mergeBusy": "有一個 Cindy 還在回覆,等它回覆完再合併",
"mergePaused": "有一個 Cindy 已暫停,先在它的設定裡恢復,再合併",
"mergeOffline": "「{{device}}」現在連不上,它上線後再合併",
- "mergeOutdated": "「{{device}}」上的 Cindy 版本較舊,請先更新它再合併"
+ "mergeOutdated": "「{{device}}」上的 Cindy 版本較舊,請先更新它再合併",
+ "homeOfflineShort": "主力電腦離線",
+ "homeReadOnly": "主力電腦:{{device}}",
+ "moveTo": "交給「{{device}}」",
+ "transferTitle": "把 {{name}} 交給「{{device}}」?",
+ "transferDescription": "從現在起 {{name}} 在「{{device}}」上執行。工作目錄和連線留在這台電腦,這台電腦上的對話變為歷史紀錄。",
+ "transferAction": "交給「{{device}}」",
+ "transferred": "{{name}} 已交給「{{device}}」",
+ "transferConflict": "{{name}} 的主力電腦已經變了,這次沒有交出",
+ "transferOffline": "連不上伺服器,{{name}} 仍在這台電腦執行",
+ "transferFailed": "未能把 {{name}} 交給「{{device}}」"
}
},
"common": {
diff --git a/apps/desktop/src/shared/providerManagement.ts b/apps/desktop/src/shared/providerManagement.ts
index bef533f243..1ffeff0c4a 100644
--- a/apps/desktop/src/shared/providerManagement.ts
+++ b/apps/desktop/src/shared/providerManagement.ts
@@ -12,7 +12,7 @@ export type ProviderGroupManagementCommand = Extract<
export type ProviderShareManagementCommand = Extract<
ProviderShareCommand,
- { action: 'owned' | 'own-usage' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'reshare-decide' }
+ { action: 'owned' | 'own-usage' | 'usage-history' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'reshare-decide' }
>;
export type ProviderManagementRequest =
diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.ts
index 631b6d1db4..dd3ba64cc6 100644
--- a/apps/desktop/src/shared/providerShare.ts
+++ b/apps/desktop/src/shared/providerShare.ts
@@ -124,6 +124,36 @@ export interface ProviderOwnUsageView {
relays: ProviderPartyUsageView[];
}
+/** 按天明细里的一行:那台电脑本地日期的一天,按(Agent、供应商、模型、组内电脑)分行。 */
+export interface ProviderUsageDayView extends ProviderShareModelUsageView {
+ /** YYYY-MM-DD,供应商所在电脑的本地日期。 */
+ day: string;
+}
+
+/** 一个使用方按天的用量;最近使用时间与 own-usage / owned 同口径。 */
+export interface ProviderUsageHistoryPartyView {
+ lastUsedAt: number | null;
+ /** 新的日子在前。 */
+ days: ProviderUsageDayView[];
+}
+
+/**
+ * 「远程与分享」页「用量」块的按天明细(provider-groups.md §7):时间段、使用方与组内电脑都由界面按天筛选,
+ * 与设置 → 用量同一种做法。日期一律是供应商所在电脑的本地日期,`todayKey` 是那台电脑的今天。
+ */
+export interface ProviderUsageHistoryView {
+ providerId: string;
+ todayKey: string;
+ /** 行数或 UTF-8 字节超出回包预算、裁掉较早行时,留下的最早一天;没有裁剪为 null。 */
+ coverageStart: string | null;
+ /** 你自己:本机与同账号其他电脑经这个供应商(组)的合计。 */
+ self: ProviderUsageHistoryPartyView;
+ /** 同账号的组所在电脑替它的受邀者转来的,每台一项(看不到最终使用者)。 */
+ relays: Array<ProviderUsageHistoryPartyView & { deviceId: string; deviceName: string | null }>;
+ /** 这个供应商的分享里现在的成员,按人。 */
+ members: Array<ProviderUsageHistoryPartyView & { shareId: string; memberId: string }>;
+}
+
export interface ProviderShareOwnerState {
/** 分享服务可用(已登录、设备互联已连上本区域服务)。 */
ready: boolean;
@@ -159,6 +189,8 @@ export type ProviderShareCommand =
| { action: 'owned'; range: ProviderShareUsageRange }
/** 这个供应商按使用方的用量(本机与我的其他电脑)。不依赖分享服务。 */
| { action: 'own-usage'; providerId: string; range: ProviderShareUsageRange }
+ /** 这个供应商的用量按天明细(你自己、转来的与分享的人),「用量」块据此按时间段、人与电脑筛选。 */
+ | { action: 'usage-history'; providerId: string }
| { action: 'create-link'; providerId: string }
| { action: 'approve' | 'reject'; requestId: string }
| { action: 'set-member'; memberId: string; status: 'pause' | 'resume' | 'remove' }
@@ -183,6 +215,7 @@ export interface ProviderShareCredentialConsentView {
export interface ProviderShareCommandResult {
owned: ProviderShareOwnerState;
'own-usage': ProviderOwnUsageView;
+ 'usage-history': ProviderUsageHistoryView;
'create-link': ProviderShareLinkCreated;
approve: { ok: true };
reject: { ok: true };
diff --git a/docs/design-previews/provider-groups/index.html b/docs/design-previews/provider-groups/index.html
index 8fec4f20e1..1f4dc880ba 100644
--- a/docs/design-previews/provider-groups/index.html
+++ b/docs/design-previews/provider-groups/index.html
@@ -189,8 +189,10 @@
.status { display: inline-flex; align-items: center; gap: 5px; font-size: 12px; color: var(--secondary); font-weight: 400; }
.status .d { width: 6px; height: 6px; border-radius: 50%; background: var(--green); }
.person[data-state="paused"] .status .d { background: var(--tertiary); }
- .person[data-state="paused"] .who, .person[data-state="paused"] .usage { opacity: .7; }
- .breakdown { padding: 0 16px 14px 60px; }
+ /* 暂停分享:头像与名字变淡,用量照常(用量是这段时间真实发生的)。 */
+ .person[data-state="paused"] > .row > .avatar, .person[data-state="paused"] .who { opacity: .7; }
+ /* 明细与头像左缘对齐:16 + 展开按钮 20 + 间距 12 = 48px。 */
+ .breakdown { margin: 0 12px 14px 48px; padding: 12px; border: 1px solid var(--border); border-radius: 8px; background: var(--surface); }
.breakdown table { width: 100%; border-collapse: collapse; font-size: 12px; }
.breakdown th { text-align: left; font-weight: 500; color: var(--secondary); padding: 6px 0; border-bottom: 1px solid var(--border); }
.breakdown td { padding: 7px 0; border-bottom: 1px solid var(--border); }
@@ -268,8 +270,6 @@
@media (max-width: 760px) {
.rail { display: none; }
- .breakdown { padding-left: 16px; }
- .person .usage { display: none; }
.appside { display: none; }
}
@@ -329,6 +329,61 @@
.framecard { background: var(--card); border: 1px solid var(--border); border-radius: 12px; overflow: hidden; }
.framecard .plist { padding: 8px 10px; }
@media (max-width: 860px) { .split { grid-template-columns: 1fr; } }
+
+ /* ---------- 远程与分享页:用量与分享合并(2026-10-16) ---------- */
+ .sdesc { margin: -2px 0 12px; font-size: 12px; line-height: 1.5; color: var(--secondary); }
+ .summary { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 8px; margin-bottom: 12px; }
+ .summary div { display: flex; flex-direction: column; gap: 2px; padding: 8px 12px; border-radius: 8px; background: var(--chip); }
+ .summary b { font-size: 16px; font-weight: 500; font-variant-numeric: tabular-nums; }
+ .summary span { font-size: 12px; color: var(--secondary); }
+ /* 窄窗口整行换行,用量与 ··· 不藏起来(与客户端一致)。 */
+ .person > .row { flex-wrap: wrap; }
+ .person > .row:hover { background: var(--hover); }
+ /* 名字旁的「你 / 分享的人」是普通的次要文字,不是标签胶囊(与客户端一致)。 */
+ .row .line1 .tag { height: auto; padding: 0; border-radius: 0; background: none; font-size: 12px; font-weight: 400; color: var(--secondary); white-space: normal; }
+ .person .usage { min-width: 108px; }
+ .person .usage .bar, .breakdown .bar { display: block; height: 4px; border-radius: 9999px; background: var(--bar); overflow: hidden; }
+ .person .usage .bar { width: 64px; margin: 6px 0 0 auto; }
+ .person .usage .bar i, .breakdown .bar i { display: block; height: 100%; border-radius: 9999px; background: var(--secondary); }
+ /* 有分享的人时每行都留 ··· 一列:你自己那一行放等宽占位,右侧用量才能对齐成列。 */
+ .person .ph { width: 28px; height: 28px; flex-shrink: 0; }
+ .reshares { display: flex; flex-direction: column; gap: 6px; padding: 0 16px 12px 92px; }
+ .reshares .t { font-size: 12px; color: var(--tertiary); }
+ .reshares .item { display: flex; align-items: center; gap: 8px; }
+ .reshares .item .nm { flex: 1; min-width: 0; }
+ .reshares .item small { margin-left: 8px; font-size: 12px; color: var(--secondary); }
+ .reshares .item[data-state="rejected"] .avatar, .reshares .item[data-state="rejected"] .nm { opacity: .7; }
+ .avatar.sm { width: 28px; height: 28px; font-size: 12px; }
+ .btn.secondary.danger-tone { color: var(--danger); }
+ .breakdown tbody + tbody { border-top: 1px solid var(--border); }
+ .breakdown td { border-bottom: 0; padding: 4px 0; }
+ .breakdown tr.computer td { padding-top: 10px; font-weight: 500; }
+ .breakdown tr.model td { color: var(--secondary); }
+ .breakdown tr.model td:first-child { padding-left: 22px; }
+ .breakdown tbody.unused tr.computer td { color: var(--tertiary); font-weight: 400; }
+ .breakdown .cname { display: flex; align-items: center; gap: 8px; }
+ .breakdown .cname small { font-size: 12px; font-weight: 400; color: var(--secondary); }
+ .breakdown .pct { margin-left: auto; padding-left: 8px; display: inline-flex; align-items: center; gap: 6px; font-weight: 400; color: var(--secondary); }
+ .breakdown .pct .bar { width: 48px; }
+ .breakdown .est { margin: 8px 0 0; font-size: 12px; }
+ .pair { font-weight: 500; letter-spacing: .06em; font-variant-numeric: tabular-nums; color: var(--text); }
+ .menu { position: absolute; z-index: 20; min-width: 160px; padding: 4px; border-radius: 12px; background: var(--card); border: 1px solid var(--border); box-shadow: var(--shadow-menu); }
+ .menu button { display: flex; width: 100%; align-items: center; gap: 10px; padding: 6px 8px; border: 0; border-radius: 8px; background: none; color: var(--text); font-size: 14px; text-align: left; }
+ .menu button:hover, .menu button:focus-visible { background: var(--hover); outline: none; }
+ .menu button.danger { color: var(--danger); }
+ /* 组内电脑:点名称展开这台的配额;分享来的电脑展开后逐人列出主人是否同意(转分享)。 */
+ .member-wrap + .member-wrap { border-top: 1px solid var(--border); }
+ .namebtn { display: block; padding: 0; border: 0; background: none; color: inherit; font: inherit; text-align: left; }
+ .namebtn .line1 svg { color: var(--secondary); transition: transform 150ms; }
+ .namebtn[aria-expanded="true"] .line1 svg { transform: rotate(90deg); }
+ .mdetail { display: flex; flex-direction: column; gap: 6px; padding: 0 16px 12px 60px; font-size: 12px; color: var(--secondary); }
+ .mdetail p { margin: 0; }
+ .mdetail .rs-title { font-weight: 500; }
+ .mdetail .guest { display: flex; align-items: center; gap: 8px; font-size: 13px; color: var(--text); }
+ .mdetail .guest .nm { flex: 1; }
+ .mdetail .guest[data-state="pending"] .avatar, .mdetail .guest[data-state="pending"] .nm { opacity: .7; }
+ @media (prefers-reduced-motion: reduce) { .namebtn .line1 svg, .chev { transition: none; } }
+ @media (max-width: 760px) { .summary { grid-template-columns: repeat(2, minmax(0, 1fr)); } .reshares, .mdetail { padding-left: 16px; } .breakdown { margin-left: 16px; } }
</style>
</head>
<body>
@@ -410,15 +465,21 @@
<svg width="14" height="14" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M10 3 5 8l5 5"/></svg>
模型供应商
</button>
- <div class="mhead">
+ <!-- 标题已经说明这页是什么;这台电脑的名字由组内本机那一行承载。生成分享链接放在标题右侧,分享前要知道的在申请弹窗的同意说明里。 -->
+ <div class="mhead" style="align-items:center">
<span class="mark" style="width:36px;height:36px;border-radius:12px">A</span>
- <!-- 标题已经说明这页是什么;这台电脑的名字由组内本机那一行承载。 -->
<div class="grow">
<h1>Anthropic · 远程与分享</h1>
</div>
<button type="button" class="btn cta sm">生成分享链接</button>
</div>
+ <!-- 待处理紧跟标题:新的分享申请,以及别人想经他自己的供应商组转用你的供应商(转分享,逐人同意)。 -->
+ <div class="section" id="pending-wrap">
+ <h3 class="section-title">待处理</h3>
+ <div class="card" id="pending"></div>
+ </div>
+
<div class="section">
<h3 class="section-title">供应商组 <span class="count" id="member-count"></span><span class="grow"></span>
<button type="button" class="btn primary sm" data-open-dialog="add" data-add-tab="mine">添加电脑</button>
@@ -442,35 +503,16 @@
<div class="section">
<h3 class="section-title usage-head">用量<span class="grow"></span>
- <span class="seg" role="group" aria-label="用量维度">
- <button type="button" data-dim="consumer" aria-pressed="true">按使用方</button>
- <button type="button" data-dim="member" aria-pressed="false">按组内电脑</button>
- </span>
<span class="seg" role="group" aria-label="用量时间段">
<button type="button" data-range="7d" aria-pressed="false">近 7 天</button>
<button type="button" data-range="month" aria-pressed="true">本月</button>
<button type="button" data-range="all" aria-pressed="false">全部</button>
</span>
</h3>
+ <p class="sdesc">按人统计 Anthropic 的用量,展开后按组内每台电脑分开。你自己的用量从这次更新后开始记录。</p>
+ <div class="summary" id="usage-summary"></div>
+ <!-- 2026-10-16:分享的人不在「分享」里另列一份——状态、加入时间、关闭与删除都在这个人的用量这一行。 -->
<div class="card" id="usage"></div>
- <p class="est" style="margin:8px 0 0;font-size:12px">金额按本地单价估算,不代表供应商实际账单。两个维度的合计相同。</p>
- </div>
-
- <div class="section">
- <h3 class="section-title">已分享的人 <span class="count">2</span>
- </h3>
- <div class="card">
- <div class="row">
- <span class="avatar">王</span>
- <div class="who"><div class="line1">王一 <span class="status"><span class="d"></span>正常 · 1 个任务运行中</span></div><div class="line2">9月28日加入 · 最近使用:刚刚</div></div>
- <div class="actions"><button type="button" class="btn secondary sm">关闭分享</button><button type="button" class="btn danger-text sm">删除</button></div>
- </div>
- <div class="row">
- <span class="avatar">K</span>
- <div class="who"><div class="line1">Kai Chen <span class="status"><span class="d"></span>正常</span></div><div class="line2">10月2日加入 · 最近使用:3 天前</div></div>
- <div class="actions"><button type="button" class="btn secondary sm">关闭分享</button><button type="button" class="btn danger-text sm">删除</button></div>
- </div>
- </div>
</div>
</section>
@@ -600,7 +642,7 @@
<li><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/></svg>
<span>你的项目文件和命令仍在你自己的电脑上执行<small>由你的任务权限把关</small></span></li>
<li><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2 12s3.5-7 10-7 10 7 10 7-3.5 7-10 7S2 12 2 12z"/><circle cx="12" cy="12" r="3"/></svg>
- <span>对话内容和 Agent 读取的文件内容会经过 Lizi 的电脑,并保存在实际运行任务的那台电脑上<small>Lizi 只会看到你的昵称和头像</small></span></li>
+ <span>对话内容和 Agent 读取的文件内容会经过 Lizi 的电脑,并保存在实际运行任务的那台电脑上<small>Lizi 和需要同意你使用的其他电脑主人只会看到你的昵称和头像</small></span></li>
<li><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg>
<span>发送申请后,需要 Lizi 同意才会生效<small>Lizi 可以随时关闭或删除这个分享</small></span></li>
</ul>
@@ -609,8 +651,19 @@
<button type="button" class="btn secondary" data-close-dialog>取消</button>
</div>
</div>
+
+ <div class="modal narrow" data-dialog="remove" role="alertdialog" aria-modal="true" aria-labelledby="remove-title" hidden>
+ <h2 id="remove-title"></h2>
+ <p class="desc" id="remove-desc"></p>
+ <div class="footer">
+ <button type="button" class="btn danger" id="remove-confirm">删除分享</button>
+ <button type="button" class="btn secondary" data-close-dialog>取消</button>
+ </div>
+ </div>
</div>
+ <div class="menu" id="menu" role="menu" hidden></div>
+
<div class="toast" id="toast" role="status" hidden>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m3 8 3 3 7-7"/></svg>
<span id="toast-text"></span>
@@ -624,13 +677,19 @@
/* ---------- 模拟数据 ---------- */
let hasGroup = true;
+ /*
+ * 组内电脑。分享来的电脑只用分享者的昵称称呼(「Magi 的电脑」),不写对方的电脑名。
+ * reshare:这台的主人是否同意你分享出去的人经组用它(转分享,provider-sharing §4.3);没同意的人,任务不会分到这台。
+ */
const members = [
/* state 为 on 时状态词由运行数决定(空闲 / N 个任务运行中),不再单独写「可用」。 */
- { id: 'self', name: '本机', sub: 'Home Mac Studio', state: 'on', running: 1, limit: 4 },
- { id: 'mbp', name: "Lizi's MacBook Pro", sub: '我的其他电脑', state: 'on', running: 0, limit: 4 },
- { id: 'mini', name: "Magi's Mac Mini", sub: '来自 Magi 的分享', state: 'on', running: 2, limit: 4 },
- { id: 'pc', name: 'Studio-PC', sub: '来自 Kai 的分享', state: 'cool', running: 0, limit: 4, status: '冷却中 · 撞到用量上限,约 15:20 恢复' },
- { id: 'imac', name: 'Office-iMac', sub: '来自 王一 的分享', state: 'off', running: 0, limit: 2, status: '不在线' },
+ { id: 'self', name: '本机', sub: 'Home Mac Studio', state: 'on', running: 1, limit: 4, quota: '5 小时:已用 38%,16:20 重置 · 每周:已用 52%,周一重置' },
+ { id: 'mbp', name: "Lizi's MacBook Pro", sub: '我的其他电脑', state: 'on', running: 0, limit: 4, quota: '5 小时:已用 12%,17:05 重置 · 每周:已用 31%,周三重置' },
+ { id: 'magi', name: 'Magi 的电脑', sub: '来自 Magi 的分享', owner: 'Magi', state: 'on', running: 2, limit: 4,
+ guests: [['王', '王一', 'approved'], ['K', 'Kai Chen', 'pending'], ['M', 'Mia', 'approved']] },
+ { id: 'ryo', name: 'Ryo 的电脑', sub: '来自 Ryo 的分享', owner: 'Ryo', state: 'cool', running: 0, limit: 4, status: '冷却中 · 撞到用量上限,约 15:20 恢复',
+ guests: [['王', '王一', 'approved'], ['K', 'Kai Chen', 'approved'], ['M', 'Mia', 'approved']] },
+ { id: 'imac', name: 'Office-iMac', sub: '我的其他电脑', state: 'off', running: 0, limit: 2, status: '不在线' },
];
const strategyDesc = {
least: '给最闲的那台',
@@ -638,38 +697,60 @@
order: '排前面的优先',
weight: '按权重比例',
};
- /* 每行:[名称, 说明, 头像, [[模型, 轮次, 输入, 输出, 估算金额]]];两个维度合计相同。 */
- const base = {
- consumer: [
- ['本机', '这台电脑上的任务', 'H', [['Claude Opus 5.5', 52, 880000, 120000, 21.4], ['Claude Sonnet 5', 30, 300000, 52000, 2.6]]],
- ["Lizi's MacBook Pro", '我的其他电脑', 'L', [['Claude Opus 5.5', 41, 620000, 90000, 15.2]]],
- ['王一', '分享的人', '王', [['Claude Sonnet 5', 64, 710000, 101000, 5.9], ['Claude Haiku 4.5', 12, 88000, 15000, 0.2]]],
- ['Kai Chen', '分享的人', 'K', [['Claude Haiku 4.5', 22, 150000, 31000, 0.4]]],
- ],
- member: [
- ['本机', 'Home Mac Studio', 'H', [['Claude Opus 5.5', 30, 500000, 70000, 12.2], ['Claude Haiku 4.5', 12, 88000, 15000, 0.2]]],
- ["Lizi's MacBook Pro", '我的其他电脑', 'L', [['Claude Opus 5.5', 38, 580000, 84000, 14.1], ['Claude Haiku 4.5', 22, 150000, 31000, 0.4]]],
- ["Magi's Mac Mini", '来自 Magi 的分享', 'M', [['Claude Opus 5.5', 25, 420000, 56000, 10.3], ['Claude Sonnet 5', 70, 760000, 113000, 6.3]]],
- ['Studio-PC', '来自 Kai 的分享', 'K', [['Claude Sonnet 5', 24, 250000, 40000, 2.2]]],
- ['Office-iMac', '来自 王一 的分享', '王', []],
- ],
- };
- const scale = (rows, k) => rows.map(([n, s, a, models]) => [n, s, a, models.map((m) => [m[0], Math.round(m[1] * k), Math.round(m[2] * k), Math.round(m[3] * k), m[4] * k])]);
- const usageData = {
- consumer: { '7d': scale(base.consumer, 0.3), month: base.consumer, all: scale(base.consumer, 2.6) },
- member: { '7d': scale(base.member, 0.3), month: base.member, all: scale(base.member, 2.6) },
- };
- let dim = 'consumer', range = 'month', strategy = 'least';
+ /*
+ * 「用量」按人:你自己在第一行,然后是分享的人。每人在每台组内电脑上的用量:[模型, 消息, 输入, 输出, 估算金额],
+ * 以本月为基准,近 7 天 / 全部按比例缩放。member:分享的人这一行同时管分享本身(2026-10-16)。
+ * reshares:这个人把你的供应商放进他自己的组、又分享给了别人,你处理过的那几位(已同意可撤回,未同意可改为同意)。
+ */
+ let people = [
+ { key: 'self', name: 'Lizi', tag: '你', avatar: 'L', last: '14 分钟前', usage: {
+ self: [['Claude Opus 5.5', 52, 880000, 120000, 21.4], ['Claude Sonnet 5', 30, 300000, 52000, 2.6]],
+ mbp: [['Claude Opus 5.5', 41, 620000, 90000, 15.2]],
+ magi: [['Claude Sonnet 5', 12, 160000, 22000, 1.4]] } },
+ { key: 'wang', name: '王一', tag: '分享的人', avatar: '王', last: '刚刚',
+ member: { status: 'active', running: 1, joined: '9月28日' }, usage: {
+ self: [['Claude Sonnet 5', 40, 450000, 61000, 3.8]],
+ magi: [['Claude Sonnet 5', 24, 260000, 40000, 2.1], ['Claude Haiku 4.5', 12, 88000, 15000, 0.2]] } },
+ { key: 'kai', name: 'Kai Chen', tag: '分享的人', avatar: 'K', last: '3 天前',
+ member: { status: 'active', running: 0, joined: '10月2日', reshares: [
+ { id: 'carol', avatar: 'C', name: 'Carol', state: 'approved' },
+ { id: 'erin', avatar: 'E', name: 'Erin', state: 'rejected' },
+ ] }, usage: { ryo: [['Claude Haiku 4.5', 22, 150000, 31000, 0.4]] } },
+ { key: 'mia', name: 'Mia', tag: '分享的人', avatar: 'M', last: null,
+ member: { status: 'paused', running: 0, joined: '10月8日' }, usage: {} },
+ ];
+ let pending = [
+ { id: 'dana', kind: 'apply', avatar: 'D', name: 'Dana', code: '4827', time: '2 分钟前' },
+ { id: 'frank', kind: 'reshare', avatar: 'F', name: 'Frank', owner: 'Kai Chen', time: '5 分钟前' },
+ ];
+ const rangeScale = { '7d': 0.3, month: 1, all: 2.6 };
+ let range = 'month', strategy = 'least', shareVariant = 'shared';
const open = new Set();
+ const openMembers = new Set();
- const fmtTok = (n) => n >= 1e6 ? (n / 1e6).toFixed(2) + 'M' : Math.round(n / 1000) + 'K';
+ const fmtTok = (n) => n >= 1e6 ? (n / 1e6).toFixed(2) + 'M' : n > 0 ? Math.round(n / 1000) + 'K' : '0';
const fmtUsd = (n) => '$' + n.toFixed(2);
const check = '<svg width="11" height="11" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m3 8 3 3 7-7"/></svg>';
/* 组内电脑用设备图标;人像头像留给「用量」与「分享」里真实的人。 */
const monitor = '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8m-4-4v4"/></svg>';
const dots = '<svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><circle cx="5" cy="12" r="1.6"/><circle cx="12" cy="12" r="1.6"/><circle cx="19" cy="12" r="1.6"/></svg>';
+ const chevR = '<svg width="12" height="12" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 3 5 5-5 5"/></svg>';
+ const pauseIco = '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10"/><path d="M10 15V9m4 6V9"/></svg>';
+ const playIco = '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10"/><path d="m10 8 6 4-6 4z"/></svg>';
+ const trashIco = '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 6h18M8 6V4h8v2m-9 0 1 14h8l1-14"/></svg>';
const chevron = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 9 6 6 6-6"/></svg>';
+ const sharing = () => shareVariant === 'shared';
+
+ /* 转分享:这台的主人对你分享出去的人逐人同意的情况,一句话接在状态后面,不另占一行。 */
+ function reshareSummary(m) {
+ const waiting = m.guests.filter((g) => g.at(2) === 'pending').length;
+ const rejected = m.guests.filter((g) => g.at(2) === 'rejected').length;
+ if (waiting) return `${waiting} 位分享的人等待 ${m.owner} 同意`;
+ if (rejected) return `${m.owner} 未同意 ${rejected} 位分享的人`;
+ return '分享的人可以用';
+ }
+
function renderMembers() {
$('#member-count').textContent = members.length + ' 台';
$('#members').innerHTML = members.map((m) => {
@@ -679,54 +760,167 @@
const load = m.state === 'on'
? (m.running > 0 ? run : '空闲')
: `${m.status}${m.running > 0 ? ` · ${run}` : ''}`;
+ // 只在这个供应商分享给了别人时才说转分享(没有分享的人就无所谓同不同意)。
+ const reshare = m.guests && sharing() ? ` · <span>${reshareSummary(m)}</span>` : '';
// 参与分配对所有来源都是同一个开关(同一个 paused 布尔值),不按来源分叉成「开关 / 暂停分配按钮」。
// 「移出组」罕用且不可逆,收进行内 ··· 菜单;本机不能移出,留等宽占位。
const more = m.id === 'self'
? '<span class="ph" aria-hidden="true"></span>'
: `<button type="button" class="icon-btn" aria-label="${m.name} 的更多操作">${dots}</button>`;
+ const isOpen = openMembers.has(m.id);
+ const guests = m.guests && sharing() ? `
+ <p class="rs-title">分享的人能否用这台电脑</p>
+ <p>需要 ${m.owner} 逐人同意。没同意的人,任务不会分到这台电脑。</p>
+ ${m.guests.map(([a, n, st]) => `<div class="guest" data-state="${st}"><span class="avatar sm">${a}</span><span class="nm">${n}</span><span class="status"><span class="d${st === 'approved' ? '' : ' gray'}"></span>${{ approved: '已同意', pending: '等待同意', rejected: '未同意' }[st]}</span></div>`).join('')}` : '';
+ const detail = !isOpen ? '' : `
+ <div class="mdetail" id="mdetail-${m.id}">
+ <p>${m.guests ? '别人分享的电脑不显示配额' : m.state === 'off' ? '不在线,读不到配额' : m.quota}</p>${guests}
+ </div>`;
return `
- <div class="row member" data-state="${m.state}">
- <span class="avatar" aria-hidden="true">${monitor}</span>
- <div class="who">
- <div class="line1">${m.name} <span class="src">${m.sub}</span></div>
- <div class="line2"><span class="status">${dot}${load}</span></div>
- </div>
- <div class="actions">
- <span class="sel">上限 ${m.limit}${chevron}</span>
- <button type="button" class="switch" role="switch" aria-checked="${m.state !== 'off'}" aria-label="给 ${m.name} 分配任务"></button>
- ${more}
- </div>
+ <div class="member-wrap">
+ <div class="row member" data-state="${m.state}">
+ <span class="avatar" aria-hidden="true">${monitor}</span>
+ <div class="who">
+ <button type="button" class="namebtn" data-member-toggle="${m.id}" aria-expanded="${isOpen}" aria-controls="mdetail-${m.id}">
+ <span class="line1">${m.name} <span class="src">${m.sub}</span>${chevR}</span>
+ </button>
+ <div class="line2"><span class="status">${dot}${load}</span>${reshare}</div>
+ </div>
+ <div class="actions">
+ <span class="sel">上限 ${m.limit}${chevron}</span>
+ <button type="button" class="switch" role="switch" aria-checked="${m.state !== 'off'}" aria-label="给 ${m.name} 分配任务"></button>
+ ${more}
+ </div>
+ </div>${detail}
</div>`;
}).join('');
$('#strategy-desc').textContent = strategyDesc[strategy];
}
+ const sumModels = (models) => models.reduce((a, r) => ({ turns: a.turns + r[1], input: a.input + r[2], output: a.output + r[3], usd: a.usd + r[4] }), { turns: 0, input: 0, output: 0, usd: 0 });
+ const scaled = (models) => models.map((r) => [r[0], ...[r[1], r[2], r[3]].map((v) => Math.round(v * rangeScale[range])), r[4] * rangeScale[range]]);
+
function renderUsage() {
- const rows = usageData[dim][range];
- $('#usage').innerHTML = rows.map(([name, sub, avatar, models], i) => {
- const key = dim + i;
- const tokens = models.reduce((s, r) => s + r[2] + r[3], 0);
- const cost = models.reduce((s, r) => s + r[4], 0);
- const isOpen = open.has(key);
+ const list = sharing() ? people : people.filter((p) => !p.member);
+ const rows = list.map((p) => {
+ const byComputer = members.map((m) => [m, scaled(p.usage[m.id] || [])]);
+ const all = byComputer.flatMap(([, models]) => models);
+ const t = sumModels(all);
+ return { p, byComputer, tokens: t.input + t.output, usd: t.usd, models: all };
+ });
+ const total = rows.reduce((sum, r) => sum + r.tokens, 0);
+ const usd = rows.reduce((sum, r) => sum + r.usd, 0);
+ const usedParties = rows.filter((r) => r.tokens > 0).length;
+ const modelCount = new Set(rows.flatMap((r) => r.models.map((m) => m[0]))).size;
+ $('#usage-summary').innerHTML = [[fmtTok(total), '总用量'], [fmtUsd(usd), '估算金额'], [usedParties, '使用方'], [modelCount, '模型']]
+ .map(([v, l]) => `<div><b>${v}</b><span>${l}</span></div>`).join('');
+ // 有分享的人时每行都留 ··· 一列,右侧用量才能对齐成列;只有你自己时不留。
+ const actionColumn = rows.some((r) => r.p.member);
+ $('#usage').innerHTML = rows.map(({ p, byComputer, tokens, usd: amount }) => {
+ const isOpen = open.has(p.key);
+ const m = p.member;
+ const usedOn = byComputer.filter(([, models]) => models.length).length;
+ const last = p.last ? `最近使用:${p.last}` : '还未使用';
+ const status = !m ? '' : `<span class="status"><span class="d${m.status === 'paused' ? ' gray' : ''}"></span>${
+ m.status === 'paused' ? '已暂停' : m.running > 0 ? `正常 · ${m.running} 个任务运行中` : '正常'}</span>`;
+ const share = tokens && total ? Math.max(3, Math.round((tokens / total) * 100)) : 0;
+ const more = !actionColumn ? ''
+ : m ? `<button type="button" class="icon-btn" data-menu="${p.key}" aria-haspopup="menu" aria-label="${p.name} 的更多操作">${dots}</button>`
+ : '<span class="ph" aria-hidden="true"></span>';
+ const reshares = !(m && m.reshares && m.reshares.length) ? '' : `
+ <div class="reshares">
+ <span class="t">经 ${p.name} 的供应商组使用</span>
+ ${m.reshares.map((r) => `<div class="item" data-state="${r.state}">
+ <span class="avatar sm">${r.avatar}</span>
+ <span class="nm">${r.name}<small>${r.state === 'approved' ? '已同意' : '未同意'}</small></span>
+ <button type="button" class="btn secondary sm${r.state === 'approved' ? ' danger-tone' : ''}" data-reshare="${p.key}:${r.id}"
+ aria-label="${r.state === 'approved' ? `撤回对 ${r.name} 的同意` : `同意 ${r.name} 使用`}">${r.state === 'approved' ? '撤回同意' : '同意'}</button>
+ </div>`).join('')}
+ </div>`;
+ const breakdown = !isOpen ? '' : `
+ <div class="breakdown" id="breakdown-${p.key}"><table>
+ <thead><tr><th>电脑 / 模型</th><th class="num">消息</th><th class="num">输入</th><th class="num">输出</th><th class="num">估算金额</th></tr></thead>
+ ${byComputer.map(([c, models]) => {
+ const t = sumModels(models);
+ const used = models.length > 0;
+ const pct = used && tokens ? Math.round(((t.input + t.output) / tokens) * 100) : null;
+ return `<tbody class="${used ? '' : 'unused'}">
+ <tr class="computer"><td><span class="cname">${c.name}<small>${c.sub}</small>${pct === null ? '' : `<span class="pct"><span class="bar"><i style="width:${Math.max(pct, 2)}%"></i></span>${pct}%</span>`}</span></td>
+ <td class="num">${used ? t.turns : '—'}</td><td class="num">${used ? fmtTok(t.input) : '—'}</td><td class="num">${used ? fmtTok(t.output) : '—'}</td><td class="num">${used ? fmtUsd(t.usd) : '—'}</td></tr>
+ ${models.map((r) => `<tr class="model"><td>${r[0]}</td><td class="num">${r[1]}</td><td class="num">${fmtTok(r[2])}</td><td class="num">${fmtTok(r[3])}</td><td class="num">${fmtUsd(r[4])}</td></tr>`).join('')}
+ </tbody>`;
+ }).join('')}
+ </table><p class="est">金额按本地单价估算,不代表供应商实际账单。</p></div>`;
return `
- <div class="person" data-open="${isOpen}">
+ <div class="person" data-open="${isOpen}" data-state="${m && m.status === 'paused' ? 'paused' : ''}">
<div class="row">
- <button type="button" class="expand" data-toggle="${key}" aria-expanded="${isOpen}" aria-label="${isOpen ? '收起' : '展开'} ${name} 的模型用量">
+ <button type="button" class="expand" data-toggle="${p.key}" aria-expanded="${isOpen}" aria-controls="breakdown-${p.key}" aria-label="${isOpen ? '收起' : '展开'} ${p.name} 的用量明细">
<svg class="chev" width="14" height="14" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 3 5 5-5 5"/></svg>
</button>
- <span class="avatar">${avatar}</span>
- <div class="who"><div class="line1">${name}</div><div class="line2">${sub}</div></div>
- <div class="usage"><b>${tokens ? fmtTok(tokens) + ' tokens' : '没有用量'}</b>${tokens ? '约 ' + fmtUsd(cost) : ''}</div>
- </div>
- ${isOpen ? `
- <div class="breakdown"><table>
- <thead><tr><th>模型</th><th class="num">轮次</th><th class="num">输入</th><th class="num">输出</th><th class="num">估算金额</th></tr></thead>
- <tbody>${models.map((r) => `<tr><td>${r[0]}</td><td class="num">${r[1]}</td><td class="num">${fmtTok(r[2])}</td><td class="num">${fmtTok(r[3])}</td><td class="num">${fmtUsd(r[4])}</td></tr>`).join('') || '<tr><td colspan="5" class="muted">这段时间没有用量</td></tr>'}</tbody>
- </table></div>` : ''}
+ <span class="avatar">${p.avatar}</span>
+ <div class="who">
+ <div class="line1">${p.name} <span class="tag">${p.tag}</span>${status}</div>
+ <div class="line2">${m ? `${m.joined}加入 · ` : ''}${last}${usedOn > 0 ? ` · 用了 ${usedOn} 台电脑` : ''}</div>
+ </div>
+ <div class="usage"><b>${fmtTok(tokens)} tokens</b>${amount ? '约 ' + fmtUsd(amount) : ''}${share ? `<span class="bar"><i style="width:${share}%"></i></span>` : ''}</div>
+ ${more}
+ </div>${reshares}${breakdown}
</div>`;
}).join('');
}
+ function renderPending() {
+ const list = sharing() ? pending : [];
+ $('#pending-wrap').hidden = list.length === 0;
+ $('#pending').innerHTML = list.map((r) => `
+ <div class="row">
+ <span class="avatar">${r.avatar}</span>
+ <div class="who">
+ <div class="line1">${r.name} <span class="tag">${r.kind === 'apply' ? '申请使用' : `想经 ${r.owner} 的供应商组使用`}</span></div>
+ <div class="line2">${r.kind === 'apply'
+ ? `配对码 <span class="pair">${r.code}</span> · ${r.time}申请 · 24 小时内未处理将自动失效`
+ : `${r.time}请求 · 同意后,${r.name} 的任务可以在这台电脑上运行,用量算在 ${r.owner} 名下`}</div>
+ </div>
+ <div class="actions">
+ <button type="button" class="btn secondary sm" data-pending="${r.id}:reject">拒绝</button>
+ <button type="button" class="btn primary sm" data-pending="${r.id}:approve">同意</button>
+ </div>
+ </div>`).join('');
+ }
+
+ /* ---------- 分享的人一行的 ··· 菜单 ---------- */
+ let menuFor = null, removing = null;
+ function closeMenu() { $('#menu').hidden = true; menuFor = null; }
+ function openMenu(btn) {
+ const p = people.find((x) => x.key === btn.dataset.menu);
+ menuFor = p.key;
+ const menu = $('#menu');
+ const paused = p.member.status === 'paused';
+ menu.innerHTML = `<button type="button" role="menuitem" data-menu-act="pause">${paused ? playIco : pauseIco}${paused ? '恢复分享' : '关闭分享'}</button>`
+ + `<button type="button" role="menuitem" class="danger" data-menu-act="remove">${trashIco}删除</button>`;
+ menu.hidden = false;
+ const w = $('#window').getBoundingClientRect(), b = btn.getBoundingClientRect();
+ menu.style.top = (b.bottom - w.top + 4) + 'px';
+ menu.style.left = (b.right - w.left - menu.offsetWidth) + 'px';
+ menu.querySelector('button').focus();
+ }
+ function menuAct(act) {
+ const p = people.find((x) => x.key === menuFor);
+ closeMenu();
+ if (!p) return;
+ if (act === 'pause') {
+ const paused = p.member.status === 'paused';
+ p.member.status = paused ? 'active' : 'paused';
+ renderUsage();
+ toast(paused ? `已恢复对 ${p.name} 的分享` : `已关闭对 ${p.name} 的分享,可随时恢复`);
+ return;
+ }
+ removing = p.key;
+ $('#remove-title').textContent = `删除对 ${p.name} 的分享?`;
+ $('#remove-desc').textContent = `${p.name} 将立即无法使用 Anthropic,正在运行的任务会停止。之后要再分享,需要重新生成链接。用量记录会保留。`;
+ openDialog('remove');
+ }
+
function renderSettings() {
$('#group-desc').textContent = hasGroup
? '本机任务、你的其他电脑和你分享的人使用 Anthropic 时,按组策略选一台组内电脑运行 Agent。'
@@ -738,9 +932,9 @@
/* ---------- 添加电脑 ---------- */
const mine = [
{ name: "Lizi's MacBook Pro", note: '我的其他电脑 · 已在组里', state: 'in' },
- { name: "Magi's Mac Mini", note: '来自 Magi 的分享 · 已在组里', state: 'in' },
+ { name: 'Magi 的电脑', note: '来自 Magi 的分享 · 已在组里', state: 'in' },
{ name: 'Office Mac mini', note: '我的其他电脑 · 在线', state: 'pick' },
- { name: "Ann's MacBook Air", note: '来自 Ann 的分享 · 在线', state: 'pick' },
+ { name: 'Ann 的电脑', note: '来自 Ann 的分享 · 在线', state: 'pick' },
{ name: 'Home-NUC', note: '我的其他电脑 · 不在线', state: 'disabled' },
];
const picked = new Set(['Office Mac mini']);
@@ -797,18 +991,57 @@
setTimeout(() => focusTarget && focusTarget.focus(), 0);
}
function closeDialog() { $('#scrim').hidden = true; $$('[data-dialog]').forEach((d) => { d.hidden = true; }); }
- document.addEventListener('keydown', (e) => { if (e.key === 'Escape' && !$('#scrim').hidden) closeDialog(); });
+ document.addEventListener('keydown', (e) => {
+ if (e.key !== 'Escape') return;
+ if (!$('#menu').hidden) { const key = menuFor; closeMenu(); const b = key && $(`[data-menu="${key}"]`); if (b) b.focus(); return; }
+ if (!$('#scrim').hidden) closeDialog();
+ });
/* 点击遮罩不关闭弹窗(DESIGN.md §4 Dialog:只通过自身按钮或 Esc 关闭)。 */
document.addEventListener('click', (e) => {
const t = e.target.closest('button, [data-pick]');
+ if (!$('#menu').hidden && !e.target.closest('#menu') && !(t && t.dataset.menu)) closeMenu();
if (!t) return;
+ if (t.dataset.menu) { menuFor === t.dataset.menu ? closeMenu() : openMenu(t); return; }
+ if (t.dataset.menuAct) { menuAct(t.dataset.menuAct); return; }
+ if (t.id === 'remove-confirm') {
+ const p = people.find((x) => x.key === removing);
+ closeDialog();
+ if (p) { people = people.filter((x) => x !== p); renderUsage(); toast(`已删除对 ${p.name} 的分享`); }
+ return;
+ }
+ if (t.dataset.memberToggle) { const id = t.dataset.memberToggle; openMembers.has(id) ? openMembers.delete(id) : openMembers.add(id); renderMembers(); return; }
+ if (t.dataset.reshare) {
+ const [pk, rid] = t.dataset.reshare.split(':');
+ const owner = people.find((x) => x.key === pk);
+ const r = owner.member.reshares.find((x) => x.id === rid);
+ r.state = r.state === 'approved' ? 'rejected' : 'approved';
+ renderUsage();
+ toast(r.state === 'approved' ? `已同意 ${r.name} 经 ${owner.name} 的供应商组使用 Anthropic` : `已撤回对 ${r.name} 的同意,正在运行的任务已停止`);
+ return;
+ }
+ if (t.dataset.pending) {
+ const [id, decision] = t.dataset.pending.split(':');
+ const r = pending.find((x) => x.id === id);
+ pending = pending.filter((x) => x !== r);
+ if (decision === 'approve' && r.kind === 'apply') {
+ // 同意后这个人出现在上方「用量」里,和其他分享的人同一种行。
+ people.push({ key: r.id, name: r.name, tag: '分享的人', avatar: r.avatar, last: null, member: { status: 'active', running: 0, joined: '今天' }, usage: {} });
+ }
+ if (decision === 'approve' && r.kind === 'reshare') {
+ people.find((x) => x.name === r.owner).member.reshares.push({ id: r.id, avatar: r.avatar, name: r.name, state: 'approved' });
+ }
+ renderUsage(); renderPending();
+ toast(decision === 'approve'
+ ? (r.kind === 'apply' ? `已同意分享 Anthropic 给 ${r.name}` : `已同意 ${r.name} 经 ${r.owner} 的供应商组使用 Anthropic`)
+ : `已拒绝 ${r.name} 的${r.kind === 'apply' ? '申请' : '请求'}`);
+ return;
+ }
if (t.matches('[data-close-dialog]')) closeDialog();
if (t.dataset.openDialog) { openDialog(t.dataset.openDialog); if (t.dataset.addTab) showAdd(t.dataset.addTab); }
else if (t.dataset.addTab) showAdd(t.dataset.addTab);
if (t.dataset.goto) setScene(t.dataset.goto);
if (t.dataset.toggle) { open.has(t.dataset.toggle) ? open.delete(t.dataset.toggle) : open.add(t.dataset.toggle); renderUsage(); }
if (t.dataset.range) { range = t.dataset.range; $$('[data-range]').forEach((b) => b.setAttribute('aria-pressed', String(b === t))); renderUsage(); }
- if (t.dataset.dim) { dim = t.dataset.dim; $$('[data-dim]').forEach((b) => b.setAttribute('aria-pressed', String(b === t))); renderUsage(); }
if (t.dataset.strategy) { strategy = t.dataset.strategy; $$('[data-strategy]').forEach((b) => b.setAttribute('aria-pressed', String(b === t))); renderMembers(); }
if (t.dataset.pick && t.getAttribute('aria-disabled') !== 'true') { picked.has(t.dataset.pick) ? picked.delete(t.dataset.pick) : picked.add(t.dataset.pick); renderMine(); }
if (t.dataset.addGo) showAdd(t.dataset.addGo);
@@ -819,12 +1052,13 @@
let scene = 'settings', othersVariant = 'normal';
const notes = {
settings: '供应商详情在「允许被远程调用」下方增加「供应商组」一行。供应商组不依赖远程调用:只给本机用时也可以建组。两处按钮都进入同一个「远程与分享」页。',
- page: '「生成分享链接」放在标题右侧,有待处理申请时紧跟标题。下面是供应商组、用量与已分享的人;不再单设「分享」标题和重复说明。审批弹窗有组时写「由供应商组选一台电脑运行 Agent」。用量维度切换仍是设计预览,当前实现按人查看。',
+ page: '「远程与分享」页:标题右侧生成分享链接,待处理申请紧跟标题;下面是供应商组与和设置页一致的用量。用量按人列出,你自己在第一行,筛选支持使用方、组内电脑、时间范围和某一天,另有每日柱图、热力图、按电脑和按模型。分享的人状态、加入时间、关闭与删除并在这个人的用量那一行(收进行尾 ···)。审批弹窗说明 Agent 的运行位置与用量归属;有组时写「由供应商组选一台电脑运行 Agent」。',
add: '添加电脑与模型列表里的远程供应商同一个来源:你的其他电脑和别人分享给你的放在一个列表里直接勾选;还不能用的别人的电脑,粘贴分享链接走申请与配对码。链接的供应商不一致(订阅账号按品牌、自定义供应商按名称判断)或属于自己账号时不发送申请。',
others: '任务正常时固定在第一次分到的电脑上,头部写明在哪台运行。那台撞到用量上限、登录失效或离线时,自动交接到组里下一台继续这一轮,消息流显示一行活动记录;每台最多试一次,全部失败才报错并逐台列出原因,有撞上限的就等最早恢复的那台自动继续。同账号其他电脑的模型列表标题写「供应商组」。',
apply: '受邀者申请弹窗不论有没有组都写「Agent 在 Lizi 的电脑或 Lizi 安排的其他电脑上运行」,内容保存在实际运行的那台电脑上。之后建组、加减电脑都不再打扰受邀者,受邀者那边也不显示组内电脑的名称。',
};
const variants = {
+ page: { label: '分享', get: () => shareVariant, set: (v) => { shareVariant = v; closeMenu(); renderMembers(); renderUsage(); renderPending(); }, opts: [['shared', '已分享给 3 人'], ['none', '还没分享']] },
settings: { label: '供应商组', get: () => (hasGroup ? 'on' : 'off'), set: (v) => { hasGroup = v === 'on'; renderSettings(); }, opts: [['off', '未设置'], ['on', '已设置']] },
add: { label: '弹窗状态', get: () => addVariant, set: (v) => { openDialog('add'); showAdd(v); }, opts: [['mine', '已经能用的'], ['link', '分享链接'], ['wait', '等待同意'], ['mismatch', '供应商不一致'], ['self', '自己账号的链接']] },
others: { label: '运行状态', get: () => othersVariant, set: (v) => {
@@ -846,6 +1080,7 @@
const page = { settings: 'settings', page: 'page', add: 'page', others: 'others', apply: 'app' }[next];
$$('[data-page]').forEach((p) => { p.hidden = p.dataset.page !== page; });
closeDialog();
+ closeMenu();
if (next === 'add') variants.add.set(addVariant);
if (next === 'apply') openDialog('apply');
$('#scene-note').textContent = notes[next];
@@ -860,7 +1095,7 @@
$$('[data-theme]').forEach((b) => b.addEventListener('click', () => setTheme(b.dataset.theme)));
setTheme(window.matchMedia && matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light');
- renderSettings(); renderMembers(); renderUsage(); renderMine(); setScene('settings');
+ renderSettings(); renderMembers(); renderUsage(); renderPending(); renderMine(); setScene('settings');
</script>
</body>
</html>
diff --git a/docs/design-previews/provider-usage/index.html b/docs/design-previews/provider-usage/index.html
new file mode 100644
index 0000000000..8310ddee1b
--- /dev/null
+++ b/docs/design-previews/provider-usage/index.html
@@ -0,0 +1,891 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="color-scheme" content="light dark" />
+<title>远程供应商用量 · 原型</title>
+<style>
+ /* 自包含原型:数值取自 Cindy 设计 token(themes/colors.ts、DESIGN.md),版式对齐「设置 → 用量」。 */
+ :root {
+ color-scheme: light;
+ --surface: #f8f8f6;
+ --card: #ffffff;
+ --border: #d7d7d4;
+ --text: #262626;
+ --secondary: #737373;
+ --tertiary: #a3a3a3;
+ --chip: #e5e5e5;
+ --hover: #f2f2ef;
+ --selected: #ececea;
+ --primary-hover: #d7d7d6;
+ --green: #2aae5b;
+ --danger: #ef4444;
+ --focus: rgba(65, 124, 221, 0.5);
+ --scrim: rgba(0, 0, 0, 0.5);
+ --tip-bg: #ffffff;
+ --shadow-menu: 0 8px 24px rgba(0, 0, 0, 0.12), 0 2px 6px rgba(0, 0, 0, 0.06);
+ --m1: #14B8A6; --m2: #F43F5E; --m3: #8B5CF6; --m4: #6366F1; --m5: #F59E0B;
+ --heat: #2563EB;
+ }
+ body.dark {
+ color-scheme: dark;
+ --surface: #1f1f1e;
+ --card: #2c2c2a;
+ --border: #3c3c3a;
+ --text: #d4d4d4;
+ --secondary: #a3a3a3;
+ --tertiary: #737373;
+ --chip: #3c3c3a;
+ --hover: #353533;
+ --selected: #3a3a38;
+ --primary-hover: #4a4a48;
+ --green: #55c886;
+ --scrim: rgba(0, 0, 0, 0.7);
+ --tip-bg: #2c2c2a;
+ --shadow-menu: 0 8px 24px rgba(0, 0, 0, 0.45), 0 2px 6px rgba(0, 0, 0, 0.3);
+ --m1: #2DD4BF; --m2: #FB7185; --m3: #A78BFA; --m4: #818CF8; --m5: #FBBF24;
+ --heat: #60A5FA;
+ }
+ * { box-sizing: border-box; }
+ [hidden] { display: none !important; }
+ body {
+ margin: 0; background: var(--surface); color: var(--text);
+ font: 13px/1.5 Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Microsoft YaHei", sans-serif;
+ -webkit-font-smoothing: antialiased;
+ }
+ button, input { font: inherit; color: inherit; }
+ button { cursor: pointer; }
+ button:focus-visible, input:focus-visible, [tabindex]:focus-visible { outline: 2px solid var(--focus); outline-offset: 2px; }
+ svg { display: block; flex-shrink: 0; }
+ .num { font-variant-numeric: tabular-nums; }
+ .muted { color: var(--secondary); }
+ .faint { color: var(--tertiary); }
+
+ /* ---------- 评审工具条(原型外壳,不属于产品界面) ---------- */
+ .reviewbar {
+ position: sticky; top: 0; z-index: 50; display: flex; align-items: center; gap: 12px; flex-wrap: wrap;
+ padding: 10px 24px; background: var(--surface); border-bottom: 1px solid var(--border); font-size: 12px;
+ }
+ .reviewbar strong { font-weight: 500; font-size: 13px; margin-right: 8px; }
+ .reviewbar .spacer { flex: 1; }
+ .seg { display: inline-flex; gap: 2px; padding: 3px; border: 1px solid var(--border); border-radius: 9999px; background: var(--card); flex-wrap: wrap; }
+ .seg button { border: 0; background: transparent; border-radius: 9999px; padding: 4px 12px; min-height: 28px; color: var(--secondary); font-size: 12px; }
+ .seg button[aria-pressed="true"] { background: var(--chip); color: var(--text); font-weight: 500; }
+
+ /* ---------- 通用控件 ---------- */
+ .btn { display: inline-flex; align-items: center; justify-content: center; gap: 6px; height: 32px; padding: 0 24px; border-radius: 9999px; border: 1px solid transparent; font-size: 13px; font-weight: 500; white-space: nowrap; background: transparent; }
+ .btn.primary { background: var(--chip); border-color: var(--chip); }
+ .btn.primary:hover { background: var(--primary-hover); border-color: var(--primary-hover); }
+ .btn.secondary { background: var(--card); border-color: var(--border); }
+ .btn.secondary:hover { background: var(--hover); }
+ .btn.danger { background: var(--danger); color: #fff; }
+ .btn.link { height: 24px; padding: 0 8px; font-weight: 400; color: var(--secondary); font-size: 12px; }
+ .btn.link:hover { background: var(--hover); color: var(--text); }
+ .icon-btn { width: 32px; height: 32px; display: inline-flex; align-items: center; justify-content: center; border: 0; border-radius: 9999px; background: transparent; color: var(--secondary); }
+ .icon-btn:hover { background: var(--hover); color: var(--text); }
+ .avatar { width: 28px; height: 28px; border-radius: 50%; display: inline-flex; align-items: center; justify-content: center; background: var(--chip); font-weight: 500; font-size: 12px; flex-shrink: 0; color: var(--text); }
+ .swatch { width: 8px; height: 8px; border-radius: 2px; flex-shrink: 0; }
+
+ /* ---------- 舞台 ---------- */
+ .stage { max-width: 1000px; margin: 16px auto 48px; padding: 0 24px; }
+ .window { background: var(--surface); border: 1px solid var(--border); border-radius: 12px; overflow: hidden; }
+ .page { padding: 24px 32px 32px; max-width: 900px; }
+ .crumb { display: inline-flex; align-items: center; gap: 4px; color: var(--secondary); font-size: 12px; margin-bottom: 8px; }
+ .pagehead { display: flex; align-items: center; gap: 12px; flex-wrap: wrap; }
+ .pagehead h1 { margin: 0; font-size: 16px; font-weight: 500; flex: 1; }
+ .stub { margin-top: 20px; display: flex; align-items: center; gap: 10px; padding: 12px 16px; border: 1px dashed var(--border); border-radius: 12px; color: var(--tertiary); font-size: 12px; }
+ .stub b { color: var(--secondary); font-weight: 500; font-size: 13px; }
+
+ /* ---------- 用量块 ---------- */
+ .usage { margin-top: 32px; }
+ .usage-head { display: flex; flex-direction: column; gap: 4px; margin-bottom: 12px; }
+ .usage-head h3 { margin: 0; font-size: 13px; font-weight: 500; }
+ .usage-head p { margin: 0; font-size: 12px; line-height: 1.5; color: var(--secondary); max-width: 640px; }
+ .filterbar { display: flex; align-items: center; gap: 12px; flex-wrap: wrap; margin-bottom: 12px; }
+ .filterbar .label { font-size: 13px; font-weight: 500; color: var(--secondary); }
+ .filters { margin-left: auto; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; min-width: 0; }
+ .select { position: relative; }
+ .select-trigger { display: flex; align-items: center; justify-content: space-between; gap: 8px; height: 36px; width: 176px; padding: 0 12px; border-radius: 9999px; border: 1px solid var(--border); background: var(--card); font-size: 13px; text-align: left; }
+ .select-trigger span { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+ .select-trigger svg { color: var(--tertiary); }
+ .select-menu { position: absolute; top: calc(100% + 4px); right: 0; z-index: 30; width: 100%; padding: 4px; border-radius: 12px; border: 1px solid var(--border); background: var(--card); box-shadow: var(--shadow-menu); }
+ .select-item { display: flex; align-items: center; justify-content: space-between; gap: 8px; width: 100%; border: 0; background: transparent; border-radius: 8px; padding: 8px 12px; text-align: left; font-size: 13px; }
+ .select-item:hover { background: var(--hover); }
+ .select-item[aria-selected="true"] { background: var(--selected); font-weight: 500; }
+ .select-item .stack { display: flex; flex-direction: column; min-width: 0; }
+ .select-item .stack > span:first-child { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+ .select-item .detail { font-size: 12px; font-weight: 400; color: var(--tertiary); white-space: normal; }
+ .select-sep { height: 1px; margin: 4px 8px; background: var(--border); }
+ .datefield { display: flex; align-items: center; gap: 8px; font-size: 13px; color: var(--secondary); }
+ .datefield input { height: 36px; width: 150px; padding: 0 12px; border-radius: 9999px; border: 1px solid var(--border); background: var(--card); }
+ .focusline { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; margin: -4px 0 12px; font-size: 12px; color: var(--secondary); }
+ .focusline .pill { display: inline-flex; align-items: center; gap: 6px; height: 24px; padding: 0 10px; border-radius: 9999px; background: var(--chip); color: var(--text); }
+
+ .card { margin-bottom: 14px; padding: 16px; border-radius: 12px; border: 1px solid var(--border); background: var(--card); }
+ .card-head { display: flex; flex-wrap: wrap; align-items: center; gap: 4px 8px; margin-bottom: 12px; min-height: 24px; }
+ .card-head .title { font-size: 14px; font-weight: 500; }
+ .card-head .subtitle { font-size: 12px; color: var(--tertiary); }
+ .card-head .right { margin-left: auto; }
+ .card-head .seg button { min-height: 24px; padding: 2px 10px; }
+ .empty { padding: 28px 0; text-align: center; color: var(--tertiary); font-size: 13px; }
+
+ .stats { display: flex; gap: 8px; flex-wrap: wrap; }
+ .stat { flex: 1 1 110px; min-width: 0; display: flex; flex-direction: column; gap: 2px; padding: 8px 12px; border-radius: 8px; background: var(--chip); }
+ .stat .v { font-size: 16px; font-weight: 500; line-height: 1.4; font-variant-numeric: tabular-nums; }
+ .stat .l { margin-top: auto; font-size: 12px; line-height: 1.5; color: var(--secondary); }
+
+ /* 每日柱图(UsageTokenBars 同一套:96px 高、最多 3 条刻度、零值日 2px) */
+ .bars { display: flex; gap: 6px; height: 96px; }
+ .yaxis { position: relative; width: 4.5ch; flex-shrink: 0; }
+ .yaxis span { position: absolute; right: 0; transform: translateY(50%); font-size: 11px; line-height: 1; color: var(--tertiary); font-variant-numeric: tabular-nums; }
+ .plot { position: relative; flex: 1; min-width: 0; }
+ .gridline { position: absolute; left: 0; right: 0; border-top: 1px solid var(--border); opacity: .5; }
+ .plot-inner { position: absolute; inset: 0; display: flex; align-items: flex-end; gap: 3px; }
+ .bar { position: relative; flex: 1; min-width: 0; display: flex; align-items: flex-end; justify-content: center; padding: 0; border: 0; background: transparent; }
+ .bar .mark { display: flex; flex-direction: column; overflow: hidden; border-radius: 2px; width: 100%; transition: width 120ms ease-out, opacity 120ms; }
+ .bar:hover .mark, .bar[aria-pressed="true"] .mark { width: calc(100% + 2px); }
+ .plot.has-hl .bar:not([data-hl="true"]) .mark { opacity: .35; }
+ .legend { display: flex; flex-wrap: wrap; gap: 4px 14px; margin-top: 10px; font-size: 12px; color: var(--secondary); }
+ .legend span { display: inline-flex; align-items: center; gap: 6px; }
+
+ /* 热力图 */
+ .heat-months { position: relative; height: 14px; margin-left: 0; }
+ .heat-months span { position: absolute; top: 0; font-size: 10px; line-height: 1.4; color: var(--tertiary); white-space: nowrap; }
+ .heat-grid { display: flex; gap: 3px; }
+ .heat-col { display: flex; flex-direction: column; gap: 3px; }
+ .heat-cell { width: 12px; height: 12px; padding: 0; border: 0; border-radius: 2px; }
+ .heat-cell.ph { visibility: hidden; }
+ .heat-cell[aria-pressed="true"] { outline: 1px solid var(--text); outline-offset: 1px; }
+
+ /* 明细表(UsageBreakdownTables 同一套) */
+ .tablewrap { overflow-x: auto; }
+ table { width: 100%; border-collapse: collapse; }
+ th { white-space: nowrap; border-bottom: 1px solid var(--border); padding: 0 0 8px 12px; text-align: right; font-size: 12px; font-weight: 500; color: var(--secondary); }
+ td { white-space: nowrap; border-bottom: 1px solid var(--border); padding: 8px 0 8px 12px; text-align: right; font-size: 13px; font-variant-numeric: tabular-nums; }
+ tr:last-child td { border-bottom: 0; }
+ th.first, td.first { width: 100%; max-width: 0; padding-left: 0; text-align: left; }
+ td.dim { color: var(--tertiary); }
+ td.act { width: 40px; padding-left: 4px; }
+ .sharecell .b { display: inline-block; height: 4px; border-radius: 2px; margin-right: 6px; vertical-align: 2px; }
+ .sharebar { display: flex; height: 8px; overflow: hidden; border-radius: 2px; margin-bottom: 12px; gap: 0; }
+ tr.click { cursor: pointer; }
+ tr.click:hover td { background: var(--hover); }
+ tr.click td:first-child { border-top-left-radius: 0; }
+ tr.selected td { background: var(--selected); }
+ tr.unused td { color: var(--tertiary); }
+ tr.paused .who { opacity: .7; }
+ .who { display: flex; align-items: center; gap: 8px; min-width: 0; }
+ .who-text { display: flex; flex-direction: column; min-width: 0; }
+ .who-l1 { display: flex; align-items: baseline; gap: 8px; min-width: 0; }
+ .who-l1 .name { font-weight: 500; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+ .who-l1 .tag, .who-l1 .src { font-size: 12px; color: var(--secondary); white-space: nowrap; }
+ .who-l2 { font-size: 12px; color: var(--secondary); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+ .status { display: inline-flex; align-items: center; gap: 4px; font-size: 12px; color: var(--secondary); white-space: nowrap; }
+ .status .dot { width: 6px; height: 6px; border-radius: 50%; background: var(--green); }
+ .status.paused .dot { background: var(--tertiary); }
+ .model-tag { flex-shrink: 0; border: 1px solid var(--border); border-radius: 4px; padding: 0 4px; font-size: 11px; line-height: 1.4; color: var(--tertiary); }
+ .note { margin: 8px 0 0; font-size: 12px; color: var(--tertiary); }
+
+ /* 行尾菜单与弹窗 */
+ .menu { position: fixed; z-index: 60; min-width: 160px; padding: 4px; border-radius: 12px; border: 1px solid var(--border); background: var(--card); box-shadow: var(--shadow-menu); }
+ .menu button { display: block; width: 100%; border: 0; background: transparent; border-radius: 8px; padding: 8px 12px; text-align: left; font-size: 13px; }
+ .menu button:hover { background: var(--hover); }
+ .menu button.danger { color: var(--danger); }
+ .scrim { position: fixed; inset: 0; z-index: 70; background: var(--scrim); display: flex; align-items: center; justify-content: center; }
+ .dialog { width: 420px; max-width: calc(100% - 32px); padding: 20px; border-radius: 16px; background: var(--card); border: 1px solid var(--border); }
+ .dialog h4 { margin: 0 0 8px; font-size: 14px; font-weight: 500; }
+ .dialog p { margin: 0 0 20px; color: var(--secondary); }
+ .dialog .actions { display: flex; justify-content: flex-end; gap: 8px; }
+
+ /* 悬停浮层(UsageBarsTooltip 的样式) */
+ .tooltip { position: fixed; z-index: 80; width: 240px; padding: 10px 12px; border-radius: 12px; border: 1px solid var(--border); background: var(--tip-bg); box-shadow: var(--shadow-menu); pointer-events: none; font-size: 12px; }
+ .tooltip .d { color: var(--secondary); }
+ .tooltip .t { font-size: 16px; font-weight: 500; font-variant-numeric: tabular-nums; margin: 2px 0 8px; }
+ .tooltip .t small { font-size: 12px; font-weight: 400; color: var(--secondary); margin-left: 4px; }
+ .tooltip .segbar { display: flex; height: 4px; border-radius: 2px; overflow: hidden; margin-bottom: 8px; }
+ .tooltip .r { display: flex; align-items: center; gap: 6px; padding: 2px 0; }
+ .tooltip .r .n { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+ .tooltip .r .v { font-variant-numeric: tabular-nums; }
+ .tooltip .r .p { width: 34px; text-align: right; color: var(--tertiary); font-variant-numeric: tabular-nums; }
+
+ /* 评审说明 */
+ .notes { margin-top: 20px; display: grid; grid-template-columns: 1fr 1fr; gap: 16px; }
+ .notes > div { padding: 16px 20px; border-radius: 12px; border: 1px solid var(--border); background: var(--card); }
+ .notes h2 { margin: 0 0 8px; font-size: 14px; font-weight: 500; }
+ .notes ol, .notes ul { margin: 0; padding-left: 18px; color: var(--secondary); }
+ .notes li { margin: 4px 0; }
+ .notes li b { color: var(--text); font-weight: 500; }
+ @media (max-width: 760px) { .notes { grid-template-columns: 1fr; } .page { padding: 20px; } }
+</style>
+</head>
+<body>
+<div class="reviewbar">
+ <strong>远程供应商「用量」· 原型</strong>
+ <div class="seg" id="theme-seg" role="group" aria-label="主题">
+ <button type="button" data-v="light" aria-pressed="true">浅色</button>
+ <button type="button" data-v="dark" aria-pressed="false">深色</button>
+ </div>
+ <div class="seg" id="scenario-seg" role="group" aria-label="场景">
+ <button type="button" data-v="group" aria-pressed="true">建了供应商组(3 台电脑)</button>
+ <button type="button" data-v="single" aria-pressed="false">没有组(只有本机)</button>
+ </div>
+ <span class="spacer"></span>
+ <span class="muted">示意数据 · 悬停柱子/格子看当天明细 · 点表格一行只看这个人或这台电脑</span>
+</div>
+
+<main class="stage">
+ <div class="window">
+ <div class="page">
+ <div class="crumb">
+ <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m15 18-6-6 6-6"/></svg>
+ 远程与分享
+ </div>
+ <div class="pagehead">
+ <h1>分享 Claude 订阅</h1>
+ <button type="button" class="btn primary">生成分享链接</button>
+ </div>
+ <div class="stub" id="group-stub"><b>供应商组</b><span>本机 · 书房 Windows · 小王的电脑 · 最少占用(原型里略去,保持现状)</span></div>
+ <section class="usage" id="usage" aria-labelledby="usage-title"></section>
+ </div>
+ </div>
+
+ <section class="notes">
+ <div>
+ <h2>这版改了什么</h2>
+ <ul>
+ <li><b>和「设置 → 用量」同一套</b>:右上筛选、概览数字、近 30 天每日柱图、活跃热力图、按模型表,样式和交互(悬停看明细、点柱子或格子选那一天)照搬。</li>
+ <li><b>多电脑:默认看合计</b>。「组内电脑」下拉可以只看一台;新增「按电脑」表,每台用了多少、几个人在用一眼看到。</li>
+ <li><b>每日柱图可切换</b>按人 / 按电脑 / 按模型堆叠,柱子高度就是当天总量。</li>
+ <li><b>按人</b>:原来的人列表变成和「按 Agent」一样的表;分享状态、加入时间、最近使用和 <code>···</code>(关闭/恢复、删除)仍在这一行。点一行 = 只看这个人,整页跟着变,代替原来的“展开看每台电脑”。</li>
+ <li><b>没有组时</b>:不出现「组内电脑」下拉、「按电脑」表和“用到的电脑”,其余一样。</li>
+ </ul>
+ </div>
+ <div>
+ <h2>已确认(2026-10-17)</h2>
+ <ol>
+ <li><b>时间段</b>与设置页一样:所有时间 / 最近 30 天 / 最近 7 天 / 今天,并能选某一天;不再有「本月」。</li>
+ <li><b>「按人」放在概览下面</b>,分享的管理操作不被图表压到下面。</li>
+ <li><b>活跃热力图保留</b>。</li>
+ <li><b>保留估算金额</b>,标注“估算”。</li>
+ <li><b>不搬「最耗 token 的任务」</b>。</li>
+ </ol>
+ </div>
+ </section>
+</main>
+
+<div id="tooltip" class="tooltip" hidden aria-hidden="true"></div>
+<div id="menu-layer"></div>
+
+<script>
+(() => {
+ // ---------------- 示意数据 ----------------
+ function mulberry32(a) { return () => { a |= 0; a = (a + 0x6D2B79F5) | 0; let t = Math.imul(a ^ (a >>> 15), 1 | a); t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t; return ((t ^ (t >>> 14)) >>> 0) / 4294967296; }; }
+ const rand = mulberry32(20261017);
+ const TODAY = new Date(2026, 9, 17);
+ const NOW = new Date(2026, 9, 17, 15, 20).getTime();
+ const keyOf = (d) => `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+ const shift = (n) => keyOf(new Date(2026, 9, 17 + n));
+ const parseKey = (k) => { const [y, m, d] = k.split('-').map(Number); return new Date(y, m - 1, d); };
+ const TODAY_KEY = keyOf(TODAY);
+
+ const MODELS = [
+ { key: 'opus', name: 'Opus 5.5', agent: 'claude-code', price: [5, 25, 0.5, 6.25], cache: 4.6 },
+ { key: 'sonnet', name: 'Sonnet 5.5', agent: 'claude-code', price: [3, 15, 0.3, 3.75], cache: 3.2 },
+ { key: 'haiku', name: 'Haiku 5.5', agent: 'claude-code', price: [1, 5, 0.1, 1.25], cache: 1.4 },
+ ];
+ const PARTIES = [
+ { key: 'self', kind: 'self', name: 'Magi', initial: 'M', activeToday: true, from: -110, to: 0, activity: 0.82, scale: 1, models: { opus: 0.68, sonnet: 0.27, haiku: 0.05 }, computers: { local: 0.5, study: 0.32, wang: 0.18 } },
+ { key: 'lin', kind: 'member', name: '小林', initial: '林', activeToday: true, joined: '2026-09-02', from: -45, to: 0, activity: 0.64, scale: 0.55, models: { opus: 0.3, sonnet: 0.6, haiku: 0.1 }, computers: { local: 0.28, study: 0.47, wang: 0.25 } },
+ { key: 'jie', kind: 'member', name: '阿杰', initial: '杰', joined: '2026-09-17', from: -30, to: -5, activity: 0.55, scale: 0.4, models: { opus: 0.15, sonnet: 0.75, haiku: 0.1 }, computers: { local: 0.4, study: 0.35, wang: 0.25 } },
+ { key: 'chen', kind: 'member', name: '陈雨', initial: '陈', joined: '2026-10-14', from: -3, to: 0, activity: 0.9, scale: 0.14, models: { sonnet: 0.4, haiku: 0.6 }, computers: { local: 0.5, study: 0.5 } },
+ { key: 'relay', kind: 'relay', name: '经 办公室 iMac 转来', from: -20, to: 0, activity: 0.35, scale: 0.18, models: { sonnet: 0.8, haiku: 0.2 }, computers: { local: 1 } },
+ ];
+ const COMPUTERS = [
+ { key: 'local', name: '本机', source: 'MacBook Pro' },
+ { key: 'study', name: '书房 Windows', source: '我的电脑' },
+ { key: 'wang', name: '小王的电脑', source: '来自 小王 的分享' },
+ { key: 'mini', name: 'Mac mini', source: '已移出组', removed: true },
+ ];
+ const NONE = '__none';
+ const COLORS = ['var(--m1)', 'var(--m2)', 'var(--m3)', 'var(--m4)', 'var(--m5)'];
+ const partyColor = (k) => COLORS[PARTIES.findIndex((p) => p.key === k)] ?? 'var(--tertiary)';
+ const computerColor = (k) => k === NONE ? 'var(--tertiary)' : COLORS[COMPUTERS.findIndex((c) => c.key === k)] ?? 'var(--tertiary)';
+ const modelColor = (k) => COLORS[MODELS.findIndex((m) => m.key === k)] ?? 'var(--tertiary)';
+
+ const BASE_ROWS = [];
+ for (const p of PARTIES) {
+ for (let o = p.from; o <= p.to; o++) {
+ const day = shift(o);
+ const dow = parseKey(day).getDay();
+ const weekend = dow === 0 || dow === 6;
+ if (!(o === 0 && p.activeToday) && rand() > p.activity * (weekend ? 0.55 : 1)) continue;
+ const dayTotal = p.scale * (500000 + rand() * 2600000) * (weekend ? 0.6 : 1);
+ let comps = { ...p.computers };
+ // 分享的人较早的记录没有区分电脑;Mac mini 在 12 天前移出组。
+ if (p.kind === 'member' && o < -35) comps = { [NONE]: 1 };
+ else if (p.kind !== 'relay' && o >= -60 && o <= -12) comps.mini = 0.25;
+ for (const [mk, mw] of Object.entries(p.models)) {
+ const model = MODELS.find((m) => m.key === mk);
+ for (const [ck, cw] of Object.entries(comps)) {
+ const T = dayTotal * mw * cw * (0.6 + rand() * 0.8);
+ if (T < 3000) continue;
+ const input = Math.round(T * 0.8), output = Math.round(T * 0.2);
+ const cacheRead = Math.round(T * model.cache * (0.8 + rand() * 0.4)), cacheCreate = Math.round(T * (0.25 + rand() * 0.3));
+ const [pi, po, pr, pw] = model.price;
+ const hour = o === 0 ? 8 + Math.floor(rand() * 7) : 9 + Math.floor(rand() * 14);
+ BASE_ROWS.push({
+ day, party: p.key, model: mk, computer: ck === NONE ? NONE : ck,
+ input, output, cacheRead, cacheCreate,
+ turns: Math.max(1, Math.round(T / 45000)),
+ amount: (input * pi + output * po + cacheRead * pr + cacheCreate * pw) / 1e6,
+ at: new Date(parseKey(day).getTime() + hour * 3600000 + Math.floor(rand() * 3600000)).getTime(),
+ });
+ }
+ }
+ }
+ }
+
+ // ---------------- 状态 ----------------
+ const state = {
+ theme: 'light', scenario: 'group',
+ party: 'all', computer: 'all', range: '30d', stack: 'party',
+ open: null,
+ statuses: { lin: { status: 'active', running: 1 }, jie: { status: 'paused', running: 0 }, chen: { status: 'active', running: 0 } },
+ removed: new Set(),
+ heatWidth: 800,
+ };
+ const grouped = () => state.scenario === 'group';
+ const rows = () => BASE_ROWS
+ .filter((r) => !state.removed.has(r.party))
+ .map((r) => grouped() || r.computer === NONE ? r : { ...r, computer: 'local' });
+ const visibleParties = () => PARTIES.filter((p) => !state.removed.has(p.key));
+
+ // ---------------- 格式 ----------------
+ const trim0 = (s) => s.replace(/\.0(?=[KMB]?$)/, '');
+ function fmtTok(n) {
+ if (!(n > 0)) return '0';
+ if (n < 1000) return String(Math.round(n));
+ if (n < 1e6) return trim0((n / 1e3).toFixed(n < 1e4 ? 1 : 0)) + 'K';
+ if (n < 1e9) return trim0((n / 1e6).toFixed(n < 1e8 ? 1 : 0)) + 'M';
+ return trim0((n / 1e9).toFixed(1)) + 'B';
+ }
+ const fmtMoney = (x) => '$' + (x < 100 ? x.toFixed(2) : Math.round(x).toLocaleString('en-US'));
+ const fmtPct = (p) => p > 0 && p < 0.01 ? '<1%' : `${Math.round(p * 100)}%`;
+ const fmtDate = (k) => { const d = parseKey(k); return `${d.getMonth() + 1}月${d.getDate()}日`; };
+ const fmtFullDate = (k) => { const d = parseKey(k); return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日`; };
+ function fmtRelative(ts) {
+ const m = Math.round((NOW - ts) / 60000);
+ if (m < 60) return `${Math.max(1, m)} 分钟前`;
+ const h = Math.round(m / 60);
+ if (h < 24) return `${h} 小时前`;
+ const d = Math.round(h / 24);
+ return d < 30 ? `${d} 天前` : fmtDate(keyOf(new Date(ts)));
+ }
+ const tokensOf = (r) => r.input + r.output;
+ const esc = (s) => String(s).replace(/[&<>"]/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;' }[c]));
+
+ // ---------------- 筛选 ----------------
+ const singleDay = () => state.range === 'today' || state.range.startsWith('day:');
+ const selectedDay = () => state.range === 'today' ? TODAY_KEY : state.range.startsWith('day:') ? state.range.slice(4) : null;
+ function rangeLabel() {
+ const d = selectedDay();
+ if (state.range.startsWith('day:')) return fmtFullDate(d);
+ return { all: '所有时间', '30d': '最近 30 天', '7d': '最近 7 天', today: '今天' }[state.range];
+ }
+ function inRange(day) {
+ if (state.range === 'all') return true;
+ if (state.range === '30d') return day >= shift(-29);
+ if (state.range === '7d') return day >= shift(-6);
+ return day === selectedDay();
+ }
+ /** 每张表都按「其他维度」筛:按人表不按使用方筛(管理操作一直在),按电脑表不按电脑筛,被选中的那一行高亮。 */
+ function pick({ party = true, computer = true, range = true } = {}) {
+ return rows().filter((r) =>
+ (!party || state.party === 'all' || r.party === state.party) &&
+ (!computer || state.computer === 'all' || r.computer === state.computer) &&
+ (!range || inRange(r.day)));
+ }
+ function sum(list) {
+ const s = { tokens: 0, input: 0, output: 0, cacheRead: 0, cacheCreate: 0, amount: 0, turns: 0, lastAt: 0 };
+ for (const r of list) {
+ s.tokens += tokensOf(r); s.input += r.input; s.output += r.output; s.cacheRead += r.cacheRead;
+ s.cacheCreate += r.cacheCreate; s.amount += r.amount; s.turns += r.turns; s.lastAt = Math.max(s.lastAt, r.at);
+ }
+ return s;
+ }
+ function groupBy(list, key) {
+ const m = new Map();
+ for (const r of list) { const k = r[key]; if (!m.has(k)) m.set(k, []); m.get(k).push(r); }
+ return m;
+ }
+
+ // ---------------- 渲染:下拉 ----------------
+ const chevron = '<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 9 6 6 6-6"/></svg>';
+ const check = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.25" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5"/></svg>';
+ const monitorIcon = (size = 14) => `<svg width="${size}" height="${size}" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>`;
+ const historyIcon = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5M12 7v5l4 2"/></svg>';
+ const dotsIcon = '<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><circle cx="5" cy="12" r="1.6"/><circle cx="12" cy="12" r="1.6"/><circle cx="19" cy="12" r="1.6"/></svg>';
+
+ function partyOptions() {
+ const opts = [{ value: 'all', label: '所有人', detail: '你和分享的人的合计' }, 'sep'];
+ for (const p of visibleParties()) {
+ if (p.kind === 'self') opts.push({ value: p.key, label: `${p.name}(你)`, detail: '本机和你其他电脑的合计' });
+ else if (p.kind === 'member') opts.push({ value: p.key, label: p.name, detail: state.statuses[p.key].status === 'paused' ? '分享的人 · 已暂停' : '分享的人' });
+ else opts.push({ value: p.key, label: p.name, detail: '看不到具体是谁' });
+ }
+ return opts;
+ }
+ function computerOptions() {
+ const opts = [{ value: 'all', label: '所有组内电脑', detail: '合计' }, 'sep'];
+ for (const c of COMPUTERS) opts.push({ value: c.key, label: c.key === 'local' ? `本机(${c.source})` : c.name, detail: c.key === 'local' ? null : c.source });
+ return opts;
+ }
+ function rangeOptions() {
+ const opts = ['all', '30d', '7d', 'today'].map((v) => ({ value: v, label: { all: '所有时间', '30d': '最近 30 天', '7d': '最近 7 天', today: '今天' }[v] }));
+ if (state.range.startsWith('day:')) opts.push({ value: state.range, label: rangeLabel() });
+ return opts;
+ }
+ function selectHtml(id, aria, value, options) {
+ const current = options.find((o) => o !== 'sep' && o.value === value);
+ const open = state.open === id;
+ return `<div class="select">
+ <button type="button" class="select-trigger" data-action="open" data-id="${id}" aria-haspopup="listbox" aria-expanded="${open}" aria-label="${aria}">
+ <span>${esc(current ? current.label : '')}</span>${chevron}
+ </button>
+ ${open ? `<div class="select-menu" role="listbox" aria-label="${aria}">${options.map((o) => o === 'sep' ? '<div class="select-sep"></div>' : `
+ <button type="button" role="option" class="select-item" data-action="pick" data-id="${id}" data-value="${esc(o.value)}" aria-selected="${o.value === value}">
+ <span class="stack"><span>${esc(o.label)}</span>${o.detail ? `<span class="detail">${esc(o.detail)}</span>` : ''}</span>
+ ${o.value === value ? check : ''}
+ </button>`).join('')}</div>` : ''}
+ </div>`;
+ }
+
+ // ---------------- 渲染:卡片 ----------------
+ const card = (title, subtitle, body, right = '') =>
+ `<div class="card"><div class="card-head"><span class="title">${title}</span>${subtitle ? `<span class="subtitle">${subtitle}</span>` : ''}${right ? `<span class="right">${right}</span>` : ''}</div>${body}</div>`;
+
+ function renderStats() {
+ const inR = pick();
+ const s = sum(inR);
+ const today = sum(pick({ range: false }).filter((r) => r.day === TODAY_KEY));
+ const parties = new Set(inR.filter((r) => tokensOf(r) > 0).map((r) => r.party)).size;
+ const computers = new Set(inR.filter((r) => r.computer !== NONE).map((r) => r.computer)).size;
+ const models = new Set(inR.map((r) => r.model)).size;
+ const cell = (v, l) => `<div class="stat"><span class="v">${v}</span><span class="l">${l}</span></div>`;
+ return `<div class="stats">
+ ${singleDay() ? '' : cell(today.tokens > 0 ? fmtTok(today.tokens) : '—', '今日 token')}
+ ${cell(s.tokens > 0 ? fmtTok(s.tokens) : '—', `${rangeLabel()} token`)}
+ ${cell(s.amount > 0 ? '约 ' + fmtMoney(s.amount) : '—', '估算金额')}
+ ${cell(parties > 0 ? String(parties) : '—', '使用方')}
+ ${grouped() ? cell(computers > 0 ? `${computers} 台` : '—', '用到的电脑') : ''}
+ ${cell(models > 0 ? String(models) : '—', '用到的模型')}
+ </div>`;
+ }
+
+ function shareCell(p, color) {
+ return `<td class="sharecell dim"><span class="b" style="width:${Math.max(2, p * 46)}px;background:${color}"></span>${fmtPct(p)}</td>`;
+ }
+ function shareBar(items) {
+ const total = items.reduce((a, i) => a + i.tokens, 0);
+ if (!(total > 0)) return '';
+ return `<div class="sharebar" aria-hidden="true">${items.filter((i) => i.tokens > 0).map((i) => `<div style="width:${(i.tokens / total) * 100}%;background:${i.color}" title="${esc(i.name)} · ${fmtTok(i.tokens)} token"></div>`).join('')}</div>`;
+ }
+
+ function renderPeople() {
+ const list = pick({ party: false });
+ const todayList = pick({ party: false, range: false }).filter((r) => r.day === TODAY_KEY);
+ const by = groupBy(list, 'party');
+ const todayBy = groupBy(todayList, 'party');
+ const allTime = groupBy(rows(), 'party');
+ const items = visibleParties().map((p) => {
+ const s = sum(by.get(p.key) ?? []);
+ return { p, s, tokens: s.tokens, color: partyColor(p.key), name: p.name, today: sum(todayBy.get(p.key) ?? []).tokens,
+ computers: new Set((by.get(p.key) ?? []).filter((r) => r.computer !== NONE).map((r) => r.computer)).size,
+ lastAt: sum(allTime.get(p.key) ?? []).lastAt };
+ });
+ const total = items.reduce((a, i) => a + i.tokens, 0);
+ const hasMembers = items.some((i) => i.p.kind === 'member');
+ const head = `<tr>
+ <th class="first">使用方</th><th>${rangeLabel()} token</th><th>占比</th>
+ ${singleDay() ? '' : '<th>今日</th>'}<th>估算金额</th>${grouped() ? '<th>用到的电脑</th>' : ''}${hasMembers ? '<th aria-label="操作"></th>' : ''}
+ </tr>`;
+ const body = items.map((i) => {
+ const p = i.p;
+ const st = state.statuses[p.key];
+ const used = i.tokens > 0;
+ const avatar = p.kind === 'relay'
+ ? `<span class="avatar" style="color:var(--secondary)">${monitorIcon(14)}</span>`
+ : `<span class="avatar">${esc(p.initial)}</span>`;
+ const tag = p.kind === 'self' ? '你' : p.kind === 'member' ? '分享的人' : '看不到具体是谁';
+ const status = p.kind === 'member'
+ ? (st.status === 'paused' ? '<span class="status paused"><span class="dot"></span>已暂停</span>'
+ : `<span class="status"><span class="dot"></span>正常${st.running > 0 ? ` · ${st.running} 个任务运行中` : ''}</span>`)
+ : '';
+ const last = i.lastAt ? `最近使用:${fmtRelative(i.lastAt)}` : '还未使用';
+ const l2 = p.kind === 'member' ? `${fmtDate(p.joined)}加入 · ${last}` : last;
+ const selected = state.party === p.key;
+ return `<tr class="click ${selected ? 'selected' : ''} ${used ? '' : 'unused'} ${st?.status === 'paused' ? 'paused' : ''}" data-action="focus-party" data-value="${p.key}" title="${selected ? '再点一次看所有人' : `只看 ${esc(p.name)}`}">
+ <td class="first"><div class="who">
+ <span class="swatch" style="background:${i.color}"></span>${avatar}
+ <div class="who-text">
+ <div class="who-l1"><span class="name">${esc(p.name)}</span><span class="tag">${tag}</span>${status}</div>
+ <div class="who-l2">${l2}</div>
+ </div>
+ </div></td>
+ <td>${used ? fmtTok(i.tokens) : '—'}</td>
+ ${used && total > 0 ? shareCell(i.tokens / total, i.color) : '<td class="dim">—</td>'}
+ ${singleDay() ? '' : `<td class="dim">${i.today > 0 ? fmtTok(i.today) : '—'}</td>`}
+ <td>${used ? '约 ' + fmtMoney(i.s.amount) : '—'}</td>
+ ${grouped() ? `<td class="dim">${i.computers > 0 ? `${i.computers} 台` : '—'}</td>` : ''}
+ ${hasMembers ? `<td class="act">${p.kind === 'member' ? `<button type="button" class="icon-btn" data-action="menu" data-value="${p.key}" aria-label="${esc(p.name)} 的更多操作">${dotsIcon}</button>` : ''}</td>` : ''}
+ </tr>`;
+ }).join('');
+ const subtitle = state.computer === 'all' ? rangeLabel() : `${rangeLabel()} · ${computerName(state.computer)}`;
+ return card('按人', subtitle, `${shareBar(items)}<div class="tablewrap"><table style="min-width:640px">${head}<tbody>${body}</tbody></table></div>`);
+ }
+
+ function computerName(k) {
+ if (k === NONE) return '更早的记录';
+ const c = COMPUTERS.find((x) => x.key === k);
+ return c.key === 'local' ? `本机(${c.source})` : c.name;
+ }
+
+ function renderComputers() {
+ const list = pick({ computer: false });
+ const todayList = pick({ computer: false, range: false }).filter((r) => r.day === TODAY_KEY);
+ const by = groupBy(list, 'computer');
+ const todayBy = groupBy(todayList, 'computer');
+ const keys = COMPUTERS.filter((c) => !c.removed || by.has(c.key)).map((c) => c.key);
+ if (by.has(NONE)) keys.push(NONE);
+ const items = keys.map((k) => {
+ const s = sum(by.get(k) ?? []);
+ return { k, s, tokens: s.tokens, color: computerColor(k), name: computerName(k), today: sum(todayBy.get(k) ?? []).tokens,
+ parties: new Set((by.get(k) ?? []).map((r) => r.party)).size };
+ });
+ const total = items.reduce((a, i) => a + i.tokens, 0);
+ const head = `<tr><th class="first">组内电脑</th><th>${rangeLabel()} token</th><th>占比</th>${singleDay() ? '' : '<th>今日</th>'}<th>估算金额</th><th>使用方</th></tr>`;
+ const body = items.map((i) => {
+ const c = COMPUTERS.find((x) => x.key === i.k);
+ const used = i.tokens > 0;
+ const selected = state.computer === i.k;
+ const source = i.k === NONE ? '当时没有区分电脑' : c.source;
+ const name = i.k === NONE ? '更早的记录' : c.name;
+ const clickable = i.k !== NONE;
+ return `<tr class="${clickable ? 'click' : ''} ${selected ? 'selected' : ''} ${used ? '' : 'unused'}" ${clickable ? `data-action="focus-computer" data-value="${i.k}" title="${selected ? '再点一次看所有电脑' : `只看 ${esc(name)}`}"` : ''}>
+ <td class="first"><div class="who">
+ <span class="swatch" style="background:${i.color}"></span>
+ <span style="color:var(--secondary)">${i.k === NONE ? historyIcon : monitorIcon(14)}</span>
+ <div class="who-l1"><span class="name" style="font-weight:${used ? 500 : 400}">${esc(name)}</span><span class="src">${esc(source)}</span></div>
+ </div></td>
+ <td>${used ? fmtTok(i.tokens) : '—'}</td>
+ ${used && total > 0 ? shareCell(i.tokens / total, i.color) : '<td class="dim">—</td>'}
+ ${singleDay() ? '' : `<td class="dim">${i.today > 0 ? fmtTok(i.today) : '—'}</td>`}
+ <td>${used ? '约 ' + fmtMoney(i.s.amount) : '—'}</td>
+ <td class="dim">${used ? `${i.parties} 方` : '—'}</td>
+ </tr>`;
+ }).join('');
+ const who = state.party === 'all' ? null : PARTIES.find((p) => p.key === state.party)?.name;
+ return card('按电脑', who ? `${rangeLabel()} · ${esc(who)}` : rangeLabel(),
+ `${shareBar(items)}<div class="tablewrap"><table style="min-width:600px">${head}<tbody>${body}</tbody></table></div>`);
+ }
+
+ function renderModels() {
+ const list = pick();
+ if (list.length === 0) return card('按模型', rangeLabel(), '<div class="empty">这段时间没有用量</div>');
+ const by = groupBy(list, 'model');
+ const items = MODELS.filter((m) => by.has(m.key)).map((m) => ({ m, s: sum(by.get(m.key)) })).sort((a, b) => b.s.tokens - a.s.tokens);
+ const total = items.reduce((a, i) => a + i.s.tokens, 0);
+ const head = `<tr><th class="first">模型</th><th>${rangeLabel()} token</th><th>占比</th><th>输入</th><th>输出</th><th>缓存读取</th><th>缓存写入</th><th title="缓存读取 ÷(输入 + 缓存读取 + 缓存写入),与消息卡片同口径。">缓存命中率</th><th>估算金额</th></tr>`;
+ const body = items.map(({ m, s }) => {
+ const color = modelColor(m.key);
+ const hit = s.cacheRead / (s.input + s.cacheRead + s.cacheCreate);
+ return `<tr>
+ <td class="first"><div class="who"><span class="swatch" style="background:${color}"></span><span class="name" style="font-weight:500">${m.name}</span><span class="model-tag">${m.agent}</span></div></td>
+ <td>${fmtTok(s.tokens)}</td>${shareCell(s.tokens / total, color)}
+ <td>${fmtTok(s.input)}</td><td>${fmtTok(s.output)}</td><td>${fmtTok(s.cacheRead)}</td><td>${fmtTok(s.cacheCreate)}</td>
+ <td>${fmtPct(hit)}</td><td>约 ${fmtMoney(s.amount)}</td>
+ </tr>`;
+ }).join('');
+ return card('按模型', rangeLabel(), `<div class="tablewrap"><table style="min-width:720px">${head}<tbody>${body}</tbody></table></div><p class="note">金额按本地单价估算,不代表供应商实际账单。</p>`);
+ }
+
+ function stackMeta() {
+ if (state.stack === 'computer') return { field: 'computer', order: [...COMPUTERS.map((c) => c.key), NONE], color: computerColor, name: computerName, label: '按电脑堆叠' };
+ if (state.stack === 'model') return { field: 'model', order: MODELS.map((m) => m.key), color: modelColor, name: (k) => MODELS.find((m) => m.key === k).name, label: '按模型堆叠' };
+ return { field: 'party', order: PARTIES.map((p) => p.key), color: partyColor, name: (k) => PARTIES.find((p) => p.key === k).name, label: '按人堆叠' };
+ }
+ function dayBars() {
+ const meta = stackMeta();
+ const list = pick({ range: false });
+ const byDay = groupBy(list, 'day');
+ const days = [];
+ for (let i = 29; i >= 0; i--) {
+ const day = shift(-i);
+ const segs = new Map();
+ for (const r of byDay.get(day) ?? []) segs.set(r[meta.field], (segs.get(r[meta.field]) ?? 0) + tokensOf(r));
+ const segments = meta.order.filter((k) => segs.get(k) > 0).map((k) => ({ key: k, tokens: segs.get(k), color: meta.color(k), name: meta.name(k) }));
+ days.push({ day, segments, tokens: segments.reduce((a, s) => a + s.tokens, 0) });
+ }
+ return { days, meta };
+ }
+ function niceTicks(max) {
+ if (!(max > 0)) return [];
+ const raw = max / 4, pow = Math.pow(10, Math.floor(Math.log10(raw)));
+ const step = [1, 2, 2.5, 5, 10].map((m) => m * pow).find((s) => s >= raw) ?? 10 * pow;
+ const t = []; for (let v = step; v <= max * 0.95 && t.length < 3; v += step) t.push(v); return t;
+ }
+ function renderBars() {
+ const H = 96;
+ const { days, meta } = dayBars();
+ const max = Math.max(0, ...days.map((d) => d.tokens));
+ const ticks = niceTicks(max);
+ const sel = selectedDay();
+ const hl = (d) => sel ? d.day === sel : state.range === '7d' && d.day >= shift(-6);
+ const anyHl = days.some(hl);
+ const bars = days.map((d) => {
+ const vh = d.tokens > 0 ? Math.max(3, Math.round((d.tokens / max) * H)) : 2;
+ return `<button type="button" class="bar" data-action="day" data-value="${d.day}" data-tip="bar" data-hl="${hl(d)}" aria-pressed="${sel === d.day}" style="height:${Math.max(24, vh)}px" aria-label="${fmtDate(d.day)} · ${d.tokens > 0 ? fmtTok(d.tokens) + ' token' : '当天没有用量记录'}">
+ <span class="mark" style="height:${vh}px;${d.segments.length ? '' : 'background:var(--chip)'}">${[...d.segments].reverse().map((s) => `<span style="height:${(s.tokens / d.tokens) * 100}%;background:${s.color}"></span>`).join('')}</span>
+ </button>`;
+ }).join('');
+ const present = meta.order.filter((k) => days.some((d) => d.segments.some((s) => s.key === k)));
+ const options = grouped() ? [['party', '按人'], ['computer', '按电脑'], ['model', '按模型']] : [['party', '按人'], ['model', '按模型']];
+ const seg = `<div class="seg" role="group" aria-label="柱子按什么分色">${options.map(([v, l]) => `<button type="button" data-action="stack" data-value="${v}" aria-pressed="${state.stack === v}">${l}</button>`).join('')}</div>`;
+ const body = max > 0 ? `<div class="bars">
+ <div class="yaxis">${ticks.map((v) => `<span style="bottom:${(v / max) * H}px">${fmtTok(v)}</span>`).join('')}</div>
+ <div class="plot ${anyHl ? 'has-hl' : ''}">
+ ${ticks.map((v) => `<div class="gridline" style="bottom:${(v / max) * H}px"></div>`).join('')}
+ <div class="plot-inner">${bars}</div>
+ </div>
+ </div>
+ <div class="legend">${present.map((k) => `<span><i class="swatch" style="background:${meta.color(k)}"></i>${esc(meta.name(k))}</span>`).join('')}</div>`
+ : '<div class="empty">近 30 天没有用量</div>';
+ return card('近 30 天每日 token', meta.label, body, seg);
+ }
+
+ function heatData() {
+ const by = new Map();
+ for (const r of pick({ range: false })) by.set(r.day, (by.get(r.day) ?? 0) + tokensOf(r));
+ return by;
+ }
+ function heatWeeks() { return Math.max(20, Math.min(53, Math.floor((state.heatWidth + 3) / 15))); }
+ function renderHeatInner() {
+ const weeks = heatWeeks();
+ const by = heatData();
+ const max = Math.max(0, ...by.values());
+ const startOffset = -TODAY.getDay() - (weeks - 1) * 7;
+ const MIX = [22, 42, 68, 100];
+ const sel = selectedDay();
+ let cols = '', months = '', lastMonth = -1;
+ for (let w = 0; w < weeks; w++) {
+ const firstDay = parseKey(shift(startOffset + w * 7));
+ if (firstDay.getMonth() !== lastMonth) {
+ if (w < weeks - 2) months += `<span style="left:${w * 15}px">${firstDay.getMonth() + 1}月</span>`;
+ lastMonth = firstDay.getMonth();
+ }
+ let cells = '';
+ for (let d = 0; d < 7; d++) {
+ const off = startOffset + w * 7 + d;
+ if (off > 0) { cells += '<span class="heat-cell ph"></span>'; continue; }
+ const day = shift(off);
+ const v = by.get(day) ?? 0;
+ const lv = v <= 0 ? 0 : v / max > 0.75 ? 4 : v / max > 0.5 ? 3 : v / max > 0.25 ? 2 : 1;
+ const bg = lv === 0 ? 'var(--chip)' : `color-mix(in srgb, var(--heat) ${MIX[lv - 1]}%, var(--chip))`;
+ cells += `<button type="button" class="heat-cell" data-action="day" data-value="${day}" data-tip="heat" aria-pressed="${sel === day}" style="background:${bg}" aria-label="${fmtDate(day)} · ${v > 0 ? fmtTok(v) + ' token' : '当天没有用量记录'}"></button>`;
+ }
+ cols += `<div class="heat-col">${cells}</div>`;
+ }
+ return `<div class="heat-months">${months}</div><div class="heat-grid">${cols}</div>`;
+ }
+ function renderHeatmap() {
+ return card('活跃热力图', `近 ${heatWeeks()} 周`, `<div id="heat-body">${renderHeatInner()}</div>`);
+ }
+
+ // ---------------- 整块 ----------------
+ function render() {
+ if (!grouped()) { state.computer = 'all'; if (state.stack === 'computer') state.stack = 'party'; }
+ const el = document.getElementById('usage');
+ const focus = [];
+ if (state.party !== 'all') focus.push(PARTIES.find((p) => p.key === state.party).name);
+ if (state.computer !== 'all') focus.push(computerName(state.computer));
+ el.innerHTML = `
+ <div class="usage-head">
+ <h3 id="usage-title">用量</h3>
+ <p>${grouped()
+ ? '按人统计 Claude 订阅的用量,默认是所有组内电脑的合计,也可以只看某个人或某一台电脑。你自己的用量从这次更新后开始记录。'
+ : '按人统计 Claude 订阅的用量,你自己 = 本机和你其他电脑的合计。你自己的用量从这次更新后开始记录。'}</p>
+ </div>
+ <div class="filterbar">
+ <span class="label">筛选</span>
+ <div class="filters">
+ ${selectHtml('party', '筛选使用方', state.party, partyOptions())}
+ ${grouped() ? selectHtml('computer', '筛选组内电脑', state.computer, computerOptions()) : ''}
+ ${selectHtml('range', '筛选用量时间范围', state.range, rangeOptions())}
+ <label class="datefield">日期<input type="date" id="date-input" max="${TODAY_KEY}" /></label>
+ </div>
+ </div>
+ ${focus.length ? `<div class="focusline">正在看<span class="pill">${focus.map(esc).join(' · ')}</span>的用量<button type="button" class="btn link" data-action="clear">看全部</button></div>` : ''}
+ ${card('概览', '', renderStats())}
+ ${renderPeople()}
+ ${renderBars()}
+ ${renderHeatmap()}
+ ${grouped() ? renderComputers() : ''}
+ ${renderModels()}
+ `;
+ const dateInput = document.getElementById('date-input');
+ if (dateInput) dateInput.value = selectedDay() ?? '';
+ document.getElementById('group-stub').hidden = !grouped();
+ }
+
+ // ---------------- 交互 ----------------
+ const usage = document.getElementById('usage');
+ usage.addEventListener('click', (e) => {
+ const t = e.target.closest('[data-action]');
+ if (!t) return;
+ const { action, id, value } = t.dataset;
+ if (action === 'open') { state.open = state.open === id ? null : id; render(); return; }
+ if (action === 'pick') {
+ // 只接受各筛选器已有的选项,不让 DOM 的 data-id 写入任意状态(如 statuses)。
+ if (id === 'party') {
+ const option = partyOptions().find((o) => o !== 'sep' && o.value === value);
+ if (option) state.party = option.value;
+ } else if (id === 'computer') {
+ const option = computerOptions().find((o) => o !== 'sep' && o.value === value);
+ if (option) state.computer = option.value;
+ } else if (id === 'range') {
+ const option = rangeOptions().find((o) => o.value === value);
+ if (option) state.range = option.value;
+ }
+ state.open = null; render(); return;
+ }
+ if (action === 'stack') { state.stack = value; render(); return; }
+ if (action === 'day') { state.range = `day:${value}`; hideTip(); render(); return; }
+ if (action === 'focus-party') { state.party = state.party === value ? 'all' : value; render(); return; }
+ if (action === 'focus-computer') { state.computer = state.computer === value ? 'all' : value; render(); return; }
+ if (action === 'clear') { state.party = 'all'; state.computer = 'all'; render(); return; }
+ if (action === 'menu') { e.stopPropagation(); openMenu(t, value); }
+ });
+ usage.addEventListener('change', (e) => {
+ if (e.target.id !== 'date-input') return;
+ const v = e.target.value;
+ if (/^\d{4}-\d{2}-\d{2}$/.test(v) && v <= TODAY_KEY) state.range = `day:${v}`;
+ else if (!v) state.range = '30d';
+ render();
+ });
+ document.addEventListener('click', (e) => {
+ if (state.open && !e.target.closest('.select')) { state.open = null; render(); }
+ if (!e.target.closest('.menu') && !e.target.closest('[data-action="menu"]')) closeMenu();
+ });
+ document.addEventListener('keydown', (e) => {
+ if (e.key !== 'Escape') return;
+ if (state.open) { state.open = null; render(); }
+ closeMenu(); closeDialog();
+ });
+
+ // 行尾 ··· 菜单与删除确认
+ const layer = document.getElementById('menu-layer');
+ function closeMenu() { layer.querySelector('.menu')?.remove(); }
+ function closeDialog() { layer.querySelector('.scrim')?.remove(); }
+ function openMenu(anchor, key) {
+ closeMenu();
+ const p = PARTIES.find((x) => x.key === key);
+ const paused = state.statuses[key].status === 'paused';
+ const r = anchor.getBoundingClientRect();
+ const menu = document.createElement('div');
+ menu.className = 'menu'; menu.setAttribute('role', 'menu');
+ menu.innerHTML = `<button type="button" role="menuitem" data-m="toggle">${paused ? '恢复分享' : '关闭分享'}</button><button type="button" role="menuitem" class="danger" data-m="remove">删除</button>`;
+ menu.style.top = `${r.bottom + 4}px`;
+ menu.style.left = `${Math.max(8, r.right - 160)}px`;
+ menu.addEventListener('click', (e) => {
+ const b = e.target.closest('[data-m]'); if (!b) return;
+ closeMenu();
+ if (b.dataset.m === 'toggle') {
+ state.statuses[key] = paused ? { status: 'active', running: 0 } : { status: 'paused', running: 0 };
+ render();
+ } else confirmRemove(p);
+ });
+ layer.appendChild(menu);
+ }
+ function confirmRemove(p) {
+ const scrim = document.createElement('div');
+ scrim.className = 'scrim';
+ scrim.innerHTML = `<div class="dialog" role="dialog" aria-modal="true" aria-labelledby="dlg-t">
+ <h4 id="dlg-t">删除对 ${esc(p.name)} 的分享?</h4>
+ <p>${esc(p.name)} 将立即无法使用 Claude 订阅,正在运行的任务会停止。之后要再分享,需要重新生成链接。用量记录会保留。</p>
+ <div class="actions"><button type="button" class="btn secondary" data-d="cancel">取消</button><button type="button" class="btn danger" data-d="ok">删除分享</button></div>
+ </div>`;
+ scrim.addEventListener('click', (e) => {
+ const b = e.target.closest('[data-d]');
+ if (e.target === scrim || b?.dataset.d === 'cancel') closeDialog();
+ else if (b?.dataset.d === 'ok') { state.removed.add(p.key); if (state.party === p.key) state.party = 'all'; closeDialog(); render(); }
+ });
+ layer.appendChild(scrim);
+ scrim.querySelector('[data-d="cancel"]').focus();
+ }
+
+ // 悬停浮层:柱子显示当天每部分多少,热力格只显示当天合计
+ const tip = document.getElementById('tooltip');
+ function hideTip() { tip.hidden = true; }
+ function showTip(el) {
+ const day = el.dataset.value;
+ let html = `<div class="d">${fmtFullDate(day)}</div>`;
+ if (el.dataset.tip === 'bar') {
+ const { days } = dayBars();
+ const d = days.find((x) => x.day === day);
+ if (!d || d.tokens === 0) html += '<div class="t" style="font-size:13px;margin-bottom:0">当天没有用量记录</div>';
+ else {
+ const segs = [...d.segments].sort((a, b) => b.tokens - a.tokens);
+ html += `<div class="t">${fmtTok(d.tokens)}<small>token</small></div>`;
+ html += `<div class="segbar">${segs.map((s) => `<span style="width:${(s.tokens / d.tokens) * 100}%;background:${s.color}"></span>`).join('')}</div>`;
+ html += segs.map((s) => `<div class="r"><i class="swatch" style="background:${s.color}"></i><span class="n">${esc(s.name)}</span><span class="v">${fmtTok(s.tokens)}</span><span class="p">${fmtPct(s.tokens / d.tokens)}</span></div>`).join('');
+ }
+ } else {
+ const v = heatData().get(day) ?? 0;
+ html += v > 0 ? `<div class="t" style="margin-bottom:0">${fmtTok(v)}<small>token</small></div>` : '<div class="t" style="font-size:13px;margin-bottom:0">当天没有用量记录</div>';
+ }
+ tip.innerHTML = html;
+ tip.hidden = false;
+ const r = el.getBoundingClientRect();
+ const w = tip.offsetWidth, h = tip.offsetHeight;
+ let left = r.left + r.width / 2 - w / 2;
+ left = Math.min(window.innerWidth - w - 8, Math.max(8, left));
+ let top = r.top - h - 8;
+ if (top < 56) top = r.bottom + 8;
+ tip.style.left = `${left}px`; tip.style.top = `${top}px`;
+ }
+ usage.addEventListener('pointerover', (e) => { const el = e.target.closest('[data-tip]'); if (el) showTip(el); });
+ usage.addEventListener('pointerout', (e) => { const el = e.target.closest('[data-tip]'); if (el && !el.contains(e.relatedTarget)) hideTip(); });
+ usage.addEventListener('focusin', (e) => { const el = e.target.closest('[data-tip]'); if (el) showTip(el); });
+ usage.addEventListener('focusout', hideTip);
+ window.addEventListener('scroll', hideTip, true);
+
+ // 热力图按卡片宽度显示至少 20 周
+ new ResizeObserver(() => {
+ const body = document.getElementById('heat-body');
+ if (!body) return;
+ const width = body.clientWidth;
+ if (Math.abs(width - state.heatWidth) < 8) return;
+ state.heatWidth = width;
+ body.innerHTML = renderHeatInner();
+ const sub = body.closest('.card').querySelector('.subtitle');
+ if (sub) sub.textContent = `近 ${heatWeeks()} 周`;
+ }).observe(document.querySelector('.page'));
+
+ // 评审工具条
+ function bindSeg(id, onPick) {
+ const seg = document.getElementById(id);
+ seg.addEventListener('click', (e) => {
+ const b = e.target.closest('button'); if (!b) return;
+ seg.querySelectorAll('button').forEach((x) => x.setAttribute('aria-pressed', String(x === b)));
+ onPick(b.dataset.v);
+ });
+ }
+ bindSeg('theme-seg', (v) => { document.body.classList.toggle('dark', v === 'dark'); });
+ bindSeg('scenario-seg', (v) => { state.scenario = v; render(); });
+
+ render();
+})();
+</script>
+</body>
+</html>
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index 67db8f252b..9591fbe271 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -268,7 +268,7 @@ The grayscale rule is near-absolute. The following are the **only** sanctioned n
> - **CINDY checked Switch** — `--switch-track-on` uses blue `#417CDD` in CINDY Light and Dark (owner decision 2026-09-15, §15.17). This is an enabled-state signal, independently adjustable from focus, caret and Auto Approval despite sharing their current hue. Other themes retain their own checked-track colors.
> - **Windows taskbar attention badge** — the native OS overlay uses a fixed red background (`#D91F37`) and white digits with no outline (`#FFFFFF`) in both Light and Dark taskbars. This is the app-wide count of active tasks needing attention, not an error-only status. The image-specific semantic pair lives in `apps/desktop/src/main/windowsBadgeIcon.ts`; it is not an in-app theme token. Keep a 16-logical-pixel transparent canvas and center the circle and digits at 80% of their original size (user refinement, 2026-09-16). Render using the highest connected display scale and pass that physical-size image directly to the Windows Shell through the native taskbar bridge (Electron 41 otherwise forces overlays to 16 physical pixels). Redraw after display/DPI changes and taskbar recreation; keep the multi-resolution Electron overlay as a failure fallback. Use a circle for one digit, a rounded square for multiple digits, and `99+` above 99. The accessibility description keeps the exact total. Only the OS image may use its fitted 8–12px system-font digits; web typography and status-dot color rules are unchanged.
> - **Toast Info / Success / Warning / Error** — `#417CDD` / `#2AAE5B` / `#F3A115` / `#D91F37`(finalized 2026-07-17; Toast exemption lifted) — used ONLY on the 16×16 lucide icon inside Toast pill notifications. The pill body (background, text, border, close icon) remains strictly grayscale. Info blue #417CDD equals the focus-ring / Auto Approval value (originally #3B82F6, added 2026-07-14, now finalized); success/warning/error equal the global status colors (done green / status error / warning foreground).
-> - **Usage History category color (owner-approved 2026-09-08, extended 2026-09-09).** The registered usage heatmap uses a blue intensity scale. Daily token bars and their corresponding model-table swatches/share marks use `--usage-model-1` … `--usage-model-5` as the seed palette; additional models receive theme-derived hues without a top-five cutoff. All model identities in the full history are included, even when absent from the last 30 days. Agent/harness swatches, share marks and the stacked share strip reuse the existing engine identity tokens: `--engine-badge-cc` (terracotta orange), `--engine-badge-codex` (blue), and `--usage-model-1` (owner-chosen teal for pi, to distinguish it from Codex blue). Claude/Codex retain their cross-mode fixed-value contract; pi follows the existing Light/Dark teal values. `--usage-heatmap-high` supplies the high end of the heatmap. The heatmap retains its process-blue alias; category colors do not inherit process/status semantics. Task marks, text and control frames stay neutral. See [the component specification](./usage-history-charts.md); colors.ts remains the seed-value source, with runtime derivation under governance §3.4.
+> - **Usage History category color (owner-approved 2026-09-08, extended 2026-09-09).** The registered usage heatmap uses a blue intensity scale. Daily token bars and their corresponding model-table swatches/share marks use `--usage-model-1` … `--usage-model-5` as the seed palette; additional models receive theme-derived hues without a top-five cutoff. All model identities in the full history are included, even when absent from the last 30 days. Agent/harness swatches, share marks and the stacked share strip reuse the existing engine identity tokens: `--engine-badge-cc` (terracotta orange), `--engine-badge-codex` (blue), and `--usage-model-1` (owner-chosen teal for pi, to distinguish it from Codex blue). Claude/Codex retain their cross-mode fixed-value contract; pi follows the existing Light/Dark teal values. `--usage-heatmap-high` supplies the high end of the heatmap. The heatmap retains its process-blue alias; category colors do not inherit process/status semantics. Task marks, text and control frames stay neutral. **Extended 2026-10-17 (owner approved the prototype):** the provider「远程与分享」page reuses the same charts and tables for provider usage; there the same seed palette and derivation also colour the person and group-computer categories (bars stacked by person / computer / model, plus each table's swatches, share marks and share strip), ranked by a fixed order (people as listed, computers in group order, models by full-history tokens) that filters never reassign. No new tokens, shapes or status meaning. See [the component specification](./usage-history-charts.md); colors.ts remains the seed-value source, with runtime derivation under governance §3.4.
> - **Resource Usage Process Categories** — the Resource Usage table may color only its 14px process-type glyphs so dense rows can be scanned by category (user-requested 2026-08-06). The six category pairs are task Agent blue `#2563EB / #60A5FA`, Agent service purple `#7C3AED / #A78BFA`, main-process pink `#DB2777 / #F472B6`, renderer cyan `#0891B2 / #22D3EE`, GPU amber `#D97706 / #F59E0B`, and utility green `#059669 / #34D399` (Light / Dark). These colors encode process category, **not health or status**; row backgrounds, labels, metrics, selection and actions remain on the neutral system. Direct use is confined to `resource-usage` process glyphs; the explicitly registered Usage History heatmap alias above may also reference the task-blue value. No other table or process UI inherits this permission. Tokens: `--process-agent-task-icon`, `--process-agent-service-icon`, `--process-main-icon`, `--process-renderer-icon`, `--process-gpu-icon`, `--process-utility-icon`.
> - **Bot Avatar Hues** — the Bots feature may fill a Bot's round avatar with one of nine registered tints so a list of persistent assistants can be told apart at a glance (registered 2026-08-17). The hue encodes **which Bot this is** — an identity cue like the file-type badges above, never health, status, or channel. Light mode uses soft tints, Dark mode the matching deep tints; the emoji and the initial-letter fallback (always `--text-primary`) stay legible in both. Tokens: `--bot-avatar-red-bg` / `-orange-` / `-amber-` / `-green-` / `-teal-` / `-blue-` / `-violet-` / `-pink-` / `-graphite-bg` (the last is the neutral step, and is where legacy `graphite` avatar data lands). Scope is strictly the Bot avatar fill in `features/bots` — do not reuse these tints for status dots, badges, row backgrounds, or any other surface. External theme import never touches them (the import template is allow-list only), so Bot identity colors do not drift between themes.
> - **Bot Unread Badge** — the Bots sidebar may paint its unread pill and its pending-todo dot in information blue `#417CDD` with white text (registered 2026-08-19). The color encodes **IM unread semantics** ("how much have I not seen"), the one signal every chat list has taught users to read by color alone; it is not a CTA and not a health/status tone. The pill was previously the inverse-CTA fill, which on the selected row's light-gray pill turned into two high-contrast marks competing for the same glance. Same value both modes — an unread count means the same thing in Light and Dark, and the value is already the registered focus-ring / Auto Approval / Toast-info blue. The foreground is a standalone white: `--accent-pure-cta-fg` flips to black in Dark and cannot be borrowed. Tokens: `--bot-unread-bg` / `--bot-unread-fg`. Scope is strictly teammate-list unread indicators in `features/bots`, including the Cindy device row, its device-picker options/trigger and shared chat-header picker; Mobile mirrors the value as `botUnread` for the companion list row's unread dot only (registered 2026-09-29 — the host sends a boolean, so Mobile shows a dot, not a count) — do not reuse it for other badges, status dots, row backgrounds, or any other surface.
@@ -929,7 +929,7 @@ Theme switching: `useTheme.ts` provides `theme` (System / Light / Dark mode) plu
| `--file-badge-pdf/-doc/-sheet/-slide/-code` + `--file-badge-fg` | `#B23A26` / `#2C5CA8` / `#2E7D4F` / `#A25A12` / `#5B49A8`, fg `#FFFFFF` | same | File-type badges on the self-drawn attachment icon (2026-07-27). Bound to _what the file is_, not to the theme, so both modes share one value. Each accent is picked for ≥4.5:1 against `--file-badge-fg` (5.96 / 6.56 / 5.05 / 5.24 / 7.09) — the badge label renders at 10px (Micro Label floor, §3), so AA small-text applies. `--file-badge-fg` is a standalone white: `--accent-pure-cta-fg` flips to black in Dark and cannot be borrowed. |
| `--bot-avatar-red-bg` … `--bot-avatar-graphite-bg` (9 tokens) | soft tints (`#f7ded9` … `#e5e5e5`) | deep tints (`#4a2e2a` … `#3c3c3a`) | Bot avatar fills in `features/bots` only (2026-08-17). Identity cue ("which Bot"), not status; emoji / initial-letter fallback reads `--text-primary` in both modes. Not part of the external-theme import allow-list, so the hues stay stable across themes. |
| `--bot-unread-bg` / `--bot-unread-fg` | `#417CDD` / `#FFFFFF` | same | Teammate-list unread indicators in `features/bots`, including the Cindy device row, its device-picker options/trigger and shared chat-header picker (scope extended 2026-09-21); Mobile `botUnread` mirrors it for the companion list unread dot only (2026-09-29). IM unread semantics, not a CTA and not status; theme-invariant because "unread" means the same thing in both modes. Value is the registered focus-ring / Auto Approval / Toast-info blue; the fg is a standalone white because `--accent-pure-cta-fg` flips to black in Dark. Must not leak to unrelated badges, dots or surfaces. |
-| `--usage-heatmap-high`, `--usage-model-1` … `--usage-model-5` | Heatmap blue alias + reference-refined model palette; see colors.ts | Corresponding Dark palette; see colors.ts | Usage History heatmap, token bars and matching model-table marks only (2026-09-08). Category/intensity, never status. Only these newly introduced model-role defaults are refined; process tokens and user theme overrides do not change. |
+| `--usage-heatmap-high`, `--usage-model-1` … `--usage-model-5` | Heatmap blue alias + reference-refined model palette; see colors.ts | Corresponding Dark palette; see colors.ts | Usage History heatmap, token bars and matching model-table marks only (2026-09-08); since 2026-10-17 also the same charts and person / computer / model table marks in the provider「远程与分享」usage block. Category/intensity, never status. Only these newly introduced model-role defaults are refined; process tokens and user theme overrides do not change. |
| `--process-agent-task-icon`, `--process-agent-service-icon`, `--process-main-icon`, `--process-renderer-icon`, `--process-gpu-icon`, `--process-utility-icon` | `#2563EB` / `#7C3AED` / `#DB2777` / `#0891B2` / `#D97706` / `#059669` | `#60A5FA` / `#A78BFA` / `#F472B6` / `#22D3EE` / `#F59E0B` / `#34D399` | Resource Usage 14px process-category glyphs only (2026-08-06). Category cue, not status; all surrounding UI stays neutral. Protected from automatic external-theme import so category identity does not drift. |
Mobile's `betaChannelBadgeBackground/Foreground` remain the cross-theme fixed pair `#DF0C27` /
diff --git a/docs/design-rules/design-inventory.md b/docs/design-rules/design-inventory.md
index c37000ec1a..481639eaee 100644
--- a/docs/design-rules/design-inventory.md
+++ b/docs/design-rules/design-inventory.md
@@ -38,7 +38,7 @@
| `desktop.overlay.toast` | desktop | Toast | App 常驻 ToastContainer(用户可见出口,不展开业务逻辑) | Toast, ToastContainer | apps/desktop/src/renderer/components/ui/toast/Toast.tsx, apps/desktop/src/renderer/components/ui/toast/ToastContainer.tsx, apps/desktop/src/renderer/components/ui/toast/index.ts | 5 | 4 | 3 |
| `desktop.plugins.app-main` | desktop | 插件主视图 | hash `/apps/:ghostId`(GhostMainViewFeatureLayout) | GhostMainViewFeatureLayout, GhostMainViewHost | apps/desktop/src/renderer/features/plugin/GhostMainViewFeatureLayout.tsx, apps/desktop/src/renderer/features/plugin/GhostMainViewHost.tsx | 0 | 0 | 0 |
| `desktop.plugins.installed` | desktop | 已装插件 | hash `/plugins`(GhostPluginPage) | AddMarketplaceDialog, GhostPluginDetailView, GhostPluginPage, MarketPluginDetailView, MyPublishesSection, PluginManagementLayout, PluginScopePicker, UpdateAllDialog | apps/desktop/src/renderer/features/plugin/AddMarketplaceDialog.tsx, apps/desktop/src/renderer/features/plugin/GhostPluginDetailView.tsx, apps/desktop/src/renderer/features/plugin/GhostPluginPage.tsx, apps/desktop/src/renderer/features/plugin/MarketPluginDetailView.tsx, apps/desktop/src/renderer/features/plugin/MyPublishesSection.tsx, apps/desktop/src/renderer/features/plugin/PluginManagementLayout.tsx, apps/desktop/src/renderer/features/plugin/PluginScopePicker.tsx, apps/desktop/src/renderer/features/plugin/UpdateAllDialog.tsx, apps/desktop/src/renderer/features/plugin/plugin-motion.css | 28 | 0 | 49 |
-| `desktop.settings` | desktop | 设置 | hash `/settings`(SettingsView;tab 含 general / personalization / providers / billing / usage / voice-input / im-bot / shortcuts / agent-island / import / remote-control / ghosts / builtin-tools / computer-use / help / about) | SettingsView | apps/desktop/src/renderer/components/settings/AboutSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AboutSection.tsx, apps/desktop/src/renderer/components/settings/AccountDeletionSection.tsx, apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx, apps/desktop/src/renderer/components/settings/AgentIslandSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AgentIslandSection.tsx, apps/desktop/src/renderer/components/settings/AgentResourceSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AgentResourceSection.tsx, apps/desktop/src/renderer/components/settings/AppearanceSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AppearanceSection.tsx, apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsx, apps/desktop/src/renderer/components/settings/AvatarCropEditor.tsx, apps/desktop/src/renderer/components/settings/BetaChannelCell.tsx, apps/desktop/src/renderer/components/settings/BillingSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/BrowserBackendSubsection.tsx, apps/desktop/src/renderer/components/settings/BrowserRealProfileSubsection.tsx, apps/desktop/src/renderer/components/settings/BuiltinToolsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/BuiltinToolsSection.tsx, apps/desktop/src/renderer/components/settings/ChatEmbeddingCell.tsx, apps/desktop/src/renderer/components/settings/ChipMetricsSection.tsx, apps/desktop/src/renderer/components/settings/CindyMakeSection.settings-search.ts, apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx, apps/desktop/src/renderer/components/settings/CollaborationSection.settings-search.ts, apps/desktop/src/renderer/components/settings/CollaborationSection.tsx, apps/desktop/src/renderer/components/settings/CompactionSection.tsx, apps/desktop/src/renderer/components/settings/ComposerSendShortcutSection.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionGuideWindow.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionRow.tsx, apps/desktop/src/renderer/components/settings/ComputerUseSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx, apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx, apps/desktop/src/renderer/components/settings/DefaultOverrideControls.tsx, apps/desktop/src/renderer/components/settings/DialogueDirectorySection.tsx, apps/desktop/src/renderer/components/settings/DingTalkBotSection.tsx, apps/desktop/src/renderer/components/settings/DiscordBotSection.tsx, apps/desktop/src/renderer/components/settings/DownloadMeter.tsx, apps/desktop/src/renderer/components/settings/ExperimentalSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotNotificationSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotSection.tsx, apps/desktop/src/renderer/components/settings/FontFamilyPicker.tsx, apps/desktop/src/renderer/components/settings/GeneralSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/GenericGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/GitSafetySection.settings-search.ts, apps/desktop/src/renderer/components/settings/GitSafetySection.tsx, apps/desktop/src/renderer/components/settings/HarnessVersionMenuRow.tsx, apps/desktop/src/renderer/components/settings/HelpAssistantPanel.tsx, apps/desktop/src/renderer/components/settings/HelpSection.settings-search.ts, apps/desktop/src/renderer/components/settings/HelpSection.tsx, apps/desktop/src/renderer/components/settings/HelpThreadView.tsx, apps/desktop/src/renderer/components/settings/HookConnectionsSection.tsx, apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsx, apps/desktop/src/renderer/components/settings/ImBotSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ImBotSection.tsx, apps/desktop/src/renderer/components/settings/ImChannelSettingsCard.tsx, apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx, apps/desktop/src/renderer/components/settings/ImLifecycleAnnouncementSection.tsx, apps/desktop/src/renderer/components/settings/InputDeviceConnectionStatus.tsx, apps/desktop/src/renderer/components/settings/JoyConGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/KeyboardShortcutsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/KeyboardShortcutsSection.tsx, apps/desktop/src/renderer/components/settings/LanguageSection.tsx, apps/desktop/src/renderer/components/settings/LayoutResetControl.tsx, apps/desktop/src/renderer/components/settings/LinkOpenSection.tsx, apps/desktop/src/renderer/components/settings/LlamaCppCandidates.tsx, apps/desktop/src/renderer/components/settings/LlamaCppProviderDetail.tsx, apps/desktop/src/renderer/components/settings/LocalModelDownloadUI.tsx, apps/desktop/src/renderer/components/settings/LocalOllamaInstall.tsx, apps/desktop/src/renderer/components/settings/LocalPackagingTag.tsx, apps/desktop/src/renderer/components/settings/LogoutSection.tsx, apps/desktop/src/renderer/components/settings/LspBetaCell.tsx, apps/desktop/src/renderer/components/settings/McpServerDialog.tsx, apps/desktop/src/renderer/components/settings/McpServersSection.tsx, apps/desktop/src/renderer/components/settings/MemorySection.tsx, apps/desktop/src/renderer/components/settings/MessageNavRailCell.tsx, apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx, apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx, apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx, apps/desktop/src/renderer/components/settings/NotificationSection.settings-search.ts, apps/desktop/src/renderer/components/settings/NotificationSection.tsx, apps/desktop/src/renderer/components/settings/OAuthDeviceCodeCard.tsx, apps/desktop/src/renderer/components/settings/OllamaProviderDetail.tsx, apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx, apps/desktop/src/renderer/components/settings/PersonalizationDetails.settings-search.ts, apps/desktop/src/renderer/components/settings/PersonalizationSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/PiKernelVersionRow.tsx, apps/desktop/src/renderer/components/settings/PiPackagesSection.tsx, apps/desktop/src/renderer/components/settings/PlayStationGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/ProfileEditDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderImportDialog.tsx, apps/desktop/src/renderer/components/settings/ProvidersSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ProvidersSection.tsx, apps/desktop/src/renderer/components/settings/ReadOnlyProviderModels.tsx, apps/desktop/src/renderer/components/settings/RemoteControlSection.settings-search.ts, apps/desktop/src/renderer/components/settings/RemoteControlSection.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopPermissions.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopSetting.tsx, apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx, apps/desktop/src/renderer/components/settings/RemoteSection.tsx, apps/desktop/src/renderer/components/settings/SessionImportSection.settings-search.ts, apps/desktop/src/renderer/components/settings/SessionImportSection.tsx, apps/desktop/src/renderer/components/settings/SessionRuntimeFallbackCell.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/settings/SettingsCatalogPanel.settings-search.ts, apps/desktop/src/renderer/components/settings/SettingsCatalogPanel.tsx, apps/desktop/src/renderer/components/settings/SettingsSearchBox.tsx, apps/desktop/src/renderer/components/settings/SettingsSearchNavigation.ts, apps/desktop/src/renderer/components/settings/SettingsSidebarNav.tsx, apps/desktop/src/renderer/components/settings/SettingsTextInput.tsx, apps/desktop/src/renderer/components/settings/SettingsView.tsx, apps/desktop/src/renderer/components/settings/SharedTasks.settings-search.ts, apps/desktop/src/renderer/components/settings/SilentEncryptedRetryCell.tsx, apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx, apps/desktop/src/renderer/components/settings/StorageManagementCard.settings-search.ts, apps/desktop/src/renderer/components/settings/StorageManagementCard.tsx, apps/desktop/src/renderer/components/settings/StreamFadeSection.tsx, apps/desktop/src/renderer/components/settings/SubagentModelSection.settings-search.ts, apps/desktop/src/renderer/components/settings/SubagentModelSection.tsx, apps/desktop/src/renderer/components/settings/SwitchProGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/TelegramBehaviorSettings.tsx, apps/desktop/src/renderer/components/settings/TelegramBotSection.tsx, apps/desktop/src/renderer/components/settings/TelegramRemoteDevices.tsx, apps/desktop/src/renderer/components/settings/TerminalShellSection.tsx, apps/desktop/src/renderer/components/settings/TipsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/TipsSection.tsx, apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx, apps/desktop/src/renderer/components/settings/UserProfileCard.tsx, apps/desktop/src/renderer/components/settings/UserPromptSection.tsx, apps/desktop/src/renderer/components/settings/VisionBridgeSection.settings-search.ts, apps/desktop/src/renderer/components/settings/VisionBridgeSection.tsx, apps/desktop/src/renderer/components/settings/VoiceInputSection.settings-search.ts, apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx, apps/desktop/src/renderer/components/settings/VoiceSpeakerEnrollmentDialog.tsx, apps/desktop/src/renderer/components/settings/VoiceSpeakerFilterCard.tsx, apps/desktop/src/renderer/components/settings/WallpaperSection.tsx, apps/desktop/src/renderer/components/settings/WechatBotSection.tsx, apps/desktop/src/renderer/components/settings/WecomBotSection.tsx, apps/desktop/src/renderer/components/settings/WindowBehaviorSection.settings-search.ts, apps/desktop/src/renderer/components/settings/WindowBehaviorSection.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeycapGlyphs.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexSettings.tsx, apps/desktop/src/renderer/components/settings/WorktreeRecycleCard.settings-search.ts, apps/desktop/src/renderer/components/settings/WorktreeRecycleCard.tsx, apps/desktop/src/renderer/components/settings/XUsageGuide.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx, apps/desktop/src/renderer/components/settings/androidStatusPresentation.ts, apps/desktop/src/renderer/components/settings/avatarCropGeometry.ts, apps/desktop/src/renderer/components/settings/avatarCropImage.ts, apps/desktop/src/renderer/components/settings/billingVisibility.ts, apps/desktop/src/renderer/components/settings/browserOpenForLoginError.ts, apps/desktop/src/renderer/components/settings/cindyMakeVisibility.ts, apps/desktop/src/renderer/components/settings/computerPermissionFlow.ts, apps/desktop/src/renderer/components/settings/contacts/ContactDetailPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsImportDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsListPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsManagerDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsSection.tsx, apps/desktop/src/renderer/components/settings/contacts/startContactsAiSession.ts, apps/desktop/src/renderer/components/settings/dialogueDirectoryDisplay.ts, apps/desktop/src/renderer/components/settings/dualSenseSilhouette.ts, apps/desktop/src/renderer/components/settings/feishuBotPresentation.ts, apps/desktop/src/renderer/components/settings/fontFamilyValue.ts, apps/desktop/src/renderer/components/settings/gamepadLayoutPrimitives.tsx, apps/desktop/src/renderer/components/settings/gamepadSilhouetteGeom.ts, apps/desktop/src/renderer/components/settings/hookWorkspacePrefsLogic.ts, apps/desktop/src/renderer/components/settings/imBotVisibility.ts, apps/desktop/src/renderer/components/settings/imDefaultSettingsLogic.ts, apps/desktop/src/renderer/components/settings/joyConSilhouette.ts, apps/desktop/src/renderer/components/settings/modelManagementPresentation.ts, apps/desktop/src/renderer/components/settings/modelManagementState.ts, apps/desktop/src/renderer/components/settings/myDevicesModel.ts, apps/desktop/src/renderer/components/settings/providerAssetModule.ts, apps/desktop/src/renderer/components/settings/realProfilePermissionGuide.ts, apps/desktop/src/renderer/components/settings/settingsSearchCatalog.ts, apps/desktop/src/renderer/components/settings/settingsSearchTypes.ts, apps/desktop/src/renderer/components/settings/switchProSilhouette.ts, apps/desktop/src/renderer/components/settings/ultimateC1Silhouette.ts, apps/desktop/src/renderer/components/settings/usage/UsageBarsTooltip.tsx, apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx, apps/desktop/src/renderer/components/settings/usage/UsageDeviceSelect.tsx, apps/desktop/src/renderer/components/settings/usage/UsageHistorySection.settings-search.ts, apps/desktop/src/renderer/components/settings/usage/UsageHistorySection.tsx, apps/desktop/src/renderer/components/settings/usage/UsageStatRow.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTaskTable.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx, apps/desktop/src/renderer/components/settings/usage/formatUsagePercent.ts, apps/desktop/src/renderer/components/settings/usage/usageCharts.css, apps/desktop/src/renderer/components/settings/usage/usageHistoryColors.ts, apps/desktop/src/renderer/components/settings/usage/usageHistoryStats.ts, apps/desktop/src/renderer/components/settings/usageVisibility.ts, apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts, apps/desktop/src/renderer/components/settings/useSettingsEscape.ts, apps/desktop/src/renderer/components/settings/useSettingsSectionTarget.ts, apps/desktop/src/renderer/components/settings/wizardRecommend.ts, apps/desktop/src/renderer/components/settings/workLouderCodexCommandCopy.ts, apps/desktop/src/renderer/components/settings/xboxSeriesSilhouette.ts, apps/desktop/src/renderer/styles/sortable.css | 139 | 100 | 550 |
+| `desktop.settings` | desktop | 设置 | hash `/settings`(SettingsView;tab 含 general / personalization / providers / billing / usage / voice-input / im-bot / shortcuts / agent-island / import / remote-control / ghosts / builtin-tools / computer-use / help / about) | SettingsView | apps/desktop/src/renderer/components/settings/AboutSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AboutSection.tsx, apps/desktop/src/renderer/components/settings/AccountDeletionSection.tsx, apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx, apps/desktop/src/renderer/components/settings/AgentIslandSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AgentIslandSection.tsx, apps/desktop/src/renderer/components/settings/AgentResourceSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AgentResourceSection.tsx, apps/desktop/src/renderer/components/settings/AppearanceSection.settings-search.ts, apps/desktop/src/renderer/components/settings/AppearanceSection.tsx, apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsx, apps/desktop/src/renderer/components/settings/AvatarCropEditor.tsx, apps/desktop/src/renderer/components/settings/BetaChannelCell.tsx, apps/desktop/src/renderer/components/settings/BillingSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/BrowserBackendSubsection.tsx, apps/desktop/src/renderer/components/settings/BrowserRealProfileSubsection.tsx, apps/desktop/src/renderer/components/settings/BuiltinToolsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/BuiltinToolsSection.tsx, apps/desktop/src/renderer/components/settings/ChatEmbeddingCell.tsx, apps/desktop/src/renderer/components/settings/ChipMetricsSection.tsx, apps/desktop/src/renderer/components/settings/CindyMakeSection.settings-search.ts, apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx, apps/desktop/src/renderer/components/settings/CollaborationSection.settings-search.ts, apps/desktop/src/renderer/components/settings/CollaborationSection.tsx, apps/desktop/src/renderer/components/settings/CompactionSection.tsx, apps/desktop/src/renderer/components/settings/ComposerSendShortcutSection.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionGuideWindow.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionRow.tsx, apps/desktop/src/renderer/components/settings/ComputerUseSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx, apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx, apps/desktop/src/renderer/components/settings/DefaultOverrideControls.tsx, apps/desktop/src/renderer/components/settings/DialogueDirectorySection.tsx, apps/desktop/src/renderer/components/settings/DingTalkBotSection.tsx, apps/desktop/src/renderer/components/settings/DiscordBotSection.tsx, apps/desktop/src/renderer/components/settings/DownloadMeter.tsx, apps/desktop/src/renderer/components/settings/ExperimentalSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotNotificationSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotSection.tsx, apps/desktop/src/renderer/components/settings/FontFamilyPicker.tsx, apps/desktop/src/renderer/components/settings/GeneralSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/GenericGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/GitSafetySection.settings-search.ts, apps/desktop/src/renderer/components/settings/GitSafetySection.tsx, apps/desktop/src/renderer/components/settings/HarnessVersionMenuRow.tsx, apps/desktop/src/renderer/components/settings/HelpAssistantPanel.tsx, apps/desktop/src/renderer/components/settings/HelpSection.settings-search.ts, apps/desktop/src/renderer/components/settings/HelpSection.tsx, apps/desktop/src/renderer/components/settings/HelpThreadView.tsx, apps/desktop/src/renderer/components/settings/HookConnectionsSection.tsx, apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsx, apps/desktop/src/renderer/components/settings/ImBotSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ImBotSection.tsx, apps/desktop/src/renderer/components/settings/ImChannelSettingsCard.tsx, apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx, apps/desktop/src/renderer/components/settings/ImLifecycleAnnouncementSection.tsx, apps/desktop/src/renderer/components/settings/InputDeviceConnectionStatus.tsx, apps/desktop/src/renderer/components/settings/JoyConGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/KeyboardShortcutsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/KeyboardShortcutsSection.tsx, apps/desktop/src/renderer/components/settings/LanguageSection.tsx, apps/desktop/src/renderer/components/settings/LayoutResetControl.tsx, apps/desktop/src/renderer/components/settings/LinkOpenSection.tsx, apps/desktop/src/renderer/components/settings/LlamaCppCandidates.tsx, apps/desktop/src/renderer/components/settings/LlamaCppProviderDetail.tsx, apps/desktop/src/renderer/components/settings/LocalModelDownloadUI.tsx, apps/desktop/src/renderer/components/settings/LocalOllamaInstall.tsx, apps/desktop/src/renderer/components/settings/LocalPackagingTag.tsx, apps/desktop/src/renderer/components/settings/LogoutSection.tsx, apps/desktop/src/renderer/components/settings/LspBetaCell.tsx, apps/desktop/src/renderer/components/settings/McpServerDialog.tsx, apps/desktop/src/renderer/components/settings/McpServersSection.tsx, apps/desktop/src/renderer/components/settings/MemorySection.tsx, apps/desktop/src/renderer/components/settings/MessageNavRailCell.tsx, apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx, apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx, apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx, apps/desktop/src/renderer/components/settings/NotificationSection.settings-search.ts, apps/desktop/src/renderer/components/settings/NotificationSection.tsx, apps/desktop/src/renderer/components/settings/OAuthDeviceCodeCard.tsx, apps/desktop/src/renderer/components/settings/OllamaProviderDetail.tsx, apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx, apps/desktop/src/renderer/components/settings/PersonalizationDetails.settings-search.ts, apps/desktop/src/renderer/components/settings/PersonalizationSettings.settings-search.ts, apps/desktop/src/renderer/components/settings/PiKernelVersionRow.tsx, apps/desktop/src/renderer/components/settings/PiPackagesSection.tsx, apps/desktop/src/renderer/components/settings/PlayStationGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/ProfileEditDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderImportDialog.tsx, apps/desktop/src/renderer/components/settings/ProvidersSection.settings-search.ts, apps/desktop/src/renderer/components/settings/ProvidersSection.tsx, apps/desktop/src/renderer/components/settings/ReadOnlyProviderModels.tsx, apps/desktop/src/renderer/components/settings/RemoteControlSection.settings-search.ts, apps/desktop/src/renderer/components/settings/RemoteControlSection.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopPermissions.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopSetting.tsx, apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx, apps/desktop/src/renderer/components/settings/RemoteSection.tsx, apps/desktop/src/renderer/components/settings/SessionImportSection.settings-search.ts, apps/desktop/src/renderer/components/settings/SessionImportSection.tsx, apps/desktop/src/renderer/components/settings/SessionRuntimeFallbackCell.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/settings/SettingsCatalogPanel.settings-search.ts, apps/desktop/src/renderer/components/settings/SettingsCatalogPanel.tsx, apps/desktop/src/renderer/components/settings/SettingsSearchBox.tsx, apps/desktop/src/renderer/components/settings/SettingsSearchNavigation.ts, apps/desktop/src/renderer/components/settings/SettingsSidebarNav.tsx, apps/desktop/src/renderer/components/settings/SettingsTextInput.tsx, apps/desktop/src/renderer/components/settings/SettingsView.tsx, apps/desktop/src/renderer/components/settings/SharedTasks.settings-search.ts, apps/desktop/src/renderer/components/settings/SilentEncryptedRetryCell.tsx, apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx, apps/desktop/src/renderer/components/settings/StorageManagementCard.settings-search.ts, apps/desktop/src/renderer/components/settings/StorageManagementCard.tsx, apps/desktop/src/renderer/components/settings/StreamFadeSection.tsx, apps/desktop/src/renderer/components/settings/SubagentModelSection.settings-search.ts, apps/desktop/src/renderer/components/settings/SubagentModelSection.tsx, apps/desktop/src/renderer/components/settings/SwitchProGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/TelegramBehaviorSettings.tsx, apps/desktop/src/renderer/components/settings/TelegramBotSection.tsx, apps/desktop/src/renderer/components/settings/TelegramRemoteDevices.tsx, apps/desktop/src/renderer/components/settings/TerminalShellSection.tsx, apps/desktop/src/renderer/components/settings/TipsSection.settings-search.ts, apps/desktop/src/renderer/components/settings/TipsSection.tsx, apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx, apps/desktop/src/renderer/components/settings/UserProfileCard.tsx, apps/desktop/src/renderer/components/settings/UserPromptSection.tsx, apps/desktop/src/renderer/components/settings/VisionBridgeSection.settings-search.ts, apps/desktop/src/renderer/components/settings/VisionBridgeSection.tsx, apps/desktop/src/renderer/components/settings/VoiceInputSection.settings-search.ts, apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx, apps/desktop/src/renderer/components/settings/VoiceSpeakerEnrollmentDialog.tsx, apps/desktop/src/renderer/components/settings/VoiceSpeakerFilterCard.tsx, apps/desktop/src/renderer/components/settings/WallpaperSection.tsx, apps/desktop/src/renderer/components/settings/WechatBotSection.tsx, apps/desktop/src/renderer/components/settings/WecomBotSection.tsx, apps/desktop/src/renderer/components/settings/WindowBehaviorSection.settings-search.ts, apps/desktop/src/renderer/components/settings/WindowBehaviorSection.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeycapGlyphs.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexSettings.tsx, apps/desktop/src/renderer/components/settings/WorktreeRecycleCard.settings-search.ts, apps/desktop/src/renderer/components/settings/WorktreeRecycleCard.tsx, apps/desktop/src/renderer/components/settings/XUsageGuide.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx, apps/desktop/src/renderer/components/settings/androidStatusPresentation.ts, apps/desktop/src/renderer/components/settings/avatarCropGeometry.ts, apps/desktop/src/renderer/components/settings/avatarCropImage.ts, apps/desktop/src/renderer/components/settings/billingVisibility.ts, apps/desktop/src/renderer/components/settings/browserOpenForLoginError.ts, apps/desktop/src/renderer/components/settings/cindyMakeVisibility.ts, apps/desktop/src/renderer/components/settings/computerPermissionFlow.ts, apps/desktop/src/renderer/components/settings/contacts/ContactDetailPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsImportDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsListPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsManagerDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsSection.tsx, apps/desktop/src/renderer/components/settings/contacts/startContactsAiSession.ts, apps/desktop/src/renderer/components/settings/dialogueDirectoryDisplay.ts, apps/desktop/src/renderer/components/settings/dualSenseSilhouette.ts, apps/desktop/src/renderer/components/settings/feishuBotPresentation.ts, apps/desktop/src/renderer/components/settings/fontFamilyValue.ts, apps/desktop/src/renderer/components/settings/gamepadLayoutPrimitives.tsx, apps/desktop/src/renderer/components/settings/gamepadSilhouetteGeom.ts, apps/desktop/src/renderer/components/settings/hookWorkspacePrefsLogic.ts, apps/desktop/src/renderer/components/settings/imBotVisibility.ts, apps/desktop/src/renderer/components/settings/imDefaultSettingsLogic.ts, apps/desktop/src/renderer/components/settings/joyConSilhouette.ts, apps/desktop/src/renderer/components/settings/modelManagementPresentation.ts, apps/desktop/src/renderer/components/settings/modelManagementState.ts, apps/desktop/src/renderer/components/settings/myDevicesModel.ts, apps/desktop/src/renderer/components/settings/providerAssetModule.ts, apps/desktop/src/renderer/components/settings/realProfilePermissionGuide.ts, apps/desktop/src/renderer/components/settings/settingsSearchCatalog.ts, apps/desktop/src/renderer/components/settings/settingsSearchTypes.ts, apps/desktop/src/renderer/components/settings/switchProSilhouette.ts, apps/desktop/src/renderer/components/settings/ultimateC1Silhouette.ts, apps/desktop/src/renderer/components/settings/usage/UsageBarsTooltip.tsx, apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx, apps/desktop/src/renderer/components/settings/usage/UsageDeviceSelect.tsx, apps/desktop/src/renderer/components/settings/usage/UsageFilterSelect.tsx, apps/desktop/src/renderer/components/settings/usage/UsageHistorySection.settings-search.ts, apps/desktop/src/renderer/components/settings/usage/UsageHistorySection.tsx, apps/desktop/src/renderer/components/settings/usage/UsageStatRow.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTaskTable.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx, apps/desktop/src/renderer/components/settings/usage/formatUsagePercent.ts, apps/desktop/src/renderer/components/settings/usage/usageCharts.css, apps/desktop/src/renderer/components/settings/usage/usageHistoryColors.ts, apps/desktop/src/renderer/components/settings/usage/usageHistoryStats.ts, apps/desktop/src/renderer/components/settings/usageVisibility.ts, apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts, apps/desktop/src/renderer/components/settings/useSettingsEscape.ts, apps/desktop/src/renderer/components/settings/useSettingsSectionTarget.ts, apps/desktop/src/renderer/components/settings/wizardRecommend.ts, apps/desktop/src/renderer/components/settings/workLouderCodexCommandCopy.ts, apps/desktop/src/renderer/components/settings/xboxSeriesSilhouette.ts, apps/desktop/src/renderer/styles/sortable.css | 139 | 100 | 553 |
| `desktop.shell.main-layout` | desktop | 主窗口壳(标题栏 / 左右栏 / 内容区) | main BrowserWindow → renderer/index.tsx → main-entry.tsx → App → MainLayout (`#/` 受保护壳) | ChromeActions, DeviceSectionHeader, FeishuConflictDialogHost, GhostMediaLightboxHost, MainLayout, ProjectsSection, RightSidebar, RightSidebarShell, SessionShareImportWizard, Sidebar, UpdateNoticeDialog, WindowControls | apps/desktop/src/renderer/cindy-brain/GhostMediaLightboxHost.tsx, apps/desktop/src/renderer/components/UpdateNoticeDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialogHost.tsx, apps/desktop/src/renderer/components/layout/AppBadgeAttentionSync.tsx, apps/desktop/src/renderer/components/layout/BrowserWebviewPool.tsx, apps/desktop/src/renderer/components/layout/ChromeActions.tsx, apps/desktop/src/renderer/components/layout/ContentHeader.tsx, apps/desktop/src/renderer/components/layout/CredentialStoreBanner.tsx, apps/desktop/src/renderer/components/layout/FadeSwitcher.tsx, apps/desktop/src/renderer/components/layout/GhostPanelWindowLayout.tsx, apps/desktop/src/renderer/components/layout/GlobalDropImportListener.tsx, apps/desktop/src/renderer/components/layout/MainEntryRedirect.tsx, apps/desktop/src/renderer/components/layout/MainLayout.tsx, apps/desktop/src/renderer/components/layout/RightSidebar.tsx, apps/desktop/src/renderer/components/layout/RightSidebarDetach.tsx, apps/desktop/src/renderer/components/layout/RightSidebarMaximize.tsx, apps/desktop/src/renderer/components/layout/RightSidebarToggle.tsx, apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx, apps/desktop/src/renderer/components/layout/WallpaperVideo.tsx, apps/desktop/src/renderer/components/layout/chromeActionsGeometry.ts, apps/desktop/src/renderer/components/layout/chromeActionsLayout.ts, apps/desktop/src/renderer/components/layout/railChromeActions.ts, apps/desktop/src/renderer/components/layout/windowDrag.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx, apps/desktop/src/renderer/components/sidebar/AttentionDot.tsx, apps/desktop/src/renderer/components/sidebar/DatabaseSizeWarningBanner.tsx, apps/desktop/src/renderer/components/sidebar/GhostMainViewNavEntries.tsx, apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx, apps/desktop/src/renderer/components/sidebar/NavigationCountBadge.tsx, apps/desktop/src/renderer/components/sidebar/Sidebar.tsx, apps/desktop/src/renderer/components/sidebar/SidebarIconButton.tsx, apps/desktop/src/renderer/components/sidebar/SidebarNavigationCustomize.tsx, apps/desktop/src/renderer/components/sidebar/SidebarTopNav.tsx, apps/desktop/src/renderer/components/sidebar/SortableList.tsx, apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsx, apps/desktop/src/renderer/components/sidebar/UserInfoSection.tsx, apps/desktop/src/renderer/components/sidebar/VendorIcon.tsx, apps/desktop/src/renderer/components/sidebar/VendorReadinessBadge.tsx, apps/desktop/src/renderer/components/sidebar/WorktreeBadge.tsx, apps/desktop/src/renderer/components/sidebar/sidebarNavigationPrefs.ts, apps/desktop/src/renderer/components/sidebar/useHoverOpenMenu.ts, apps/desktop/src/renderer/components/title-bar/ChromeIconButton.tsx, apps/desktop/src/renderer/components/title-bar/MenuButton.tsx, apps/desktop/src/renderer/components/title-bar/WindowControls.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx, apps/desktop/src/renderer/features/right-sidebar/AddTabDropdown.tsx, apps/desktop/src/renderer/features/right-sidebar/EmptyState.tsx, apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBodyErrorBoundary.tsx, apps/desktop/src/renderer/features/right-sidebar/hooks/useBrowserWebview.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useNativePopupSurface.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserPartition.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserWebviewPool.ts, apps/desktop/src/renderer/features/right-sidebar/lib/detachedSidebarRouting.ts, apps/desktop/src/renderer/features/right-sidebar/lib/executeSidebarCommand.ts, apps/desktop/src/renderer/features/right-sidebar/lib/lastTurnChangedFiles.ts, apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts, apps/desktop/src/renderer/features/right-sidebar/lib/nativePopupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBackgroundTasksTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBotWorkbenchTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarFileBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openRoutinesTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openSubagentsTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTerminalShortcut.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTurnReview.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupRouter.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/rsbBrowserBridge.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarCommands.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarHostSession.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowAgentStrip.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/chatTaskFocusIntent.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/listSessionTasks.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/workflowProgressModel.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/bot-workbench/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/CindyMakeTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.css, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/dropExternalFile.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/fileTreeImagePreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/useSessionScopedTreeWidth.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/index.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersAttentionIcon.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/closeDecision.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/ResourceUsageBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/resource-usage.css, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/subscription.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/retired-feature/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/ImageDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/MarkdownDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/PlainUnifiedDiff.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/diffRows.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/highlight.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/inlineDiff.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/useDiffHighlights.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/ReviewTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/diffExpansionPreference.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/fileTree.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/gitApplyCommand.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/markdownPreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useLastTurnFilter.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewGitState.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewSource.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/routines/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/ConversationStream.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/DetailView.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/RunList.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentToolCard.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentsBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentChangeFence.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentConversation.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/TerminalTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserCommentPopover.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/browserCommentEditorDraft.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/lib/parseOmnibox.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useBrowserComment.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useLocalHtmlAutoReload.ts, apps/desktop/src/renderer/features/right-sidebar/registry.ts, apps/desktop/src/renderer/features/right-sidebar/store.ts, apps/desktop/src/renderer/features/right-sidebar/tabAvailability.ts, apps/desktop/src/renderer/features/right-sidebar/types.ts, apps/desktop/src/renderer/layout/LayoutRoot.tsx, apps/desktop/src/renderer/layout/PanelDragController.tsx, apps/desktop/src/renderer/layout/PanelDragPrototype.tsx, apps/desktop/src/renderer/layout/collapsePrefs.ts, apps/desktop/src/renderer/layout/layoutDevTools.ts, apps/desktop/src/renderer/layout/panePlacement.tsx, apps/desktop/src/renderer/layout/paneWidths.tsx, apps/desktop/src/renderer/layout/panelMaximize.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 144 | 46 | 200 |
| `desktop.skillhub.local` | desktop | SkillHub 本地技能 | hash `/skillhub/local` 及统一详情 `/skillhub/detail`(旧详情链接重定向) | InstallTargetPicker, PluginManagementLayout, SkillDetailLayout, SkillhubDetailRoute, SkillhubDetailView, SkillhubFeatureLayout, SkillhubHomeView, SkillhubLocalLayout, SkillhubMarketDetailView | apps/desktop/src/renderer/features/plugin/PluginManagementLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubDetailRoute.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubFeatureLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubLocalLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubMarketDetailView.tsx, apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillDetailLayout.tsx | 35 | 0 | 43 |
| `desktop.skillhub.market` | desktop | SkillHub 市场 | hash `/skillhub/market`(SkillhubMarketListView) | InstallTargetPicker, MarketCard, MarketInfoEditDialog, SkillhubMarketDetailView, SkillhubMarketListView, VisibilityEditorDialog | apps/desktop/src/renderer/features/skillhub/SkillhubMarketDetailView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubMarketListView.tsx, apps/desktop/src/renderer/features/skillhub/components/HomeMarketCard.tsx, apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx, apps/desktop/src/renderer/features/skillhub/components/LocalSkillControls.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketCard.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketInfoEditDialog.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketInstallStatus.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketListError.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketLocalSkills.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketPreviewTree.tsx, apps/desktop/src/renderer/features/skillhub/components/OfficialSkillBadge.tsx, apps/desktop/src/renderer/features/skillhub/components/PlatformTagSelector.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillCategoryFilterBar.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillDetailLayout.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillIcon.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillTagList.tsx, apps/desktop/src/renderer/features/skillhub/components/TeamScopePicker.tsx, apps/desktop/src/renderer/features/skillhub/components/VisibilityEditorDialog.tsx | 43 | 0 | 37 |
diff --git a/docs/design-rules/usage-history-charts.md b/docs/design-rules/usage-history-charts.md
index 8d97ed983e..c2222c9e71 100644
--- a/docs/design-rules/usage-history-charts.md
+++ b/docs/design-rules/usage-history-charts.md
@@ -1,6 +1,6 @@
# 用量历史图表与日期选择
-适用入口:设置 → 用量历史(`UsageHistorySection`)。依据为 2026-09-07 所有者圆角裁决与 `DESIGN.md §5`;`usage-heatmap-day` / `usage-token-bar` 的成员登记与 2026-09-08 交互几何登记由本 PR 直接落在 `DESIGN.md §4/§5`(usage data marks 2px 例外 + 交互几何段),不依赖尚未合入的规范 PR。
+适用入口:设置 → 用量历史(`UsageHistorySection`);2026-10-17 起供应商「远程与分享」页的用量复用同一套(见文末)。依据为 2026-09-07 所有者圆角裁决与 `DESIGN.md §5`;`usage-heatmap-day` / `usage-token-bar` 的成员登记与 2026-09-08 交互几何登记由本 PR 直接落在 `DESIGN.md §4/§5`(usage data marks 2px 例外 + 交互几何段),不依赖尚未合入的规范 PR。
## 可见层与布局
@@ -73,6 +73,25 @@ Agent/harness 表复用现有引擎身份色(09-09 所有者再次反馈):
图表标记自身的命中几何裁决不变:命中框保持已登记尺寸(热力图 12×12px、柱图高度 `max(24px, 柱高)`),数据标记不因等价入口的补回放大或缩小。等价入口补回关闭的是此前登记的“欠交付等价入口”缺口;真实平台与用户侧验收仍须独立记录,台账在记录补齐前不标记 migrated,也不据此声称已满足原定 Equivalent 条件或批准 Essential 豁免。日期行为测试验证的是选日状态同步与筛选路径,不是点击尺寸合规证明。
+## 「远程与分享」页的用量(2026-10-17 所有者确认原型)
+
+供应商「远程与分享」页的「用量」块复用本页的图表与表格,规则见 [供应商组](../product-rules/provider-groups.md) §7:
+
+- **同一套组件**:热力图(`UsageHeatmap`,token 口径)与每日柱图(`UsageSeriesBars`,`UsageTokenBars` 的通用形态,几何、交互、浮层、
+ 淡化与选中规则完全相同);卡片、概览数字格、表格列样式(`UsageBreakdownTables` 导出的表头/单元格/色块/占比格)与筛选下拉
+ (`UsageFilterSelect`,与时间范围、设备选择器同一外观)都与本页一致;整块套 `.usage-history-charts`。
+- **标题与筛选同一行**(2026-10-17 用户反馈文字多、排版怪后收紧):块标题「用量」(13px / 500) 在左,筛选组在右——使用方与组内电脑
+ 168px、时间范围 148px 的 36px 胶囊下拉,与 148px 日期输入(只有 `aria-label`,不另写「日期」),间距 8px;放不下时筛选组整组换行、
+ 靠左,不出现右对齐后左侧大片空白。标题下不放说明文字,也不另写「正在看 X」(下拉与选中行已表达)。时间范围与本页相同;那台电脑
+ 是旧版本、只有所有时间合计时,不摆出时间范围与日期,筛选下方一行 12px tertiary 写需要更新;两张图不显示。
+- **柱图分色可切换**:按人 / 按电脑 / 按模型(卡片标题行右侧 28px 分段控件,不另写副标题)。人、电脑与模型三类都用本页登记的
+ 分类色(`DESIGN.md §2` 2026-10-17 扩展):人按表里的顺序、电脑按组里的顺序、模型按完整历史用量排名;时间范围与筛选变化不重新
+ 分配颜色。当时没有区分电脑的「更早的记录」作为最后一类。
+- **表格**:按人、按电脑与按模型三张表沿用本页按 Agent / 按模型表的列样式与占比条;按人与按电脑两张表的一行可点(整行是鼠标的
+ 放大命中区,名字是带 `aria-pressed` 的按钮供键盘使用),选中行用 `--surface-chip` 底色;分享的人一行行尾 `···` 与下方的转分享
+ 列表不属于点选区域。
+- 双模式:只用语义 token 与本页登记的分类色,Light / Dark 同一实现。
+
## 交付状态
实现与回归检查随视觉修复 PR 交付。真实 Desktop 截图、窗口尺寸与交互实测见 [证据索引](../design-evidence/2026-09-08/usage-chart-shapes.md)。设计师视觉验收仍待完成;AI 的截图采集、静态检查和作者目检不构成人工批准。
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 30342424d1..29dcba0178 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1488,6 +1488,8 @@ G 与 O 之间不变。受邀者能调用的 channel 不变(仍是 `maker:remote
- C 侧:任务此刻所在电脑与供应商和绑定那台对得上才算经组(绑定没清掉的空档里不报);每轮记进按账号的账本(`group` 行,
只用来报告,不算进 C 自己的供应商),防抖 5s 报从那天起的一份;启动(账号确定)
后整份报一次补上次没送到的;送不到按 30s 起、最长 10 分钟退避重报,不截断单日或未报告的旧日期。
+ - 日期归一:`day` 是报告端本地日期,但接收端按 `lastAt` 在自己的时区重新计算日期;增量请求和替换时各多带两天,
+ 避免跨时区的午夜边界漏掉或重复历史。
- **超出单次 3000 行或 UTF-8 字节预算时用新动作 `usage-part` 分批传完整报告**:
- 请求 `{ action: 'usage-part', seq, sinceDay, offset, total, rows }`;每批仍最多 3000 行,整份最多 20000 行,
同时按实际 JSON 序列化后的 UTF-8 字节数切批(包含转义开销),请求预算取可靠消息/普通帧上限的较小值再预留 64 KiB 给 invoke 头;offset 按实际批次行数推进。
@@ -1525,8 +1527,16 @@ G 与 O 之间不变。受邀者能调用的 channel 不变(仍是 `maker:remote
- **`provider-group:remote` 新增 `action: 'manage-group'` / `'manage-share'`**(同一 channel、同一同账号 allowlist,
受邀者与共享任务访客照旧 `CHANNEL_NOT_ALLOWED`):请求 `{ action, command }`,`command` 与本机命令同构,结构与校验在
`apps/desktop/src/shared/providerManagement.ts`。`manage-group` 只收 `get` / `candidates` / `save-if-current` / `delete-if-current`;
- `manage-share` 只收 `owned` / `own-usage` / `create-link` / `approve` / `reject` / `set-member` / `reshare-decide`,其余回
+ `manage-share` 只收 `owned` / `own-usage` / `usage-history` / `create-link` / `approve` / `reject` / `set-member` / `reshare-decide`,其余回
`[PERMISSION_DENIED]`。回包 `{ result, respondedAt }`,`respondedAt` 只用于把链接有效期换算到 C 的时钟。
+ - `usage-history`(2026-10-17,供应商组 §7):只读,`{ action, providerId }`,回这个供应商用量的按天明细
+ `{ providerId, todayKey, coverageStart, self, relays, members }`(结构在 `apps/desktop/src/shared/providerShare.ts`),
+ 日期是 O 的本地日期,金额在 O 上估算;`members` 只含 O 上这个供应商的分享里现在的成员。最多 5,000 行,按日期从新到旧
+ 截取,最新一天允许只保留一部分,再按实际 UTF-8 JSON 字节数裁剪,均用 `coverageStart` 标出保留下来的最早日期,
+ 整包为单帧 2MB 预留 invoke 信封空间。旧 O 不认识该动作,`parseProviderShareCommand` 回
+ `[INVALID_PARAMS] Unknown command`,C 的 Main 把 `manage-share` 的这个回包统一成 `[UNSUPPORTED_CAPABILITY]`(与
+ `unknown provider group action` 同一处),管理页退回 `own-usage` 与 `owned`(range=all)的所有时间合计并提示更新 O,不重试。
+ 旧 C 不发这个动作,照旧读 `own-usage` / `owned`,O 对两者的回包不变。
- O 在执行前后核对账号未切换;`approve` / `reject` / `set-member` 先刷新快照,申请或成员不在 O 的分享里回 `[NOT_FOUND]`;
`owned` 的回包只含 `{ ready, shares }`,不带 O 自己的弹窗安排。不再转发给第三台电脑。
- `reshare-decide` 只修改 O 当前账号的本机转分享记录,写锁内和返回前继续核对账号边界;撤回由 O 停止对应中转任务。
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index 421a477642..8d59c10bee 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -32,8 +32,15 @@
> 分享的人一样按组策略分配,本机只是组里普通的一台;「暂停对外分配」仍只拦外部新任务。同日要求**配额先比、快到期的先用**
> (目的是尽快把快重置的配额用掉):不论选哪种组策略,都先用每周配额 5 小时内重置的,然后是 5 小时配额 1 小时内重置的,
> 再选已用百分比低的;组策略只在用量相近的几台里挑,「用量均衡」不再单列为选项,见 §5。
+> 2026-10-16 用户要求:「远程与分享」页的**「已分享的人」并进「用量」**——同一个人不在两处各占一行:分享的人那一行同时写分享状态、
+> 加入时间与用量,关闭/恢复与删除收进行尾 `···`,见 §7、§10。同日用户反馈底部的「生成分享链接」太难找:它放到页面标题右侧,
+> 待处理紧跟标题,页面不再单设「分享」块与分享说明,见 §10。
+> 2026-10-17 用户确认原型:「用量」块**改成和设置 → 用量一样**——标题同一行右侧筛选使用方、组内电脑、时间范围与某一天(同日用户
+> 反馈文字多、排版怪:去掉标题下的说明与「正在看 X」一行),默认是所有人、
+> 所有组内电脑的合计;下面是概览、按人(管理操作仍在这一行)、近 30 天每日 token(可按人/电脑/模型分色)、活跃热力图、按电脑、按模型。
+> 时间范围与设置页相同(所有时间、最近 30 天、最近 7 天、今天、选某一天),不再有「本月」;保留估算金额;不显示任务排行,见 §7。
> 实现进度见 §12:P1 已实现;P2 全部已实现:同账号直连与模型列表只显示组(P2a)、分享的人经组中转与启动阶段换电脑(P2b)、
-> 分享的人运行中换电脑与申请弹窗新说法(P2c);P3 已做按人用量与按组内电脑展开(§7)。
+> 分享的人运行中换电脑与申请弹窗新说法(P2c);P3 已做按人与按组内电脑两个维度的用量(§7)。
> 交互设计稿见 [`docs/design-previews/provider-groups/index.html`](../design-previews/provider-groups/index.html)。
> 读取时机:新增或修改供应商组、组策略、组内电脑的添加与状态、经供应商组的任务分配或转发、
> 供应商组用量与「远程与分享」页之前。
@@ -411,26 +418,50 @@
- **两个维度**:
- 按使用方:本机、我的其他电脑(按电脑分开)、分享的人(按人分开);
- 按组内电脑:每台实际运行的用量。
-- 指标:轮次、输入 token、输出 token、估算金额;时间段近 7 天、本月、全部;展开按模型列出。
- 订阅类供应商按本地单价估算并标注「估算」,不代表供应商实际账单(与供应商分享 §7.4 一致)。
+- 指标:token(输入 + 输出)、输入、输出、缓存读取与写入、估算金额;时间范围与设置 → 用量相同(所有时间、最近 30 天、
+ 最近 7 天、今天、选某一天,2026-10-17 起)。订阅类供应商按本地单价估算并标注「估算」,不代表供应商实际账单
+ (与供应商分享 §7.4 一致)。
+- 同账号电脑经组报告的行带有 Unix 时间戳;组所在电脑按自己的时区重新计算本地日期,增量报告前后各多带两天,
+ 所以跨时区的午夜边界不会把一天的用量漏掉或重复。
+- 按天明细经同账号远程管理回传时最多保留 5,000 行,按日期从新到旧截取,最新一天可以只保留部分行;再按实际 UTF-8
+ JSON 大小预留 invoke 信封空间,`coverageStart` 表示实际保留下来的最早日期。
- 没有组的供应商也显示「按使用方」:列出我的其他电脑与分享的人经这台电脑使用这个供应商的用量。
- 组内电脑的主人在自己的分享管理页里看到的是组所在电脑账号的合计用量,看不到最终使用者。
-- **已实现(2026-10-11,按人,2026-10-11 用户要求)**:「远程与分享」页的「用量」块**按人**列,共用一个时间段切换;
- 分享的人的用量从「已分享的人」一行移到这一块。
- - **自己在第一行**:当前登录账号的头像与昵称,旁边写「你」,和下面分享的人显示的内容一致。自己 = 本机 + 同账号其他电脑
- 经这个供应商(组)的用量总和,不再把本机与我的其他电脑分成几行。
- - **分享的人**:每人一行(头像与昵称,供应商分享 §6)。
+- **已实现(2026-10-11 按人;2026-10-17 改成和设置 → 用量一样,用户确认原型)**:「远程与分享」页的「用量」块与设置 → 用量
+ 同一套版式、图表与交互(`docs/design-rules/usage-history-charts.md`「远程与分享页」)。2026-10-16 起「已分享的人」整块并进来
+ (用户要求:同一个人只占一行),见下方「按人」。
+ - **筛选与标题同一行**:标题「用量」在左,右边依次是使用方(所有人 / 你 / 每个分享的人 / 经某台电脑转来)、组内电脑(所有组内电脑 /
+ 每台;没有组时不出现)、时间范围与日期(与设置页相同);放不下时筛选整组换到下一行、靠左。默认是所有人、所有组内电脑的合计。
+ 标题下不放说明文字,选中的人或电脑也不另写一行(2026-10-17 用户反馈文字多、排版怪:下拉本身已写明「所有人」「所有组内电脑」,
+ 选中的那一行有底色)。那台电脑是旧版本时不摆出时间范围与日期,只写一句「{电脑} 的 Cindy 需要更新,暂时只能看所有时间的合计」。
+ - **从上到下**:概览(今日 token、所选范围 token、估算金额、使用方、用到的电脑(有组时)、用到的模型;读不到时不当 0);
+ **按人**;近 30 天每日 token;活跃热力图;**按电脑**(有组时);**按模型**(含缓存读写、缓存命中率与估算金额,下附估算说明)。
+ 「按人」放在概览之后、图表之前:分享的管理操作在这一行,不能被图表压到下面(2026-10-17 用户确认)。
+ - **每张表按「其他维度」筛**:按人表不按使用方筛(所有人一直在,管理操作不会被筛掉),按电脑表不按电脑筛;被选中的那一行
+ 底色标出。点表格里的一行等于在筛选里选它,再点一次回到全部。两张图不按时间范围筛(固定近 30 天与近若干周,与设置页相同),
+ 点柱子或热力格选那一天。
+ - **每日柱图可切换分色**:按人、按电脑(有组时)、按模型(切换在卡片标题行右侧,不再另写「按人堆叠」副标题);柱高始终是当天总量,
+ 悬停浮层列出当天每部分。配色:人按表里的顺序、
+ 电脑按组里的顺序、模型按完整历史的用量排名,都用用量图表的分类色;筛选与时间范围变化不重新分配颜色。
+ - **按人**:你自己在第一行(当前登录账号的头像与昵称,旁边写「你」),自己 = 本机 + 同账号其他电脑经这个供应商(组)的用量总和,
+ 不把本机与我的其他电脑分成几行。分享的人每人一行(头像与昵称,供应商分享 §6),同时管分享本身(2026-10-16):名字旁写分享状态
+ (正常、正常 · N 个任务运行中、已暂停,暂停时头像与名字变淡),第二行写加入时间与最近使用;行尾 `···` 里是关闭/恢复分享与删除
+ (删除前二次确认);经他的供应商组转给别人用、已处理过的人列在这一行下方(供应商分享 §4.3)。列:所选范围 token、占比、今日、
+ 估算金额、用到的电脑(有组时)。
- **经其他电脑转来**:本机是同账号另一台电脑上的组里的一台时,那台替它的受邀者转来的任务看不到具体的人,按那台电脑
一行(「经 {电脑} 转来」),不算进自己。
- - **收起是总量,展开看明细**:建了组的供应商按组内每台电脑分开——组里每台都列出(这段时间没用过的也列,变淡、不写数字),
- 按组里的顺序,每台一行合计(带占这个人总量的比例)、下面每个模型一行;已经移出组、这段时间用过的电脑排在后面
- (写「已移出组」);这一字段加上之前记的分享的人用量没有区分电脑,归在最后的「更早的记录」。收起时状态行写用了几台电脑。
- - **顶部摘要与占比**:人列表上方四个数字——总用量、估算金额、使用方、模型(只汇总已读到的使用方,读失败的不当 0);
- 每人一行右侧带占全部用量的比例条。
- - **没有组的供应商当成只有本机一台的组**(2026-10-12 用户要求):与建了组的走同一套显示——同样的摘要与占比,展开后
- 「本机」一行合计、下面每个模型一行,以及「更早的记录」。不经组、就在本机运行的用量本来就记在 `local` 上,不用另一套
- 按模型的表;只有收起时不写「用了几台电脑」(只有一台,没有信息量),说明文字不提组内电脑。**只限用量显示**:任务运行、
- 模型列表与「供应商组」块仍按「组是用户另外建的」处理,不把没有组的供应商当成组。
+ - **按电脑**:组里每台都列出(这段时间没用过的也列,变淡、不写数字),按组里的顺序;已经移出组、这段时间用过的电脑排在后面
+ (写「已移出组」);这一字段加上之前记的分享的人用量没有区分电脑,归在最后的「更早的记录」(不能选来筛)。同一台电脑上的
+ 几个账号合成一台。列:所选范围 token、占比、今日、估算金额、几个使用方。
+ - **没有组的供应商当成只有本机一台的组**(2026-10-12 用户要求):同样的概览、按人、两张图与按模型,只是不出现组内电脑的筛选、
+ 「按电脑」与「用到的电脑」(只有一台,没有信息量)。**只限用量显示**:任务运行、模型列表与「供应商组」块
+ 仍按「组是用户另外建的」处理,不把没有组的供应商当成组。
+ - **数据**:页面向管理对象所在电脑读这个供应商的按天明细(`usage-history`:你自己、转来的与分享的人,每天按 Agent、供应商、
+ 模型、组内电脑分行,金额在那台电脑上估算),时间范围、人与电脑都在界面上筛选,与设置 → 用量同一种做法。日期是那台电脑的
+ 本地日期,「今天」「最近 7 天」以它的今天为准。打开页面、分享变化时与每分钟各读一次;读不到时保留上次读到的,第一次就读不到时
+ 写「暂时读不到用量」,不当 0。明细最多 5,000 行(远程管理整份经设备互联回包,单帧 2MB),按日期从新到旧截取,最新一天
+ 可以只保留部分,再按 UTF-8 JSON 字节预算裁剪,并注明「按天统计从 X 起」。那台电脑是旧版本、不认识这个命令时,退回所有时间的合计(你自己读 `own-usage`,分享的人读
+ `owned` 里的成员用量):时间固定为所有时间、不显示两张图,并提示更新那台电脑(§14)。
- 自己的用量从这次更新开始记,不补以前的;计量与受邀者用量同一套(每一轮的 done 事件),每一轮另记实际在哪台组内电脑
运行(组内电脑的稳定键,本机为 `local`)。任务此刻所在的电脑与供应商和绑定那台对得上才按组记,任务挪走了而绑定还没清掉时
按没有组记。各部分来源:
@@ -443,8 +474,8 @@
还没更新的旧版本电脑不报,这部分就缺;组所在电脑是旧版本时那边也收不到,任务照常运行。
- 账本按账号存放(`docs/dev-rules/credentials-and-local-storage.md`)。实现见
`apps/desktop/src/main/usage/providerPartyUsageStore.ts`、`apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.ts`、
- `apps/desktop/src/main/provider-group/usageReporter.ts`,界面 `apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx`。
- - 还没做:「按组内电脑」作为单独的维度切换(现在是每个人展开后按电脑分开)。
+ `apps/desktop/src/main/provider-group/usageReporter.ts`;按天明细 `apps/desktop/src/main/device-link/providerShareRuntime.ts`
+ (`usageHistory`),界面 `apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx` 与 `providerUsageStats.ts`。
## 8. 告知与隐私
@@ -459,9 +490,9 @@
自动换电脑的活动记录写「已自动换一台电脑继续」。组内电脑的名称属于分享者和组内电脑主人,不透给受邀者;
分享者的电脑名同样不给受邀者(供应商分享 §6)。
- 分享者这边也不弹确认:「远程与分享」页的供应商组一块写明「分享的人的任务也按组分配」。
- - 分享者的审批弹窗有组时写「由供应商组选一台电脑运行 Agent」;本机审批读本机组设置,其他电脑审批读供应商所在电脑的组摘要。
- 组信息尚未读到、正在重读或读取失败时,不启用「同意分享」,避免按错误的运行位置说明审批。实现与回归见
- `ProviderShareApproveDialog.tsx` 与 `ProviderShareGlobalHost.test.tsx`(2026-10-17)。
+ - 分享者的审批弹窗(供应商分享 §4 第 4 步)有组时同意说明写「由供应商组选一台电脑运行 Agent」,不说 Agent 在这台电脑上
+ 运行;在另一台电脑上审批时按那台目录里带的组摘要判断。读到有没有组之前「同意分享」不可点,免得先按没有组的说法
+ 同意(2026-10-17 用户裁决)。
- 已知差异(2026-10-09 确认接受):这条规则上线前加入的受邀者,以及仍在用旧版本申请的受邀者,看到的是
「Agent 在 {分享者} 的电脑上运行」。不补提醒,只更新「分享给我的供应商」详情里的说明。
- 分享来的组内电脑上,组所在电脑作为受邀者照常受到受邀者隔离(供应商分享 §9);它的主人只看到组所在电脑账号的昵称与头像,
@@ -519,14 +550,15 @@
- **不闪状态**:入口按钮读本机组设置(全窗口共用的快照),不等组内电脑的实时状态;第一次读完之前整行不出现,
不先显示「没有组」再跳成组。「远程与分享」页再次打开时先显示上次读到的组,没读过就按本机组设置先排出组内电脑、
状态写「检查中」,再在后台刷新。
-- **「远程与分享」页**(原「分享 {供应商}」管理页扩展):标题右侧放「生成分享链接」,待处理申请紧跟标题,下面分三块:
+- **「远程与分享」页**(原「分享 {供应商}」管理页扩展):标题一行右侧是「生成分享链接」;有待处理(分享申请、转分享请求)时
+ 紧跟标题列出;未开启「允许被远程调用」时,「生成分享链接」置灰,标题下说明先开启哪一级(供应商分享 §3)。下面分两块:
1. **供应商组**:组内电脑列表(来源、状态、正在运行的任务数、冷却到何时——不在今天恢复的带上日期,如周上限)、并发上限、
添加电脑、组策略;
- 2. **用量**(P3):按人列出(自己在第一行),时间段切换;每人收起是总量,展开后按组内每台电脑、再按模型(§7);
- 还没有单独的「按组内电脑」切换;
- 3. **已分享的人**:只管分享本身(按人用量已移到「用量」块);不再另设「分享」标题与重复说明。
- 未开启「允许被远程调用」时,标题处的生成链接按钮置灰,并紧跟标题说明先开启哪一级(供应商分享 §3)。
- 生成链接与待处理从底部移到标题处,避免难找;运行位置与用量归属在审批弹窗里说明(2026-10-16 用户要求)。
+ 2. **用量**(P3):与设置 → 用量同一套(2026-10-17)——标题同一行右侧筛选使用方、组内电脑、时间范围与日期;概览、按人(自己在第一行)、
+ 近 30 天每日 token、活跃热力图、按电脑、按模型(§7)。分享的人那一行同时显示分享状态,并在行尾 `···` 关闭/恢复或删除(2026-10-16,§7)。
+ 原来页面底部的「分享」块 2026-10-16 起取消(用户反馈「生成分享链接」在底部太难找):已分享的人并进「用量」块,
+ 生成分享链接与待处理移到标题处;块里那段分享说明不再保留——分享者真正做决定是在同意申请时,同意说明已讲 Agent 在哪运行、
+ 用量计入谁。
- **同账号任意电脑管理**(2026-10-14 用户裁决:组属于账号,不该只能在建组电脑上管):登录同一账号的任意电脑,
都能从设置页左栏组那一项的详情点「远程与分享」,进入与建组电脑同一个页面,管理组内电脑、并发上限与权重、组策略、
添加电脑,生成分享链接、处理申请、暂停或删除分享的人,查看用量。当前电脑不需要在组里。
@@ -660,7 +692,7 @@
| P2a(已实现) | 同账号其他电脑经组直连:问组所在电脑选电脑、直接连过去、本机自动换电脑并报告冷却;运行中任务报告给组所在电脑计入负载;防转圈标记;同账号其他电脑的模型列表与设置页只显示组、组项标出供应商组与组内电脑状态 |
| P2b(已实现) | 分享的人经组所在电脑中转;使用方隔离;同账号组内电脑接受被中转的受邀者(隔离);续接回到原来那台;启动阶段换电脑;删除受邀者时通知组内电脑清理 |
| P2c(已实现) | 分享的人运行中换电脑:「需要换一台」信号与受邀者那边的自动交接、活动记录「已自动换一台电脑继续」(桌面与手机);申请弹窗与「分享给我的供应商」详情的新说法;「远程与分享」页写明分享的人的任务也按组分配 |
-| P3 | 两个维度的用量(按人、展开按组内电脑已实现,含同账号电脑报告经组的用量,见 §7);全部失败时逐台列出原因、按全组最早恢复的一台等待;手机端显示实际运行电脑 |
+| P3 | 两个维度的用量(按人与按组内电脑已实现,与设置 → 用量同一套筛选与图表,含同账号电脑报告经组的用量,见 §7);全部失败时逐台列出原因、按全组最早恢复的一台等待;手机端显示实际运行电脑 |
## 13. 验收
@@ -701,6 +733,7 @@
| 手机与远程控制 | 旧手机、旧控制端不认识组摘要,模型列表照常逐台列出。被控电脑是旧版本时问不到「这个任务归哪个组」(`CHANNEL_NOT_ALLOWED` 或不认识的动作),按没归组处理:组照样收起,在组那一项里选模型照旧先确认换电脑,与之前相同 |
| 分享的人 | 照常使用,中转对它透明(协议不变)。打开任务阶段的换电脑由组所在电脑完成,旧版本同样享受;运行中失败时它没有声明支持「需要换一台」,组所在电脑照旧返回原来的错误(如用量上限),用户像现在一样换模型或稍后重试。新版本声明支持,运行中失败时自动换一台(§6.1)。旧版本申请弹窗仍是「Agent 在 {分享者} 的电脑上运行」(§8 已知差异) |
| 受邀者申请 | 申请弹窗由受邀者自己的 Cindy 显示,旧版本仍是原来的说法(§8 已知差异) |
+| 被管理的电脑(用量) | 2026-10-17 之前的版本不认识「用量」的按天明细(`usage-history`),回 `[INVALID_PARAMS] Unknown command`,管理的那台统一成「需要更新」并退回所有时间的合计:时间固定为所有时间、不显示两张图,提示更新那台电脑(§7)。旧版管理的那台照旧读 `own-usage` 与 `owned`,不受影响 |
- 本地数据:供应商组设置只新增存储,不改已有的供应商、远程调用与分享数据;涉及数据库时按
`docs/dev-rules/database-and-migrations.md` 只做新增。
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 1eb8a02996..81a052cce0 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -90,7 +90,6 @@
分享的是 Claude 订阅登录时,弹窗另写一句:受邀者使用时,Agent 能看到分享者登录 Claude 用的邮箱
(Claude Code 自己会把它交给模型,Cindy 目前挡不住;2026-10-10 裁决先告知分享者)。
这个供应商建了组时,同意说明写「由供应商组选一台电脑运行 Agent」,不说在这台电脑上运行([供应商组](provider-groups.md) §8)。
- 没有组时,本机审批写「Agent 在这台电脑上运行」;跨电脑审批写「Agent 在供应商所在的电脑上运行」,避免把审批所在电脑误说成运行位置。
- **弹窗跟着生成链接的电脑**(2026-10-14 用户裁决):同账号另一台电脑可以从「远程与分享」为供应商组生成链接
([供应商组](provider-groups.md) §10 同账号管理)。这时审批弹窗与系统通知出现在**生成链接的那台电脑**上,
供应商所在电脑与其他电脑都不弹,只在管理页「待处理」和入口提示点里显示;同意、拒绝转交供应商所在电脑执行。
@@ -286,21 +285,17 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
管理页按供应商划分,标题为「{供应商} · 远程与分享」,从设置页进入、可返回:
-- **生成分享链接**:放在页面标题右侧(2026-10-16 用户反馈:底部难找)。去掉原「分享」标题和重复说明;
- Agent 在哪运行、用量算谁的由审批弹窗的同意说明(§4.1 第 4 步)讲清。分享未开启的原因紧跟标题提示(§3)。
-- **待处理**:待审批的申请(同意/拒绝),以及转分享请求(§4.3,同意/拒绝);紧跟标题,排在供应商组与用量前面,为空时整块隐藏。
- 普通申请点击「同意分享」时,先打开与自动提醒共用的审批弹窗,展示运行位置、用量归属与必要告知(§4.1 第 4 步),
- 确认后才提交;同一窗口只显示一个审批弹窗,申请从最新列表消失或离开管理页时关闭手动打开的弹窗。
- 主窗口与副窗口均能手动审批;自动提醒仍只由主窗口处理。
- 跨电脑管理仍由供应商所在电脑执行;稍后处理保留申请,关闭弹窗后焦点回到触发按钮,按钮已从列表或页面移除时不回焦。实现与回归见 `ProviderShareGlobalHost.tsx`、
- `ProviderShareManagePage.tsx` 与 `ProviderShareManagePage.test.tsx`。
+- **生成分享链接**:主操作,放在页面标题一行的右侧(2026-10-16 用户反馈放在页面底部太难找)。页面不再单设「分享」块和
+ 分享说明:Agent 在哪运行、用量算谁的,由审批时的同意说明(§4.1 第 4 步)讲清;未开启分享时的原因提示紧跟标题(§3)。
+- **待处理**:待审批的申请(同意/拒绝),以及转分享请求(§4.3,同意/拒绝);紧跟标题、排在供应商组之前,为空时整块隐藏。
链接 5 分钟即过期,不列出未使用的链接。
-- **已分享的人**:每人一行,显示头像、昵称、加入时间、最近使用、当前状态(正常/已暂停)与是否有任务正在运行;这个人经自己的
- 供应商组转给别人用、已处理过的请求列在这一行下方(已同意的可撤回,拒绝的可改为同意,§4.3)。
-- **用量**(2026-10-11 起移到页面上方的「用量」块,见[供应商组](provider-groups.md) §7):按人列出——第一行是自己(当前登录账号),
- 之后是分享的人,每人一行显示所选时间段内的用量合计(只显示昵称与头像,§6);展开后按电脑分开、每台下面按模型列出
- (没有组的供应商当成只有本机一台的组,2026-10-12 起):轮次、输入 token、输出 token、估算金额。
- 时间段可选近 7 天/本月/全部。
+- **已分享的人**(2026-10-16 起不再单列,并进页面上方的「用量」块,与这个人的用量同一行,见[供应商组](provider-groups.md) §7;
+ 用户要求同一个人不在两处出现):显示头像、昵称、加入时间、最近使用、当前状态(正常/已暂停)与是否有任务正在运行;关闭与删除在
+ 这一行行尾的 `···` 里;这个人经自己的供应商组转给别人用、已处理过的请求列在这一行下方(已同意的可撤回,拒绝的可改为同意,§4.3)。
+- **用量**(2026-10-11 起移到页面上方的「用量」块;2026-10-17 起与设置 → 用量同一套,见[供应商组](provider-groups.md) §7):
+ 标题同一行右侧筛选使用方、组内电脑、时间范围与日期,默认是所有人的合计;概览、按人(第一行是自己即当前登录账号,之后是分享的人,
+ 只显示昵称与头像,§6)、近 30 天每日 token、活跃热力图、按电脑(有组时)、按模型(含估算金额)。时间范围与设置页相同:
+ 所有时间/最近 30 天/最近 7 天/今天/选某一天。
- **操作**:
- **关闭**:暂停对此人的分享,可随时恢复;
- **删除**:永久移除,需要重新生成链接才能再次分享;删除前二次确认。
@@ -315,6 +310,9 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
- 用量在分享者电脑上按受邀者与模型统计:Agent 在那里运行,数据最准,也不经过服务端。
- 订阅类供应商没有逐次扣费,按本地单价估算并明确标注「估算」,不代表供应商实际账单。
+- 管理页按天明细经同账号远程管理回传时最多 5,000 行,按最新日期的行优先保留;最新一天可以只保留部分,
+ 超出 UTF-8 JSON 字节预算时继续从较早的行裁剪,`coverageStart` 标出保留下来的最早日期。报告行的日期按接收端时区的
+ `lastAt` 重新计算,跨时区边界由前后两天的增量缓冲覆盖。
- **受邀者自己的运行数**(2026-10-10):分享者电脑在给受邀者的供应商目录里带上这个受邀者账号(它的每台电脑)
此刻在这个分享上正在运行一轮的任务数,供受邀者的[供应商组](provider-groups.md) §5 统计。只是受邀者自己的数,
不含分享者本人和其他受邀者,不泄露分享者电脑上的其他使用情况;不是用量,§12「受邀者查看自己的用量」仍未做。