Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-share): 仅展开明细时查询共享用量
fmfsaisaieb02fd60a248
diff --git a/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx b/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsxindex 75b92f01ac..78e2297d4f 100644--- a/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx+++ b/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx@@ -140,6 +140,7 @@ void mountPage({let visibility = { quota, usage: allowUsage };const command = async (cmd: {action: string;+ includeUsage?: boolean;visibility?: Partial<typeof visibility>;favoriteRecovery?: { ownerStamp: unknown };}) => {@@ -155,7 +156,7 @@ void mountPage({capabilities: visibility,status: {quota: quota ? 'ready' : 'disabled',- usage: allowUsage ? 'ready' : 'disabled',+ usage: !allowUsage ? 'disabled' : cmd.includeUsage ? 'ready' : 'not-requested',},quota: quota? {@@ -165,7 +166,7 @@ void mountPage({ctx.case === 'group' ? [account, subscriptionAccount] : [displayedAccount],}: null,- usage: allowUsage ? usage : null,+ usage: allowUsage && cmd.includeUsage ? usage : null,} satisfies ProviderShareInsights;case 'received':return [share];diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.tsindex d77a9beea3..ca2897870a 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts@@ -386,7 +386,7 @@ describe('provider share insights delivery', () => {});setProviderShareAccess({ guestAccess: () => state.access, ensureKnown: async () => undefined, hasShares: () => true, insights, insightsCurrent: insights.isCurrent });const client = fakeClient(); __testing.setActiveClient(client);- const payload = { channel: 'provider-share:insights:v1', args: [{ version: 1 }] };+ const payload = { channel: 'provider-share:insights:v1', args: [{ version: 1, includeUsage: false }] };return { visibility, client, payload };}it.each([false, true])('refuses outbox data after closing permissions (reopened=%s)', async (reopened) => {diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.tsindex 807eeff1a2..f6ed28c1dc 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.ts@@ -99,7 +99,7 @@ function fixture() {};return { state, deps, history, read: createProviderShareInsightsReader(deps) };}-const request = { version: 1 };+const request = { version: 1, includeUsage: true };describe('provider share insights', () => {afterEach(() => vi.restoreAllMocks());it.each([@@ -117,6 +117,34 @@ describe('provider share insights', () => {expect(deps.quota).toHaveBeenCalledTimes(Number(quota));expect(deps.history).toHaveBeenCalledTimes(Number(usage));});+ // 默认折叠曾读取全部历史;通过真实 reader 验证未请求不会读账本、投影或发送缓存。+ it('returns permissions and quota without touching usage until explicitly requested', async () => {+ const { read, deps } = fixture();+ const owner = vi.spyOn(deps, 'owner');+ const collapsed = { version: 1, includeUsage: false };+ const initial = await read('peer', collapsed);+ expect(initial).toMatchObject({+ capabilities: { usage: true },+ status: { usage: 'not-requested' },+ usage: null,+ });+ expect(initial.quota).not.toBeNull();+ expect(deps.history).not.toHaveBeenCalled();+ expect(owner).not.toHaveBeenCalled();+ expect((await read('peer', request)).usage?.parties.length).toBe(3);+ expect(deps.history).toHaveBeenCalledTimes(1);+ owner.mockClear();+ expect(await read('peer', collapsed)).toMatchObject({+ status: { usage: 'not-requested' },+ usage: null,+ });+ expect(owner).not.toHaveBeenCalled();+ expect(deps.history).toHaveBeenCalledTimes(1);+ await expect(read('peer', { version: 1 })).rejects.toThrow('INVALID_PARAMS');+ await expect(read('peer', { version: 1, includeUsage: 'true' })).rejects.toThrow(+ 'INVALID_PARAMS',+ );+ });it('includes relayed totals without topology, private notes, or deleted members', async () => {const { read, deps, history } = fixture();depsdiff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.tsindex 895e3dddba..ac59de7fa4 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts@@ -347,22 +347,23 @@ describe('share visibility management and guest query', () => {expect(visibility.set).toHaveBeenCalledWith('anthropic', { quota: true }, expect.any(Function));expect(() => parseProviderShareCommand({ action: 'set-visibility', providerId: 'anthropic', visibility: { quota: 'true' } })).toThrow('INVALID_PARAMS');});- it.each(['revision', 'owner', 'removed', 'old-version'])('rejects a stale or unsupported guest response: %s', async (change) => {+ it.each(['revision', 'owner', 'removed', 'old-version', 'old-unscoped'])('rejects a stale or unsupported guest response: %s', async (change) => {guest.share = { shareId: 's', memberId: 'm', status: 'active', hostOnline: true };guest.revision = 0;const invoke = vi.fn(async () => {if (change === 'revision') guest.revision += 2; // pause then resume: same current share, different generationif (change === 'owner') state.owner = 'owner-b';if (change === 'removed') guest.share = null;- return { ok: true, result: {} } as const;+ return { ok: true, result: change === 'old-unscoped' ? { version: 1, capabilities: { quota: false, usage: true }, status: { quota: 'disabled', usage: 'ready' }, quota: null, usage: { todayKey: '2026-10-19', coverageStart: null, parties: [] } } : {} } as const;});stopProviderShareRuntime(); startProviderShareRuntime(vi.fn(), { invoke });const handle = vi.spyOn(ipcMain, 'handle');registerProviderShareIpc();const handler = handle.mock.calls.find(([channel]) => channel === 'provider-share:command')![1];handle.mockRestore();- await expect(handler({} as Electron.IpcMainInvokeEvent, { action: 'insights', shareId: 's' })).rejects.toThrow(- change === 'old-version' ? 'UNSUPPORTED_CAPABILITY' : change === 'owner' ? 'PRECONDITION_FAILED' : 'PERMISSION_DENIED');- expect(invoke).toHaveBeenCalledWith('share:s', 'provider-share:insights:v1', [{ version: 1 }], expect.any(Object));+ await expect(handler({} as Electron.IpcMainInvokeEvent, { action: 'insights', shareId: 's', includeUsage: false })).rejects.toThrow(+ change.startsWith('old-') ? 'UNSUPPORTED_CAPABILITY' : change === 'owner' ? 'PRECONDITION_FAILED' : 'PERMISSION_DENIED');+ expect(invoke).toHaveBeenCalledTimes(1);+ expect(invoke).toHaveBeenCalledWith('share:s', 'provider-share:insights:v1', [{ version: 1, includeUsage: false }], expect.any(Object));});});diff --git a/apps/desktop/src/main/device-link/providerShareInsights.ts b/apps/desktop/src/main/device-link/providerShareInsights.tsindex a613cfe3c5..beca7fed22 100644--- a/apps/desktop/src/main/device-link/providerShareInsights.ts+++ b/apps/desktop/src/main/device-link/providerShareInsights.ts@@ -183,11 +183,13 @@ export function createProviderShareInsightsReader(deps: ProviderShareInsightsDep!raw ||typeof raw !== 'object' ||Array.isArray(raw) ||- Object.keys(raw).length !== 1 ||+ Object.keys(raw).length !== 2 ||+ typeof (raw as { includeUsage?: unknown }).includeUsage !== 'boolean' ||(raw as { version?: unknown }).version !== 1) {throwIpcError('INVALID_PARAMS', 'Invalid provider share insights request');}+ const includeUsage = (raw as { includeUsage: boolean }).includeUsage;const assertOwner = deps.captureScope();const owner = deps.scopeKey();const access = deps.access(peer);@@ -227,7 +229,7 @@ export function createProviderShareInsightsReader(deps: ProviderShareInsightsDeplet cached = histories.get(access.providerId);if (!visibility.usage) {histories.delete(access.providerId);- } else if (!cached) {+ } else if (includeUsage && !cached) {const read = deps.history(access.providerId);cached = { visibilityRevision: visibility.revision, expiresAt: now + 15_000, read };histories.set(access.providerId, cached);@@ -236,7 +238,7 @@ export function createProviderShareInsightsReader(deps: ProviderShareInsightsDep});}const [historyResult, quotaResult] = await Promise.allSettled([- visibility.usage ? cached!.read : null,+ visibility.usage && includeUsage ? cached!.read : null,visibility.quota ? deps.quota(access.providerId) : null,]);assertCurrent();@@ -249,7 +251,13 @@ export function createProviderShareInsightsReader(deps: ProviderShareInsightsDepcapabilities: { quota: visibility.quota, usage: visibility.usage },status: {quota: !visibility.quota ? 'disabled' : quota ? 'ready' : 'unavailable',- usage: !visibility.usage ? 'disabled' : history ? 'ready' : 'unavailable',+ usage: !visibility.usage+ ? 'disabled'+ : !includeUsage+ ? 'not-requested'+ : history+ ? 'ready'+ : 'unavailable',},quota,usage: history ? publicUsage(history, share, access.memberId, deps.owner()) : null,diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex fc15d30e3c..40e145fc1b 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -358,7 +358,8 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {return { action: 'set-visibility', providerId: value.providerId, visibility: patch };}case 'insights':- return { action: 'insights', shareId: text(value.shareId, 'shareId', 128) };+ if (typeof value.includeUsage !== 'boolean') throwIpcError('INVALID_PARAMS', 'Invalid insights scope');+ return { action: 'insights', shareId: text(value.shareId, 'shareId', 128), includeUsage: value.includeUsage };case 'get-run-limits':case 'reset-run-limits':return { action: value.action };@@ -734,7 +735,7 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => voidthrowIpcError('PERMISSION_DENIED', 'Provider share changed');}};- const response = await shareInvoke(`share:${command.shareId}`, PROVIDER_SHARE_INSIGHTS_CHANNEL, [{ version: 1 }], { preSend: assertShare });+ const response = await shareInvoke(`share:${command.shareId}`, PROVIDER_SHARE_INSIGHTS_CHANNEL, [{ version: 1, includeUsage: command.includeUsage }], { preSend: assertShare });assertShare();if (!response.ok) {throwIpcError(response.error.code === 'CHANNEL_NOT_ALLOWED' ? 'UNSUPPORTED_CAPABILITY'@@ -744,7 +745,9 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => void: 'PERMISSION_DENIED', 'Provider share insights are not available');}const result = parseProviderShareInsights(response.result);- if (!result) throwIpcError('UNSUPPORTED_CAPABILITY', 'Provider share insights require an update');+ if (!result || (command.includeUsage && result.status.usage === 'not-requested') || (!command.includeUsage && (result.usage !== null || !['disabled', 'not-requested'].includes(result.status.usage)))) {+ throwIpcError('UNSUPPORTED_CAPABILITY', 'Provider share insights require an update');+ }return result;}case 'get-run-limits':diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsxindex 359eb3f96b..506a60cd94 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsx@@ -3,7 +3,7 @@ import { Collapse } from '@/components/ui/collapse';import { QuotaHoverCard } from '@/components/status/QuotaHoverCard';import { CreditPoolRowView } from '@/features/billing/CreditPoolRowView';import { formatBillingAmount } from '@/features/billing/money';-import { useEffect, useId, useState } from 'react';+import { useEffect, useId, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import type { ProviderShareReceived } from '@cindy/device-link';import { useOptionalAuthUser } from '@/contexts/AuthContext';@@ -23,9 +23,26 @@ import { useShareTimeFormat } from './useShareTimeFormat';/** 可见页面每五秒复核权限;不持久化数据,身份变化、失败与隐藏都丢弃旧结果。 */export function ProviderShareInsightsSection({ share }: { share: ProviderShareReceived }) {- const { t, i18n } = useTranslation();useOptionalAuthUser();const owner = getDataOwnerGeneration();+ return (+ <InsightsView+ key={JSON.stringify([+ owner,+ share.shareId,+ share.memberId,+ share.status,+ share.hostOnline,+ share.hostCapable,+ ])}+ share={share}+ />+ );+}++function InsightsView({ share }: { share: ProviderShareReceived }) {+ const { t, i18n } = useTranslation();+ const owner = getDataOwnerGeneration();const identity = JSON.stringify([share.shareId,share.memberId,@@ -39,27 +56,51 @@ export function ProviderShareInsightsSection({ share }: { share: ProviderShareReview: ProviderShareInsights | null;error: string | null;} | null>(null);+ const [expanded, setExpanded] = useState(false);+ const [usageFailed, setUsageFailed] = useState(false);const available = share.status === 'active' && share.hostOnline && share.hostCapable;+ const valid = useRef(available);+ const expandedRef = useRef(false);+ const generation = useRef(0);useEffect(() => {let alive = true;- let generation = 0;let reading = false;- let valid = available;- const clear = (error: string | null) => setResult({ identity, owner, view: null, error });- clear(null);+ const clear = (error: string | null) => {+ setResult({ identity, owner, view: null, error });+ expandedRef.current = false;+ setUsageFailed(false);+ setExpanded(false);+ };const load = async () => {- if (!alive || !valid || reading || document.visibilityState === 'hidden') return;+ if (+ !alive ||+ !valid.current ||+ reading ||+ !isDataOwnerGenerationCurrent(owner) ||+ document.visibilityState === 'hidden'+ )+ return;reading = true;- const current = ++generation;+ const current = ++generation.current;try {const view = await window.electronAPI.providerShare.command({action: 'insights',shareId: share.shareId,+ includeUsage: expanded && expandedRef.current,});- if (alive && current === generation && isDataOwnerGenerationCurrent(owner))+ if (alive && current === generation.current && isDataOwnerGenerationCurrent(owner)) {setResult({ identity, owner, view, error: null });+ if (!view.capabilities.usage) setUsageFailed(false);+ else if (expanded && expandedRef.current)+ setUsageFailed(view.status.usage === 'unavailable');+ if (!view.capabilities.usage || view.status.usage === 'unavailable') {+ expandedRef.current = false;+ setExpanded(false);+ }+ }} catch (reason) {- if (!alive || current !== generation || !isDataOwnerGenerationCurrent(owner)) return;+ if (!alive || current !== generation.current || !isDataOwnerGenerationCurrent(owner))+ return;const code = extractIpcError(reason)?.code;clear(code === 'UNSUPPORTED_CAPABILITY'@@ -87,16 +128,16 @@ export function ProviderShareInsightsSection({ share }: { share: ProviderShareRelatest.hostCapable,]);if (next !== identity) {- valid = false;- generation++;+ valid.current = false;+ generation.current++;clear('denied');- } else if (!valid) {- valid = available;+ } else if (!valid.current) {+ valid.current = available;void load();}});const visibility = () => {- generation++;+ generation.current++;clear(null);if (document.visibilityState !== 'hidden') void load();};@@ -106,12 +147,12 @@ export function ProviderShareInsightsSection({ share }: { share: ProviderShareRe}, 5_000);return () => {alive = false;- generation++;+ generation.current++;off();window.clearInterval(timer);document.removeEventListener('visibilitychange', visibility);};- }, [available, identity, owner, share.shareId]);+ }, [available, expanded, identity, owner, share.shareId]);const current =result?.identity === identity && isDataOwnerGenerationCurrent(result.owner) ? result : null;const view = available ? current?.view : null;@@ -173,11 +214,33 @@ export function ProviderShareInsightsSection({ share }: { share: ProviderShareRe)}</div>)}- {view.capabilities.usage && view.status.usage === 'ready' && view.usage ? (+ {view.capabilities.usage ? (<SharedUsageDetailskey={JSON.stringify([share.shareId, share.memberId, owner])}providerId={share.providerId}- usage={view.usage}+ usage={expanded ? view.usage : null}+ failed={usageFailed}+ expanded={expanded}+ onExpandedChange={(next) => {+ generation.current++;+ expandedRef.current = next;+ if (next) setUsageFailed(false);+ setExpanded(next);+ // 收起即丢弃明细;保留额度,切换查询范围不闪空整个卡片。+ if (!next)+ setResult((previous) =>+ previous?.view+ ? {+ ...previous,+ view: {+ ...previous.view,+ usage: null,+ status: { ...previous.view.status, usage: 'not-requested' },+ },+ }+ : previous,+ );+ }}/>) : (<p className="mt-6 text-12 leading-[1.5] text-[var(--text-secondary)]">@@ -197,13 +260,18 @@ export function ProviderShareInsightsSection({ share }: { share: ProviderShareRefunction SharedUsageDetails({providerId,usage,+ failed,+ expanded,+ onExpandedChange,}: {providerId: string;- usage: ProviderShareUsageDetails;+ usage: ProviderShareUsageDetails | null;+ failed: boolean;+ expanded: boolean;+ onExpandedChange(value: boolean): void;}) {const { t } = useTranslation();const time = useShareTimeFormat();- const [expanded, setExpanded] = useState(false);const id = useId();return (<div className="mt-4 border-t border-[var(--border-default)] pt-2">@@ -212,7 +280,7 @@ function SharedUsageDetails({id={`${id}-trigger`}aria-expanded={expanded}aria-controls={`${id}-content`}- onClick={() => setExpanded((value) => !value)}+ onClick={() => onExpandedChange(!expanded)}className="flex min-h-9 w-full items-center gap-1.5 text-left text-13 font-medium text-[var(--text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[var(--focus-ring)]"><ChevronRight@@ -221,6 +289,11 @@ function SharedUsageDetails({/>{t('providerShare.insights.usageTitle')}</button>+ {failed && (+ <p role="status" className="mt-2 text-12 text-[var(--text-secondary)]">+ {t('providerShare.insights.usageUnavailable')}+ </p>+ )}<Collapseopen={expanded}id={`${id}-content`}@@ -230,22 +303,28 @@ function SharedUsageDetails({<p className="mt-2 text-12 leading-[1.5] text-[var(--text-secondary)]">{t('providerShare.insights.usageNote')}</p>- {usage.parties.some((party) => party.isRelay) && (+ {usage?.parties.some((party) => party.isRelay) && (<p className="mt-1 text-12 leading-[1.5] text-[var(--text-secondary)]">{t('providerShare.insights.relayNote')}</p>)}- <ProviderUsageSection- providerId={providerId}- sharedUsage={usage}- history={null}- status="ready"- legacyOwn={null}- members={[]}- selfDeviceName={null}- groupConfig={null}- time={time}- />+ {!usage ? (+ <p role="status" className="mt-2 text-12 text-[var(--text-tertiary)]">+ {t('providerShare.manage.loading')}+ </p>+ ) : (+ <ProviderUsageSection+ providerId={providerId}+ sharedUsage={usage}+ history={null}+ status="ready"+ legacyOwn={null}+ members={[]}+ selfDeviceName={null}+ groupConfig={null}+ time={time}+ />+ )}</Collapse></div>);diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsxindex 17bab344a1..ec49437825 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx@@ -241,7 +241,7 @@ describe('ProviderShareReceivedDetail', () => {await waitFor(() => expect(toggle.hasAttribute('disabled')).toBe(false));expect(toggle.getAttribute('aria-checked')).toBe(String(initial));- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });expect(command).toHaveBeenCalledWith({ action: 'set-credential-consent', shareId: 'share-1', skip: !initial });expect(toggle.hasAttribute('disabled')).toBe(true);expect(toggle.getAttribute('aria-checked')).toBe(String(initial));@@ -275,7 +275,7 @@ describe('ProviderShareReceivedDetail', () => {const view = render(<ProviderShareReceivedDetail share={share} />);const toggle = await consentSwitch();await waitFor(() => expect(toggle.hasAttribute('disabled')).toBe(false));- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });await waitFor(() => expect(command).toHaveBeenCalledWith({ action: 'set-credential-consent', shareId: 'share-1', skip: false }));view.rerender(<ProviderShareReceivedDetail share={{ ...share, shareId: 'share-2', memberId: 'mem-2' }} />);@@ -302,12 +302,12 @@ describe('ProviderShareReceivedDetail', () => {const view = render(<ProviderShareReceivedDetail share={share} />);const toggle = await consentSwitch();await waitFor(() => expect(toggle.hasAttribute('disabled')).toBe(false));- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });await waitFor(() => expect(saves.has('share-1')).toBe(true));view.rerender(<ProviderShareReceivedDetail share={{ ...share, shareId: 'share-2', memberId: 'mem-2' }} />);await waitFor(() => expect(toggle.hasAttribute('disabled')).toBe(false));- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });await waitFor(() => expect(saves.has('share-2')).toBe(true));await act(async () => { saves.get('share-1')!({ skip: false }); });expect(toggle.hasAttribute('disabled')).toBe(true);@@ -335,7 +335,7 @@ describe('ProviderShareReceivedDetail', () => {await waitFor(() => expect(toggle.getAttribute('aria-checked')).toBe('true'));await waitFor(() => expect(toggle.hasAttribute('disabled')).toBe(false));- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });await waitFor(() => expect(command).toHaveBeenCalledWith({ action: 'set-credential-consent', shareId: 'share-1', skip: false }));await waitFor(() => expect(toggle.getAttribute('aria-checked')).toBe('false'));expect(toast.error).not.toHaveBeenCalled();@@ -353,36 +353,36 @@ describe('ProviderShareReceivedDetail', () => {await waitFor(() => expect(toggle.hasAttribute('disabled')).toBe(false));expect(toggle.getAttribute('aria-checked')).toBe('false');- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });await waitFor(() => expect(toast.error).toHaveBeenCalledWith('providerShare.received.credentialConsent.writeFailed'));expect(toggle.getAttribute('aria-checked')).toBe('false');});});/* 真实详情组件验证两开关组合及轮询/身份切换时清空;不覆盖已有模型目录测试。tier: unit。 */-const insights = (quota = true, usage = true): ProviderShareInsights => ({- version: 1, capabilities: { quota, usage }, status: { quota: quota ? 'ready' : 'disabled', usage: usage ? 'ready' : 'disabled' },+const insights = (quota = true, usage = true, includeUsage = true): ProviderShareInsights => ({+ version: 1, capabilities: { quota, usage }, status: { quota: quota ? 'ready' : 'disabled', usage: !usage ? 'disabled' : includeUsage ? 'ready' : 'not-requested' },quota: quota ? { group: false, partial: false, accounts: [{ state: 'ready', updatedAt: null, windows: [], balance: { remaining: 12.34, total: null, currency: 'USD', resetsAt: null, pools: [] } }] } : null,- usage: usage ? { todayKey: '2026-10-19', coverageStart: null, parties: [{ key: 'owner', displayName: 'Shared Owner', avatarUrl: null, isYou: false, isOwner: true, isRelay: false, lastUsedAt: null, days: [] }] } : null,+ usage: usage && includeUsage ? { todayKey: '2026-10-19', coverageStart: null, parties: [{ key: 'owner', displayName: 'Shared Owner', avatarUrl: null, isYou: false, isOwner: true, isRelay: false, lastUsedAt: null, days: [] }] } : null,});describe('shared read-only insights', () => {it.each([[false, false], [true, false], [false, true], [true, true]])('renders independent quota=%s usage=%s permissions', async (quota, usage) => {const original = command.getMockImplementation()!;- command.mockImplementation((cmd) => cmd.action === 'insights' ? Promise.resolve(insights(quota, usage)) : original(cmd));+ command.mockImplementation((cmd) => cmd.action === 'insights' ? Promise.resolve(insights(quota, usage, cmd.includeUsage)) : original(cmd));await act(async () => { render(<ProviderShareReceivedDetail share={{ ...share, status: 'active' }} />); });expect(Boolean(screen.queryByText('$12.34'))).toBe(quota);expect(screen.queryByText('Shared Owner')).toBeNull();- if (usage) fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' }));+ if (usage) await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' })); });expect(Boolean(screen.queryByText('Shared Owner'))).toBe(usage);expect(screen.queryByText('providerGroup.usage.stack.computer')).toBeNull();expect(screen.queryByTestId('share-member-menu')).toBeNull();});it('clears the previous display when polling observes closed permissions', async () => {vi.useFakeTimers();- command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights() : []);+ command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights(true, true, cmd.includeUsage) : []);await act(async () => { render(<ProviderShareInsightsSection share={{ ...share, status: 'active' }} />); });expect(screen.getByText('$12.34')).toBeTruthy();- fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' }));+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' })); });expect(screen.getByText('Shared Owner')).toBeTruthy();command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights(false, false) : []);await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });@@ -391,7 +391,7 @@ describe('shared read-only insights', () => {// 默认收起不挡模型;轮询不改变用户选择,切换身份不能继承展开状态。tier: unit。it('keeps usage collapsed by default and preserves explicit toggles across polling', async () => {vi.useFakeTimers();- command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights() : []);+ command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights(true, true, cmd.includeUsage) : []);await act(async () => { render(<ProviderShareInsightsSection share={{ ...share, status: 'active' }} />); });const toggle = screen.getByRole('button', { name: 'providerShare.insights.usageTitle' });expect(toggle.getAttribute('aria-expanded')).toBe('false');@@ -399,21 +399,45 @@ describe('shared read-only insights', () => {expect(screen.getByText('$12.34')).toBeTruthy();await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });expect(toggle.getAttribute('aria-expanded')).toBe('false');- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });expect(toggle.getAttribute('aria-expanded')).toBe('true');expect(screen.getByText('Shared Owner')).toBeTruthy();await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });expect(toggle.getAttribute('aria-expanded')).toBe('true');- fireEvent.click(toggle);+ await act(async () => { fireEvent.click(toggle); });expect(toggle.getAttribute('aria-expanded')).toBe('false');expect(screen.queryByText('Shared Owner')).toBeNull();expect(screen.getByText('$12.34')).toBeTruthy();});+ // 明细请求失败后仍可看额度和重新展开;仅折叠轮询不能伪装成重试成功。+ it('keeps quota and the actual usage failure until an explicit retry', async () => {+ vi.useFakeTimers();+ let fail = true;+ command.mockImplementation(async (cmd) => {+ if (cmd.action !== 'insights') return [];+ const view = insights(true, true, cmd.includeUsage);+ return cmd.includeUsage && fail ? { ...view, status: { ...view.status, usage: 'unavailable' }, usage: null } : view;+ });+ await act(async () => { render(<ProviderShareInsightsSection share={{ ...share, status: 'active' }} />); });+ expect(screen.queryByText('providerShare.insights.usageUnavailable')).toBeNull();+ const toggle = screen.getByRole('button', { name: 'providerShare.insights.usageTitle' });+ await act(async () => { fireEvent.click(toggle); });+ expect(toggle.getAttribute('aria-expanded')).toBe('false');+ expect(screen.getByText('$12.34')).toBeTruthy();+ expect(screen.getByText('providerShare.insights.usageUnavailable')).toBeTruthy();+ await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });+ expect(command.mock.lastCall?.[0].includeUsage).toBe(false);+ expect(screen.getByText('providerShare.insights.usageUnavailable')).toBeTruthy();+ fail = false;+ await act(async () => { fireEvent.click(toggle); });+ expect(screen.getByText('Shared Owner')).toBeTruthy();+ expect(screen.queryByText('providerShare.insights.usageUnavailable')).toBeNull();+ });it.each(['share', 'account'])('resets expanded usage after %s changes', async (change) => {- command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights() : []);+ command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights(true, true, cmd.includeUsage) : []);let view!: ReturnType<typeof render>;await act(async () => { view = render(<ProviderShareInsightsSection share={{ ...share, status: 'active' }} />); });- fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' }));+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' })); });expect(screen.getByText('Shared Owner')).toBeTruthy();await act(async () => {if (change === 'account') setDataOwnerGeneration('new-owner');@@ -421,6 +445,7 @@ describe('shared read-only insights', () => {});expect(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' }).getAttribute('aria-expanded')).toBe('false');expect(screen.queryByText('Shared Owner')).toBeNull();+ expect(command.mock.calls.filter(([cmd]) => cmd.action === 'insights').at(-1)?.[0].includeUsage).toBe(false);setDataOwnerGeneration(null);});// 分享余额曾把剩余比例当普通余额条,缺少低余额预警。经真实分享组件验证剩余/已用转换;@@ -458,9 +483,9 @@ describe('shared read-only insights', () => {['DEVICE_LINK_DEVICE_OFFLINE', 'offline'],])('clears the previous display when polling returns %s', async (code, message) => {vi.useFakeTimers();- command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights() : []);+ command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights(true, true, cmd.includeUsage) : []);await act(async () => { render(<ProviderShareInsightsSection share={{ ...share, status: 'active' }} />); });- fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' }));+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' })); });expect(screen.getByText('Shared Owner')).toBeTruthy();command.mockRejectedValue(new Error(`[${code}] unavailable`));await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });@@ -477,7 +502,7 @@ describe('shared read-only insights', () => {await act(async () => { render(<ProviderShareInsightsSection share={{ ...share, status: 'active' }} />); });await act(async () => { listener([{ ...share, status: 'paused' }]); listener([{ ...share, status: 'active' }]); finish(insights()); });expect(screen.queryByText('$12.34')).toBeNull();- command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights() : []);+ command.mockImplementation(async (cmd) => cmd.action === 'insights' ? insights(true, true, cmd.includeUsage) : []);await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });expect(screen.getByText('$12.34')).toBeTruthy();});diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/providerShareInsightsFlow.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/providerShareInsightsFlow.test.tsxindex b88e4889af..34a4a898ba 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/providerShareInsightsFlow.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/providerShareInsightsFlow.test.tsx@@ -2,7 +2,8 @@/*** 跨模块集成:真实 renderer → IPC handler → guest runtime → host dispatch → insights* reader/文件权限 → wire DTO → renderer。现有单段测试没有覆盖这条接线。- * 最小失败输入:一份有效分享,开启后读取,再关闭用量并刷新。unit runner;集成场景。+ * 最小失败输入:一份获准的分享,默认折叠却查历史;展开→收起/隐藏/离页期间迟到的回包。+ * 既有测试仅验证显示折叠,未检查真实 host 读取与传输。unit runner;集成场景。* Electron、传输、账号关系快照、上游额度和账本为替身,不是真实跨账号/跨电脑 E2E。*/import fs from 'node:fs';@@ -18,7 +19,7 @@ import {type ProviderShareReceived,} from '@cindy/device-link';-const state = vi.hoisted(() => ({ root: '', active: true }));+const state = vi.hoisted(() => ({ root: '', active: true, historyReads: 0 }));vi.mock('electron-store', () => ({ default: class {} }));vi.mock('electron', () => ({app: { getAppPath: () => state.root, getPath: () => state.root, getVersion: () => '0.0.0-test' },@@ -133,25 +134,28 @@ vi.mock('../../../../main/device-link/providerShareQuota.js', () => ({}));vi.mock('../../../../main/usage/providerPartyUsageStore.js', () => ({currentProviderPartyUsageStore: () => ({- history: () => ({- self: {- lastUsedAt: null,- days: [- {- day: '2026-10-19',- kind: 'codex',- model: 'model-a',- memberKey: 'private-device',- turns: 1,- inputTokens: 10,- outputTokens: 2,- cacheReadTokens: 0,- cacheCreateTokens: 0,- },- ],- },- relays: [],- }),+ history: () => (+ state.historyReads++,+ {+ self: {+ lastUsedAt: null,+ days: [+ {+ day: '2026-10-19',+ kind: 'codex',+ model: 'model-a',+ memberKey: 'private-device',+ turns: 1,+ inputTokens: 10,+ outputTokens: 2,+ cacheReadTokens: 0,+ cacheCreateTokens: 0,+ },+ ],+ },+ relays: [],+ }+ ),}),}));vi.mock('../../../../main/device-link/providerShareUsageStore.js', () => ({@@ -232,6 +236,8 @@ afterEach(() => {if (state.root) fs.rmSync(state.root, { recursive: true, force: true });});it('round-trips permissions, private projection and live revocation through the real query stack', async () => {+ vi.useFakeTimers({ toFake: ['setInterval', 'clearInterval', 'Date'] });+ state.historyReads = 0;state.root = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-share-flow-'));const peer = providerShareGuestPeer('flow', 'guest', 'test-device');const received: InvokeResultPayload[] = [];@@ -247,11 +253,14 @@ it('round-trips permissions, private projection and live revocation through theconst agent = vi.fn();setRemoteAgentHandler({ handle: agent, abortAll: vi.fn() });let request = 0;+ let holdResponse: Promise<void> | null = null;startProviderShareRuntime(vi.fn(), {invoke: async (_target, channel, args, options) => {options?.preSend?.();await dispatch.handleInvoke(client, peer, `query-${request++}`, { channel, args });- return received.at(-1)!;+ const response = received.at(-1)!;+ await holdResponse;+ return response;},});const registration = vi.spyOn(ipcMain, 'handle');@@ -269,12 +278,24 @@ it('round-trips permissions, private projection and live revocation through thecommand({ action: 'get-visibility', providerId: 'anthropic' }),).resolves.toMatchObject({ quota: false, usage: false });await save(true, true);+ expect(request).toBe(0);+ expect(state.historyReads).toBe(0);+ let page!: ReturnType<typeof render>;await act(async () => {- render(<ProviderShareInsightsSection share={share} />);+ page = render(<ProviderShareInsightsSection share={share} />);});expect(screen.getByRole('progressbar').getAttribute('aria-valuenow')).toBe('25');expect(screen.queryByText('Guest Alice')).toBeNull();- fireEvent.click(screen.getByRole('button', { name: 'providerShare.insights.usageTitle' }));+ expect(state.historyReads).toBe(0);+ expect(received.at(-1)).toMatchObject({+ ok: true,+ result: { capabilities: { usage: true }, status: { usage: 'not-requested' }, usage: null },+ });+ const toggle = () => screen.getByRole('button', { name: 'providerShare.insights.usageTitle' });+ await act(async () => {+ fireEvent.click(toggle());+ });+ expect(state.historyReads).toBe(1);expect(screen.getByText('Guest Alice')).toBeTruthy();expect(screen.getByText('Shared Owner')).toBeTruthy();fireEvent.click(screen.getByRole('tab', { name: 'providerGroup.usage.stack.model' }));@@ -295,6 +316,92 @@ it('round-trips permissions, private projection and live revocation through theexpect(JSON.stringify(received)).not.toMatch(/private-device|private-guest|memberKey|hostDeviceId/,);+ // 折叠后即使越过缓存有效期仍不读历史,额度继续刷新且模型区域不被明细占据。+ await act(async () => {+ fireEvent.click(toggle());+ });+ await act(async () => {+ await vi.advanceTimersByTimeAsync(20_000);+ });+ expect(state.historyReads).toBe(1);+ expect(received.at(-1)).toMatchObject({+ ok: true,+ result: { usage: null, status: { usage: 'not-requested' } },+ });+ expect(screen.getByRole('progressbar').getAttribute('aria-valuenow')).toBe('25');+ let release!: () => void;+ holdResponse = new Promise<void>((resolve) => {+ release = resolve;+ });+ await act(async () => {+ fireEvent.click(toggle());+ });+ expect(state.historyReads).toBe(2);+ const lateUsage = release;+ holdResponse = null;+ await act(async () => {+ fireEvent.click(toggle());+ lateUsage();+ });+ expect(toggle().getAttribute('aria-expanded')).toBe('false');+ expect(screen.queryByText('Guest Alice')).toBeNull();+ expect(screen.getByRole('progressbar')).toBeTruthy();+ await act(async () => {+ fireEvent.click(toggle());+ });+ expect(screen.getByText('Guest Alice')).toBeTruthy();+ holdResponse = new Promise<void>((resolve) => {+ release = resolve;+ });+ await act(async () => {+ await vi.advanceTimersByTimeAsync(5_000);+ });+ await act(async () => {+ vi.spyOn(document, 'visibilityState', 'get').mockReturnValue('hidden');+ document.dispatchEvent(new Event('visibilitychange'));+ });+ const hiddenRequests = request;+ const hiddenReads = state.historyReads;+ await act(async () => {+ release();+ });+ holdResponse = null;+ expect(screen.queryByRole('progressbar')).toBeNull();+ await act(async () => {+ await vi.advanceTimersByTimeAsync(20_000);+ });+ expect(request).toBe(hiddenRequests);+ expect(state.historyReads).toBe(hiddenReads);+ expect(screen.queryByText('Guest Alice')).toBeNull();+ await act(async () => {+ vi.spyOn(document, 'visibilityState', 'get').mockReturnValue('visible');+ document.dispatchEvent(new Event('visibilitychange'));+ });+ expect(toggle().getAttribute('aria-expanded')).toBe('false');+ expect(state.historyReads).toBe(hiddenReads);+ // 已发请求不声称跨端取消;离页后到达的真实 host 回包不能进入新页面。+ holdResponse = new Promise<void>((resolve) => {+ release = resolve;+ });+ await act(async () => {+ fireEvent.click(toggle());+ });+ const leftReads = state.historyReads;+ page.unmount();+ const leftRequests = request;+ await act(async () => {+ release();+ await vi.advanceTimersByTimeAsync(20_000);+ });+ expect(request).toBe(leftRequests);+ expect(state.historyReads).toBe(leftReads);+ holdResponse = null;+ await act(async () => {+ page = render(<ProviderShareInsightsSection share={share} />);+ });+ expect(toggle().getAttribute('aria-expanded')).toBe('false');+ expect(screen.queryByText('Guest Alice')).toBeNull();+ expect(state.historyReads).toBe(leftReads);const reopened = createProviderShareVisibilityStore({filePath: () => path.join(state.root, 'provider-share-visibility.json'),scopeKey: () => 'isolated-owner',@@ -302,6 +409,8 @@ it('round-trips permissions, private projection and live revocation through theexpect(reopened.read('anthropic')).toMatchObject({ quota: true, usage: true });// 重新挂载触发同一真实查询;不依赖真实时间等待,也不以伪造响应替代撤权。cleanup();+ // 文件权限写入使用真实文件锁时钟;轮询与缓存过期已用虚拟时间验证完毕。+ vi.useRealTimers();await save(true, false);await act(async () => {render(<ProviderShareInsightsSection share={share} />);diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex c41b371a38..3f59e5f1e4 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -194,7 +194,7 @@ export type ProviderShareCommand =| { action: 'get-visibility'; providerId: string }| { action: 'set-visibility'; providerId: string; visibility: Partial<ProviderShareVisibility> }| { action: 'quota-account'; providerId: string }- | { action: 'insights'; shareId: string }+ | { action: 'insights'; shareId: string; includeUsage: boolean }| { action: 'get-run-limits' }| { action: 'reset-run-limits' }| { action: 'set-run-limits'; limits: Partial<RemoteAgentLimits> }diff --git a/apps/desktop/src/shared/providerShareInsights.ts b/apps/desktop/src/shared/providerShareInsights.tsindex c2661f96d6..a3ddf9ef9b 100644--- a/apps/desktop/src/shared/providerShareInsights.ts+++ b/apps/desktop/src/shared/providerShareInsights.ts@@ -53,7 +53,7 @@ export interface ProviderShareInsights {capabilities: ProviderShareVisibility;status: {quota: 'disabled' | 'ready' | 'unavailable';- usage: 'disabled' | 'ready' | 'unavailable';+ usage: 'disabled' | 'not-requested' | 'ready' | 'unavailable';};quota: { group: boolean; partial: boolean; accounts: ProviderShareQuotaAccount[] } | null;usage: ProviderShareUsageDetails | null;@@ -98,7 +98,10 @@ const status = z.enum(['disabled', 'ready', 'unavailable']);const schema = z.object({version: z.literal(1),capabilities: z.object({ quota: z.boolean(), usage: z.boolean() }),- status: z.object({ quota: status, usage: status }),+ status: z.object({+ quota: status,+ usage: z.enum(['disabled', 'not-requested', 'ready', 'unavailable']),+ }),quota: z.object({ group: z.boolean(), partial: z.boolean(), accounts: z.array(quotaAccount).max(512) }).nullable(),diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex a00e22bd9f..715363b8f6 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1620,9 +1620,13 @@ G 与 O 之间不变。受邀者能调用的 channel 不变(仍是 `maker:remote## 供应商分享:按授权查看额度与用量(2026-10-19)-- 新只读通道 `provider-share:insights:v1` 仅接受分享身份,参数严格为 `{ version: 1 }`,供应商由已验证身份决定。+- 新只读通道 `provider-share:insights:v1` 仅接受分享身份,参数严格为 `{ version: 1, includeUsage: boolean }`,供应商由已验证身份决定。返回 `{ version, capabilities, status, quota, usage }`,结构和接收端白名单解析在 `shared/providerShareInsights.ts`;两项能力默认关闭,未开放无数据,读取失败分别标 unavailable。无版本/能力/状态或未知版本提示更新,不降为管理通道。+ `includeUsage: false` 仍返回独立能力位;获准用量标 `not-requested`、usage 为 null,不读账本、不投影或返回缓存历史。+ 仅主动展开时传 true,收起后恢复 false,离开/隐藏详情不再发请求,未请求与未开放/失败/零用量明确区分。+ 新通道 v1 首次发布即要求 includeUsage;缺少或非布尔值拒绝,不回退为全量读取。+ 已发布旧端不支持此新通道;新端提示更新。接收端同时拒绝折叠请求却附带历史的响应,不降为全量查询。- 同账号 `manage-share` 追加 `get-visibility`、`set-visibility`(按供应商,仅 quota/usage 布尔补丁)、`quota-account`。写入仍只在供应商所在电脑执行;旧端的 Unknown command 映射为 UNSUPPORTED_CAPABILITY,不改存控制端、不重放写入。受邀者不能调用这些管理动作,也不能指定另一个 providerId 或借通道读取全量账本。diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 6538285a7b..d24d21f91f 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -339,7 +339,10 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):不显示充值、重置次数等管理操作信息。组内自有账号匿名逐项显示,不相加百分比、不声称同账号多设备可合并;从他人借来的账号不继续公开额度。页面说明可能只显示部分账号、同一账号多设备可能分列;不可读取、不支持、离线、旧端、未开放分别显示。-- 用量明细默认收起,主动展开后显示筛选、概览、图表和明细,避免遮挡模型列表;轮询不改变展开状态,换分享或账号重置,不保存偏好。+- 用量明细默认收起;未打开对应分享详情不发本功能查询。打开但未展开时只取权限和获准的额度,不读取、汇总、投影或传输用量历史(包括缓存)。+ 主动展开才立即读取明细,并在页面可见期间刷新,显示筛选、概览、图表和明细,避免遮挡模型列表。+ 再次收起停止后续明细请求,保留有效额度;离页或隐藏停止全部本功能查询。已发出的调用不做跨端取消,但迟到结果不得回填。+ 轮询不自动展开,换分享或账号、重新进入详情均默认收起,不保存偏好。用量复用现有账本、时间范围与图表,开放分享者本人和当前成员昵称/头像、按人/模型/时间的历史统计,金额标为估算。已删除成员沿用现有不展示规则;经同账号组转来的用量汇入匿名「转来的用量」,不暴露设备、不归入分享者本人。私人备注、真实设备身份、凭证、登录邮箱、任务/文件内容与转分享审批细节不进入展示 DTO。