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): 没有组的供应商用量按只有本机一台的组显示 (#5806)

Lizidbb2377fba0e
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
index 82c4d5e158..43369376a4 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
@@ -1,13 +1,14 @@
/**
* 「远程与分享」页的「用量」块(供应商组 §7、§10):按人列出这个供应商的用量——你自己(当前登录的账号,
- * 本机与你其他电脑的合计)、分享的人(按人分开),共用一个时间段切换。收起时是这个人的总量;展开后建了组的
- * 按组内每台电脑分开(每台下面列模型),没有组的按模型列。
+ * 本机与你其他电脑的合计)、分享的人(按人分开),共用一个时间段切换。收起时是这个人的总量;展开后按电脑分开
+ * (每台下面列模型)。没有组的供应商当成只有本机一台的组,与建了组的走同一套显示(2026-10-12 用户要求):
+ * 账本里不经组、就在本机运行的用量本来就记在本机(`local`)上。
*
* 自己的用量来自这台电脑的账本(main 的 own-usage,含你其他电脑经组在别的组内电脑上运行、报告过来的部分),
* 分享的人来自分享服务的成员用量。
*/
import { ChevronRight, History, Monitor } from 'lucide-react';
-import { Fragment, useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { SegmentedControl } from '@/components/ui/segmented-control';
@@ -85,7 +86,10 @@ export function ProviderUsageSection({
const devices = useDeviceLinkDeviceList();
const ownerNameOf = useProviderShareOwnerNameOf();
const group = useLocalProviderGroups()[providerId] ?? null;
- const memberKeys = useMemo(() => group?.members.map((member) => member.key) ?? [], [group]);
+ const memberKeys = useMemo(
+ () => group?.members.map((member) => member.key) ?? [PROVIDER_GROUP_LOCAL_MEMBER_KEY],
+ [group],
+ );
const [expanded, setExpanded] = useState<ReadonlySet<string>>(() => new Set());
const parties = useMemo<UsageParty[]>(() => {
@@ -187,7 +191,7 @@ export function ProviderUsageSection({
return (
<section className="mt-8 shrink-0" aria-labelledby="provider-usage-title">
- <div className={cn(group ? 'mb-3 flex flex-wrap items-start gap-3' : 'mb-2 flex flex-wrap items-center gap-2')}>
+ <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')}
@@ -203,7 +207,7 @@ export function ProviderUsageSection({
options={RANGES.map((value) => ({ value, label: t(`providerShare.manage.members.range.${value}`) }))}
/>
</div>
- {group && parties.length > 0 && (
+ {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) : '—'}
@@ -236,9 +240,9 @@ export function ProviderUsageSection({
first={index === 0}
open={expanded.has(party.key)}
unavailable={party.key === 'self' && ownFailed && !own}
- enhanced={Boolean(group)}
- totalTokens={group ? summary.tokens : 0}
- memberKeys={group ? memberKeys : null}
+ totalTokens={summary.tokens}
+ memberKeys={memberKeys}
+ showComputerCount={Boolean(group)}
memberLabel={memberLabel}
time={time}
onToggle={() => toggle(party.key)}
@@ -264,9 +268,9 @@ function UsagePartyRow({
first,
open,
unavailable,
- enhanced,
totalTokens,
memberKeys,
+ showComputerCount,
memberLabel,
time,
onToggle,
@@ -276,12 +280,12 @@ function UsagePartyRow({
open: boolean;
/** 自己的账本没读出来:不写 0,免得被当成没用过。 */
unavailable: boolean;
- /** 供应商组专属的摘要、占比和内层明细视觉。普通供应商保持原有用量界面。 */
- enhanced: boolean;
/** 所选时间段所有已读使用方的 token 总量,用来画轻量占比条。 */
totalTokens: number;
- /** 供应商组的组内电脑(按组里的顺序);没有组为 null。 */
- memberKeys: readonly string[] | null;
+ /** 组内电脑(按组里的顺序);没有组时只有本机。 */
+ memberKeys: readonly string[];
+ /** 收起时写「用了几台电脑」:没有组时只有本机一台,这句没有信息量。 */
+ showComputerCount: boolean;
memberLabel: (memberKey: string | null, inGroup: boolean) => MemberLabel;
time: ShareTimeFormat;
onToggle: () => void;
@@ -289,11 +293,10 @@ function UsagePartyRow({
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(
- () => (memberKeys ? groupUsageByMember(party.models, memberKeys) : null),
- [memberKeys, party.models],
- );
- const usedOn = breakdown?.filter((item) => item.memberKey !== null && summarizeShareUsage(item.models).tokens > 0).length ?? 0;
+ const breakdown = useMemo(() => groupUsageByMember(party.models, memberKeys), [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
@@ -307,11 +310,7 @@ function UsagePartyRow({
data-usage-party={party.key}
className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}
>
- <div className={cn(
- enhanced
- ? 'flex flex-wrap items-center gap-3 px-4 py-3.5 transition-colors motion-reduce:transition-none hover:bg-[var(--surface-hover)]'
- : 'flex flex-wrap items-center gap-3 px-4 py-3',
- )}>
+ <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"
@@ -351,11 +350,7 @@ function UsagePartyRow({
</span>
</div>
{!unavailable && (
- <div className={cn(
- enhanced
- ? 'flex min-w-[108px] shrink-0 flex-col items-end text-12 text-[var(--text-secondary)]'
- : 'flex shrink-0 flex-col items-end text-12 text-[var(--text-secondary)]',
- )}>
+ <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>
@@ -364,7 +359,7 @@ function UsagePartyRow({
{t('providerShare.manage.members.amount', { amount: formatShareMoney(totals.amount) })}
</span>
)}
- {enhanced && share > 0 && (
+ {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)]"
@@ -379,27 +374,20 @@ function UsagePartyRow({
{open && !unavailable && (
<div
id={breakdownId}
- className={cn(
- enhanced
- ? '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'
- : 'px-4 pb-3.5 sm:pl-12',
- )}
+ 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={enhanced ? 'overflow-x-auto' : undefined}>
- <table className={cn('w-full border-collapse text-12', enhanced && 'min-w-[560px]')}>
- <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(breakdown ? 'providerGroup.usage.table.member' : 'providerShare.manage.members.table.model')}
- </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>
- </tr>
- </thead>
- {breakdown ? (
- breakdown.map((item, index) => (
+ <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>
+ </tr>
+ </thead>
+ {breakdown.map((item, index) => (
<MemberUsageRows
key={item.memberKey ?? '\u0000unattributed'}
item={item}
@@ -407,27 +395,7 @@ function UsagePartyRow({
label={memberLabel(item.memberKey, item.inGroup)}
partyTokens={totals.tokens}
/>
- ))
- ) : (
- <tbody className="text-[var(--text-primary)] [font-variant-numeric:tabular-nums]">
- {party.models.length === 0 ? (
- <tr>
- <td colSpan={5} className="py-2 text-[var(--text-secondary)]">
- {t('providerShare.manage.members.noUsage')}
- </td>
- </tr>
- ) : (
- mergeModelUsage([party.models], { ignoreMember: true }).map((model) => (
- <tr
- key={`${model.kind}:${model.providerId ?? ''}:${model.model}`}
- className="border-b border-[var(--border-default)] last:border-b-0"
- >
- <ModelCells model={model} />
- </tr>
- ))
- )}
- </tbody>
- )}
+ ))}
</table>
</div>
<p className="mt-2 text-12 text-[var(--text-tertiary)]">{t('providerShare.manage.members.estimateNote')}</p>
@@ -494,24 +462,14 @@ function MemberUsageRows({
</tr>
{item.models.map((model) => (
<tr key={`${model.kind}:${model.providerId ?? ''}:${model.model}`} className="text-[var(--text-secondary)]">
- <ModelCells model={model} indent />
+ {/* 模型行收紧(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>
);
}
-
-function ModelCells({ model, indent = false }: { model: ProviderShareModelUsageView; indent?: boolean }) {
- // 组内电脑下的模型行收紧(py-1);没有组时的按模型表照旧(py-1.5)。
- const cell = indent ? 'py-1' : 'py-1.5';
- return (
- <Fragment>
- {/* 缩进与上一行的电脑名对齐:图标 14 + gap-2。 */}
- <td className={cn(cell, 'pr-3', indent && 'pl-[22px]')}>{formatModelShort(model.model)}</td>
- <td className={cn(cell, 'pr-3 text-right')}>{model.turns}</td>
- <td className={cn(cell, 'pr-3 text-right')}>{formatShareTokens(model.inputTokens)}</td>
- <td className={cn(cell, 'pr-3 text-right')}>{formatShareTokens(model.outputTokens)}</td>
- <td className={cn(cell, 'text-right')}>{model.amount ? formatShareMoney(model.amount) : '—'}</td>
- </Fragment>
- );
-}
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 56a376ce26..891d91e625 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
@@ -232,17 +232,36 @@ describe('ProviderShareManagePage', () => {
expect(lizi.textContent).toContain('providerGroup.usage.unattributed');
});
- it('re-reads usage when the period changes and expands the per-model breakdown', async () => {
+ it('re-reads usage when the period changes', 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' });
+ });
+
+ 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();
+ // 和建了组的一样有摘要与占比,只是收起时不写用了几台电脑(只有一台)。
+ 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/ }));
- expect(screen.getByText('Opus 5.5')).toBeTruthy();
- expect(screen.getByText('$31.20')).toBeTruthy();
- expect(screen.getByText('providerShare.manage.members.estimateNote')).toBeTruthy();
+ 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();
});
it('does not show zero for this computer when its usage could not be read', async () => {
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 55b4288d90..6b2af40f1d 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
@@ -34,12 +34,9 @@ describe('mergeModelUsage', () => {
]);
});
- it('can ignore the computer, and never adds amounts in different currencies', () => {
- const merged = mergeModelUsage(
- [[usage({}), usage({ memberKey: 'device:studio:xd', amount: { amount: 7, currency: 'CNY' } })]],
- { ignoreMember: true },
- );
- expect(merged).toEqual([expect.objectContaining({ memberKey: null, turns: 2, inputTokens: 20, amount: null })]);
+ 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 })]);
});
});
@@ -56,6 +53,14 @@ describe('groupUsageByMember', () => {
[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],
+ ]);
+ });
});
describe('member keys', () => {
diff --git a/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts b/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts
index b1c84b1457..c22b47a361 100644
--- a/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts
+++ b/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts
@@ -13,20 +13,18 @@ function addMoney(a: ProviderShareMoney | null, b: ProviderShareMoney | null): P
/**
* 合并几份按模型的用量:同一 Agent、供应商、模型、组内电脑的行相加。
- * `ignoreMember` 时不分组内电脑(没有组的供应商按模型列)。金额币种不一致的那一行不给金额,不伪造合计。
+ * 金额币种不一致的那一行不给金额,不伪造合计。
*/
export function mergeModelUsage(
lists: ReadonlyArray<readonly ProviderShareModelUsageView[]>,
- options: { ignoreMember?: boolean } = {},
): ProviderShareModelUsageView[] {
const merged = new Map<string, ProviderShareModelUsageView & { mixed?: boolean }>();
for (const list of lists) {
for (const row of list) {
- const memberKey = options.ignoreMember ? null : row.memberKey;
- const key = JSON.stringify([row.kind, row.providerId, row.model, memberKey]);
+ const key = JSON.stringify([row.kind, row.providerId, row.model, row.memberKey]);
const existing = merged.get(key);
if (!existing) {
- merged.set(key, { ...row, memberKey, amount: row.amount ? { ...row.amount } : null });
+ merged.set(key, { ...row, amount: row.amount ? { ...row.amount } : null });
continue;
}
existing.turns += row.turns;
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 560beb2a58..7911b608a8 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -243,13 +243,11 @@
"collapseAria": "Collapse {{name}}’s Model Usage",
"empty": "You haven’t shared with anyone yet. Create a share link and send it; once they request access and you approve, they’ll appear here.",
"table": {
- "model": "Model",
"turns": "Messages",
"input": "Input",
"output": "Output",
"amount": "Est. Cost"
},
- "noUsage": "No usage in this period",
"estimateNote": "Amounts are estimated from local unit prices and don’t reflect the provider’s actual bill."
},
"removeConfirm": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 3732815215..a5286718bb 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -241,13 +241,11 @@
"collapseAria": "{{name}} のモデル別使用量を折りたたむ",
"empty": "まだ誰とも共有していません。共有リンクを作成して相手に送ってください。相手が申請し、あなたが承認するとここに表示されます。",
"table": {
- "model": "モデル",
"turns": "メッセージ",
"input": "入力",
"output": "出力",
"amount": "推定金額"
},
- "noUsage": "この期間の使用量はありません",
"estimateNote": "金額はローカルの単価に基づく推定で、プロバイダーの実際の請求額ではありません。"
},
"removeConfirm": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 2d58992732..2321b11f9c 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -241,13 +241,11 @@
"collapseAria": "{{name}}님의 모델별 사용량 접기",
"empty": "아직 아무와도 공유하지 않았습니다. 공유 링크를 만들어 보내세요. 상대방이 요청하고 내가 승인하면 여기에 표시됩니다.",
"table": {
- "model": "모델",
"turns": "메시지",
"input": "입력",
"output": "출력",
"amount": "예상 금액"
},
- "noUsage": "이 기간에는 사용량이 없습니다",
"estimateNote": "금액은 로컬 단가로 추정한 값이며 제공자의 실제 청구액이 아닙니다."
},
"removeConfirm": {
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 bd3b185cee..18c4d0d34a 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -241,13 +241,11 @@
"collapseAria": "收起 {{name}} 的模型用量",
"empty": "还没有分享给任何人。生成分享链接发给对方,对方申请、你同意后会出现在这里。",
"table": {
- "model": "模型",
"turns": "消息",
"input": "输入",
"output": "输出",
"amount": "估算金额"
},
- "noUsage": "这段时间没有用量",
"estimateNote": "金额按本地单价估算,不代表供应商实际账单。"
},
"removeConfirm": {
@@ -422,7 +420,7 @@
"expandAria": "展开 {{name}} 的用量明细",
"collapseAria": "收起 {{name}} 的用量明细",
"table": {
- "member": "组内电脑 / 模型"
+ "member": "电脑 / 模型"
}
},
"section": {
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 c3cc15d75c..7d4be02176 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -241,13 +241,11 @@
"collapseAria": "收起 {{name}} 的模型用量",
"empty": "還沒有分享給任何人。產生分享連結傳給對方,對方申請、你同意後會出現在這裡。",
"table": {
- "model": "模型",
"turns": "訊息",
"input": "輸入",
"output": "輸出",
"amount": "估算金額"
},
- "noUsage": "這段時間沒有用量",
"estimateNote": "金額按本機單價估算,不代表供應商實際帳單。"
},
"removeConfirm": {
@@ -422,7 +420,7 @@
"expandAria": "展開 {{name}} 的用量明細",
"collapseAria": "收起 {{name}} 的用量明細",
"table": {
- "member": "組內電腦 / 模型"
+ "member": "電腦 / 模型"
}
},
"section": {
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index 4a049f026f..d48282bd22 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -353,7 +353,12 @@
- **收起是总量,展开看明细**:建了组的供应商按组内每台电脑分开——组里每台都列出(这段时间没用过的也列,变淡、不写数字),
按组里的顺序,每台一行合计(带占这个人总量的比例)、下面每个模型一行;已经移出组、这段时间用过的电脑排在后面
(写「已移出组」);这一字段加上之前记的分享的人用量没有区分电脑,归在最后的「更早的记录」。收起时状态行写用了几台电脑。
- 没有组的供应商展开按模型列。
+ - **顶部摘要与占比**:人列表上方四个数字——总用量、估算金额、使用方、模型(只汇总已读到的使用方,读失败的不当 0);
+ 每人一行右侧带占全部用量的比例条。
+ - **没有组的供应商当成只有本机一台的组**(2026-10-12 用户要求):与建了组的走同一套显示——同样的摘要与占比,展开后
+ 「本机」一行合计、下面每个模型一行,以及「更早的记录」。不经组、就在本机运行的用量本来就记在 `local` 上,不用另一套
+ 按模型的表;只有收起时不写「用了几台电脑」(只有一台,没有信息量),说明文字不提组内电脑。**只限用量显示**:任务运行、
+ 模型列表与「供应商组」块仍按「组是用户另外建的」处理,不把没有组的供应商当成组。
- 自己的用量从这次更新开始记,不补以前的;计量与受邀者用量同一套(每一轮的 done 事件),每一轮另记实际在哪台组内电脑
运行(组内电脑的稳定键,本机为 `local`)。任务此刻所在的电脑与供应商和绑定那台对得上才按组记,任务挪走了而绑定还没清掉时
按没有组记。各部分来源:
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 64f6b7b112..ef6a2f4f92 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -201,8 +201,8 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
- **待处理**:待审批的申请(同意/拒绝);为空时整块隐藏。链接 5 分钟即过期,不列出未使用的链接。
- **已分享的人**:每人一行,显示头像、昵称、加入时间、最近使用、当前状态(正常/已暂停)与是否有任务正在运行。
- **用量**(2026-10-11 起移到页面上方的「用量」块,见[供应商组](provider-groups.md) §7):按人列出——第一行是自己(当前登录账号),
- 之后是分享的人,每人一行显示所选时间段内的用量合计(只显示昵称与头像,§6);展开后建了组的按组内每台电脑分开、每台下面
- 按模型列出,没有组的按模型列出:轮次、输入 token、输出 token、估算金额。
+ 之后是分享的人,每人一行显示所选时间段内的用量合计(只显示昵称与头像,§6);展开后按电脑分开、每台下面按模型列出
+ (没有组的供应商当成只有本机一台的组,2026-10-12 起):轮次、输入 token、输出 token、估算金额。
时间段可选近 7 天/本月/全部。
- **操作**:
- **关闭**:暂停对此人的分享,可随时恢复;