Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(provider-share): add per-member model usage share limits
zqchrisa2cb9bca1d2e
diff --git a/apps/desktop/scripts/fixtures/remote-model-access/remote-model-access-fixture.tsx b/apps/desktop/scripts/fixtures/remote-model-access/remote-model-access-fixture.tsxindex 7798a406c3..80692e49bd 100644--- a/apps/desktop/scripts/fixtures/remote-model-access/remote-model-access-fixture.tsx+++ b/apps/desktop/scripts/fixtures/remote-model-access/remote-model-access-fixture.tsx@@ -4,15 +4,34 @@ import type { RemoteModelSelection } from '../../../src/shared/remoteModelAccessvoid mountPage({host: (ctx) => {+ const budgetCase = ctx.case.startsWith('budget');+ const claude = ctx.case === 'budget-claude';+ const recommended = claude ? 'claude-sonnet' : 'gpt-terra';+ const limited = claude ? 'claude-fable' : 'gpt-astra';+ const catalog = claude ? [+ { id: 'claude-sonnet', name: 'Sonnet' }, { id: 'claude-haiku', name: 'Haiku' }, { id: 'claude-fable', name: 'Fable' },+ ] : [+ { id: 'gpt-sol', name: 'Sol' }, { id: 'gpt-terra', name: 'Terra' }, { id: 'gpt-astra', name: 'Astra' },+ ...(ctx.case === 'budget-new-model' ? [{ id: 'catalog-new-model-42', name: 'New model 42' }] : []),+ ];+ let budget = budgetCase ? { recommendedModel: recommended, rules: [{ id: 'premium', models: [limited], maxPercent: 30 }], basis: 'member-input-output-7d' as const, enabled: false } : null;let models: RemoteModelSelection = ctx.case === 'member' ? ['small'] : null;return {providerShare: {onOwnedChanged: subscription('ownedShares'),- command: async (cmd: { action: string; models?: RemoteModelSelection }) => {+ command: async (cmd: { action: string; models?: RemoteModelSelection; memberBudget?: typeof budget }) => {+ if (cmd.action === 'set-model-access' && ctx.case === 'budget-save-failure') throw new Error('Fixture save failed');+ if (cmd.memberBudget !== undefined) budget = cmd.memberBudget;if (cmd.action === 'set-model-access') models = cmd.models ?? null;return {- version: 1, models, providerModels: ctx.case === 'member' ? ['small', 'medium'] : null,- availableModels: [+ version: 1, providerName: claude ? 'Claude' : 'OpenAI', models, providerModels: ctx.case === 'member' ? ['small', 'medium'] : null,+ ...(budgetCase ? {+ budgetSupported: true, budgetAvailable: ctx.case !== 'budget-unsupported', memberBudget: budget,+ budgetStatus: { state: ctx.case === 'budget-learning' ? 'empty' : 'recorded', enabled: false, windowStart: '2026-10-22', windowEnd: '2026-10-28', nextWindowAt: Date.parse('2026-10-29T00:00:00+08:00'), totalTokens: ctx.case === 'budget-learning' ? 0 : 100,+ recommendedModel: recommended,+ rules: [{ id: 'premium', models: [limited], tokens: ctx.case === 'budget-learning' ? 0 : 60, usedPercent: ctx.case === 'budget-learning' ? null : 60, limitPercent: 30, wouldBlock: ctx.case !== 'budget-learning', blocked: false }] },+ } : {}),+ availableModels: budgetCase ? catalog : [{ id: 'small', name: 'Claude Haiku' },{ id: 'medium', name: 'Claude Sonnet' },{ id: 'large', name: 'Claude Opus' },@@ -25,8 +44,8 @@ void mountPage({render: (ctx) => (<AppFrame header={false}><div className="p-6">- <RemoteModelAccessSection providerId="fixture-provider" />- {ctx.case === 'member' && <RemoteModelAccessDialog providerId="fixture-provider" memberId="fixture-member" memberName="小林" onClose={() => {}} />}+ <RemoteModelAccessSection providerId={ctx.case === 'budget-claude' ? 'anthropic' : 'openai'} />+ {(ctx.case === 'member' || ctx.case.startsWith('budget')) && <RemoteModelAccessDialog providerId={ctx.case === 'budget-claude' ? 'anthropic' : 'openai'} memberId="fixture-member" memberName="小林" onClose={() => {}} />}</div></AppFrame>),diff --git a/apps/desktop/scripts/fixtures/remote-model-access/ui-page.mjs b/apps/desktop/scripts/fixtures/remote-model-access/ui-page.mjsindex 21ca0f032c..4f35c2dbf8 100644--- a/apps/desktop/scripts/fixtures/remote-model-access/ui-page.mjs+++ b/apps/desktop/scripts/fixtures/remote-model-access/ui-page.mjs@@ -7,6 +7,12 @@ export default {real: 'RemoteModelAccessSection, RemoteModelAccessDialog, product buttons, translations and themes',notCovered: 'Live IPC, persisted permissions and cross-device calls. Names and models are fixture data.',cases: {+ budget: { about: 'OpenAI single-model percentage limit' },+ 'budget-claude': { about: 'Claude uses its own catalog and single-model percentage limit' },+ 'budget-new-model': { about: 'A new catalog model can be selected without product code changes' },+ 'budget-learning': { about: 'Unknown usage is not zero' },+ 'budget-save-failure': { about: 'Retains a percentage change on save failure' },+ 'budget-unsupported': { about: 'Provider group cannot add a percentage policy' },default: { about: 'Provider-wide model selection' },member: { about: 'Per-person model selection within the provider ceiling' },},@@ -14,6 +20,37 @@ export default {await page.getByRole('button', { name: /.+/ }).first().waitFor();},async check(page, ui) {+ if (ui.case.startsWith('budget')) {+ const percent = page.getByRole('spinbutton', { name: await ui.t('providerShare.memberBudget.maxPercent'), exact: true });+ await percent.waitFor();+ assert.equal(await percent.inputValue(), '30');+ const recommended = page.getByRole('combobox', { name: await ui.t('providerShare.memberBudget.recommended'), exact: true });+ const claude = ui.case === 'budget-claude';+ const alternative = claude ? 'claude-haiku' : 'gpt-sol';+ await recommended.selectOption(alternative);+ assert.equal(await recommended.inputValue(), alternative);+ await recommended.selectOption(claude ? 'claude-sonnet' : 'gpt-terra');+ const selectedModel = page.getByRole('combobox', { name: await ui.t('providerShare.memberBudget.chooseModels'), exact: true });+ assert.equal(await selectedModel.inputValue(), claude ? 'claude-fable' : 'gpt-astra');+ if (claude) assert.equal(await selectedModel.locator('option[value="gpt-astra"]').count(), 0);+ else assert.equal(await selectedModel.locator('option[value="claude-fable"]').count(), 0);+ if (ui.case === 'budget-new-model') {+ await selectedModel.selectOption('catalog-new-model-42');+ await recommended.selectOption('catalog-new-model-42');+ assert.equal(await selectedModel.inputValue(), 'catalog-new-model-42');+ }+ if (ui.case === 'budget-unsupported') {+ assert.equal(await page.getByRole('button', { name: await ui.t('providerShare.memberBudget.addGroup'), exact: true }).isEnabled(), false);+ } else if (ui.case === 'budget-save-failure') {+ await percent.fill('25');+ await page.getByRole('button', { name: await ui.t('settings.providers.custom.save'), exact: true }).click();+ await page.getByRole('alert').waitFor();+ assert.equal(await percent.inputValue(), '25');+ }+ await page.getByRole('checkbox', { name: await ui.t('providerShare.memberBudget.enable'), exact: true }).scrollIntoViewIfNeeded();+ await ui.capture('budget');+ return;+ }if (ui.case === 'default') {await page.getByRole('button', { name: await ui.t('providerShare.modelAccess.choose'), exact: true }).click();}diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareBudgetRuntime.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareBudgetRuntime.test.tsnew file mode 100644index 0000000000..3458bbde54--- /dev/null+++ b/apps/desktop/src/main/device-link/__tests__/providerShareBudgetRuntime.test.ts@@ -0,0 +1,90 @@+import { afterEach, beforeEach, expect, it, vi } from 'vitest';+import type { ProviderView } from '@cindy/model-providers';+import type { ProviderShareMemberBudget } from '../../../shared/providerShareBudget.js';+// Unit: real admission/status entry. The old account estimator cannot verify personal token+// shares, draft bypass, exact-boundary admission or recovery after other-model usage.+const state = vi.hoisted(() => ({+ read: vi.fn(), ledger: vi.fn(), broken: false, available: true, modelTokens: 60, otherTokens: 40,+ policy: null as ProviderShareMemberBudget | null,+}));+vi.mock('../../maker-host/active-catalog.js', () => ({ getActiveCatalog: () => ({ providers: [{ id: 'p', models: { codex: [{ id: 'future-model' }, { id: 'other-model' }] } }] }) }));+vi.mock('../../provider-group/store.js', () => ({ readProviderGroup: () => null }));+vi.mock('../providerShareHost.js', () => ({ getProviderShareHostSnapshot: () => [{ shareId: 'share', providerId: 'p', members: [{ memberId: 'alice' }] }] }));+vi.mock('../providerShareUsageStore.js', async importOriginal => {+ const actual = await importOriginal<typeof import('../providerShareUsageStore.js')>();+ return { ...actual, getProviderShareUsageStore: () => ({ memberTokenSnapshot: state.ledger }) };+});+vi.mock('../remoteModelAccess.js', () => ({ remoteModelAccess: { read: state.read, allows: () => true } }));+import { memberBudgetAllows, memberBudgetAllowsCached, readMemberBudgetStatus, supportsMemberBudget } from '../providerShareBudgetRuntime.js';+import { isProviderShareMemberBudget } from '../../../shared/providerShareBudget.js';++beforeEach(() => {+ state.broken = false; state.available = true; state.modelTokens = 60; state.otherTokens = 40;+ state.policy = { basis: 'member-input-output-7d', enabled: true, rules: [{ id: 'one', models: ['future-model'], maxPercent: 50 }], recommendedModel: 'other-model' };+ state.read.mockReset().mockImplementation(() => {+ if (state.broken) throw new Error('unreadable settings');+ return { memberBudget: state.policy };+ });+ state.ledger.mockReset().mockImplementation(() => ({ available: state.available, windowStart: '2026-10-22', windowEnd: '2026-10-28', nextWindowAt: 1,+ models: [{ model: 'future-model', tokens: state.modelTokens }, { model: 'other-model', tokens: state.otherTokens }] }));+});+afterEach(() => vi.restoreAllMocks());++it('never reads member rules or usage for owner and same-account admission even with broken storage', async () => {+ state.broken = true;+ expect(memberBudgetAllowsCached('p', 'future-model')).toBe(true);+ expect(await memberBudgetAllows('p', 'future-model')).toBe(true);+ expect(state.read).not.toHaveBeenCalled();+ expect(state.ledger).not.toHaveBeenCalled();+});+it('keeps a draft non-enforcing, while its status shows the actual threshold comparison', () => {+ state.policy!.enabled = false;+ expect(memberBudgetAllowsCached('p', 'future-model', 'alice')).toBe(true);+ expect(state.ledger).not.toHaveBeenCalled();+ expect(readMemberBudgetStatus('p', 'alice')?.rules[0]).toMatchObject({ usedPercent: 60, wouldBlock: true, blocked: false });+ state.available = false;+ expect(memberBudgetAllowsCached('p', 'future-model', 'alice')).toBe(true);+});+it('previews recorded usage before any rule exists without creating or enabling one', () => {+ state.policy = null;+ expect(readMemberBudgetStatus('p', 'alice')).toBeNull();+ expect(readMemberBudgetStatus('p', 'alice', true)).toMatchObject({ enabled: false, totalTokens: 100, rules: [],+ modelUsage: [{ model: 'future-model', tokens: 60 }, { model: 'other-model', tokens: 40 }] });+ expect(state.policy).toBeNull();+ expect(memberBudgetAllowsCached('p', 'future-model', 'alice')).toBe(true);+});+it('limits only the configured member model, then recovers as that member uses another model', () => {+ expect(supportsMemberBudget({ id: 'p' } as ProviderView)).toBe(true);+ expect(memberBudgetAllowsCached('p', 'future-model', 'alice')).toBe(false);+ expect(memberBudgetAllowsCached('p', 'other-model', 'alice')).toBe(true);+ state.otherTokens = 60;+ expect(readMemberBudgetStatus('p', 'alice')?.rules[0].usedPercent).toBe(50);+ expect(memberBudgetAllowsCached('p', 'future-model', 'alice')).toBe(false);+ state.otherTokens = 61;+ expect(memberBudgetAllowsCached('p', 'future-model', 'alice')).toBe(true);+});+// Unit: bridge-qualified model IDs must not split the numerator or bypass admission.+it('combines canonical and bridge usage and applies the same rule to either request ID', () => {+ state.ledger.mockReturnValue({ available: true, windowStart: '2026-10-22', windowEnd: '2026-10-28', nextWindowAt: 1,+ models: [{ model: 'future-model', tokens: 30 }, { model: 'chatgpt/future-model', tokens: 30 }, { model: 'other-model', tokens: 40 }] });+ expect(readMemberBudgetStatus('p', 'alice')?.rules[0]).toMatchObject({ usedPercent: 60, tokens: 60 });+ expect(memberBudgetAllowsCached('p', 'chatgpt/future-model', 'alice')).toBe(false);+});+it('does not fabricate 0% for empty or unreadable records; empty allows bootstrap and 100% is unrestricted', () => {+ state.modelTokens = state.otherTokens = 0;+ expect(readMemberBudgetStatus('p', 'alice')).toMatchObject({ state: 'empty', totalTokens: 0, rules: [{ usedPercent: null, blocked: false }] });+ state.available = false;+ expect(readMemberBudgetStatus('p', 'alice')).toMatchObject({ state: 'unavailable', totalTokens: null, rules: [{ usedPercent: null, blocked: true }] });+ state.available = true; state.modelTokens = 100;+ state.policy!.rules[0]!.maxPercent = 100;+ expect(memberBudgetAllowsCached('p', 'future-model', 'alice')).toBe(true);+});+it('rejects the former quota schema and duplicate or combined models instead of reinterpreting them', () => {+ expect(isProviderShareMemberBudget(state.policy)).toBe(true);+ const { basis: _basis, ...old } = state.policy!;+ expect(isProviderShareMemberBudget(old)).toBe(false);+ expect(isProviderShareMemberBudget({ ...state.policy, rules: [{ id: 'one', models: ['a', 'b'], maxPercent: 50 }] })).toBe(false);+ expect(isProviderShareMemberBudget({ ...state.policy, rules: [...state.policy!.rules, { ...state.policy!.rules[0], id: 'two' }] })).toBe(false);+ for (const maxPercent of [0, 0.5, 30.5, 101, NaN, '50']) expect(isProviderShareMemberBudget({ ...state.policy, rules: [{ ...state.policy!.rules[0], maxPercent }] })).toBe(false);+ expect(isProviderShareMemberBudget({ ...state.policy, rules: [...state.policy!.rules, { id: 'alias', models: ['chatgpt/future-model'], maxPercent: 50 }] })).toBe(false);+});diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.tsindex 3c73991792..31f7b44c2d 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareInsights.test.ts@@ -102,6 +102,21 @@ function fixture() {const request = { version: 1, includeUsage: true };describe('provider share insights', () => {afterEach(() => vi.restoreAllMocks());+ // Member policy remains visible while the owner keeps aggregate account usage private.+ it('projects only the authenticated member budget independently of quota visibility', async () => {+ const { state, deps } = fixture();+ state.visibility = { quota: false, usage: false, revision: 0 };+ const budget = vi.fn(async () => ({ state: 'recorded' as const, enabled: true, windowStart: '2026-10-22', windowEnd: '2026-10-28', nextWindowAt: 2000, totalTokens: 100, recommendedModel: 'terra',+ rules: [{ id: 'premium', models: ['provider-model'], tokens: 20, usedPercent: 20, limitPercent: 30, wouldBlock: false, blocked: false }] }));+ const read = createProviderShareInsightsReader({ ...deps, budget });+ const result = parseProviderShareInsights(await read('peer', { version: 1, includeUsage: false }));+ expect(budget).toHaveBeenCalledWith('provider', 'member');+ expect(result?.memberBudget?.rules[0].usedPercent).toBe(20);+ expect(result?.quota).toBeNull();+ expect(result?.usage).toBeNull();+ expect(deps.quota).not.toHaveBeenCalled();+ expect(deps.history).not.toHaveBeenCalled();+ });it.each([[false, false],[true, false],diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.tsindex 57aaa874ee..ec1b41acef 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareUsageStore.test.ts@@ -19,6 +19,38 @@ describe('provider share usage store', () => {fs.rmSync(dir, { recursive: true, force: true });});+ // Unit, real ledger entry: personal ratios must isolate identity/provider/date and exclude cache.+ // Existing range tests do not cover midnight recovery or a failed ledger becoming a false 0%.+ it('reconstructs only one member/provider over seven local dates and advances at midnight', async () => {+ let now = new Date(2026, 9, 22, 10).getTime();+ const file = path.join(dir, 'usage.json');+ const store = createProviderShareUsageStore(file, { now: () => now });+ const write = (share: string, member: string, provider: string, model: string, tokens: number) =>+ store.record(share, member, { kind: 'codex', providerId: provider, memberKey: 'local', samples: [{ ...sample(model, tokens, 0), cacheReadTokens: 99999 }] });+ write('s', 'alice', 'p', 'new-model', 60);+ write('s', 'bob', 'p', 'new-model', 900);+ write('s', 'alice', 'another-provider', 'new-model', 900);+ write('another-share', 'alice', 'p', 'new-model', 900);+ now = new Date(2026, 9, 28, 10).getTime();+ write('s', 'alice', 'p', 'other-model', 40);+ const current = store.memberTokenSnapshot(new Set(['s']), 'p', 'alice');+ expect(current).toMatchObject({ available: true, windowStart: '2026-10-22', windowEnd: '2026-10-28',+ models: [{ model: 'new-model', tokens: 60 }, { model: 'other-model', tokens: 40 }] });+ now = current.nextWindowAt;+ expect(store.memberTokenSnapshot(new Set(['s']), 'p', 'alice')).toMatchObject({ windowStart: '2026-10-23', models: [{ model: 'other-model', tokens: 40 }] });+ await store.flush();+ expect(createProviderShareUsageStore(file, { now: () => now }).memberTokenSnapshot(new Set(['s']), 'p', 'alice').models).toEqual([{ model: 'other-model', tokens: 40 }]);+ });+ it('marks corrupt usage unavailable across subsequent writes and reloads', async () => {+ const file = path.join(dir, 'usage.json');+ fs.writeFileSync(file, '{broken');+ const store = createProviderShareUsageStore(file);+ expect(store.memberTokenSnapshot(new Set(['s']), 'p', 'alice').available).toBe(false);+ store.record('s', 'alice', { kind: 'codex', providerId: 'p', memberKey: 'local', samples: [sample('model', 1, 0)] });+ await store.flush();+ expect(createProviderShareUsageStore(file).memberTokenSnapshot(new Set(['s']), 'p', 'alice').available).toBe(false);+ });+it('aggregates per member and model, filters by range and only returns requested shares', async () => {let now = new Date(2026, 9, 7, 12).getTime();const file = path.join(dir, 'usage.json');diff --git a/apps/desktop/src/main/device-link/__tests__/remoteModelAccess.test.ts b/apps/desktop/src/main/device-link/__tests__/remoteModelAccess.test.tsindex 20a3c5756d..4e08ddb209 100644--- a/apps/desktop/src/main/device-link/__tests__/remoteModelAccess.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/remoteModelAccess.test.ts@@ -71,6 +71,23 @@ describe('remote model permissions', () => {await expect(make().set('p', [], undefined, () => {})).rejects.toThrow();expect(fs.existsSync(filePath())).toBe(false);});+ it('persists member budgets atomically, preserves them for older clients, and keeps the owner exempt', async () => {+ const policy = { rules: [{ id: 'a', models: ['astra'], maxPercent: 30 }], recommendedModel: 'terra', basis: 'member-input-output-7d' as const, enabled: false };+ await make().set('p', null, 'alice', () => {}, policy);+ expect(make().read('p', 'alice').memberBudget).toEqual(policy);+ expect(make().read('p').memberBudget).toBeNull();+ expect(make().read('p', 'bob').memberBudget).toBeNull();+ await make().set('p', ['astra', 'terra'], 'alice', () => {});+ expect(make().read('p', 'alice').memberBudget).toEqual(policy);+ await make().set('p', null, 'alice', () => {}, null);+ expect(make().read('p', 'alice').memberBudget).toBeNull();+ });+ it('denies damaged member rules without changing owner access', () => {+ fs.mkdirSync(path.dirname(filePath()), { recursive: true });+ fs.writeFileSync(filePath(), JSON.stringify({ providers: { p: { members: {}, budgets: [] } } }));+ expect(make().allows('p', 'astra', 'alice')).toBe(false);+ expect(make().allows('p', 'astra')).toBe(true);+ });it.each([{}, ['x', 'x'], [''], [' x'], [42], Array(4097).fill('m')])('refuses malformed model selections %#', (value) => {expect(isRemoteModelSelection(value)).toBe(false);});diff --git a/apps/desktop/src/main/device-link/providerShareBudgetCalculation.ts b/apps/desktop/src/main/device-link/providerShareBudgetCalculation.tsnew file mode 100644index 0000000000..07074ad39b--- /dev/null+++ b/apps/desktop/src/main/device-link/providerShareBudgetCalculation.ts@@ -0,0 +1,36 @@+import type { ProviderShareMemberBudget, ProviderShareBudgetStatus } from '../../shared/providerShareBudget.js';+import { unifiedModelKeyId } from '@cindy/model-providers';++export interface MemberTokenSnapshot {+ available: boolean;+ windowStart: string;+ windowEnd: string;+ nextWindowAt: number;+ models: Array<{ model: string; tokens: number }>;+}+/** Exact arithmetic over the available ledger, not a claim of complete upstream accounting. */+export function memberBudgetStatus(snapshot: MemberTokenSnapshot, policy: ProviderShareMemberBudget): ProviderShareBudgetStatus {+ const models = new Map<string, number>();+ let valid = snapshot.available;+ for (const row of snapshot.models) {+ if (!row.model || !Number.isSafeInteger(row.tokens) || row.tokens < 0) { valid = false; continue; }+ const model = unifiedModelKeyId(row.model);+ models.set(model, (models.get(model) ?? 0) + row.tokens);+ }+ const sum = [...models.values()].reduce((a, b) => a + b, 0);+ valid &&= Number.isSafeInteger(sum);+ const total = valid ? sum : null;+ const rules = policy.rules.map(rule => {+ const tokens = valid ? models.get(unifiedModelKeyId(rule.models[0]!)) ?? 0 : null;+ const usedPercent = total && tokens !== null ? tokens / total * 100 : null;+ // No observations: allow a first request. 100% is unrestricted, including exactly 100%.+ // Existing requests finish; a later request sees the newly recorded ratio.+ const wouldBlock = rule.maxPercent < 100 && (total === null || (total > 0 && tokens! * 100 >= total * rule.maxPercent));+ return { id: rule.id, models: [...rule.models], tokens, usedPercent, limitPercent: rule.maxPercent,+ wouldBlock, blocked: policy.enabled && wouldBlock };+ });+ return { state: total === null ? 'unavailable' : total === 0 ? 'empty' : 'recorded', enabled: policy.enabled,+ windowStart: snapshot.windowStart, windowEnd: snapshot.windowEnd, nextWindowAt: snapshot.nextWindowAt,+ totalTokens: total, modelUsage: valid ? [...models].map(([model, tokens]) => ({ model, tokens })) : [],+ rules, recommendedModel: policy.recommendedModel };+}diff --git a/apps/desktop/src/main/device-link/providerShareBudgetRuntime.ts b/apps/desktop/src/main/device-link/providerShareBudgetRuntime.tsnew file mode 100644index 0000000000..014b39d3b4--- /dev/null+++ b/apps/desktop/src/main/device-link/providerShareBudgetRuntime.ts@@ -0,0 +1,36 @@+import type { ProviderView } from '@cindy/model-providers';+import { getActiveCatalog } from '../maker-host/active-catalog.js';+import { getProviderShareHostSnapshot } from './providerShareHost.js';+import { getProviderShareUsageStore, providerUsageLocalDay, providerShareUsageRangeStart } from './providerShareUsageStore.js';+import { remoteModelAccess } from './remoteModelAccess.js';+import { createMemberBudgetService } from './providerShareBudgetService.js';++/** Any provider with a member ledger, including groups, uses the same ratio. */+export function supportsMemberBudget(_provider: ProviderView): boolean { return true; }++const service = createMemberBudgetService({+ readPolicy: (providerId, memberId) => remoteModelAccess.read(providerId, memberId).memberBudget,+ readUsage(providerId, memberId) {+ const shares = getProviderShareHostSnapshot().filter(share => share.providerId === providerId+ && share.members.some(member => member.memberId === memberId));+ const now = Date.now();+ const date = new Date(now);+ const snapshot = getProviderShareUsageStore()?.memberTokenSnapshot(new Set(shares.map(share => share.shareId)), providerId, memberId, now)+ ?? { available: false, models: [], windowStart: providerShareUsageRangeStart('7d', now)!,+ windowEnd: providerUsageLocalDay(now), nextWindowAt: new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1).getTime() };+ if (!shares.length) snapshot.available = false;+ return snapshot;+ },+ modelAvailable(providerId, memberId, model) {+ const provider = getActiveCatalog().providers.find(item => item.id === providerId);+ return Object.values(provider?.models ?? {}).some(models => models?.some(item => item.id === model && !item.disabled))+ && remoteModelAccess.allows(providerId, model, memberId);+ },+});+export const readMemberBudgetStatus = service.status;+export const memberBudgetAllowsCached = service.allows;+export const memberBudgetDenial = service.denial;+export const assertMemberBudget = service.assertAllowed;+export async function memberBudgetAllows(providerId: string, model: string, memberId?: string): Promise<boolean> {+ return service.allows(providerId, model, memberId);+}diff --git a/apps/desktop/src/main/device-link/providerShareBudgetService.ts b/apps/desktop/src/main/device-link/providerShareBudgetService.tsnew file mode 100644index 0000000000..3276da327d--- /dev/null+++ b/apps/desktop/src/main/device-link/providerShareBudgetService.ts@@ -0,0 +1,42 @@+import type { ProviderShareMemberBudget } from '../../shared/providerShareBudget.js';+import { memberBudgetStatus, type MemberTokenSnapshot } from './providerShareBudgetCalculation.js';+import { unifiedModelKeyId } from '@cindy/model-providers';++const matches = (models: string[], model: string) => models.some(id => unifiedModelKeyId(id) === unifiedModelKeyId(model));++/** Member identity and the ledger are supplied by the authenticated host. */+export function createMemberBudgetService(deps: {+ readPolicy(providerId: string, memberId: string): ProviderShareMemberBudget | null;+ readUsage(providerId: string, memberId: string): MemberTokenSnapshot;+ modelAvailable(providerId: string, memberId: string, model: string): boolean;+}) {+ function status(providerId: string, memberId: string, preview = false) {+ const policy = deps.readPolicy(providerId, memberId)+ ?? (preview ? { basis: 'member-input-output-7d' as const, enabled: false, recommendedModel: null, rules: [] } : null);+ if (!policy) return null;+ const result = memberBudgetStatus(deps.readUsage(providerId, memberId), policy);+ const recommended = result.recommendedModel;+ if (recommended && (!deps.modelAvailable(providerId, memberId, recommended)+ || result.rules.some(rule => matches(rule.models, recommended) && rule.wouldBlock))) result.recommendedModel = null;+ return result;+ }+ function allows(providerId: string, model: string, memberId?: string): boolean {+ // Owner and same-account calls never read a member policy or ledger.+ if (!memberId) return true;+ try {+ const policy = deps.readPolicy(providerId, memberId);+ if (!policy?.enabled || !policy.rules.some(rule => matches(rule.models, model))) return true;+ return status(providerId, memberId)?.rules.find(rule => matches(rule.models, model))?.blocked === false;+ } catch { return false; }+ }+ function denial(providerId: string, model: string, memberId?: string) {+ if (allows(providerId, model, memberId)) return null;+ return { code: 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED',+ message: '[REMOTE_AGENT_MEMBER_BUDGET_PAUSED] This model is paused by your shared-provider model limit. Choose another available model; check your usage in Remote & Sharing.' };+ }+ function assertAllowed(providerId: string, model: string, memberId?: string): void {+ const error = denial(providerId, model, memberId);+ if (error) throw Object.assign(new Error(error.message), { code: error.code });+ }+ return { status, allows, denial, assertAllowed };+}diff --git a/apps/desktop/src/main/device-link/providerShareInsights.ts b/apps/desktop/src/main/device-link/providerShareInsights.tsindex beca7fed22..114cde12e7 100644--- a/apps/desktop/src/main/device-link/providerShareInsights.ts+++ b/apps/desktop/src/main/device-link/providerShareInsights.ts@@ -1,5 +1,6 @@import { createHash } from 'node:crypto';import { MAX_FRAME_BYTES, type ProviderShareOwned } from '@cindy/device-link';+import type { ProviderShareBudgetStatus } from '../../shared/providerShareBudget.js';import type { ProviderUsageHistoryView } from '../../shared/providerShare.js';import type {ProviderShareInsights,@@ -19,6 +20,7 @@ export interface ProviderShareInsightsDeps {visibility(providerId: string): ProviderShareVisibility & { revision: number };shares(): readonly ProviderShareOwned[];owner(): { displayName: string; avatarUrl: string | null };+ budget?(providerId: string, memberId: string): Promise<ProviderShareBudgetStatus | null>;history(providerId: string): Promise<ProviderUsageHistoryView>;quota(providerId: string,@@ -126,6 +128,7 @@ const INSIGHTS_MAX_BYTES = MAX_FRAME_BYTES - 1_024;const jsonBytes = (value: unknown): number => Buffer.byteLength(JSON.stringify(value), 'utf8');function boundInsightsFrame(result: ProviderShareInsights): void {+ if (result.memberBudget && jsonBytes({ ...result, usage: null, quota: null }) > INSIGHTS_MAX_BYTES) result.memberBudget = null;// An oversized capability must not turn the other capability into a transport error.if (result.quota && jsonBytes({ ...result, usage: null }) > INSIGHTS_MAX_BYTES) {result.quota = null;@@ -237,17 +240,22 @@ export function createProviderShareInsightsReader(deps: ProviderShareInsightsDepif (histories.get(access.providerId)?.read === read) histories.delete(access.providerId);});}- const [historyResult, quotaResult] = await Promise.allSettled([+ const [historyResult, quotaResult, budgetResult] = await Promise.allSettled([visibility.usage && includeUsage ? cached!.read : null,visibility.quota ? deps.quota(access.providerId) : null,+ deps.budget?.(access.providerId, access.memberId) ?? null,]);assertCurrent();const share = deps.shares().find((item) => item.shareId === access.shareId);if (!share) throwIpcError('PERMISSION_DENIED', 'Provider share is not available');const history = historyResult.status === 'fulfilled' ? historyResult.value : null;const quota = quotaResult.status === 'fulfilled' ? quotaResult.value : null;+ const budget = budgetResult.status === 'fulfilled' ? budgetResult.value : null;+ // Unsaved model previews belong to the owner editor, not the guest wire payload.+ const { modelUsage: _modelUsage, ...publicBudget } = budget ?? {};const result: ProviderShareInsights = {version: 1,+ ...(deps.budget ? { memberBudget: budget ? publicBudget as ProviderShareBudgetStatus : null } : {}),capabilities: { quota: visibility.quota, usage: visibility.usage },status: {quota: !visibility.quota ? 'disabled' : quota ? 'ready' : 'unavailable',diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex b06601b425..81ef4c490c 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -1,5 +1,7 @@+import { isProviderShareMemberBudget } from '../../shared/providerShareBudget.js';+import { readMemberBudgetStatus, supportsMemberBudget } from './providerShareBudgetRuntime.js';import { isRemoteAgentLimitsPatch } from '../../shared/remoteAgentLimits.js';-import { supportsSubscriptionFastPolicy } from '@cindy/model-providers';+import { supportsSubscriptionFastPolicy, unifiedModelKeyId } from '@cindy/model-providers';import { providerFastPolicy } from '../maker-host/provider-fast-policy-store.js';import { notifySubscriptionFastPolicyChanged } from '../maker-host/subscription-fast-policy.js';import { notifyProviderShareCatalogChanged } from './dispatch.js';@@ -369,7 +371,10 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {const scope = { providerId: value.providerId, ...(memberId !== undefined ? { memberId } : {}) };if (value.action === 'get-model-access') return { action: value.action, ...scope };if (!isRemoteModelSelection(value.models)) throwIpcError('INVALID_PARAMS', 'Invalid remote model selection');- return { action: value.action, ...scope, models: value.models === null ? null : [...value.models] };+ if (value.memberBudget !== undefined && (!memberId || (value.memberBudget !== null && !isProviderShareMemberBudget(value.memberBudget))))+ throwIpcError('INVALID_PARAMS', 'Invalid member budget');+ return { action: value.action, ...scope, models: value.models === null ? null : [...value.models],+ ...(value.memberBudget !== undefined ? { memberBudget: value.memberBudget as import('../../shared/providerShareBudget.js').ProviderShareMemberBudget | null } : {}) };}case 'get-visibility':case 'quota-account':@@ -777,8 +782,22 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => voidassertScope();const provider = providers.find((entry) => entry.id === command.providerId);if (!provider) throwIpcError('NOT_FOUND', 'This provider is no longer available');+ const budgetAvailable = supportsMemberBudget(provider);+ const recommendationModelIds = [...new Set(Object.values(provider.models).flatMap(models => (models ?? []).filter(model => !model.disabled).map(model => model.id)))];+ const budgetModelIds = recommendationModelIds.filter(id => id === unifiedModelKeyId(id)+ || !recommendationModelIds.includes(unifiedModelKeyId(id)));if (command.action === 'set-model-access') {- await remoteModelAccess.set(command.providerId, command.models, command.memberId, assertScope);+ if (command.memberBudget?.rules.length && !budgetAvailable) throwIpcError('PRECONDITION_FAILED', 'Member model limits are not available for this provider group');+ if (command.memberBudget) {+ const previous = remoteModelAccess.read(command.providerId, command.memberId).memberBudget;+ const retained = new Set(previous?.rules.flatMap(rule => rule.models) ?? []);+ if (command.memberBudget.rules.some(rule => rule.models.some(model => !budgetModelIds.includes(model) && !retained.has(model))))+ throwIpcError('INVALID_PARAMS', 'This model does not support percentage budgets');+ const recommended = command.memberBudget.recommendedModel;+ if (recommended && !recommendationModelIds.includes(recommended) && recommended !== previous?.recommendedModel)+ throwIpcError('INVALID_PARAMS', 'The recommended model is unavailable');+ }+ await remoteModelAccess.set(command.providerId, command.models, command.memberId, assertScope, command.memberBudget);assertScope();await revalidateRemoteModelAccess();assertScope();@@ -790,7 +809,11 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => voidfor (const entries of [...Object.values(provider.models), ...PROVIDER_MEDIA_FIELDS.map(field => provider[field])]) for (const model of entries ?? []) {if (!model.disabled) availableModels.set(model.id, { id: model.id, name: model.name || model.id });}+ assertScope();return { version: 1, ...remoteModelAccess.read(command.providerId, command.memberId),+ providerName: provider.name,+ budgetSupported: true, budgetAvailable, budgetModelIds, recommendationModelIds,+ ...(command.memberId ? { budgetStatus: readMemberBudgetStatus(command.providerId, command.memberId, true) ?? undefined } : {}),availableModels: [...availableModels.values()] } satisfies RemoteModelAccessView;}case 'get-visibility':@@ -1023,6 +1046,9 @@ export function registerProviderShareIpc(): void {owner: () => ({ displayName: getAuthState().user?.name ?? '', avatarUrl: getAuthState().user?.avatar ?? null }),history: usageHistory,quota: readProviderShareQuota,+ budget: async (providerId, memberId) => {+ return readMemberBudgetStatus(providerId, memberId);+ },});setProviderShareAccess({remoteModels: (providerId) => {diff --git a/apps/desktop/src/main/device-link/providerShareUsageStore.ts b/apps/desktop/src/main/device-link/providerShareUsageStore.tsindex e15b165736..fd2c6a4c97 100644--- a/apps/desktop/src/main/device-link/providerShareUsageStore.ts+++ b/apps/desktop/src/main/device-link/providerShareUsageStore.ts@@ -154,6 +154,7 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:const now = options.now ?? Date.now;let rows: Map<string, ProviderShareUsageRow> | null = null;let timer: ReturnType<typeof setTimeout> | null = null;+ let incomplete = false;let writing: Promise<void> = Promise.resolve();const keyOf = (row: Pick<ProviderShareUsageRow, 'day' | 'shareId' | 'memberId' | 'kind' | 'providerId' | 'model'>) =>@@ -163,15 +164,18 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:if (rows) return rows;rows = new Map();try {- const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8')) as { version?: unknown; rows?: unknown };+ const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8')) as { version?: unknown; rows?: unknown; incomplete?: unknown };+ incomplete = parsed.incomplete === true;if (parsed.version === FILE_VERSION && Array.isArray(parsed.rows)) {for (const raw of parsed.rows) {const row = parseRow(raw);if (row) rows.set(keyOf(row), row);+ else incomplete = true;}- }- } catch {- // 没有文件或文件损坏:从空账本开始。+ } else incomplete = true;+ } catch (error) {+ // A missing ledger is empty; unreadable/corrupt data must not become a measured 0%.+ incomplete = (error as NodeJS.ErrnoException).code !== 'ENOENT';}return rows;}@@ -187,7 +191,7 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:async function writeNow(): Promise<void> {const map = load();prune(map);- const body = JSON.stringify({ version: FILE_VERSION, rows: [...map.values()] });+ const body = JSON.stringify({ version: FILE_VERSION, rows: [...map.values()], ...(incomplete ? { incomplete: true } : {}) });const tmp = `${filePath}.${process.pid}.${Date.now()}.tmp`;await fsp.mkdir(path.dirname(filePath), { recursive: true });try {@@ -208,6 +212,21 @@ export function createProviderShareUsageStore(filePath: string, options: { now?:}return {+ /** Same member/provider only, today's local calendar date plus six preceding dates. */+ memberTokenSnapshot(shareIds: ReadonlySet<string>, providerId: string, memberId: string, at = now()) {+ const start = providerShareUsageRangeStart('7d', at)!;+ const end = localDay(at);+ const date = new Date(at);+ const totals = new Map<string, number>();+ for (const row of load().values()) {+ if (!shareIds.has(row.shareId) || row.memberId !== memberId || row.providerId !== providerId+ || row.day < start || row.day > end) continue;+ totals.set(row.model, (totals.get(row.model) ?? 0) + row.inputTokens + row.outputTokens);+ }+ return { available: !incomplete, windowStart: start, windowEnd: end,+ nextWindowAt: new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1).getTime(),+ models: [...totals].map(([model, tokens]) => ({ model, tokens })) };+ },/** memberKey:这一轮在哪台组内电脑运行(本机为 `local`)。 */record(shareId: string,diff --git a/apps/desktop/src/main/device-link/remoteModelAccess.ts b/apps/desktop/src/main/device-link/remoteModelAccess.tsindex c1041bcaff..de69dae675 100644--- a/apps/desktop/src/main/device-link/remoteModelAccess.ts+++ b/apps/desktop/src/main/device-link/remoteModelAccess.ts@@ -1,4 +1,5 @@import fs from 'node:fs';+import { isProviderShareMemberBudget, type ProviderShareMemberBudget } from '../../shared/providerShareBudget.js';import { activeOwnerScopeKey, ownerScopedUserDataPath } from '../appSessionState.js';import { createLogger } from '../logger.js';import { createOverrideSettingsFile } from '../maker-host/override-settings-file.js';@@ -6,7 +7,7 @@ import { captureProviderManagementScope } from '../provider-group/managementScopimport { throwIpcError } from '../utils/ipcValidate.js';import { isRemoteModelSelection, type RemoteModelSelection } from '../../shared/remoteModelAccess.js';-interface ProviderRule { models?: string[]; members: Record<string, string[]> }+interface ProviderRule { models?: string[]; members: Record<string, string[]>; budgets?: Record<string, ProviderShareMemberBudget | null> | null }interface Settings { providers: Record<string, ProviderRule> | null }const object = (value: unknown): value is Record<string, unknown> => Boolean(value) && typeof value === 'object' && !Array.isArray(value);const selection = (value: unknown): string[] => isRemoteModelSelection(value) && value !== null ? value : [];@@ -27,6 +28,8 @@ export function createRemoteModelAccessStore(options: { filePath(): string; scopif (!object(rule) || !object(rule.members)) return [id, { models: [], members: {} }];return [id, {...('models' in rule ? { models: selection(rule.models) } : {}),+ ...(object(rule.budgets) ? { budgets: Object.fromEntries(Object.entries(rule.budgets).map(([member, budget]) =>+ [member, isProviderShareMemberBudget(budget) ? budget : null])) } : ('budgets' in rule ? { budgets: null } : {})),members: object(rule.members)? Object.fromEntries(Object.entries(rule.members).map(([member, ids]) => [member, selection(ids)])) : {},}];@@ -36,25 +39,36 @@ export function createRemoteModelAccessStore(options: { filePath(): string; scopmaxBytes: 4 * 1024 * 1024, preserveUnreadableFile: true,logLoadedValue: false, logReadErrorDetails: false,});- function read(providerId: string, memberId?: string): { models: RemoteModelSelection; providerModels: RemoteModelSelection } {+ function read(providerId: string, memberId?: string): { models: RemoteModelSelection; providerModels: RemoteModelSelection; memberBudget: ProviderShareMemberBudget | null } {store.invalidateIfChanged();const providers = store.read().providers;if (providers === null) throwIpcError('PRECONDITION_FAILED', 'Remote model permissions could not be read');const rule = Object.hasOwn(providers, providerId) ? providers[providerId] : undefined;const providerModels = rule?.models ?? null;const models = memberId ? (rule && Object.hasOwn(rule.members, memberId) ? rule.members[memberId] : null) : providerModels;- return { models, providerModels };+ if (memberId && rule?.budgets === null) throwIpcError('PRECONDITION_FAILED', 'Member budget settings could not be read');+ const hasBudget = !!memberId && !!rule?.budgets && Object.hasOwn(rule.budgets, memberId);+ const memberBudget = hasBudget ? rule!.budgets![memberId!] : null;+ if (hasBudget && memberBudget === null) throwIpcError('PRECONDITION_FAILED', 'Member budget settings could not be read');+ return { models, providerModels, memberBudget };}return {read,+ budgetProviderIds(): string[] {+ store.invalidateIfChanged();+ const providers = store.read().providers;+ return providers ? Object.entries(providers).filter(([, rule]) => Object.keys(rule.budgets ?? {}).length > 0).map(([id]) => id) : [];+ },allows(providerId: string, model: string, memberId?: string): boolean {try {const { models, providerModels } = read(providerId, memberId);return Boolean(model) && (providerModels === null || providerModels.includes(model)) && (models === null || models.includes(model));} catch { return false; }},- async set(providerId: string, models: RemoteModelSelection, memberId: string | undefined, assertCurrent: () => void) {+ async set(providerId: string, models: RemoteModelSelection, memberId: string | undefined, assertCurrent: () => void, memberBudget?: ProviderShareMemberBudget | null) {if (!isRemoteModelSelection(models)) throwIpcError('INVALID_PARAMS', 'Invalid remote model selection');+ if (memberBudget !== undefined && (!memberId || (memberBudget !== null && !isProviderShareMemberBudget(memberBudget))))+ throwIpcError('INVALID_PARAMS', 'Invalid member budget settings');assertCurrent();await store.updateAtomic(({ value }) => {assertCurrent();@@ -67,7 +81,13 @@ export function createRemoteModelAccessStore(options: { filePath(): string; scopelse Object.defineProperty(rule.members, memberId, { value: [...models], enumerable: true, configurable: true, writable: true });} else if (models === null) delete rule.models;else rule.models = [...models];- if (rule.models === undefined && Object.keys(rule.members).length === 0) delete providers[providerId];+ if (memberId && memberBudget !== undefined) {+ if (previous?.budgets === null) throwIpcError('PRECONDITION_FAILED', 'Member budget settings could not be read');+ rule.budgets = { ...previous?.budgets };+ if (memberBudget === null) delete rule.budgets[memberId];+ else Object.defineProperty(rule.budgets, memberId, { value: structuredClone(memberBudget), enumerable: true, configurable: true, writable: true });+ }+ if (rule.models === undefined && Object.keys(rule.members).length === 0 && !Object.keys(rule.budgets ?? {}).length) delete providers[providerId];else Object.defineProperty(providers, providerId, { value: rule, enumerable: true, configurable: true, writable: true });return { providers };});diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.tsindex d1b0c1818a..07a0075918 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts@@ -32,7 +32,7 @@ import type { RoutingDecision } from '@cindy/anthropic-compat-proxy';import { getActiveCatalog, setCustomProviders, setDiscoveredCodexModels } from '../active-catalog';import { createCodexGuestRoutingGuard, createModelRoutingTransform, registerComposed, registerReviewerRouteContext, unregister } from '../codex-proxy-host';import { CODEX_CUSTOM_PROVIDER_ROUTE_ROOT, deriveCodexCustomProviderRoutes } from '../codex-custom-provider-route';-import { registerGuestProviderRoute, resetGuestProviderRoutesForTest } from '../guest-provider-route-store';+import { captureGuestRequestUsage, registerGuestProviderRoute, resetGuestProviderRoutesForTest } from '../guest-provider-route-store';import { bindHostedSessionProvider, clearAllSessionProviders, setSessionProvider } from '../session-provider-store';import { setCustomProviderKeyReader } from '../provider-route';@@ -50,6 +50,18 @@ async function statusOf(input: RoutingDecision | null | undefined | Promise<Rout}describe('Codex proxy guard for shared-provider guests', () => {+ it('returns an identifiable member-budget refusal and never meters unbound owner requests', async () => {+ const code = 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED';+ registerGuestProviderRoute('budget-guest', 'openai', () => false, () => true, () => ({ code, message: `[${code}] Choose another model.` }));+ const guard = createCodexGuestRoutingGuard('openai', 'oauth-bearer', 'budget-guest');+ const decision = await guard({ model: 'astra' }, ctx('/responses'));+ let body = '';+ let status = 0;+ await decision!.localHandler!({ res: { writeHead: (value: number) => { status = value; }, end: (value: string) => { body = value; } } } as never);+ expect(status).toBe(403);+ expect(JSON.parse(body).error.code).toBe(code);+ expect(captureGuestRequestUsage('owner-local', 'astra')).toBeUndefined();+ });beforeEach(() => {const provider = (id: string, model: string) => buildUserProvider({id,diff --git a/apps/desktop/src/main/maker-host/__tests__/piNativeSubscriptionForwarding.test.ts b/apps/desktop/src/main/maker-host/__tests__/piNativeSubscriptionForwarding.test.tsindex b8d6733d81..7b9bd27fbb 100644--- a/apps/desktop/src/main/maker-host/__tests__/piNativeSubscriptionForwarding.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/piNativeSubscriptionForwarding.test.ts@@ -65,6 +65,7 @@ import {import { buildUserProvider } from '@cindy/model-providers';import { setCustomProviders, setXaiDiscoveredModels } from '../active-catalog.js';import { registerUsagePricing, clearUsagePricing } from '../model-usage-pricing.js';+import { registerGuestProviderRoute } from '../guest-provider-route-store.js';import { setSessionFastMode } from '../session-effort-store.js';function responseRecorder() {@@ -1113,3 +1114,21 @@ it.each([false, true])('scopes independent Grok limits and drops stale token puselse expect(injected.recordXaiRateLimit).toHaveBeenCalledWith(expect.objectContaining({ remainingRequests: 7 }), 'xai-work');} finally { setCustomProviderConfigs([]); }});++// The production native handler must meter a child model before forwarding its final bytes.+// This covers the path the turn-summary tests cannot observe. Tier: unit; injected HTTP response.+it('records a shared native request once by its requested model and preserves streaming bytes', async () => {+ const record = vi.fn();+ const binding = registerGuestProviderRoute('guest-meter', 'openai', undefined, undefined, undefined, record);+ const frame = { type: 'response.completed', response: { usage: { input_tokens: 120, output_tokens: 8, input_tokens_details: { cached_tokens: 100 } } } };+ const wire = `data: ${JSON.stringify(frame)}\n\ndata: ${JSON.stringify(frame)}\n\n`;+ const injected = deps({ fetch: vi.fn(async () => new Response(wire, { headers: { 'content-type': 'text/event-stream' } })) });+ const body = { model: 'astra', input: [] };+ const res = responseRecorder();+ try {+ await getPiNativeSubscriptionHandler('openai', 'guest-meter', injected)({ rawBody: Buffer.from(JSON.stringify(body)), parsedBody: body,+ ctx: { method: 'POST', url: '/codex/responses', headers: { 'content-type': 'application/json' } }, res } as never);+ expect(Buffer.concat(res.chunks).toString()).toBe(wire);+ expect(record).toHaveBeenCalledExactlyOnceWith({ model: 'astra', inputTokens: 20, outputTokens: 8, cacheReadTokens: 100, cacheCreateTokens: 0 });+ } finally { binding.release(); }+});diff --git a/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts b/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.tsindex 6e173efa1c..e3d5bed867 100644--- a/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts+++ b/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts@@ -86,6 +86,7 @@ import { getSessionProvider, hasHostedSessionModelAccess } from './session-proviimport {GUEST_ROUTE_HEADER,guestProviderOffersModel,+ guestProviderModelDenial,hostedProviderOffersModel,guestProviderRouteForSession,guestProviderRouteForToken,@@ -718,6 +719,8 @@ export function createModelRoutingTransform(): RoutingTransform {if (!allowed) { deniedModel = model; break; }}if (requestModels.length === 0 || deniedModel !== undefined) {+ const denial = piGuest && deniedModel ? guestProviderModelDenial(piGuest.sessionId, deniedModel, 'pi') : null;+ if (denial) return refuseGuestProviderRoute(403, denial.code, denial.message);return piGuest ? refuseGuestForeignRoute(deniedModel ?? ''): refuseGuestProviderRoute(403, 'remote_model_not_allowed', 'This model is not available for this remote task.');}@@ -1135,7 +1138,10 @@ export function createModelRoutingTransform(): RoutingTransform {: refuseGuestProviderRoute(403, 'shared_provider_only', 'This request is outside the provider shared with you.');}const wireModel = typeof body.model === 'string' ? body.model : '';- if (!await guestProviderOffersModel(guest.providerId, 'claude-code', wireModel, guest.sessionId)) return refuseGuestForeignRoute(wireModel);+ if (!await guestProviderOffersModel(guest.providerId, 'claude-code', wireModel, guest.sessionId)) {+ const denial = guestProviderModelDenial(guest.sessionId, wireModel, 'claude-code');+ return denial ? refuseGuestProviderRoute(403, denial.code, denial.message) : refuseGuestForeignRoute(wireModel);+ }return route(body, ctx, guest);};try {diff --git a/apps/desktop/src/main/maker-host/anthropic-responses-bridge-host.ts b/apps/desktop/src/main/maker-host/anthropic-responses-bridge-host.tsindex 62fa3ec2b3..cf288e85d2 100644--- a/apps/desktop/src/main/maker-host/anthropic-responses-bridge-host.ts+++ b/apps/desktop/src/main/maker-host/anthropic-responses-bridge-host.ts@@ -1,3 +1,4 @@+import { captureGuestRequestUsage } from './guest-provider-route-store.js';import { fastModelId, rewriteFastModel } from './model-fast-mode.js';import { captureUsagePricing, createUsagePricingObserver } from './model-usage-pricing.js';import type { ResponseObserverSink } from '@cindy/anthropic-compat-proxy';@@ -763,6 +764,7 @@ export function getPiNativeSubscriptionHandler(headers['content-type'] = ctx.headers['content-type'] ?? 'application/json';headers.accept = ctx.headers.accept ?? 'text/event-stream';let recordUsage: ReturnType<typeof captureUsagePricing> | undefined;+ let recordGuestUsage: ReturnType<typeof captureGuestRequestUsage>;let outboundBody = rawBody;let contentEncoding: string | undefined = ctx.headers['content-encoding'];if (isOpenAiSubscriptionProviderId(providerId)) {@@ -780,6 +782,7 @@ export function getPiNativeSubscriptionHandler(} catch (error) {decodeError = error;}+ recordGuestUsage = captureGuestRequestUsage(sessionId, isPlainRecord(current) && typeof current.model === 'string' ? current.model : '');const profile = withOpenaiContextProfileModel(current);current = profile ?? current;let changed = profile !== null;@@ -862,8 +865,8 @@ export function getPiNativeSubscriptionHandler(res.end(errorBody);return;}- await pipeNativeResponse(response, res, recordUsage- ? createUsagePricingObserver(response.headers.get('content-type') ?? '', recordUsage) : undefined);+ await pipeNativeResponse(response, res, recordUsage || recordGuestUsage+ ? createUsagePricingObserver(response.headers.get('content-type') ?? '', value => { recordUsage?.(value); recordGuestUsage?.(value); }) : undefined);} catch (err) {if (controller.signal.aborted || res.destroyed) return;// Once a 200/SSE response has started, an upstream body failure cannotdiff --git a/apps/desktop/src/main/maker-host/codex-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.tsindex 8b618bd7b1..e052470459 100644--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts@@ -130,7 +130,7 @@ import {} from './provider-route.js';import type { CodexSubagentRouteSnapshot } from './codex-subagent-config.js';import { getSessionProvider, hasHostedSessionModelAccess, hostedSessionModelAllowed } from './session-provider-store.js';-import { guestProviderModelAllowed, guestProviderOffersModel, guestProviderRouteForSession, hostedProviderOffersModel } from './guest-provider-route-store.js';+import { captureGuestRequestUsage, guestProviderModelDenial, guestProviderModelAllowed, guestProviderOffersModel, guestProviderRouteForSession, hostedProviderOffersModel } from './guest-provider-route-store.js';import { isOpenAiSubscriptionProviderId } from './codex-account-auth.js';import { composeResponseObservers } from './claude-rate-limit-headers-observer.js';import { createProviderUpstreamErrorObserver, reportProviderUpstreamError } from './provider-upstream-error-observer.js';@@ -2518,7 +2518,8 @@ function codexCustomProviderRouteFailure(status: number, code: string): RoutingD};}-function codexGuestRouteRefusal(): RoutingDecision {+function codexGuestRouteRefusal(sessionId?: string | null, model = ''): RoutingDecision {+ const denial = guestProviderModelDenial(sessionId, model);return {localHandler: async ({ res }) => {res.writeHead(403, {@@ -2528,8 +2529,8 @@ function codexGuestRouteRefusal(): RoutingDecision {res.end(JSON.stringify({error: {type: 'invalid_request_error',- code: 'shared_provider_only',- message: 'This request is outside the provider shared with you.',+ code: denial?.code ?? 'shared_provider_only',+ message: denial?.message ?? 'This request is outside the provider shared with you.',},}));},@@ -2573,16 +2574,16 @@ export function createCodexGuestRoutingGuard(const reviewerModel = requestModel === CODEX_AUTO_REVIEW_MODEL && guardianParentThreadIdFromHeaders(ctx.headers) && sessionId? reviewerModelBySession.get(sessionId): undefined;- if (!await guestProviderModelAllowed(providerId, reviewerModel ?? requestModel, sessionId)) return codexGuestRouteRefusal();+ if (!await guestProviderModelAllowed(providerId, reviewerModel ?? requestModel, sessionId)) return codexGuestRouteRefusal(sessionId, reviewerModel ?? requestModel);if (parseCodexCustomProviderPath(ctx.url).kind !== 'not-custom-provider-route') return undefined;const authInjection = frozenAuthInjection ?? getCodexProxyAuthInjection();if (ctx.url.split('?', 1)[0]?.endsWith('/responses')) {const effectiveModel = providerAwareGuardianReviewerModel(body, ctx.headers, authInjection) ?? requestModel;- if (effectiveModel !== requestModel && !await guestProviderModelAllowed(providerId, effectiveModel, sessionId)) return codexGuestRouteRefusal();+ if (effectiveModel !== requestModel && !await guestProviderModelAllowed(providerId, effectiveModel, sessionId)) return codexGuestRouteRefusal(sessionId, effectiveModel);const offered = effectiveModel === CODEX_AUTO_REVIEW_MODEL? isOpenAiSubscriptionProviderId(providerId): await guestProviderOffersModel(providerId, 'codex', effectiveModel, sessionId ?? undefined);- if (!offered) return codexGuestRouteRefusal();+ if (!offered) return codexGuestRouteRefusal(sessionId, effectiveModel);}if (requestSessionId) {return guestProviderRouteForSession(requestSessionId)?.providerId === providerId@@ -3445,6 +3446,7 @@ async function createCodexProxyHandle(providerId: customProviderId ?? gatewayProviderIdForRewrittenModel(model) ?? context.providerId ?? guestProviderId?? (gatewayProviderIdForRewrittenModel(model) ? null : (frozenAuthInjection ?? getCodexProxyAuthInjection()) === 'oauth-bearer' ? 'openai' : null),}, ctx);+ if (!decision?.localHandler && guestProviderId && isOpenAiSubscriptionProviderId(guestProviderId)) return { ...decision, headerOverride: { ...decision?.headerOverride, 'accept-encoding': 'identity' } };if (decision?.localHandler || !isXaiUpstream(decision?.upstreamOverride ?? '')|| ctx.method !== 'POST' || !ctx.url.split('?', 1)[0]?.endsWith('/responses')) return decision;// The observer receives raw wire bytes. Negotiate plaintext so the execution-price@@ -3534,6 +3536,13 @@ async function createCodexProxyHandle(() => buildCodexGatewayBaseUrl(),),responseObserver: composeResponseObservers(+ ctx => {+ if (!guestSessionId || ctx.status < 200 || ctx.status >= 300) return null;+ let model = '';+ try { const body = JSON.parse(ctx.requestBody.toString('utf8')); if (typeof body.model === 'string') model = body.model; } catch { return null; }+ const record = captureGuestRequestUsage(guestSessionId, model);+ return record ? createUsagePricingObserver(ctx.responseHeaders['content-type'] ?? '', record) : null;+ },ctx => {const record = pricing.get(ctx.reqId);return record && ctx.status >= 200 && ctx.status < 300@@ -3582,6 +3591,8 @@ async function createCodexProxyHandle(* thread 不预扫描、不降级,继续保留原生 WS 容量体验。*/resolveWebSocketUpstream: ({ headers }) => {+ // Member budgets and grants are evaluated for every request on the isolated guest proxy.+ if (guestProviderId) return null;if ((frozenAuthInjection ?? getCodexProxyAuthInjection()) !== 'oauth-bearer') return null;// Hosted owner tasks need HTTP so every model request (and later revocation) reaches the live grant check.if (hasHostedSessionModelAccess(sessionIdFromHeaders(headers))) return null;diff --git a/apps/desktop/src/main/maker-host/guest-provider-route-store.ts b/apps/desktop/src/main/maker-host/guest-provider-route-store.tsindex 3ffaeac8ff..edaea8606d 100644--- a/apps/desktop/src/main/maker-host/guest-provider-route-store.ts+++ b/apps/desktop/src/main/maker-host/guest-provider-route-store.ts@@ -28,10 +28,15 @@ export interface GuestProviderRoute {providerId: string;}+export interface GuestRequestUsage {+ model: string; inputTokens: number; outputTokens: number; cacheReadTokens: number; cacheCreateTokens: number;+}interface Binding extends GuestProviderRoute {token: string;+ recordUsage?: (sample: GuestRequestUsage) => void;allowsModel?: (model: string) => boolean | Promise<boolean>;modelAccessRestricted?: () => boolean;+ modelDenial?: (model: string) => { code: string; message: string } | null;}const byToken = new Map<string, Binding>();@@ -45,9 +50,11 @@ export function registerGuestProviderRoute(providerId: string,allowsModel?: (model: string) => boolean | Promise<boolean>,modelAccessRestricted?: () => boolean,+ modelDenial?: (model: string) => { code: string; message: string } | null,+ recordUsage?: (sample: GuestRequestUsage) => void,): { token: string; release(): void } {const token = randomBytes(32).toString('base64url');- const binding: Binding = { sessionId, providerId, token, allowsModel, modelAccessRestricted };+ const binding: Binding = { sessionId, providerId, token, allowsModel, modelAccessRestricted, modelDenial, recordUsage };const previous = bySession.get(sessionId);if (previous) byToken.delete(previous.token);byToken.set(token, binding);@@ -156,3 +163,39 @@ export function resetGuestProviderRoutesForTest(): void {byToken.clear();bySession.clear();}++/** Only the authenticated, still-current binding may explain a member refusal. */+export function guestProviderModelDenial(sessionId: string | null | undefined, model: string, kind?: AgentKind) {+ if (!sessionId) return null;+ const binding = bySession.get(sessionId);+ if (!binding || getSessionProvider(sessionId) !== binding.providerId) return null;+ try {+ const provider = getActiveCatalog().providers.find(item => item.id === binding.providerId);+ const catalogModel = kind ? findCatalogModel(provider, model, kind)?.id ?? model : model;+ return binding.modelDenial?.(catalogModel) ?? null;+ } catch { return null; }+}++/** Request-scoped native usage, including child requests. No response content is retained. */+export function captureGuestRequestUsage(sessionId: string | null | undefined, model: string) {+ const binding = sessionId ? bySession.get(sessionId) : undefined;+ if (!binding?.recordUsage || !model) return undefined;+ let settled = false;+ return (value: unknown) => {+ if (settled || bySession.get(binding.sessionId) !== binding || getSessionProvider(binding.sessionId) !== binding.providerId) return;+ const record = (v: unknown): Record<string, unknown> | null => v && typeof v === 'object' && !Array.isArray(v) ? v as Record<string, unknown> : null;+ const frame = record(value);+ if (!frame || (typeof frame.type === 'string' && frame.type.startsWith('response.')+ && frame.type !== 'response.completed' && frame.type !== 'response.incomplete')) return;+ const response = record(frame.response) ?? frame;+ const usage = record(response.usage);+ if (!usage) return;+ const input = usage.input_tokens ?? usage.prompt_tokens;+ const output = usage.output_tokens ?? usage.completion_tokens;+ const cache = record(usage.input_tokens_details)?.cached_tokens ?? record(usage.prompt_tokens_details)?.cached_tokens ?? 0;+ const valid = (n: unknown): n is number => typeof n === 'number' && Number.isFinite(n) && n >= 0;+ if (!valid(input) || !valid(output) || !valid(cache) || cache > input) return;+ settled = true;+ binding.recordUsage!({ model, inputTokens: input - cache, outputTokens: output, cacheReadTokens: cache, cacheCreateTokens: 0 });+ };+}diff --git a/apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.ts b/apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.tsindex 1692981204..6ecb0ca1a7 100644--- a/apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.ts+++ b/apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.ts@@ -97,7 +97,7 @@ export function recordSessionProviderPartyUsage(session: Session,event: AgentEvent,): void {- if (event.type !== 'done') return;+ if (event.type !== 'done' && event.type !== 'status') return;let meter = meters.get(session);if (!meter) {meter = createGuestUsageMeter(session.agentKind);diff --git a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.tsindex eb18cf3acd..73fe7a5cd8 100644--- a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts@@ -23,6 +23,8 @@ import { RemoteAgentRunClient } from '../controller/runClient';import { relayConnId, relayKeyFor, reshareKeyFor, type RelayRunFailure } from '../host/groupRelay';import { createGuestProviderRouteBinder } from '../host/providerAccess';import { guestProviderRouteForToken } from '../../maker-host/guest-provider-route-store';+import { createProviderShareUsageStore } from '../../device-link/providerShareUsageStore';+import { memberBudgetStatus } from '../../device-link/providerShareBudgetCalculation';import {createRemoteAgentHost,hostSessionIdFor,@@ -350,6 +352,12 @@ describe('provider group relay for shared users', () => {// only opus, while the executor offers opus and sonnet; revoke opus mid-run.it('projects the original member catalog and rechecks every child call across the relay', async () => {const allowed = new Set(['claude-opus']);+ const ledger = createProviderShareUsageStore(path.join(root, 'ratio-usage.json'));+ const record = (model: string, tokens: number) => ledger.record('share', GUEST_A, { providerId: 'shared-provider', kind: 'claude-code', memberKey: 'mini',+ samples: [{ model, inputTokens: tokens, outputTokens: 0, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0, turns: 0 }] });+ record('claude-opus', 60); record('claude-sonnet', 140);+ const policy = { basis: 'member-input-output-7d' as const, enabled: true, recommendedModel: 'claude-sonnet',+ rules: [{ id: 'limit', models: ['claude-opus'], maxPercent: 50 }] };let executorAllowed = true;const binder = createGuestProviderRouteBinder({readProviders: async () => [{ id: MEMBER_MINI.providerId, models: { 'claude-code': [@@ -358,7 +366,13 @@ describe('provider group relay for shared users', () => {guestAccess: () => null, ownerAllowed: () => true, providerAllowed: () => executorAllowed,modelAccess: { allows: () => true, read: () => ({ models: null, providerModels: null }) },});- const check = vi.fn((_provider: string, controller: string, model?: string) => controller === GUEST_A && (!model || allowed.has(model)));+ const check = vi.fn((_provider: string, controller: string, model?: string) => {+ if (controller !== GUEST_A || (model && !allowed.has(model))) return false;+ const status = memberBudgetStatus(ledger.memberTokenSnapshot(new Set(['share']), 'shared-provider', GUEST_A), policy);+ if (model && status.rules.some(rule => rule.models.includes(model) && rule.blocked))+ throw new Error('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED] Model share reached');+ return true;+ });const env = setup({ memberBinder: binder, owner: { modelAccess: {isAllowed: check, models: async () => [...allowed], restricted: () => true,} } });@@ -367,13 +381,22 @@ describe('provider group relay for shared users', () => {try {const input = env.memberStarted.mini[0].input;expect(input.guestProvider!.modelIds).toEqual(['claude-opus']);- const allows = async (model: string) => {+ const decision = async (model: string) => {const response = await fetch(input.tunnel.url + '/cindy/model-access', { method: 'POST',headers: { Authorization: 'Bearer ' + input.tunnel.token }, body: JSON.stringify({ model }) });- return (await response.json() as { allowed: boolean }).allowed;+ return await response.json() as { allowed: boolean; code?: string };};+ const allows = async (model: string) => (await decision(model)).allowed;expect(await allows('claude-opus')).toBe(true);expect(await allows('claude-sonnet')).toBe(false);+ record('claude-opus', 200);+ expect(await decision('claude-opus')).toEqual({ allowed: false, code: 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED' });+ await expect(client.call('send', [{ content: 'blocked', attachments: [] }, {}])).rejects.toThrow('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]');+ expect(env.memberStarted.mini[0].sends).toHaveLength(0);+ record('claude-sonnet', 200);+ expect(await allows('claude-opus')).toBe(true);+ await client.call('send', [{ content: 'resumed', attachments: [] }, {}]);+ expect(env.memberStarted.mini[0].sends).toHaveLength(1);allowed.clear();expect(await allows('claude-opus')).toBe(false);allowed.add('claude-opus');@@ -382,7 +405,10 @@ describe('provider group relay for shared users', () => {expect(await allows('claude-opus')).toBe(false);expect(check).toHaveBeenCalledWith('shared-provider', GUEST_A, 'claude-sonnet');} finally { await client.close('close', 'navigation'); }- } finally { for (const host of [env.owner, ...Object.values(env.members)]) { await host.abortAll(); host.dispose(); } }+ } finally {+ await ledger.flush();+ for (const host of [env.owner, ...Object.values(env.members)]) { await host.abortAll(); host.dispose(); }+ }});it.each([true, false])('handles a legacy executor with restricted=%s and stops it when new restrictions appear', async restrictedAtStart => {diff --git a/apps/desktop/src/main/remote-agent/__tests__/guestUsage.test.ts b/apps/desktop/src/main/remote-agent/__tests__/guestUsage.test.tsindex ce18ff4fd3..253e997249 100644--- a/apps/desktop/src/main/remote-agent/__tests__/guestUsage.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/guestUsage.test.ts@@ -35,6 +35,22 @@ describe('guest usage meter', () => {.toEqual([{ model: 'sonnet', turns: 1, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0 }]);});+ // Native Claude bypasses the HTTP proxy: streaming usage must settle before a long turn ends.+ // The SDK result may additionally include child-only usage; neither source may double-charge. Unit.+ it('reconciles live Claude model receipts with cumulative root and child totals', () => {+ const meter = createGuestUsageMeter('claude-code');+ const requestUsage = { epoch: 'native', models: [{ model: 'future-model', inputTokens: 100, outputTokens: 20 }] };+ expect(meter.observe({ type: 'status', data: { requestUsage } } as AgentEvent, 'root')[0])+ .toMatchObject({ model: 'future-model', inputTokens: 100, outputTokens: 20 });+ const result = { requestUsage, modelUsageCumulativeStartsAtZero: true, modelUsage: {+ 'future-model': { inputTokens: 100, outputTokens: 25 }, 'child-model': { inputTokens: 40, outputTokens: 10 },+ } };+ const samples = meter.observe(done(result), 'root');+ expect(samples.find(row => row.model === 'future-model')).toMatchObject({ inputTokens: 0, outputTokens: 5 });+ expect(samples.find(row => row.model === 'child-model')).toMatchObject({ inputTokens: 40, outputTokens: 10 });+ expect(meter.observe(done(result), 'root').every(row => row.inputTokens === 0 && row.outputTokens === 0)).toBe(true);+ });+it('reads Codex and Pi per-turn usage against the current model', () => {expect(createGuestUsageMeter('codex').observe(done({ usage: { promptTokens: 9, completionTokens: 4, cachedTokens: 3, cacheCreationTokens: 1 } }), 'gpt-5.5')).toEqual([{ model: 'gpt-5.5', turns: 1, inputTokens: 9, outputTokens: 4, cacheReadTokens: 3, cacheCreateTokens: 1, sdkCostUsd: 0 }]);@@ -42,6 +58,32 @@ describe('guest usage meter', () => {.toEqual([{ model: 'grok', turns: 1, inputTokens: 7, outputTokens: 2, cacheReadTokens: 1, cacheCreateTokens: 0, sdkCostUsd: 0 }]);});+ // Unit regression: the first resumed SDK total establishes a baseline. Live+ // receipts covered by that total must not consume the following turn's delta.+ it('settles live receipts when a resumed Claude process establishes its baseline', () => {+ const meter = createGuestUsageMeter('claude-code');+ const requestUsage = { epoch: 'resumed', models: [{ model: 'model-a', inputTokens: 10, outputTokens: 5 }] };+ expect(meter.observe({ type: 'status', data: { requestUsage } } as AgentEvent, 'model-a')[0])+ .toMatchObject({ inputTokens: 10, outputTokens: 5 });+ meter.observe(done({ requestUsage, modelUsage: { 'model-a': { inputTokens: 110, outputTokens: 55 } } }), 'model-a');+ const next = meter.observe(done({ requestUsage, modelUsage: { 'model-a': { inputTokens: 120, outputTokens: 60 } } }), 'model-a');+ expect(next[0]).toMatchObject({ inputTokens: 10, outputTokens: 5 });+ });++ // A long shared turn must settle model receipts before done, without charging retries twice.+ it.each(['codex', 'pi'])('meters %s request receipts by actual model across turns and runtime restarts', kind => {+ const meter = createGuestUsageMeter(kind);+ const snapshot = (epoch: string, outputTokens: number) => ({ type: 'status', data: { requestUsage: {+ epoch, models: [{ model: 'astra', inputTokens: 10, outputTokens, cacheReadTokens: 2 }],+ } } } as unknown as AgentEvent);+ expect(meter.observe(snapshot('run-a', 4), 'sol')[0]).toMatchObject({ model: 'astra', inputTokens: 10, outputTokens: 4, turns: 0 });+ expect(meter.observe(snapshot('run-a', 4), 'terra')).toEqual([]);+ expect(meter.observe(snapshot('run-a', 2), 'terra')).toEqual([]);+ expect(meter.observe(done({ usage: { promptTokens: 10, completionTokens: 4 } }), 'terra')[0]).toMatchObject({ turns: 1, inputTokens: 0, outputTokens: 0 });+ expect(meter.observe(snapshot('run-a', 6), 'terra')[0]).toMatchObject({ model: 'astra', inputTokens: 0, outputTokens: 2 });+ expect(meter.observe(snapshot('run-b', 1), 'terra')[0]).toMatchObject({ model: 'astra', inputTokens: 10, outputTokens: 1 });+ });+it('ignores events other than done and malformed numbers', () => {const meter = createGuestUsageMeter('codex');expect(meter.observe({ type: 'text', data: 'hi' } as unknown as AgentEvent, 'm')).toEqual([]);diff --git a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.tsindex 86889b3390..6a5e9e9b4b 100644--- a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts@@ -93,6 +93,27 @@ afterEach(() => {// have no direct-share member. Minimum: an authorized same-account controller// binding a guest-isolated task. Verify the real proxy grant, including revocation.describe('guest proxy binding for direct shares and same-account group relays', () => {+ it('enforces a changed member budget on the next request and exempts same-account callers', async () => {+ let blocked = true;+ const checks: Array<string | undefined> = [];+ const binder = createGuestProviderRouteBinder({+ readProviders: async () => [view('spark', ['opus', 'sonnet'])],+ guestAccess: () => ({ providerId: 'spark', memberId: 'alice' }), ownerAllowed: () => true, providerAllowed: () => true,+ modelAccess: { allows: () => true, read: () => ({ models: null, providerModels: null, memberBudget: { enabled: true, rules: [{}] } }) },+ memberBudgetAllows: async (_provider, model, member) => { checks.push(member); return !member || !blocked || model === 'sonnet'; },+ });+ const guest = await binder({ kind: 'claude-code', hostSessionId: 'guest-budget', providerId: 'spark', controller: providerShareGuestPeer('share', 'alice', 'phone'), isCurrent: () => true });+ const owner = await binder({ kind: 'claude-code', hostSessionId: 'owner-budget', providerId: 'spark', controller: 'owner-device', isCurrent: () => true });+ expect(guest!.modelIds).toEqual(['opus', 'sonnet']);+ blocked = false;+ checks.length = 0;+ expect(await guest!.allowsModel!('opus')).toBe(true);+ blocked = true;+ expect(await guest!.allowsModel!('opus')).toBe(false);+ expect(await guest!.allowsModel!('sonnet')).toBe(true);+ expect(await owner!.allowsModel!('opus')).toBe(true);+ expect(checks).toEqual(['alice', 'alice', 'alice', undefined]);+ });// Unit: an async authorization response must not resurrect a replaced binding.it('rejects a failed grant query or one arriving after the task binding was released', async () => {let finish!: (allowed: boolean) => void;diff --git a/apps/desktop/src/main/remote-agent/host/guestUsage.ts b/apps/desktop/src/main/remote-agent/host/guestUsage.tsindex f5bfdf3e8b..eaeed40232 100644--- a/apps/desktop/src/main/remote-agent/host/guestUsage.ts+++ b/apps/desktop/src/main/remote-agent/host/guestUsage.ts@@ -1,5 +1,5 @@/**- * 受邀者(供应商分享)在本机运行的 Agent 用量:从 `done` 事件取每一轮的 token。+ * 受邀者(供应商分享)在本机运行的 Agent 用量:优先读取请求级累计回执,旧运行时从 `done` 事件取每轮 token。* - Claude 的 modelUsage 是同一个 SDK 进程内的累计值,按任务实例保存基线后求增量;* - Codex、Pi 的 usage 已是本轮增量,模型取当前会话模型。* 纯函数,不落盘;落盘与按分享汇总在 device-link/providerShareUsageStore。@@ -33,16 +33,66 @@ function empty(model: string): GuestUsageSample {/** 一个任务实例一个计量器(Claude 的累计基线跟着 SDK 进程走)。 */export function createGuestUsageMeter(kind: string) {+ let receiptEpoch: string | null = null;+ let receipts = new Map<string, GuestUsageSample>();let claudeBaseline: Map<string, ModelUsageCumulative> | undefined;+ const claudePending = new Map<string, GuestUsageSample>();return {observe(event: AgentEvent, currentModel: string): GuestUsageSample[] {- if (event.type !== 'done') return [];+ if (event.type !== 'done' && event.type !== 'status') return [];const data = record(event.data);const fallbackModel = currentModel || 'unknown';+ const cumulative = record(data?.requestUsage);+ const liveSamples: GuestUsageSample[] = [];+ if (typeof cumulative?.epoch === 'string' && Array.isArray(cumulative.models)) {+ if (cumulative.epoch !== receiptEpoch) {+ receiptEpoch = cumulative.epoch;+ receipts = new Map();+ claudeBaseline = undefined;+ claudePending.clear();+ }+ const samples: GuestUsageSample[] = [];+ for (const raw of cumulative.models.slice(0, 4096)) {+ const row = record(raw);+ if (!row) continue;+ // Missing model identity is not relabelled as the current model after a switch.+ const model = typeof row.model === 'string' && row.model ? row.model : 'unknown';+ const previous = receipts.get(model) ?? empty(model);+ const next = { ...empty(model), inputTokens: count(row.inputTokens), outputTokens: count(row.outputTokens),+ cacheReadTokens: count(row.cacheReadTokens), cacheCreateTokens: count(row.cacheCreateTokens) };+ const delta = { ...empty(model) };+ for (const key of ['inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheCreateTokens'] as const) {+ delta[key] = Math.max(0, next[key] - previous[key]);+ next[key] = Math.max(next[key], previous[key]);+ }+ receipts.set(model, next);+ if (delta.inputTokens || delta.outputTokens || delta.cacheReadTokens || delta.cacheCreateTokens) {+ samples.push(delta);+ if (kind === 'claude-code') {+ const pending = claudePending.get(model) ?? empty(model);+ for (const key of ['inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheCreateTokens'] as const) pending[key] += delta[key];+ claudePending.set(model, pending);+ }+ }+ }+ if (kind !== 'claude-code' || event.type !== 'done') {+ if (event.type === 'done') samples.push({ ...empty(fallbackModel), turns: 1 });+ return samples;+ }+ liveSamples.push(...samples);+ }+ if (event.type !== 'done') return [];+ // New runtimes report receipts before terminal/cancellation events. Don't bill them twice.+ if ((kind === 'codex' || kind === 'pi') && receiptEpoch) return [{ ...empty(fallbackModel), turns: 1 }];if (kind === 'claude-code') {const modelUsage = record(data?.modelUsage);- if (!modelUsage) return [{ ...empty(fallbackModel), turns: 1 }];+ if (!modelUsage) return [...liveSamples, { ...empty(fallbackModel), turns: 1 }];+ // A first/resumed cumulative snapshot also settles already-emitted live+ // receipts, even when its historical tokens are deliberately not billed.+ const settlement = computeModelUsageDeltas(claudeBaseline, modelUsage, undefined, {+ cumulativeStartsAtZero: true,+ }).deltas;const { next, deltas } = computeModelUsageDeltas(claudeBaseline, modelUsage, undefined, {cumulativeStartsAtZero: data?.modelUsageCumulativeStartsAtZero === true,});@@ -56,6 +106,21 @@ export function createGuestUsageMeter(kind: string) {cacheCreateTokens: delta.cacheCreateTokensDelta,sdkCostUsd: delta.costUsdDelta,}));+ // Native Claude streams can precede the process-cumulative SDK receipt.+ // Settle only the unreported remainder, including child models absent from the stream.+ for (const settled of settlement) {+ const pending = claudePending.get(settled.model);+ if (!pending) continue;+ const sample = samples.find(item => item.model === settled.model);+ const coverage = { inputTokens: settled.inputTokensDelta, outputTokens: settled.outputTokensDelta,+ cacheReadTokens: settled.cacheReadTokensDelta, cacheCreateTokens: settled.cacheCreateTokensDelta };+ for (const key of ['inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheCreateTokens'] as const) {+ const covered = Math.min(coverage[key], pending[key]);+ if (sample) sample[key] = Math.max(0, sample[key] - covered);+ pending[key] -= covered;+ }+ if (!(pending.inputTokens || pending.outputTokens || pending.cacheReadTokens || pending.cacheCreateTokens)) claudePending.delete(settled.model);+ }// 一轮只算一次,记在输出最多的模型上(子 Agent 用的小模型不重复计轮次)。const primary = samples.reduce<GuestUsageSample | null>((best, sample) => (!best || sample.outputTokens > best.outputTokens ? sample : best),@@ -63,7 +128,7 @@ export function createGuestUsageMeter(kind: string) {);if (primary) primary.turns = 1;else samples.push({ ...empty(fallbackModel), turns: 1 });- return samples;+ return [...liveSamples, ...samples];}const usage = record(data?.usage);const sample = { ...empty(fallbackModel), turns: 1 };diff --git a/apps/desktop/src/main/remote-agent/host/providerAccess.ts b/apps/desktop/src/main/remote-agent/host/providerAccess.tsindex ef47e82895..a86f11c83d 100644--- a/apps/desktop/src/main/remote-agent/host/providerAccess.ts+++ b/apps/desktop/src/main/remote-agent/host/providerAccess.ts@@ -4,23 +4,30 @@*/import {actualSourceIdForModel,+ findCatalogModel,effectiveSourceIdForModel,type AgentKind,type ProviderView,} from '@cindy/model-providers';import { isProviderSharePeer } from '@cindy/device-link';import { registerGuestProviderRoute, guestProviderModelAllowed } from '../../maker-host/guest-provider-route-store.js';+import { providerWeeklyQuotaSource } from '../../../shared/providerQuotaSource.js';+import type { GuestRequestUsage } from '../../maker-host/guest-provider-route-store.js';+import { isMemberBudgetPaused } from '../../../shared/providerShareBudget.js';import type { RemoteAgentHostDeps } from './runHost.js';/** Shared users and same-account group relays both need a guest-isolated proxy binding. */export function createGuestProviderRouteBinder(deps: {+ recordRequestUsage?(controller: string, providerId: string, kind: AgentKind, sample: GuestRequestUsage): void;readProviders(): Promise<readonly ProviderView[]>;guestAccess(controller: string): { providerId: string; memberId: string } | null;ownerAllowed(controller: string): boolean;providerAllowed(providerId: string): boolean;+ memberBudgetDenial?(providerId: string, model: string, memberId?: string): { code: string; message: string } | null;+ memberBudgetAllows?(providerId: string, model: string, memberId?: string): Promise<boolean>;modelAccess: {allows(providerId: string, model: string, memberId?: string): boolean;- read(providerId: string, memberId?: string): { models: readonly string[] | null; providerModels: readonly string[] | null };+ read(providerId: string, memberId?: string): { models: readonly string[] | null; providerModels: readonly string[] | null; memberBudget?: { enabled: boolean; rules: unknown[] } | null };};}): NonNullable<RemoteAgentHostDeps['bindGuestProviderRoute']> {return async ({ kind, hostSessionId, providerId, controller, isCurrent, relayModelAccess }) => {@@ -40,22 +47,46 @@ export function createGuestProviderRouteBinder(deps: {};if (!providerAllowed()) return null;const localAllows = (model: string) => isCurrent() && providerAllowed() && deps.modelAccess.allows(providerId, model, memberId);- const allowsModel = async (model: string) => localAllows(model)- && (!relayModelAccess || await relayModelAccess.allows(model)) && localAllows(model);+ const relayDenials = new Map<string, { code: string; message: string }>();+ const allowsModel = async (model: string) => {+ relayDenials.delete(model);+ try {+ return localAllows(model) && (!relayModelAccess || await relayModelAccess.allows(model))+ && (!deps.memberBudgetAllows || await deps.memberBudgetAllows(providerId, model, memberId)) && localAllows(model);+ } catch (error) {+ if (isMemberBudgetPaused(error)) relayDenials.set(model, {+ code: 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED',+ message: '[REMOTE_AGENT_MEMBER_BUDGET_PAUSED] This model has reached your shared-provider model limit.',+ });+ return false;+ }+ };+ const modelDenial = (model: string) => localAllows(model)+ ? deps.memberBudgetDenial?.(providerId, model, memberId) ?? relayDenials.get(model) ?? null : null;+ // The native runtime freezes this list at startup. Keep temporary pauses out of+ // it: each request is checked live, and a recovered model must work without restart.const modelIds = guestProviderModelIds(views, providerId, kind).filter(model => localAllows(model) && (!relayModelAccess || relayModelAccess.models.includes(model)));if (!isCurrent()) return null;+ const provider = views.find(view => view.id === providerId);+ const receiptMetering = sharedPeer && (kind === 'codex' || kind === 'pi') && provider && providerWeeklyQuotaSource(provider) === 'codex' && !!deps.recordRequestUsage;const binding = registerGuestProviderRoute(hostSessionId, providerId, allowsModel, () => {if (relayModelAccess) return true;try {const rule = deps.modelAccess.read(providerId, memberId);- return rule.models !== null || rule.providerModels !== null;+ return rule.models !== null || rule.providerModels !== null || !!(rule.memberBudget?.enabled && rule.memberBudget.rules.length);} catch { return true; }- });+ }, modelDenial, receiptMetering ? sample => {+ if (!isCurrent()) return;+ const model = findCatalogModel(provider, sample.model, kind)?.id ?? sample.model;+ deps.recordRequestUsage!(controller, providerId, kind, { ...sample, model });+ } : undefined);return {+ receiptMetering: !!receiptMetering,routeToken: binding.token,modelIds,allowsModel: model => guestProviderModelAllowed(providerId, model, hostSessionId),+ modelDenial,release: binding.release,};};diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.tsindex 32468ba129..b48f448ec6 100644--- a/apps/desktop/src/main/remote-agent/host/runHost.ts+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts@@ -173,6 +173,8 @@ export interface HostedStartInput {/** 一次受邀者任务的出站登记(见 RemoteAgentHostDeps.bindGuestProviderRoute)。 */export interface GuestProviderRouteBinding {+ receiptMetering?: boolean;+ modelDenial?(model: string): { code: string; message: string } | null;routeToken: string;modelIds: string[];allowsModel?(model: string): Promise<boolean>;@@ -1288,7 +1290,8 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {} catch {/* Failed authorization must never open a native stream. */}- return { status: 200, headers: [['content-type', 'application/json']], body: Buffer.from(JSON.stringify({ allowed })) };+ const denial = !allowed && typeof model === 'string' ? run.guestRoute?.modelDenial?.(model) : null;+ return { status: 200, headers: [['content-type', 'application/json']], body: Buffer.from(JSON.stringify({ allowed, ...(denial ? { code: denial.code } : {}) })) };}return reverseHttp(run, request, signal);},@@ -1329,7 +1332,12 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {if (!deps.bindGuestProviderRoute || !run.providerId) failProviderNotAllowed();const checkRelayModel = async (model?: string): Promise<unknown> => {const reply = await reverse(run, { type: 'model-access', ...(model ? { model } : {}) }, AbortSignal.timeout(10_000));- return reply.type === 'callback' ? reply.value : undefined;+ const value = reply.type === 'callback' ? reply.value : undefined;+ if (value && typeof value === 'object' && !Array.isArray(value)+ && (value as { code?: unknown }).code === 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED') {+ throw new Error('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED] This model has reached your shared-provider model limit.');+ }+ return value;};let relayModelAccess: { models: string[]; allows(model: string): Promise<boolean> } | undefined;if (run.relayKey && payload.relayModelAccess) {@@ -1343,7 +1351,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {hostSessionId,providerId: run.providerId!,controller: run.controller,- isCurrent: () => !run.closing,+ isCurrent: () => !run.closing && deps.isOwnerCurrent(run.owner),...(relayModelAccess ? { relayModelAccess } : {}),}),);@@ -1560,10 +1568,14 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {function meterRunUsage(run: Run, model: string | undefined, event: AgentEvent): void {const record = run.trust === 'guest' ? deps.recordGuestUsage : deps.recordOwnerUsage;// 换了账号之后迟到的这一轮不记:用量账本按账号存放,记进去会落到新账号名下。- if (!record || event.type !== 'done' || !deps.isOwnerCurrent(run.owner)) return;+ if (!record || (event.type !== 'done' && event.type !== 'status') || !deps.isOwnerCurrent(run.owner)) return;run.usageMeter ??= createGuestUsageMeter(run.kind);try {- const samples = run.usageMeter.observe(event, model ?? '');+ const observed = run.usageMeter.observe(event, model ?? '');+ // Native proxy receipts already include root and child tokens. Terminal events only count turns.+ const samples = run.guestRoute?.receiptMetering ? observed.filter(sample => sample.turns > 0).map(sample => ({+ ...sample, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0,+ })) : observed;if (samples.length === 0) return;// 转给组内电脑的记在那台名下;在本机运行的(含组里选回本机)记为本机。const memberKey = run.relay?.member.memberKey ?? PROVIDER_GROUP_LOCAL_MEMBER_KEY;@@ -1895,9 +1907,18 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {&& deps.isOwnerCurrent(run.owner) && deps.isControllerAuthorized(run.controller);const providerId = run.providerId;if (!current() || !providerId || !deps.providerAccess) return { type: 'callback', value: false };- if (request.model) return { type: 'callback', value: deps.providerAccess.isAllowed(providerId, run.controller, request.model) };+ if (request.model) {+ try { return { type: 'callback', value: deps.providerAccess.isAllowed(providerId, run.controller, request.model) }; }+ catch (error) {+ if (error instanceof Error && error.message.includes('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]'))+ return { type: 'callback', value: { allowed: false, code: 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED' } };+ throw error;+ }+ }const models = await deps.providerAccess.models?.(run.kind, providerId, run.controller);- return { type: 'callback', value: current() && models ? models.filter(model => deps.providerAccess!.isAllowed(providerId, run.controller, model)) : [] };+ // This is the frozen runtime catalog. Temporary usage pauses are evaluated+ // by the individual model checks, so recovery does not require a restart.+ return { type: 'callback', value: current() && models ? models : [] };},onWs: (item) => {if (run.closing || run.relay !== backend) return;diff --git a/apps/desktop/src/main/remote-agent/host/service.ts b/apps/desktop/src/main/remote-agent/host/service.tsindex 4177837353..36f35175a5 100644--- a/apps/desktop/src/main/remote-agent/host/service.ts+++ b/apps/desktop/src/main/remote-agent/host/service.ts@@ -1,3 +1,4 @@+import { assertMemberBudget, memberBudgetDenial, memberBudgetAllows } from '../../device-link/providerShareBudgetRuntime.js';import { readRemoteAgentLimitsState } from './limitsStore.js';/*** 远程 Agent 运行服务的被控端接线:把 `maker:remote-agent:v1` 接到本机 Maker 的 Agent。@@ -176,13 +177,17 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDattry {const access = isProviderSharePeer(controller) ? providerShareGuestAccess(controller) : null;const rule = remoteModelAccess.read(providerId, access?.memberId);- return rule.models !== null || rule.providerModels !== null;+ return rule.models !== null || rule.providerModels !== null || !!(rule.memberBudget?.enabled && rule.memberBudget.rules.length);} catch { return true; }},resolve: async (kind, model, providerId, controller) => {const views = await getDesktopProviderService().listProviders({ allowSideEffects: false });const memberId = isProviderSharePeer(controller) ? providerShareGuestAccess(controller)?.memberId : undefined;- const allowed = (id: string) => isRemoteProviderInvocationAllowed(id) && remoteModelAccess.allows(id, model, memberId);+ const allowed = (id: string) => {+ if (!isRemoteProviderInvocationAllowed(id) || !remoteModelAccess.allows(id, model, memberId)) return false;+ assertMemberBudget(id, model, memberId);+ return true;+ };// 受邀者:来源钉在分享的供应商上,且要它提供所选模型(启动与每次换模型都核对)。if (isProviderSharePeer(controller)) {return resolveGuestProviderId(@@ -199,7 +204,8 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDatisAllowed: (providerId, controller, model) => {const access = isProviderSharePeer(controller) ? providerShareGuestAccess(controller) : null;return (isProviderSharePeer(controller) ? guestAllows(controller, providerId) : isRemoteProviderInvocationAllowed(providerId))- && remoteModelAccess.allows(providerId, model ?? '', access?.memberId);+ && remoteModelAccess.allows(providerId, model ?? '', access?.memberId)+ && (assertMemberBudget(providerId, model ?? '', access?.memberId), true);},},// 受邀者任务的出站登记:本机 proxy 只让它经分享的供应商、用它提供的模型。@@ -209,6 +215,13 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDatownerAllowed: isControllerAuthorized,providerAllowed: isRemoteProviderInvocationAllowed,modelAccess: remoteModelAccess,+ memberBudgetAllows,+ memberBudgetDenial,+ recordRequestUsage: (controller, providerId, kind, sample) => {+ const peer = parseProviderSharePeer(controller);+ if (peer?.role === 'guest' && peer.memberId) usage.record(peer.shareId, peer.memberId,+ { providerId, kind, memberKey: 'local', samples: [{ ...sample, turns: 0, sdkCostUsd: 0 }] });+ },}),// Codex 与 Pi 的会话历史在受邀者目录里,随它整体删除;这里清 Claude Code 的项目记录与 Pi 子代理运行目录。purgeHostedTranscripts: async (hostSessionIds, nativeIds) => {diff --git a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsxindex d9fc99708c..2aff87c861 100644--- a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx+++ b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx@@ -1,3 +1,4 @@+import { isMemberBudgetPaused } from '../../../shared/providerShareBudget';import { remoteAgentLimitErrorKey } from '../../../shared/remoteAgentLimits';import { useCodexRateLimits } from '@/hooks/useCodexRateLimits';import { useCodexRateLimitReset } from '@/hooks/useCodexRateLimitReset';@@ -364,7 +365,7 @@ export function ErrorBanner({: undefined;const remoteErrorCode = parseAgentErrorCode(error)?.code;const isAttachmentAccessDenied = remoteErrorCode === 'DEVICE_LINK_MEDIA_ACCESS_DENIED';- const remoteErrorKey = remoteAgentLimitErrorKey(error) ?? chatRemoteErrorGuidanceKey(remoteErrorCode, sessionSource);+ const remoteErrorKey = (isMemberBudgetPaused(error) ? 'providerShare.memberBudget.paused' : null) ?? remoteAgentLimitErrorKey(error) ?? chatRemoteErrorGuidanceKey(remoteErrorCode, sessionSource);const remoteGuidance = remoteErrorKey && i18n.exists(remoteErrorKey) ? t(remoteErrorKey) : undefined;const terminalRateLimitRetryProgress = parseTerminalRateLimitRetryProgress(error, errorReason);const isCodexUsageLimitError =@@ -412,7 +413,7 @@ export function ErrorBanner({});// 订阅套餐错误保留 Retry:用户重新连接 Anthropic 后可从当前错误卡片重试;// Gateway 错误则隐藏 Retry,改走切换到 Claude.ai 的明确恢复动作。- const hideRetry =+ const hideRetry = isMemberBudgetPaused(error) ||isSilentStopExhausted ||isClaudeGatewayOpusPlanMismatch ||isGatewayProxyTokenInvalid ||diff --git a/apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx b/apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsxindex 94821b23f1..e84d8e19f2 100644--- a/apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx+++ b/apps/desktop/src/renderer/components/chat/ErrorMessageCard.tsx@@ -1,3 +1,4 @@+import { isMemberBudgetPaused } from '../../../shared/providerShareBudget';/*** ErrorMessageCard — 消息流里的静态错误记录卡* ---------------------------------------------------------------------------@@ -53,7 +54,7 @@ export function ErrorMessageCard({const { t, i18n } = useTranslation();const decoded = decodeRemoteErrorMessage(message);const parsedRemoteKey = remoteErrorI18nKey(message);- const remoteKey = parsedRemoteKey === 'chat.remoteError.AUTO_REVIEW_UNAVAILABLE'+ const remoteKey = isMemberBudgetPaused(message) ? 'providerShare.memberBudget.paused' : parsedRemoteKey === 'chat.remoteError.AUTO_REVIEW_UNAVAILABLE'? chatRemoteErrorGuidanceKey('AUTO_REVIEW_UNAVAILABLE', sessionSource): parsedRemoteKey;const isAttachmentAccessDenied = kind === 'reply-error'diff --git a/apps/desktop/src/renderer/features/provider-share/MemberBudgetEditor.tsx b/apps/desktop/src/renderer/features/provider-share/MemberBudgetEditor.tsxnew file mode 100644index 0000000000..55605ba5d2--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/MemberBudgetEditor.tsx@@ -0,0 +1,97 @@+import { useTranslation } from 'react-i18next';+import { unifiedModelKeyId } from '@cindy/model-providers';+import { Button } from '@/components/ui/button';+import { Input } from '@/components/ui/input';+import type { ProviderShareBudgetRule, ProviderShareBudgetStatus, ProviderShareMemberBudget } from '../../../shared/providerShareBudget';++const key = 'providerShare.memberBudget.';+const empty: ProviderShareMemberBudget = { basis: 'member-input-output-7d', enabled: false, recommendedModel: null, rules: [] };+const selectClass = 'min-h-9 max-w-full rounded-full border border-[var(--border-default)] bg-[var(--surface-elevated)] px-3 text-13 text-[var(--text-primary)]';++export function MemberBudgetEditor({ value, onChange, models, budgetModelIds, recommendationModelIds, disabled, canAddRules, status }: {+ value: ProviderShareMemberBudget | null;+ onChange(value: ProviderShareMemberBudget): void;+ models: Array<{ id: string; name: string }>;+ budgetModelIds?: string[];+ recommendationModelIds?: string[];+ disabled: boolean;+ canAddRules: boolean;+ status?: ProviderShareBudgetStatus;+}) {+ const { t } = useTranslation();+ const policy = value ?? empty;+ const budgetModels = models.filter(model => !budgetModelIds || budgetModelIds.includes(model.id));+ const recommendations = models.filter(model => !recommendationModelIds || recommendationModelIds.includes(model.id));+ const patch = (next: Partial<ProviderShareMemberBudget>) => onChange({ ...policy, ...next });+ const hasRule = (model: string) => policy.rules.some(rule => rule.models.some(id => unifiedModelKeyId(id) === unifiedModelKeyId(model)));+ const updateRule = (id: string, next: Partial<ProviderShareBudgetRule>) =>+ patch({ rules: policy.rules.map(rule => rule.id === id ? { ...rule, ...next } : rule) });+ return <section className="mt-5 shrink-0 space-y-4 border-t border-[var(--border-default)] pt-4">+ <label className="flex flex-wrap items-center justify-between gap-3 text-13 text-[var(--text-primary)]">+ <span>{t(key + 'recommended')}</span>+ <select className={selectClass} value={policy.recommendedModel ?? ''} disabled={disabled}+ onChange={event => patch({ recommendedModel: event.target.value || null })}>+ <option value="">{t(key + 'none')}</option>+ {recommendations.map(model => <option key={model.id} value={model.id}>{model.name}</option>)}+ {policy.recommendedModel && !recommendations.some(model => model.id === policy.recommendedModel)+ && <option value={policy.recommendedModel}>{policy.recommendedModel} · {t(key + 'modelUnavailable')}</option>}+ </select>+ </label>+ <div className="flex flex-wrap items-center justify-between gap-2">+ <h3 className="text-13 font-medium text-[var(--text-primary)]">{t(key + 'title')}</h3>+ <span className="text-12 text-[var(--text-secondary)]">{t(key + (policy.enabled ? 'active' : 'draft'))}</span>+ </div>+ <p className="text-12 text-[var(--text-secondary)]">{t(key + 'basis')}</p>+ {status && <p className="text-12 text-[var(--text-secondary)]">{t(key + 'window', { start: status.windowStart, end: status.windowEnd })}</p>}+ {!canAddRules && <p className="text-12 text-[var(--text-secondary)]">{t(key + 'unsupported')}</p>}+ {policy.rules.map((rule, index) => {+ const selected = rule.models[0] ?? '';+ const used = status?.rules.find(item => item.id === rule.id && item.models[0] === selected);+ const usedPercent = status?.modelUsage && status.state === 'recorded' && status.totalTokens+ ? (status.modelUsage.find(item => item.model === unifiedModelKeyId(selected))?.tokens ?? 0) / status.totalTokens * 100+ : used?.usedPercent;+ return <div key={rule.id} className="space-y-3 rounded-xl border border-[var(--border-default)] p-4">+ <select className={`${selectClass} w-full`} value={selected} disabled={disabled}+ aria-label={t(key + 'chooseModels')}+ onChange={event => updateRule(rule.id, { models: [event.target.value] })}>+ <option value="" disabled>{t(key + 'chooseModels')}</option>+ {budgetModels.map(model => <option key={model.id} value={model.id}+ disabled={policy.rules.some(other => other.id !== rule.id && other.models.some(id => unifiedModelKeyId(id) === unifiedModelKeyId(model.id)))}>{model.name}</option>)}+ {selected && !budgetModels.some(model => model.id === selected)+ && <option value={selected}>{selected} · {t(key + 'modelUnavailable')}</option>}+ </select>+ <div className="flex flex-wrap items-center justify-between gap-3">+ <label htmlFor={`budget-percent-${rule.id}`} className="text-13 text-[var(--text-primary)]">{t(key + 'maxPercent')}</label>+ <div className="w-24">+ <Input id={`budget-percent-${rule.id}`} type="number" min={1} max={100} step={1}+ value={Number.isFinite(rule.maxPercent) ? String(rule.maxPercent) : ''} disabled={disabled}+ onChange={text => updateRule(rule.id, { maxPercent: text === '' ? NaN : Number(text) })} size="md" trailing={<span className="pointer-events-none absolute inset-y-0 right-3 flex items-center text-12 text-[var(--text-secondary)]">%</span>} />+ </div>+ </div>+ <div className="flex flex-wrap items-center justify-between gap-2">+ <span role="status" className="text-12 text-[var(--text-secondary)]">+ {usedPercent != null+ ? t(key + 'used', { percent: usedPercent.toFixed(2) })+ : t(key + (status?.state === 'empty' ? 'empty' : 'unavailable'))}+ </span>+ <Button variant="secondary" size="sm" disabled={disabled} aria-label={t(key + 'removeGroup', { index: index + 1 })}+ onClick={() => patch({ rules: policy.rules.filter(item => item.id !== rule.id), ...(policy.rules.length === 1 ? { enabled: false } : {}) })}>{t(key + 'remove')}</Button>+ </div>+ {usedPercent != null && Number.isFinite(rule.maxPercent) && rule.maxPercent < 100 && usedPercent >= rule.maxPercent+ && <p className="text-12 text-[var(--text-secondary)]">{t(key + (policy.enabled ? 'pausedOnSave' : 'draftExceeded'))}</p>}+ </div>;+ })}+ <Button variant="secondary" size="sm" disabled={disabled || !canAddRules || policy.rules.length >= 32 || budgetModels.every(model => hasRule(model.id))}+ onClick={() => {+ const next = budgetModels.find(model => !hasRule(model.id));+ if (next) patch({ rules: [...policy.rules, { id: crypto.randomUUID(), models: [next.id], maxPercent: 30 }] });+ }}>{t(key + 'addGroup')}</Button>+ <label className="flex min-h-9 items-center gap-2 text-13 text-[var(--text-primary)]">+ <input type="checkbox" checked={policy.enabled} disabled={disabled || !canAddRules || !policy.rules.length}+ className="h-4 w-4 accent-[var(--text-primary)]"+ onChange={event => patch({ enabled: event.target.checked })} />+ {t(key + 'enable')}+ </label>+ <p className="text-12 text-[var(--text-secondary)]">{t(key + 'enforcement')}</p>+ </section>;+}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsxindex 506a60cd94..dd8a362faf 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareInsightsSection.tsx@@ -172,6 +172,23 @@ function InsightsView({ share }: { share: ProviderShareReceived }) {className="shrink-0 border-t border-[var(--border-default)] px-5 py-4"data-testid="provider-share-insights">+ {view?.memberBudget?.enabled && <div className="mb-5 space-y-3">+ <h3 className="text-13 font-medium text-[var(--text-primary)]">{t('providerShare.memberBudget.yourBudget')}</h3>+ {view.memberBudget.rules.map(rule => <div key={rule.id} className="space-y-1">+ <div className="break-words text-13 text-[var(--text-primary)]">{rule.models.join(' + ')}</div>+ <div className="text-12 text-[var(--text-secondary)]">+ {rule.usedPercent === null ? t('providerShare.memberBudget.' + view.memberBudget!.state)+ : t('providerShare.memberBudget.progress', { used: rule.usedPercent.toFixed(1), limit: rule.limitPercent })}+ </div>+ {rule.blocked && <div className="text-12 text-[var(--text-secondary)]">{t('providerShare.memberBudget.paused')}</div>}+ </div>)}+ {view.memberBudget.recommendedModel && <p className="break-words text-12 text-[var(--text-secondary)]">+ {t('providerShare.memberBudget.recommendation', { model: view.memberBudget.recommendedModel })}+ </p>}+ <p className="text-12 text-[var(--text-tertiary)]">+ {t('providerShare.memberBudget.window', { start: view.memberBudget.windowStart, end: view.memberBudget.windowEnd })}+ </p>+ </div>}<h3 className="text-13 font-medium leading-[1.5] text-[var(--text-primary)]">{t('providerShare.insights.quotaTitle')}</h3>diff --git a/apps/desktop/src/renderer/features/provider-share/RemoteModelAccessSection.tsx b/apps/desktop/src/renderer/features/provider-share/RemoteModelAccessSection.tsxindex 970d06b116..e0311ec8ed 100644--- a/apps/desktop/src/renderer/features/provider-share/RemoteModelAccessSection.tsx+++ b/apps/desktop/src/renderer/features/provider-share/RemoteModelAccessSection.tsx@@ -1,3 +1,5 @@+import { MemberBudgetEditor } from './MemberBudgetEditor';+import { isProviderShareMemberBudget, type ProviderShareMemberBudget } from '../../../shared/providerShareBudget';import { useEffect, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import { Button } from '@/components/ui/button';@@ -67,6 +69,7 @@ export function RemoteModelAccessDialog({ providerId, deviceId, memberId, memberconst [storedView, setView] = useState<RemoteModelAccessView | null>(null);const loadedOwner = useRef<ReturnType<typeof getDataOwnerGeneration> | null>(null);const [models, setModels] = useState<RemoteModelSelection>(null);+ const [memberBudget, setMemberBudget] = useState<ProviderShareMemberBudget | null>(null);const [search, setSearch] = useState('');const [error, setError] = useState<string | null>(null);const [saving, setSaving] = useState(false);@@ -82,7 +85,7 @@ export function RemoteModelAccessDialog({ providerId, deviceId, memberId, memberif (request !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;if (next?.version !== 1) { setError(key + 'needsUpdate'); return; }loadedOwner.current = owner;- setView(next); setModels(next.models); setError(null);+ setView(next); setModels(next.models); setMemberBudget(next.memberBudget ?? null); setError(null);}, (reason) => {if (request === sequence.current && isDataOwnerGenerationCurrent(owner)) setError(key + (isProviderManagementOutdated(reason) ? 'needsUpdate' : 'loadFailed'));});@@ -96,10 +99,11 @@ export function RemoteModelAccessDialog({ providerId, deviceId, memberId, memberconst rows = [...available, ...missing].filter((model) => `${model.name} ${model.id}`.toLowerCase().includes(search.toLowerCase()));const save = async () => {if (inFlight.current || !view) return;+ if (memberBudget && !isProviderShareMemberBudget(memberBudget)) { setError('providerShare.memberBudget.invalid'); return; }inFlight.current = true; setSaving(true); setError(null);const request = ++sequence.current;try {- const next = await providerShareManagementCommand({ action: 'set-model-access', providerId, memberId, models }, deviceId);+ const next = await providerShareManagementCommand({ action: 'set-model-access', providerId, memberId, models, ...(memberId && view.budgetSupported ? { memberBudget } : {}) }, deviceId);if (request === sequence.current && isDataOwnerGenerationCurrent(owner)) {if (next?.version !== 1) { setError(key + 'needsUpdate'); return; }if (onSaved) onSaved(next); else onClose();@@ -110,14 +114,15 @@ export function RemoteModelAccessDialog({ providerId, deviceId, memberId, member};return (<ProviderShareDialog open busy={saving} returnFocusTo={returnFocusTo} initialFocusRef={searchRef} onOpenChange={(next) => { if (!next) onClose(); }} maxWidth={520}>- <ProviderShareDialogTitle>{t(key + (memberId ? 'memberTitle' : 'choose'))}</ProviderShareDialogTitle>+ <ProviderShareDialogTitle className="shrink-0">{view?.providerName ? `${view.providerName} · ` : ''}{t(key + (memberId ? 'memberTitle' : 'choose'))}</ProviderShareDialogTitle>+ <div className="min-h-0 overflow-y-auto overscroll-contain"><p className="mt-2 text-13 leading-[1.5] text-[var(--confirm-desc)]">{t(key + (memberId ? 'memberDescription' : 'description'), { name: memberName })}</p><label className="mt-4 flex min-h-8 items-center gap-2 text-13 leading-[1.5] text-[var(--text-primary)]"><input type="checkbox" className="h-4 w-4 shrink-0 accent-[var(--text-primary)]" checked={models === null} disabled={!view || saving} onChange={(event) => setModels(event.target.checked ? null : [])} />{t(key + (memberId ? 'inherit' : 'allFuture'))}</label><div className="mt-3"><Input inputRef={searchRef} value={search} onChange={setSearch} placeholder={t(key + 'search')} aria-label={t(key + 'search')} disabled={!view || saving} /></div>- <div className="mt-2 max-h-72 overflow-y-auto overscroll-contain rounded-lg border border-[var(--border-default)] p-2" aria-busy={!view}>+ <div className="mt-2 max-h-72 shrink-0 overflow-y-auto overscroll-contain rounded-lg border border-[var(--border-default)] p-2" aria-busy={!view}>{rows.map((model) => {const allowed = providerAllows(model.id);const checked = models === null ? allowed : models.includes(model.id);@@ -132,8 +137,13 @@ export function RemoteModelAccessDialog({ providerId, deviceId, memberId, member})}{rows.length === 0 && <p role="status" className="p-2 text-12 leading-[1.5] text-[var(--text-secondary)]">{t(key + (view ? 'empty' : 'loading'))}</p>}</div>+ {memberId && view?.budgetSupported && <MemberBudgetEditor value={memberBudget} onChange={setMemberBudget}+ budgetModelIds={view.budgetModelIds} recommendationModelIds={view.recommendationModelIds}+ models={available.filter(model => providerAllows(model.id) && (models === null || models.includes(model.id)))}+ disabled={saving} canAddRules={view.budgetAvailable === true} status={view.budgetStatus} />}{models?.length === 0 && <p className="mt-2 text-12 leading-[1.5] text-[var(--text-secondary)]">{t(key + 'none')}</p>}{error && <ErrorNotice role="alert" className="mt-3" message={t(error)} />}+ </div><ProviderShareDialogFooter><Button variant="secondary" disabled={saving} onClick={onClose}>{t('settings.providers.button.cancel')}</Button><Button variant="primary" disabled={!view || saving} onClick={() => { void save(); }}>{t('settings.providers.custom.save')}</Button>diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteModelAccessSection.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteModelAccessSection.test.tsxindex b2795c5c07..7275b47c9f 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteModelAccessSection.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteModelAccessSection.test.tsx@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { RemoteModelAccessDialog, RemoteModelAccessSection } from '../RemoteModelAccessSection';import type { RemoteModelAccessView } from '../../../../shared/remoteModelAccess';-vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key, i18n: { language: 'en' } }) }));+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string, options?: { percent?: string }) => options?.percent ? `${key} ${options.percent}` : key, i18n: { language: 'en' } }) }));vi.mock('@/contexts/AuthContext', () => ({ useOptionalAuthUser: () => null }));/* 测试价值:用户新增的勾选授权保存、个人上限、失败保留草稿及旧端禁写。现有管理页 fixture 不单独驱动此弹窗;* 最小输入:两个型号,仅开放一个,再清空个人选择。unit;真实组件与同账号管理 adapter,使用独立 jsdom。 */@@ -22,6 +22,29 @@ beforeEach(() => {});afterEach(() => cleanup());describe('remote model settings', () => {+ // Unit: a member limit edit must preserve the existing model grant on save.+ it('saves member limits in the model access panel without broadening the model grant', async () => {+ local.mockResolvedValue({ ...value(), models: ['small'], budgetSupported: true, budgetAvailable: true });+ render(<RemoteModelAccessDialog providerId="p" memberId="alice" onClose={() => {}} />);+ fireEvent.click(await screen.findByRole('button', { name: 'providerShare.memberBudget.addGroup' }));+ expect(screen.getByRole('checkbox', { name: 'providerShare.modelAccess.inherit' })).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'settings.providers.custom.save' }));+ await waitFor(() => expect(local).toHaveBeenCalledWith(expect.objectContaining({ action: 'set-model-access', providerId: 'p', memberId: 'alice', models: ['small'],+ memberBudget: expect.objectContaining({ enabled: false, rules: [expect.objectContaining({ models: ['small'], maxPercent: 30 })] }) })));+ });+ // Unsaved model changes must recompute from the real snapshot, not keep another model's ratio.+ it('shows recorded ratios immediately when adding and changing an unsaved model limit', async () => {+ local.mockResolvedValue({ ...value(), budgetSupported: true, budgetAvailable: true,+ budgetStatus: { state: 'recorded', totalTokens: 100, modelUsage: [{ model: 'small', tokens: 20 }, { model: 'large', tokens: 80 }], rules: [] } });+ render(<RemoteModelAccessDialog providerId="p" memberId="alice" onClose={() => {}} />);+ fireEvent.click(await screen.findByRole('button', { name: 'providerShare.memberBudget.addGroup' }));+ expect(screen.getByText('providerShare.memberBudget.used 20.00')).toBeTruthy();+ fireEvent.change(screen.getByRole('combobox', { name: 'providerShare.memberBudget.chooseModels' }), { target: { value: 'large' } });+ expect(screen.getByText('providerShare.memberBudget.used 80.00')).toBeTruthy();+ expect(screen.getByText('providerShare.memberBudget.draftExceeded')).toBeTruthy();+ expect((screen.getByRole('checkbox', { name: 'providerShare.memberBudget.enable' }) as HTMLInputElement).checked).toBe(false);+ expect(local).toHaveBeenCalledTimes(1);+ });it('opens the global selection from settings and saves only the checked model', async () => {render(<RemoteModelAccessSection providerId="p" />);const choose = screen.getByRole('button', { name: 'providerShare.modelAccess.choose' });@@ -60,4 +83,29 @@ describe('remote model settings', () => {expect((screen.getByRole('button', { name: 'settings.providers.custom.save' }) as HTMLButtonElement).disabled).toBe(true);expect(local).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'set-model-access' }));});++ // Percent/recommendation must travel atomically with grants and survive failed persistence.+ // The existing tests above exercise grants only. Minimal input: one group + changed recommendation; unit.+ it('retains a single-model percentage budget and recommendation after failed save, then retries the same values', async () => {+ const memberBudget = { rules: [{ id: 'premium', models: ['large'], maxPercent: 30 }], recommendedModel: 'small', basis: 'member-input-output-7d' as const, enabled: false };+ let fail = true;+ local.mockImplementation(async command => {+ if (command.action === 'set-model-access' && fail) throw new Error('offline');+ return { ...value(), budgetSupported: true, budgetAvailable: true, memberBudget };+ });+ const closed = vi.fn();+ render(<RemoteModelAccessDialog providerId="p" memberId="alice" onClose={closed} />);+ const percent = await screen.findByLabelText('providerShare.memberBudget.maxPercent');+ fireEvent.change(percent, { target: { value: '25' } });+ fireEvent.change(screen.getByRole('combobox', { name: 'providerShare.memberBudget.recommended' }), { target: { value: 'large' } });+ fireEvent.click(screen.getByRole('button', { name: 'settings.providers.custom.save' }));+ await screen.findByRole('alert');+ expect((percent as HTMLInputElement).value).toBe('25');+ expect(closed).not.toHaveBeenCalled();+ fail = false;+ fireEvent.click(screen.getByRole('button', { name: 'settings.providers.custom.save' }));+ await waitFor(() => expect(closed).toHaveBeenCalledOnce());+ expect(local).toHaveBeenLastCalledWith({ action: 'set-model-access', providerId: 'p', memberId: 'alice', models: null,+ memberBudget: { ...memberBudget, recommendedModel: 'large', rules: [{ ...memberBudget.rules[0], maxPercent: 25 }] } });+ });});diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 39f8145e78..c8ded79849 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -313,6 +313,35 @@"closeAllDescription": "Guests will lose access. Task history is kept."},"providerShare": {+ "memberBudget": {+ "recommended": "Recommended model",+ "none": "No recommendation",+ "unavailable": "Usage data unavailable",+ "title": "Personal model share",+ "chooseModels": "Choose a model",+ "used": "Current share {{percent}}%",+ "addGroup": "Add model limit",+ "remove": "Remove",+ "removeGroup": "Remove model limit {{index}}",+ "invalid": "Choose a model and a whole-number share from 1 to 100%.",+ "yourBudget": "My model share limits",+ "progress": "Current share {{used}}% · limit {{limit}}%",+ "paused": "This model is paused. Choose another available model.",+ "recommendation": "Recommended: {{model}}",+ "unsupported": "Model share limits are not yet supported for this provider group.",+ "basis": "Last 7 calendar days · input + output tokens, excluding cache",+ "maxPercent": "Maximum share of personal usage",+ "empty": "No usage recorded",+ "recorded": "Recorded usage",+ "enable": "Enable model share limits",+ "active": "Enabled",+ "draft": "Draft · disabled",+ "window": "Date range: {{start}} — {{end}}",+ "draftExceeded": "Current records meet the limit. This draft does not block requests.",+ "pausedOnSave": "Saving with limits enabled will pause new requests for this model.",+ "enforcement": "Applies to subsequent messages. Usage already in progress may exceed the limit.",+ "modelUnavailable": "Model unavailable"+ },"modelAccess": {"title": "Models allowed for remote use","description": "Only limits remote use. Local use is unchanged. Saved changes apply when creating a task, switching models, or sending the next message.",@@ -12997,6 +13026,7 @@"REMOTE_AGENT_BUSY": "Too many sessions are running on the other computer. End some of them and try again.","REMOTE_AGENT_UNSUPPORTED": "This Agent isn't available on the other computer. Install or sign in to it there, or pick another Agent.","REMOTE_AGENT_INVALID": "Something went wrong talking to the computer running the Agent. Try again; if it keeps happening, update Cindy on both computers.",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "This model has reached the model share limit set by its owner. Choose another available model to continue.","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "That computer hasn’t granted you remote access to this provider or the selected model. Ask its owner to adjust access in Remote & Sharing, or pick another model.","REMOTE_AGENT_FORK_FAILED": "The computer running the Agent couldn’t start a new session from here. Try again, or try a different message.","REMOTE_AGENT_SHARE_PAUSED": "The owner has paused this share for you, so these models can’t be used until it’s resumed. Switch to another model to continue.",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 5dcd384eed..6496fe692a 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -313,6 +313,35 @@"closeAllDescription": "すべてのゲストがアクセスできなくなります。タスクの履歴は保持されます。"},"providerShare": {+ "memberBudget": {+ "recommended": "おすすめモデル",+ "none": "指定しない",+ "unavailable": "使用量データを取得できません",+ "title": "個人のモデル使用割合",+ "chooseModels": "モデルを選択",+ "used": "現在の割合 {{percent}}%",+ "addGroup": "モデル上限を追加",+ "remove": "削除",+ "removeGroup": "モデル上限 {{index}} を削除",+ "invalid": "モデルを選び、1〜100% の整数で割合を入力してください。",+ "yourBudget": "モデル使用割合の上限",+ "progress": "現在 {{used}}% · 上限 {{limit}}%",+ "paused": "このモデルは停止中です。他の利用可能なモデルを選んでください。",+ "recommendation": "おすすめ:{{model}}",+ "unsupported": "このプロバイダーグループではモデル使用割合の制限に未対応です。",+ "basis": "直近7暦日 · 入力+出力トークン(キャッシュを除く)",+ "maxPercent": "個人使用量に占める割合の上限",+ "empty": "使用記録がありません",+ "recorded": "記録済みの使用量",+ "enable": "モデル使用割合の制限を有効にする",+ "active": "有効",+ "draft": "下書き · 無効",+ "window": "集計期間:{{start}} — {{end}}",+ "draftExceeded": "現在の記録では上限に達しています。下書きのためリクエストは制限されません。",+ "pausedOnSave": "有効にして保存すると、このモデルへの新しいリクエストを停止します。",+ "enforcement": "以降のメッセージに適用されます。処理中の使用量は上限を超える場合があります。",+ "modelUnavailable": "モデルを利用できません"+ },"modelAccess": {"title": "リモート利用を許可するモデル","description": "リモート利用のみを制限し、ローカル利用には影響しません。保存後、タスクの作成、モデルの変更、次のメッセージの送信時に適用されます。",@@ -12952,6 +12981,7 @@"REMOTE_AGENT_BUSY": "相手のパソコンで実行中のセッションが多すぎます。いくつか終了してからもう一度お試しください。","REMOTE_AGENT_UNSUPPORTED": "相手のパソコンではこの Agent を使えません。そのパソコンでインストールまたはサインインするか、別の Agent を選んでください。","REMOTE_AGENT_INVALID": "Agent を実行しているパソコンとの通信でエラーが発生しました。もう一度お試しください。続く場合は両方のパソコンの Cindy を最新版に更新してください。",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "このモデルは共有者が設定したモデル使用割合の上限に達しました。別の利用可能なモデルで続行してください。","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "そのパソコンでは、このプロバイダーまたは選択したモデルのリモート利用が許可されていません。提供者に「リモートと共有」で利用範囲を変更してもらうか、別のモデルを選んでください。","REMOTE_AGENT_FORK_FAILED": "Agent を実行しているパソコンで、ここから新しいセッションを始められませんでした。もう一度試すか、別のメッセージでお試しください。","REMOTE_AGENT_SHARE_PAUSED": "共有した人があなたへの共有を一時停止したため、再開されるまでこれらのモデルは使えません。別のモデルに切り替えて続けられます。",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 616d6ca9f9..7da3362053 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -313,6 +313,35 @@"closeAllDescription": "모든 게스트의 접근이 차단됩니다. 작업 기록은 유지됩니다."},"providerShare": {+ "memberBudget": {+ "recommended": "추천 모델",+ "none": "추천하지 않음",+ "unavailable": "사용량 데이터를 가져올 수 없음",+ "title": "개인 모델 사용 비율",+ "chooseModels": "모델 선택",+ "used": "현재 비율 {{percent}}%",+ "addGroup": "모델 한도 추가",+ "remove": "삭제",+ "removeGroup": "모델 한도 {{index}} 삭제",+ "invalid": "모델을 선택하고 1~100% 사이의 정수 비율을 입력하세요.",+ "yourBudget": "내 모델 사용 비율 상한",+ "progress": "현재 {{used}}% · 상한 {{limit}}%",+ "paused": "이 모델이 중지되었습니다. 사용 가능한 다른 모델을 선택하세요.",+ "recommendation": "추천: {{model}}",+ "unsupported": "이 공급자 그룹은 아직 모델 사용 비율 제한을 지원하지 않습니다.",+ "basis": "최근 7일(오늘 포함) · 캐시 제외 입력+출력 토큰",+ "maxPercent": "개인 사용량 중 최대 비율",+ "empty": "기록된 사용량 없음",+ "recorded": "기록된 사용량",+ "enable": "모델 사용 비율 제한 활성화",+ "active": "활성화됨",+ "draft": "초안 · 비활성화",+ "window": "집계 기간: {{start}} — {{end}}",+ "draftExceeded": "현재 기록이 상한에 도달했습니다. 초안은 요청을 차단하지 않습니다.",+ "pausedOnSave": "제한을 활성화하여 저장하면 이 모델의 새 요청이 중지됩니다.",+ "enforcement": "이후 메시지에 적용됩니다. 진행 중인 사용량은 한도를 넘을 수 있습니다.",+ "modelUnavailable": "모델을 사용할 수 없음"+ },"modelAccess": {"title": "원격 호출을 허용할 모델","description": "원격 사용만 제한하며 로컬 사용에는 영향이 없습니다. 저장 후 작업 생성, 모델 변경, 다음 메시지 전송 시 적용됩니다.",@@ -12952,6 +12981,7 @@"REMOTE_AGENT_BUSY": "상대 컴퓨터에서 실행 중인 세션이 너무 많습니다. 일부를 종료한 뒤 다시 시도하세요.","REMOTE_AGENT_UNSUPPORTED": "상대 컴퓨터에서는 이 Agent를 사용할 수 없습니다. 그 컴퓨터에서 설치하거나 로그인한 뒤 다시 시도하거나, 다른 Agent를 선택하세요.","REMOTE_AGENT_INVALID": "Agent를 실행하는 컴퓨터와 통신하는 중 오류가 발생했습니다. 다시 시도하고, 계속되면 두 컴퓨터의 Cindy를 모두 최신 버전으로 업데이트하세요.",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "이 모델은 공유자가 설정한 모델 사용 비율 한도에 도달했습니다. 다른 사용 가능한 모델로 계속하세요.","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "그 컴퓨터에서 이 제공자 또는 선택한 모델의 원격 사용을 허용하지 않았습니다. 제공자에게 원격 및 공유에서 사용 범위를 조정해 달라고 요청하거나 다른 모델을 선택하세요.","REMOTE_AGENT_FORK_FAILED": "Agent를 실행하는 컴퓨터에서 여기서 새 세션을 시작하지 못했습니다. 다시 시도하거나 다른 메시지로 시도해 주세요.","REMOTE_AGENT_SHARE_PAUSED": "공유한 사람이 나에 대한 공유를 일시 중지해서 재개될 때까지 이 모델을 사용할 수 없습니다. 다른 모델로 바꿔 계속할 수 있습니다.",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 726109012d..11f8f5c469 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -313,6 +313,35 @@"closeAllDescription": "所有访客将无法继续访问,任务记录保留。"},"providerShare": {+ "memberBudget": {+ "recommended": "推荐模型",+ "none": "不指定",+ "unavailable": "用量数据不可用",+ "title": "个人模型占比",+ "chooseModels": "选择模型",+ "used": "当前占比 {{percent}}%",+ "addGroup": "添加模型上限",+ "remove": "移除",+ "removeGroup": "移除第 {{index}} 条上限",+ "invalid": "请选择模型,并填写 1–100% 的整数占比。",+ "yourBudget": "我的模型占比上限",+ "progress": "当前占比 {{used}}% · 上限 {{limit}}%",+ "paused": "此模型已暂停,请选择其他可用模型。",+ "recommendation": "推荐使用 {{model}}",+ "unsupported": "此供应商组暂不支持模型占比限制。",+ "basis": "近 7 个自然日 · 输入+输出 token,不含缓存",+ "maxPercent": "占个人用量的上限",+ "empty": "暂无用量数据",+ "recorded": "已记录用量",+ "enable": "启用模型占比限制",+ "active": "已启用",+ "draft": "草案 · 未启用",+ "window": "统计日期:{{start}} — {{end}}",+ "draftExceeded": "按当前记录已达上限;草案未启用,不会拦截。",+ "pausedOnSave": "保存并启用后,将暂停此模型的新请求。",+ "enforcement": "对后续消息生效;已开始的用量可能超过上限。",+ "modelUnavailable": "模型不可用"+ },"modelAccess": {"title": "允许远程调用的模型","description": "只限制远程调用,本机使用不受影响。保存后,创建任务、切换模型和发送下一轮消息时生效。",@@ -12952,6 +12981,7 @@"REMOTE_AGENT_BUSY": "那台电脑上同时运行的任务太多。先结束一些任务后再试。","REMOTE_AGENT_UNSUPPORTED": "那台电脑上这个 Agent 不可用。在那台电脑上安装或登录后再试,或换一个 Agent。","REMOTE_AGENT_INVALID": "和运行 Agent 的电脑通信出错。请重试;如果一直出现,请把两台电脑上的 Cindy 都更新到最新版。",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "此模型已达到分享者设置的模型占比上限。请选择其他可用模型继续。","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那台电脑未向你开放这个供应商或所选模型。请让电脑主人在「远程与分享」中调整开放范围,或换一个模型。","REMOTE_AGENT_FORK_FAILED": "运行 Agent 的电脑没能从这里开启新任务。请重试,或换一条消息再试。","REMOTE_AGENT_SHARE_PAUSED": "对方已暂停对你的分享,恢复前不能使用这些模型。可以换成其他模型继续。",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 06d05eeb29..b57261784d 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -313,6 +313,35 @@"closeAllDescription": "所有訪客將無法繼續存取,任務記錄保留。"},"providerShare": {+ "memberBudget": {+ "recommended": "推薦模型",+ "none": "不指定",+ "unavailable": "用量資料無法取得",+ "title": "個人模型占比",+ "chooseModels": "選擇模型",+ "used": "目前占比 {{percent}}%",+ "addGroup": "新增模型上限",+ "remove": "移除",+ "removeGroup": "移除第 {{index}} 條上限",+ "invalid": "請選擇模型,並填寫 1–100% 的整數占比。",+ "yourBudget": "我的模型占比上限",+ "progress": "目前占比 {{used}}% · 上限 {{limit}}%",+ "paused": "此模型已暫停,請選擇其他可用模型。",+ "recommendation": "推薦使用 {{model}}",+ "unsupported": "此供應商群組暫不支援模型占比限制。",+ "basis": "近 7 個自然日 · 輸入+輸出 token,不含快取",+ "maxPercent": "占個人用量的上限",+ "empty": "尚無用量資料",+ "recorded": "已記錄用量",+ "enable": "啟用模型占比限制",+ "active": "已啟用",+ "draft": "草稿 · 未啟用",+ "window": "統計日期:{{start}} — {{end}}",+ "draftExceeded": "依目前記錄已達上限;草稿尚未啟用,不會攔截。",+ "pausedOnSave": "儲存並啟用後,將暫停此模型的新請求。",+ "enforcement": "對後續訊息生效;已開始的用量可能超過上限。",+ "modelUnavailable": "模型無法使用"+ },"modelAccess": {"title": "允許遠端呼叫的模型","description": "僅限制遠端呼叫,不影響本機使用。儲存後,建立任務、切換模型及傳送下一輪訊息時生效。",@@ -12951,6 +12980,7 @@"REMOTE_AGENT_BUSY": "那臺電腦上同時執行的任務太多。先結束一些任務後再試。","REMOTE_AGENT_UNSUPPORTED": "那臺電腦上這個 Agent 無法使用。在那臺電腦上安裝或登入後再試,或換一個 Agent。","REMOTE_AGENT_INVALID": "與執行 Agent 的電腦通訊時出錯。請重試;如果持續出現,請把兩臺電腦上的 Cindy 都更新到最新版。",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "此模型已達到分享者設定的模型占比上限。請選擇其他可用模型繼續。","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那臺電腦未向你開放這個供應商或所選模型。請讓電腦主人在「遠端與分享」中調整開放範圍,或換一個模型。","REMOTE_AGENT_FORK_FAILED": "執行 Agent 的電腦沒能從這裡開啟新任務。請重試,或換一則訊息再試。","REMOTE_AGENT_SHARE_PAUSED": "對方已暫停對你的分享,恢復前不能使用這些模型。可以換成其他模型繼續。",diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex 2d9f22848f..da5d3bc236 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -1,3 +1,4 @@+import type { ProviderShareMemberBudget } from './providerShareBudget.js';/*** 供应商分享的 Renderer ↔ Main 契约(只在本机进程之间;服务端契约见* docs/provider-sharing-contract.md)。身份只有昵称与头像。@@ -196,7 +197,7 @@ export type ProviderShareCommand =| { action: 'get-fast-policy'; providerId: string }| { action: 'set-fast-policy'; providerId: string; allowFast: boolean }| { action: 'get-model-access'; providerId: string; memberId?: string }- | { action: 'set-model-access'; providerId: string; memberId?: string; models: RemoteModelSelection }+ | { action: 'set-model-access'; providerId: string; memberId?: string; models: RemoteModelSelection; memberBudget?: ProviderShareMemberBudget | null }| { action: 'get-visibility'; providerId: string }| { action: 'set-visibility'; providerId: string; visibility: Partial<ProviderShareVisibility> }| { action: 'quota-account'; providerId: string }diff --git a/apps/desktop/src/shared/providerShareBudget.ts b/apps/desktop/src/shared/providerShareBudget.tsnew file mode 100644index 0000000000..1b5a788bc1--- /dev/null+++ b/apps/desktop/src/shared/providerShareBudget.ts@@ -0,0 +1,56 @@+import { unifiedModelKeyId } from '@cindy/model-providers';++/** Shares of one member's recorded input + output tokens, excluding cache. */+export interface ProviderShareBudgetRule {+ id: string;+ /** One model from this provider's catalog. */+ models: string[];+ maxPercent: number;+}+export interface ProviderShareMemberBudget {+ /** Explicit discriminator: never reinterpret an old account-quota estimate as a token ratio. */+ basis: 'member-input-output-7d';+ enabled: boolean;+ recommendedModel: string | null;+ rules: ProviderShareBudgetRule[];+}+export type ProviderShareBudgetState = 'recorded' | 'empty' | 'unavailable';+export interface ProviderShareBudgetStatus {+ state: ProviderShareBudgetState;+ enabled: boolean;+ windowStart: string;+ windowEnd: string;+ /** Next local midnight changes the window; it does not guarantee recovery. */+ nextWindowAt: number;+ totalTokens: number | null;+ /** Owner editor only: lets an unsaved rule use the same recorded window. */+ modelUsage?: Array<{ model: string; tokens: number }>;+ rules: Array<{ id: string; models: string[]; tokens: number | null; usedPercent: number | null; limitPercent: number; wouldBlock: boolean; blocked: boolean }>;+ recommendedModel: string | null;+}+const record = (value: unknown): value is Record<string, unknown> =>+ !!value && typeof value === 'object' && !Array.isArray(value);+const identifier = (value: unknown): value is string =>+ typeof value === 'string' && value.length > 0 && value.length <= 512 && value.trim() === value;+const percent = (value: unknown): value is number =>+ typeof value === 'number' && Number.isInteger(value) && value >= 1 && value <= 100;+export function isProviderShareMemberBudget(value: unknown): value is ProviderShareMemberBudget {+ if (!record(value) || value.basis !== 'member-input-output-7d' || typeof value.enabled !== 'boolean'+ || !(value.recommendedModel === null || identifier(value.recommendedModel))+ || !Array.isArray(value.rules) || value.rules.length > 32) return false;+ const ids = new Set<string>();+ const models = new Set<string>();+ for (const rule of value.rules) {+ if (!record(rule) || !identifier(rule.id) || ids.has(rule.id) || !percent(rule.maxPercent)+ || !Array.isArray(rule.models) || rule.models.length !== 1) return false;+ ids.add(rule.id);+ const model = rule.models[0];+ if (!identifier(model) || models.has(unifiedModelKeyId(model))) return false;+ models.add(unifiedModelKeyId(model));+ }+ return true;+}+export function isMemberBudgetPaused(error: unknown): boolean {+ const message = error instanceof Error ? error.message : typeof error === 'string' ? error : '';+ return message.includes('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]');+}diff --git a/apps/desktop/src/shared/providerShareInsights.ts b/apps/desktop/src/shared/providerShareInsights.tsindex 9e38f6048f..28ac8f21da 100644--- a/apps/desktop/src/shared/providerShareInsights.ts+++ b/apps/desktop/src/shared/providerShareInsights.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import type { ProviderShareBudgetStatus } from './providerShareBudget';import type { ProviderUsageDayView } from './providerShare';export const PROVIDER_SHARE_INSIGHTS_CHANNEL = 'provider-share:insights:v1';@@ -50,6 +51,7 @@ export interface ProviderShareUsageDetails {export interface ProviderShareInsights {version: 1;+ memberBudget?: ProviderShareBudgetStatus | null;capabilities: ProviderShareVisibility;status: {quota: 'disabled' | 'ready' | 'unavailable';@@ -99,6 +101,17 @@ const quotaAccount = z.object({const status = z.enum(['disabled', 'ready', 'unavailable']);const schema = z.object({version: z.literal(1),+ memberBudget: z.object({+ state: z.enum(['recorded', 'empty', 'unavailable']), enabled: z.boolean(),+ windowStart: z.iso.date(), windowEnd: z.iso.date(), nextWindowAt: timestamp,+ totalTokens: number.min(0).nullable(),+ recommendedModel: z.string().max(512).nullable(),+ rules: z.array(z.object({+ id: z.string().max(512), models: z.array(z.string().max(512)).length(1),+ tokens: number.min(0).nullable(), usedPercent: number.min(0).max(100).nullable(),+ limitPercent: number.positive().max(100), wouldBlock: z.boolean(), blocked: z.boolean(),+ })).max(32),+ }).nullable().optional(),capabilities: z.object({ quota: z.boolean(), usage: z.boolean() }),status: z.object({quota: status,diff --git a/apps/desktop/src/shared/remoteModelAccess.ts b/apps/desktop/src/shared/remoteModelAccess.tsindex fdefbef1c6..360e18b1b1 100644--- a/apps/desktop/src/shared/remoteModelAccess.ts+++ b/apps/desktop/src/shared/remoteModelAccess.ts@@ -1,8 +1,17 @@+import type { ProviderShareMemberBudget, ProviderShareBudgetStatus } from './providerShareBudget.js';/** null follows all currently offered models; [] deliberately grants none. IDs are exact catalog IDs. */export type RemoteModelSelection = string[] | null;export interface RemoteModelAccessView {version: 1;+ providerName?: string;+ memberBudget?: ProviderShareMemberBudget | null;+ budgetStatus?: ProviderShareBudgetStatus;+ budgetSupported?: boolean;+ budgetAvailable?: boolean;+ /** Current provider catalog models eligible for member limits. */+ budgetModelIds?: string[];+ recommendationModelIds?: string[];models: RemoteModelSelection;providerModels: RemoteModelSelection;availableModels: Array<{ id: string; name: string }>;diff --git a/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx b/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsxindex 2fbdbb153c..1de859235b 100644--- a/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx+++ b/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx@@ -138,6 +138,18 @@ describe.each(SUPPORTED_LOCALES)('mobile errors in %s', locale => {describe.each(SUPPORTED_LOCALES)('known mobile remote errors in %s', locale => {+ // New member-budget refusal can be wrapped by the proxy; old cases only cover top-level codes.+ // Minimal input is a 403 wrapper. Verify the production history projection in every locale; unit.+ it('keeps a wrapped member budget pause understandable in history and action errors', async () => {+ await i18n.changeLanguage(locale);+ const message = '403 proxy: [REMOTE_AGENT_MEMBER_BUDGET_PAUSED] technical fallback';+ const key = 'session.remoteError.REMOTE_AGENT_MEMBER_BUDGET_PAUSED';+ expect(requiresAgentErrorConfigurationChange(message)).toBe(true);+ expect(remoteActionErrorI18nKey(message)).toBe(key);+ const [normalized] = normalizeRemoteMessages([row(message)]);+ expect(normalized.body).toBe(i18n.t(key));+ expect(normalized.body).not.toContain('technical fallback');+ });it.each(['DEVICE_LIMIT', 'TOTAL_LIMIT'])('recognizes wrapped %s errors from the remote computer', async reason => {await i18n.changeLanguage(locale);const message = `LAZY_CREATE_FAILED: [REMOTE_AGENT_BUSY] [${reason}] upstream diagnostic`;diff --git a/apps/mobile/src/device-link/remoteStatus.ts b/apps/mobile/src/device-link/remoteStatus.tsindex b2e1ec60f9..4b7c84926c 100644--- a/apps/mobile/src/device-link/remoteStatus.ts+++ b/apps/mobile/src/device-link/remoteStatus.ts@@ -108,6 +108,7 @@ export function describeAgentAuthError(error: string | null | undefined): string/** 结构化运行错误保留 marker 做状态分类,展示文案复用 Mobile i18n。 */function localizedRuntimeErrorCopy(error: unknown): string | null {const formatted = typeof error === 'string' ? error : formatRemoteErrorShared(error);+ if (formatted.includes('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]')) return i18n.t('session.remoteError.REMOTE_AGENT_MEMBER_BUDGET_PAUSED');const agentCode = parseAgentErrorCode(formatted)?.code;if (agentCode && i18n.exists(`session.remoteError.${agentCode}`)) return i18n.t(`session.remoteError.${agentCode}`);if (formatted.includes('DEVICE_OFFLINE')) return i18n.t('session.menu.aiRenameOffline');diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.jsonindex 842bfb6644..b775da3700 100644--- a/apps/mobile/src/i18n/locales/en/session.json+++ b/apps/mobile/src/i18n/locales/en/session.json@@ -629,6 +629,7 @@"REMOTE_AGENT_RESUME_LOST": "The earlier conversation on the other computer could not be reconnected, so the agent continues without that context.","REMOTE_AGENT_UNSUPPORTED": "This Agent isn't available on the other computer. Install or sign in to it there, or pick another Agent.","REMOTE_AGENT_INVALID": "Something went wrong talking to the computer running the Agent. Try again; if it keeps happening, update Cindy on both computers.",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "This model has reached the model share limit set by its owner. Choose another available model to continue.","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "That computer hasn’t allowed remote use of this provider. On that computer, turn on “Allow remote use” in Settings → Providers, or pick another model.","REMOTE_AGENT_FORK_FAILED": "The computer running the Agent couldn’t start a new session from here. Try again, or try a different message.","REMOTE_AGENT_SHARE_PAUSED": "The owner has paused this share for you, so these models can’t be used until it’s resumed. Switch to another model to continue.",diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.jsonindex 28e339e098..d1ee12804c 100644--- a/apps/mobile/src/i18n/locales/ja/session.json+++ b/apps/mobile/src/i18n/locales/ja/session.json@@ -629,6 +629,7 @@"REMOTE_AGENT_RESUME_LOST": "相手のパソコンでのこれまでの会話に再接続できなかったため、Agent はその文脈なしで続行します。","REMOTE_AGENT_UNSUPPORTED": "相手のパソコンではこの Agent を使えません。そのパソコンでインストールまたはサインインするか、別の Agent を選んでください。","REMOTE_AGENT_INVALID": "Agent を実行しているパソコンとの通信でエラーが発生しました。もう一度お試しください。続く場合は両方のパソコンの Cindy を最新版に更新してください。",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "このモデルは共有者が設定したモデル使用割合の上限に達しました。別の利用可能なモデルで続行してください。","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "そのパソコンでは、このプロバイダーのリモート利用が許可されていません。そのパソコンの「設定 → モデルプロバイダー」で「リモート利用を許可」をオンにするか、別のモデルを選んでください。","REMOTE_AGENT_FORK_FAILED": "Agent を実行しているパソコンで、ここから新しいセッションを始められませんでした。もう一度試すか、別のメッセージでお試しください。","REMOTE_AGENT_SHARE_PAUSED": "共有した人があなたへの共有を一時停止したため、再開されるまでこれらのモデルは使えません。別のモデルに切り替えて続けられます。",diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.jsonindex ba35459395..b34afa677b 100644--- a/apps/mobile/src/i18n/locales/ko/session.json+++ b/apps/mobile/src/i18n/locales/ko/session.json@@ -625,6 +625,7 @@"REMOTE_AGENT_RESUME_LOST": "상대 컴퓨터의 이전 대화에 다시 연결하지 못해 Agent가 그 맥락 없이 계속합니다.","REMOTE_AGENT_UNSUPPORTED": "상대 컴퓨터에서는 이 Agent를 사용할 수 없습니다. 그 컴퓨터에서 설치하거나 로그인한 뒤 다시 시도하거나, 다른 Agent를 선택하세요.","REMOTE_AGENT_INVALID": "Agent를 실행하는 컴퓨터와 통신하는 중 오류가 발생했습니다. 다시 시도하고, 계속되면 두 컴퓨터의 Cindy를 모두 최신 버전으로 업데이트하세요.",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "이 모델은 공유자가 설정한 모델 사용 비율 한도에 도달했습니다. 다른 사용 가능한 모델로 계속하세요.","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "그 컴퓨터에서 이 제공자의 원격 사용을 허용하지 않았습니다. 그 컴퓨터의 설정 → 모델 제공자에서 원격 사용 허용을 켜거나 다른 모델을 선택하세요.","REMOTE_AGENT_FORK_FAILED": "Agent를 실행하는 컴퓨터에서 여기서 새 세션을 시작하지 못했습니다. 다시 시도하거나 다른 메시지로 시도해 주세요.","REMOTE_AGENT_SHARE_PAUSED": "공유한 사람이 나에 대한 공유를 일시 중지해서 재개될 때까지 이 모델을 사용할 수 없습니다. 다른 모델로 바꿔 계속할 수 있습니다.",diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.jsonindex a3567ed000..0681f13fce 100644--- a/apps/mobile/src/i18n/locales/zh-CN/session.json+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json@@ -625,6 +625,7 @@"REMOTE_AGENT_RESUME_LOST": "之前在那台电脑上的对话没能接上,Agent 会在没有之前上下文的情况下继续。","REMOTE_AGENT_UNSUPPORTED": "那台电脑上这个 Agent 不可用。在那台电脑上安装或登录后再试,或换一个 Agent。","REMOTE_AGENT_INVALID": "和运行 Agent 的电脑通信出错。请重试;如果一直出现,请把两台电脑上的 Cindy 都更新到最新版。",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "此模型已达到分享者设置的模型占比上限。请选择其他可用模型继续。","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那台电脑没有允许远程调用这个供应商。请在那台电脑的「设置 → 模型供应商」里打开「允许被远程调用」,或换一个模型。","REMOTE_AGENT_FORK_FAILED": "运行 Agent 的电脑没能从这里开启新任务。请重试,或换一条消息再试。","REMOTE_AGENT_SHARE_PAUSED": "对方已暂停对你的分享,恢复前不能使用这些模型。可以换成其他模型继续。",diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.jsonindex 70adb31496..9c303ba04c 100644--- a/apps/mobile/src/i18n/locales/zh-TW/session.json+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json@@ -629,6 +629,7 @@"REMOTE_AGENT_RESUME_LOST": "之前在那台電腦上的對話沒能接上,Agent 會在沒有之前上下文的情況下繼續。","REMOTE_AGENT_UNSUPPORTED": "那臺電腦上這個 Agent 無法使用。在那臺電腦上安裝或登入後再試,或換一個 Agent。","REMOTE_AGENT_INVALID": "與執行 Agent 的電腦通訊時出錯。請重試;如果持續出現,請把兩臺電腦上的 Cindy 都更新到最新版。",+ "REMOTE_AGENT_MEMBER_BUDGET_PAUSED": "此模型已達到分享者設定的模型占比上限。請選擇其他可用模型繼續。","REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那臺電腦沒有允許遠端呼叫這個供應商。請在那臺電腦的「設定 → 模型供應商」裡開啟「允許遠端呼叫」,或換一個模型。","REMOTE_AGENT_FORK_FAILED": "執行 Agent 的電腦沒能從這裡開啟新任務。請重試,或換一則訊息再試。","REMOTE_AGENT_SHARE_PAUSED": "對方已暫停對你的分享,恢復前不能使用這些模型。可以換成其他模型繼續。",diff --git a/apps/mobile/src/session/agentErrorI18n.ts b/apps/mobile/src/session/agentErrorI18n.tsindex 2bdba0a945..29c615d004 100644--- a/apps/mobile/src/session/agentErrorI18n.ts+++ b/apps/mobile/src/session/agentErrorI18n.ts@@ -1,14 +1,19 @@import { isResponsesLiteParallelToolCallsError, parseAgentErrorCode } from '@cindy/maker-shared/error-redaction';-export { requiresAgentErrorConfigurationChange } from '@cindy/maker-shared/error-redaction';+import { requiresAgentErrorConfigurationChange as requiresConfigurationChange } from '@cindy/maker-shared/error-redaction';import { i18n } from '@/i18n';import { describeAgentAuthError } from '@/device-link/remoteStatus';+export function requiresAgentErrorConfigurationChange(message: string): boolean {+ return message.includes('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]') || requiresConfigurationChange(message);+}+/*** Mobile history errors and recovery-less live failures share this guidance.* Retrying cannot fix missing host credentials, a lost Codex thread or content* encrypted for a different provider. Desktop has additional local-context gates.*/export function describeNonRetryableAgentError(text: string): string | null {+ if (text.includes('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]')) return i18n.t('session.remoteError.REMOTE_AGENT_MEMBER_BUDGET_PAUSED');const authGuidance = describeAgentAuthError(text);if (authGuidance) return authGuidance;if (/thread not found/i.test(text)) return i18n.t('session.tail.codexThreadLost');@@ -85,6 +90,7 @@ export function autoReviewUnavailableGuidanceCode(sessionSource: unknown): strin/** Unknown provider messages stay in diagnostic details, never in the localized summary. */export function unclassifiedAgentErrorI18nKey(message: string, sessionSource?: unknown): string {+ if (message.includes('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]')) return 'session.remoteError.REMOTE_AGENT_MEMBER_BUDGET_PAUSED';const limitReason = /\[REMOTE_AGENT_BUSY\] \[(DEVICE_LIMIT|TOTAL_LIMIT)\]/.exec(message)?.[1];if (limitReason) return `session.remoteError.REMOTE_AGENT_${limitReason}`;const parsed = parseAgentErrorCode(message);@@ -103,6 +109,7 @@ export function unclassifiedAgentErrorI18nKey(message: string, sessionSource?: u* Unknown codes return null so the caller keeps its own fallback instead of "reply failed".*/export function remoteActionErrorI18nKey(message: string): string | null {+ if (message.includes('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]')) return 'session.remoteError.REMOTE_AGENT_MEMBER_BUDGET_PAUSED';const code = parseAgentErrorCode(message)?.code;const key = code ? `session.remoteError.${code}` : null;return key && i18n.exists(key) ? key : null;diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 9853928f88..24d3365072 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -628,11 +628,21 @@ Pi 的 API Key 直连保留原生 SDK,由既有原生适配器在打开每条初始化、模型热刷新及子代理继承的适配器均保留检查,本机自用不启用远程授权门。受限任务不分给缺少这项复核能力的旧电脑;原本不限模型的旧电脑任务在新增限制时结束,重新分配到支持复核的电脑。-## 13. 后续可选+## 13. 成员模型占比上限++在成员的「可用模型」面板按当前供应商目录设置单模型占比上限与推荐模型;模型授权和占比规则一次保存。+规则默认关闭,仅约束该供应商的受邀成员,不影响机主、本机或同账号远控。++占比为该成员在该供应商今天及之前六个本地自然日的已记录输入+输出 token 中,此模型所占的比例,+不含缓存,也不是订阅周额度百分比。没有记录显示未知并允许建立首笔记录;达到上限暂停后续准入,+其他模型用量增加或旧记录退出窗口后可以恢复。已发出的请求不截断,不自动重试或切换推荐模型。+不同运行通道的检查粒度、数据缺失与并发边界见[成员模型占比上限](../provider-share-member-budget.md)。++## 14. 后续可选以下不在首版范围,需要时另行裁决:- 在手机上审批申请与管理分享;-- 按人设置用量上限;+- 按人设置总用量上限(与已实现的单模型占比上限不同);- 分享有效期;- 按人定制额度与用量可见范围(当前按供应商对全部受邀者统一开放,见 §7.5)。diff --git a/docs/provider-share-member-budget.md b/docs/provider-share-member-budget.mdnew file mode 100644index 0000000000..ffa89e8ffd--- /dev/null+++ b/docs/provider-share-member-budget.md@@ -0,0 +1,38 @@+# 供应商分享:成员模型占比上限++## 数据与口径++- 规则按供应商连接、经过身份核实的受邀成员、单个目录模型分别设置。+- 指标固定为:该成员在此供应商使用该模型的已记录输入+输出 token,除以同一成员在此供应商全部模型的已记录输入+输出 token。缓存读取、缓存写入、机主、同账号使用和其他成员均不计入。+- 时间窗口是提供服务的电脑本地时区的今天及之前六个自然日,不是过去 168 小时,也不是订阅周额度窗口。每天零点向前移一天。+- 数据直接来自已有分享用量账本;比例是对已记录数据的计算,不声称覆盖上游全部请求。历史账本缺失的请求及子代理归属不能追溯补造。+- 不再根据账号额度变化或 API 参考价格分摊个人订阅额度。不需要知道 GPT 周额度是多少,也不依赖订阅配额 API。+- 模型与推荐模型来自该供应商的当前目录和授权范围。新增型号可以配置;未配置型号不自动继承其他模型上限。++## 草案与执行++- 成员的「可用模型」面板同时编辑模型授权、单模型占比上限和推荐模型,一次保存。沿用原有成员入口,不另设上限管理页;只修改上限时保留既有模型授权。+- 新建规则默认关闭,明确显示草案;保存草案不改变模型可用性。预览的“达到上限”和真实“正在拦截”分开记录。+- 百分比为 1–100 的整数。目录已有的桥接型号别名按统一模型键合并统计和判定,不能用别名绕过同一条规则。+- 开启后,占比大于或等于上限时暂停该成员对此模型的新请求。100% 表示不限制;其他模型维持原授权。+- 没有记录时显示“暂无用量数据”,比例为未知,不显示 0%。允许首次请求以建立使用记录;其结果可能使下一请求超限。+- 已有记录中某型号没有用量,可以显示它在当前账本中的 0%;不能说它消耗了账号周额度的 0%。+- 无法读取、解析或可靠求和账本时显示不可用。已启用且小于 100% 的受限模型暂停;草案、未受限模型和机主不受影响。+- 已发出的请求完成后入账,不中断当前输出。并发请求与回执延迟可能跨过阈值,不能承诺严格零超支。+- 该成员使用其他模型或旧记录退出窗口后重新计算;低于上限才恢复。午夜只更新窗口,不保证恢复。不会自动重试或静默换模型。+- 推荐模型也受既有授权及自身上限约束,不推荐已不可用的模型;推荐不是自动切换。+- 规则持久化携带 `basis: member-input-output-7d` 和独立 `enabled` 字段,旧的账号额度估算草稿不能被重新解释成这个指标。++## 适用边界++- 机主、本机、同账号远控和机主子代理在成员规则读取前豁免。分母只属于该成员,不因机主或其他人继续使用而变化。+- 这是模型使用结构控制,不是个人总用量上限,不能保证节省多少订阅额度。账号总额度保护是另一独立指标,不混入本次个人占比设置;该能力尚未交付。+- Codex/Pi 的共享 ChatGPT 代理按真实请求型号记账并检查准入。Claude 保留原生 CLI 登录与直连;启动、换模型、新一轮准入已有检查,CLI 一轮内部逐请求即时拦截仍未完成,不能宣称等价支持。+- 供应商组通过已有的反向模型准入通道检查成员占比;暂停标识回传使用端。暂时达到上限的模型保留在静态授权目录中,实时准入复核负责阻止与恢复,避免比例恢复后仍无法使用。三宿主中转定向测试已覆盖,真实跨账号网络路径尚未验证。+- 旧记录按原有归属保留;新计量不能补齐历史没有记录的明细。真实跨账号、并发、断线、重启和升级路径仍需验收。++## 本轮验证范围++真实账本只读试算使用生产的 `memberTokenSnapshot` 与 `memberBudgetStatus`,结果另存任务私有草案,不写入正式配置。定向测试覆盖草案豁免、机主豁免、个人/供应商/分享隔离、缓存排除、阈值边界、其他模型用量导致恢复、自然日窗口切换和损坏数据。++完整开发版中的设置交互使用隔离测试成员及模拟的管理传输边界核对;设置存储、账本计算与成员准入调用生产实现。该测试不代表真实跨账号认证、外部模型请求或正式部署已经验证。diff --git a/packages/maker-core/src/agents/claude-code/translator.ts b/packages/maker-core/src/agents/claude-code/translator.tsindex b71c8a465d..8b1e77630d 100644--- a/packages/maker-core/src/agents/claude-code/translator.ts+++ b/packages/maker-core/src/agents/claude-code/translator.ts@@ -350,6 +350,7 @@ function ccLiveStatus(openStartedAt: ctx.rt.generation.startedAt,reliable: ctx.rt.generation.reliable,}),+ requestUsage: ctx.tracker.getRequestMetering(),isRunning,};}@@ -2552,6 +2553,7 @@ function handleResult(: msg;const resultWithUsageSegments = {...safeResult,+ requestUsage: ctx.tracker.getRequestMetering(),usageSegments: turnUsageSegments,usageSegmentsComplete,modelUsageCumulativeStartsAtZero: ctx.modelUsageCumulativeStartsAtZero?.() === true,diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.tsindex e80bbd7f31..86cd159744 100644--- a/packages/maker-core/src/agents/codex/index.ts+++ b/packages/maker-core/src/agents/codex/index.ts@@ -3667,7 +3667,7 @@ assertRouteCurrent();const translatorRt: CodexRuntimeState = newCodexRuntimeState();const liveUsageSnapshot = () => {const speed = translatorRt.generationTimingReliable ? translatorRt.tokenSpeed.snapshot() : undefined;- return attachLiveGeneration(usageTracker.snapshot(), {+ return attachLiveGeneration({ ...usageTracker.snapshot(), requestUsage: usageTracker.getRequestMetering() }, {tokenSpeed: speed,// Legacy clients use these fields: they must share the speed snapshot's// measured numerator/denominator, never the billing ledger's lifetime.@@ -11124,6 +11124,7 @@ assertRouteCurrent();cancelled: turn.status === 'interrupted',...(assistantAttemptFailure ? { assistantAttemptFailure } : {}),usage: codexDoneUsage,+ requestUsage: usageTracker.getRequestMetering(),raw: turn,},source: 'codex',@@ -11223,6 +11224,7 @@ assertRouteCurrent();type: 'codex/event/task_complete',result: finalAssistantText,usage: codexDoneUsage,+ requestUsage: usageTracker.getRequestMetering(),raw: turn,plan: latestPlanByTurn.get(turn.id) ?? null,},diff --git a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.tsindex 877816aac5..a718a77db6 100644--- a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts@@ -93,6 +93,8 @@ describe('Cindy native provider refresh bridge', () => {await adapter.refresh(snapshot, h.ctx, new Set());allowed = false;await expect(request()).rejects.toThrow('not authorized');+ fetchGrant.mockResolvedValueOnce({ ok: true, json: async () => ({ allowed: false, code: 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED' }) });+ await expect(request()).rejects.toThrow('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED]');fetchGrant.mockRejectedValueOnce(new Error('disconnected'));await expect(request()).rejects.toThrow('disconnected');expect(stream).toHaveBeenCalledTimes(1);diff --git a/packages/maker-core/src/agents/pi/native-provider-adapter-source.ts b/packages/maker-core/src/agents/pi/native-provider-adapter-source.tsindex 60c0d9ba47..9b65b513f8 100644--- a/packages/maker-core/src/agents/pi/native-provider-adapter-source.ts+++ b/packages/maker-core/src/agents/pi/native-provider-adapter-source.ts@@ -121,7 +121,12 @@ async function registerCindyNativeProviderAdapters(pi: any) {method: 'POST', headers: { Authorization: 'Bearer ' + CINDY_HOSTED.token, 'content-type': 'application/json' },body: JSON.stringify({ model: grant, ...(alias.remoteProviderId ? { providerId: alias.remoteProviderId } : {}) }), signal,});- if (!response.ok || (await response.json()).allowed !== true) throw new Error('The model is not authorized for this remote task');+ const decision = response.ok ? await response.json() : null;+ if (decision?.allowed !== true) {+ if (decision?.code === 'REMOTE_AGENT_MEMBER_BUDGET_PAUSED')+ throw new Error('[REMOTE_AGENT_MEMBER_BUDGET_PAUSED] This model has reached your shared-provider model limit.');+ throw new Error('The model is not authorized for this remote task');+ }}const api = getApiProvider(model.api);if (!api) throw new Error('The selected native provider API is unavailable');diff --git a/packages/maker-core/src/agents/pi/translator.ts b/packages/maker-core/src/agents/pi/translator.tsindex ff00ad3b6a..2382f89c76 100644--- a/packages/maker-core/src/agents/pi/translator.ts+++ b/packages/maker-core/src/agents/pi/translator.ts@@ -9,7 +9,7 @@ import { nativeToolMediaFields } from '@cindy/maker-shared/tool-process-media';* - tool_result_full: { toolUseId, fullText, isError }* - tool_result: { summary, toolUseIds }* - status: { status, ...UsageSnapshot 展开, isRunning }- * - done: { type: 'pi/agent_settled', ... }+ * - done: { type: 'pi/agent_settled', requestUsage, ... }** 文本策略:pi 一条 assistant 消息可含多个 text block(text→toolcall→text),* renderer 的 isFinal 语义是"整条消息全文 overwrite"——因此流式期间只发 delta,@@ -34,7 +34,7 @@ import type { AgentEvent, AgentTaskUpdateEventData, UsageSnapshot } from '../../import type { AsyncQueue } from '../shared/async-queue.js';import { attachLiveGeneration } from '../shared/live-generation-snapshot.js';import { TokenSpeedMeter } from '../shared/token-speed.js';-import type { UsageSegment } from '../shared/usage-tracker.js';+import { RequestUsageTracker, type UsageSegment } from '../shared/usage-tracker.js';import {UPSTREAM_OVERLOAD_REASON,formatOverloadRetryMessage,@@ -117,6 +117,7 @@ export interface PiTranslateContext {turnOutput: number;turnCacheRead: number;turnCacheWrite: number;+ requestUsageTracker: RequestUsageTracker;turnUsageSegments: UsageSegment[];turnUsageSegmentsComplete: boolean;turnUsageSegmentSeq: number;@@ -218,6 +219,7 @@ export function createPiTranslateContext(logger: Logger): PiTranslateContext {turnOutput: 0,turnCacheRead: 0,turnCacheWrite: 0,+ requestUsageTracker: new RequestUsageTracker(),turnUsageSegments: [],turnUsageSegmentsComplete: true,turnUsageSegmentSeq: 0,@@ -373,6 +375,7 @@ function startPiGenerationHeartbeat(ctx: PiTranslateContext): void {export function usageSnapshotOf(ctx: PiTranslateContext): UsageSnapshot {return attachLiveGeneration({+ requestUsage: ctx.requestUsageTracker.snapshot(),tokenUsage: ctx.turnTokens,contextTokens: ctx.contextTokens,contextWindow: ctx.workingContextWindow && ctx.workingContextWindow > 0@@ -448,6 +451,7 @@ function applyUsage(ctx.contextTokens = input + cacheRead + cacheWrite;const cost = usage.cost?.total;if (typeof cost === 'number' && Number.isFinite(cost)) ctx.costUsd += cost;+ ctx.requestUsageTracker.ingest({ model, inputTokens: input, outputTokens: output, cacheReadTokens: cacheRead, cacheCreateTokens: cacheWrite });ctx.turnUsageSegments.push({id: `pi:${++ctx.turnUsageSegmentSeq}`,...(model ? { model } : {}),@@ -515,6 +519,7 @@ function applyDelegatedUsage(ctx.turnCacheRead += segment.cacheRead;ctx.turnCacheWrite += segment.cacheWrite;ctx.costUsd += segment.cost;+ ctx.requestUsageTracker.ingest({ model: segment.model, inputTokens: segment.input, outputTokens: segment.output, cacheReadTokens: segment.cacheRead, cacheCreateTokens: segment.cacheWrite });ctx.turnUsageSegments.push({id: `pi-child:${identity}`,...(segment.model ? { model: segment.model } : {}),@@ -545,6 +550,7 @@ function applyDelegatedUsage(cacheWrite: Math.max(0, cumulative.cacheWrite - (previous?.cacheWrite ?? 0)),cost: Math.max(0, cumulative.cost - (previous?.cost ?? 0)),};+ ctx.requestUsageTracker.ingest({ inputTokens: delta.input, outputTokens: delta.output, cacheReadTokens: delta.cacheRead, cacheCreateTokens: delta.cacheWrite });ctx.delegatedUsage.set(taskId, cumulative);ctx.turnTokens += delta.input + delta.output;ctx.turnInput += delta.input;@@ -1058,6 +1064,7 @@ export function translatePiEvent(type: 'done',data: {type: 'pi/agent_settled',+ requestUsage: ctx.requestUsageTracker.snapshot(),// 本 turn 最终 assistant 回复文本。与 CC/Codex 的 done.data.result 对齐:// register.ts 的 will-assistant-message 出口钩子与 Orca worker 终态 finalText// 都读 done.data.result,不带上就会对 Pi 静默跳过这些钩子(codex review P1)。diff --git a/packages/maker-core/src/agents/shared/usage-tracker.test.ts b/packages/maker-core/src/agents/shared/usage-tracker.test.tsindex 543d75d41a..c07894e06a 100644--- a/packages/maker-core/src/agents/shared/usage-tracker.test.ts+++ b/packages/maker-core/src/agents/shared/usage-tracker.test.ts@@ -241,3 +241,20 @@ describe('UsageTracker.markContextOverflow', () => {expect(tracker.snapshot().contextTokens).toBe(272_000);});});++// Request receipts must survive turn resets and merge repeated partial frames exactly once.+it('retains per-model metering across turn boundaries without recounting split frames', () => {+ const tracker = new UsageTracker();+ tracker.upsertApiCallUsage('one', { model: 'astra', inputTokens: 10, outputTokens: 0 });+ tracker.upsertApiCallUsage('one', { model: 'astra', inputTokens: 10, outputTokens: 4 });+ const first = tracker.getRequestMetering();+ tracker.endTurn();+ tracker.beginTurn();+ tracker.ingestApiCallUsage({ model: 'sol', inputTokens: 3, outputTokens: 2 });+ const next = tracker.getRequestMetering();+ expect(next.epoch).toBe(first.epoch);+ expect(next.models).toMatchObject([+ { model: 'astra', inputTokens: 10, outputTokens: 4 },+ { model: 'sol', inputTokens: 3, outputTokens: 2 },+ ]);+});diff --git a/packages/maker-core/src/agents/shared/usage-tracker.ts b/packages/maker-core/src/agents/shared/usage-tracker.tsindex 7f53403d3d..ef44a72f28 100644--- a/packages/maker-core/src/agents/shared/usage-tracker.ts+++ b/packages/maker-core/src/agents/shared/usage-tracker.ts@@ -22,6 +22,7 @@* (它属于 session lifecycle 不属于 usage)*/+import { randomUUID } from 'node:crypto';import type { UsageSnapshot } from '../../types/events.js';/**@@ -53,7 +54,32 @@ export interface UsageSegment {complete?: boolean;}+export class RequestUsageTracker {+ private meteringEpoch = randomUUID();+ private meteringModels = new Map<string, UsageSegment>();++ /** Runtime-cumulative receipts. Independent of turn resets, context and display cost. */+ snapshot() {+ return { epoch: this.meteringEpoch, models: [...this.meteringModels.values()].map(row => ({ ...row })) };+ }++ ingest(usage: UsageSegment): void {+ const model = usage.model ?? 'unknown';+ const previous = this.meteringModels.get(model);+ this.meteringModels.set(model, {+ model,+ inputTokens: (previous?.inputTokens ?? 0) + usage.inputTokens,+ outputTokens: (previous?.outputTokens ?? 0) + usage.outputTokens,+ cacheReadTokens: (previous?.cacheReadTokens ?? 0) + (usage.cacheReadTokens ?? 0),+ cacheCreateTokens: (previous?.cacheCreateTokens ?? 0) + (usage.cacheCreateTokens ?? 0),+ });+ }++}+export class UsageTracker {+ private requestMeter = new RequestUsageTracker();+ getRequestMetering() { return this.requestMeter.snapshot(); }// ── turn 累计 ────────────────────────────────────────────────────────────// 每次 ingestApiCallUsage 累加, endTurn 后由 resetCurrentTurn 清零。// 老链路对标: agentManager.ts:2362-2365 currentTurn{Input,Output,CacheRead,CacheCreate}Tokens@@ -147,6 +173,13 @@ export class UsageTracker {: {}),};this.currentTurnSegments[existingIndex] = merged;+ this.requestMeter.ingest({+ model: merged.model,+ inputTokens: merged.inputTokens - existing.inputTokens,+ outputTokens: merged.outputTokens - existing.outputTokens,+ cacheReadTokens: (merged.cacheReadTokens ?? 0) - (existing.cacheReadTokens ?? 0),+ cacheCreateTokens: (merged.cacheCreateTokens ?? 0) - (existing.cacheCreateTokens ?? 0),+ });this.applyUsageDelta({inputTokens: merged.inputTokens - existing.inputTokens,@@ -185,6 +218,7 @@ export class UsageTracker {this.currentTurnSegmentIndex.set(normalized.id, this.currentTurnSegments.length);this.currentTurnSegments.push(normalized);this.applyUsageDelta(normalized, true);+ this.requestMeter.ingest(normalized);}private applyUsageDelta(diff --git a/packages/maker-core/src/types/events.ts b/packages/maker-core/src/types/events.tsindex d22aba9acd..bae9522dd0 100644--- a/packages/maker-core/src/types/events.ts+++ b/packages/maker-core/src/types/events.ts@@ -426,6 +426,11 @@ export interface InteractionDismissedEvent {* 注: isRunning / status text 不属于 usage, 由 translator 在 emit status event 时单独拼。*/export interface UsageSnapshot {+ /** Optional, runtime-cumulative provider receipts; older hosts can ignore this field. */+ requestUsage?: {+ epoch: string;+ models: Array<{ model?: string; inputTokens: number; outputTokens: number; cacheReadTokens?: number; cacheCreateTokens?: number }>;+ };tokenUsage: number;contextTokens: number;contextWindow: number;