Skip to content

armgit / cindy

Public Imported from GitHub
0

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

Merge remote-tracking branch 'origin/main' into HEAD

MagicLizi9203b4f25900
diff --cc apps/desktop/src/main/provider-group/__tests__/directory.test.ts
index 235c9dec4c,6217052cd4..a9a7b65523
--- a/apps/desktop/src/main/provider-group/__tests__/directory.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/directory.test.ts
@@@ -100,19 -100,22 +100,35 @@@ describe('listCandidates', () =>
});
describe('resolveMembers', () => {
+ it('uses actual local and advertised device versions, including offline devices; never invents a share version', async () => {
+ const directory = createProviderGroupDirectory(deps({ localAppVersion: () => '0.1.104-beta' }));
+ const members: ProviderGroupConfig['members'] = [
+ { key: 'local', kind: 'local', agentDeviceId: null, providerId: 'anthropic', limit: 4, weight: 1, paused: false },
+ { key: 'mini', kind: 'device', agentDeviceId: 'mini', providerId: 'anthropic-1a2b3c4d', limit: 4, weight: 1, paused: false },
+ { key: 'off', kind: 'device', agentDeviceId: 'off', providerId: 'anthropic', limit: 4, weight: 1, paused: false },
+ { key: 'share', kind: 'share', agentDeviceId: 'share:s1', providerId: 'anthropic', limit: 4, weight: 1, paused: false },
+ ];
+ const resolved = await directory.resolveMembers('anthropic', { strategy: 'least', autoSwitch: true, members });
+ expect(resolved.map((m) => m.appVersion)).toEqual(['0.1.104-beta', '1.0.0', '1.0.0', undefined]);
+ expect(resolved[2].state).toBe('offline');
+ });
+
+ it('reads quota only for available Claude subscriptions on this account’s computers', async () => {
+ const readClaudeUsage = vi.fn(async (_member: ProviderGroupMember) => ({ updatedAt: 1_000, fiveHour: { utilization: 25 } }));
+ const directory = createProviderGroupDirectory(deps({ readClaudeUsage }));
+ const member = (kind: 'local' | 'device' | 'share', agentDeviceId: string | null, providerId: string) => ({
+ key: `${kind}:${agentDeviceId}:${providerId}`, kind, agentDeviceId, providerId, limit: 4, weight: 1, paused: false,
+ });
+ const members = [member('local', null, 'anthropic'), member('device', 'mini', 'anthropic-1a2b3c4d'),
+ member('device', 'mini', 'deepseek'), member('device', 'off', 'anthropic'), member('share', 'share:s1', 'anthropic')];
+ const result = await directory.resolveMembers('anthropic', { strategy: 'usage', autoSwitch: true, members });
+ expect(readClaudeUsage).toHaveBeenCalledTimes(2);
+ expect(readClaudeUsage).toHaveBeenCalledWith(members[0]);
+ expect(readClaudeUsage).toHaveBeenCalledWith(members[1]);
+ expect(result[0].claudeUsage?.fiveHour?.utilization).toBe(25);
+ expect(result[4]).not.toHaveProperty('claudeUsage');
+ });
+
it('reports each member with a state and reason', async () => {
const directory = createProviderGroupDirectory(deps({
listReceivedShares: () => [share('s1'), share('s2', { status: 'paused' })],
diff --cc apps/desktop/src/main/provider-group/__tests__/runtime.test.ts
index 168f803b22,f436945e78..8bafe0877e
--- a/apps/desktop/src/main/provider-group/__tests__/runtime.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/runtime.test.ts
@@@ -12,30 -20,18 +20,33 @@@ vi.mock('../../device-link/index.js', (
vi.mock('../../device-link/controllerPlatform.js', () => ({ isMobilePlatform: () => false }));
vi.mock('../../device-link/deviceName.js', () => ({ deviceName: () => 'This computer' }));
vi.mock('../../maker-host/createDesktopProviderService.js', () => ({
- getDesktopProviderService: () => ({ listProviders: vi.fn(async () => []) }),
+ getDesktopProviderService: () => ({ listProviders: io.local }),
}));
- vi.mock('../../remote-agent/controller/deviceCatalog.js', () => ({ readDeviceProviderViews: vi.fn(async () => []) }));
+ vi.mock('../../remote-agent/controller/deviceCatalog.js', () => ({ readDeviceProviderViews: io.catalog }));
vi.mock('../bindings.js', () => ({ listProviderGroupBindings: () => ({}) }));
vi.mock('../store.js', () => ({ readProviderGroup: () => null }));
+ vi.mock('../coolingStore.js', () => ({ readProviderGroupCooling: () => ({}), writeProviderGroupCooling: vi.fn() }));
+
+ const { getProviderGroupDirectory, getProviderGroupOwnerScope, getProviderGroupRouter, setProviderGroupClaudeUsageReader } = await import('../runtime.js');
- const { getProviderGroupDirectory, getProviderGroupOwnerScope, getProviderGroupRouter } = await import('../runtime.js');
+ afterEach(() => setProviderGroupClaudeUsageReader(null));
describe('provider group runtime', () => {
+ it('does not return the previous owner’s details after an account change', async () => {
+ owner = 'detail-owner';
+ const scope = getProviderGroupOwnerScope();
+ const read = vi.spyOn(scope.router, 'view').mockImplementationOnce(async (providerId) => {
+ owner = 'next-detail-owner';
+ return {
+ providerId, config: { strategy: 'least', autoSwitch: true, members: [] },
+ members: [{ key: 'local', kind: 'local', label: 'private', state: 'available', running: 0, limit: 4, weight: 1, paused: false }],
+ };
+ });
+ expect(await getProviderGroupRouter().view('anthropic', { includeGuestSupport: true }))
+ .toEqual({ providerId: 'anthropic', config: null, members: [] });
+ read.mockRestore();
+ });
+
it('keeps cooling and round state per account behind stable handles', () => {
const router = getProviderGroupRouter();
expect(getProviderGroupRouter()).toBe(router);
diff --cc apps/desktop/src/main/provider-group/remoteClient.ts
index 098b16dd04,f9a85a079a..abb594bd63
--- a/apps/desktop/src/main/provider-group/remoteClient.ts
+++ b/apps/desktop/src/main/provider-group/remoteClient.ts
@@@ -45,7 -45,7 +45,7 @@@ export interface ProviderGroupRemoteCli
resetAt?: number | null;
}): Promise<void>;
leases(ownerDeviceId: string, seq: number, entries: readonly ProviderGroupRemoteLease[]): Promise<void>;
- view(ownerDeviceId: string, providerId: string, options?: { includeGuestSupport?: boolean }): Promise<ProviderGroupView>;
- view(ownerDeviceId: string, providerId: string, model?: string): Promise<ProviderGroupView>;
++ view(ownerDeviceId: string, providerId: string, modelOrOptions?: string | { model?: string; includeGuestSupport?: boolean }): Promise<ProviderGroupView>;
/** 报告经组、在组里别的电脑上运行的用量;组所在电脑是旧版本时抛 ProviderGroupRemoteUnsupportedError。 */
usage(ownerDeviceId: string, report: { seq: number; sinceDay: string | null; rows: readonly ProviderGroupRemoteUsageRow[] }, beforeSend?: () => void): Promise<void>;
}
@@@ -103,10 -103,11 +103,14 @@@ export function createProviderGroupRemo
await call(ownerDeviceId, { action: 'leases', seq, entries: entries.map((e) => ({ ...e })) });
},
- async view(ownerDeviceId, providerId, options) {
- async view(ownerDeviceId, providerId, model) {
++ async view(ownerDeviceId, providerId, modelOrOptions) {
++ const model = typeof modelOrOptions === 'string' ? modelOrOptions : modelOrOptions?.model;
++ const includeGuestSupport = typeof modelOrOptions === 'object' && modelOrOptions?.includeGuestSupport === true;
return parseProviderGroupRemoteView(await call(ownerDeviceId, {
- action: 'view', providerId,
- ...(options?.includeGuestSupport ? { includeGuestSupport: true } : {}),
+ action: 'view',
+ providerId,
+ ...(model ? { model } : {}),
++ ...(includeGuestSupport ? { includeGuestSupport: true } : {}),
}), providerId);
},
diff --cc apps/desktop/src/main/provider-group/remoteHandler.ts
index 5260eba1aa,750c2486aa..0abf8cbb3e
--- a/apps/desktop/src/main/provider-group/remoteHandler.ts
+++ b/apps/desktop/src/main/provider-group/remoteHandler.ts
@@@ -148,9 -148,7 +148,14 @@@ export async function handleProviderGro
return {};
case 'view': {
if (!deps.isRemoteAllowed(request.providerId)) return { providerId: request.providerId, config: null, members: [] };
- const view = await scope.router.view(request.providerId, { includeGuestSupport: request.includeGuestSupport === true });
- return scope.router.view(request.providerId, request.model);
++ const options = request.model !== undefined
++ ? request.includeGuestSupport === true
++ ? { model: request.model, includeGuestSupport: true }
++ : request.model
++ : { includeGuestSupport: request.includeGuestSupport === true };
++ const view = await scope.router.view(request.providerId, options);
+ return scope.isCurrent() && deps.isRemoteAllowed(request.providerId)
+ ? view : { providerId: request.providerId, config: null, members: [] };
}
case 'usage':
case 'usage-part': {
diff --cc apps/desktop/src/main/provider-group/router.ts
index 3ddbe70b2b,2f7bd7cb88..b892d89ade
--- a/apps/desktop/src/main/provider-group/router.ts
+++ b/apps/desktop/src/main/provider-group/router.ts
@@@ -19,7 -18,7 +19,8 @@@ import type { ProviderGroupConfig, Prov
import type { ProviderGroupBinding } from './bindings.js';
import type { ProviderGroupDirectory, ResolvedProviderGroupMember } from './directory.js';
import { pickProviderGroupMember, type SchedulableMember } from './scheduler.js';
+import { createGuestSupportReader } from './sharedStatus.js';
+ import { providerGroupUsageState } from './usage.js';
/** 撞到用量上限但拿不到重置时刻时,默认冷却多久。 */
export const PROVIDER_GROUP_DEFAULT_COOLDOWN_MS = 30 * 60_000;
@@@ -95,7 -92,7 +96,7 @@@ export type ProviderGroupPickResult
export interface ProviderGroupRouter {
pick(input: ProviderGroupPickInput): Promise<ProviderGroupPickResult>;
- view(providerId: string, options?: { includeGuestSupport?: boolean }): Promise<ProviderGroupView>;
- view(providerId: string, model?: string): Promise<ProviderGroupView>;
++ view(providerId: string, options?: string | { model?: string; includeGuestSupport?: boolean }): Promise<ProviderGroupView>;
/** 经本组分到这台、正在运行的任务数。 */
running(providerId: string, memberKey: string): number;
markCooling(providerId: string, memberKey: string, until: number): void;
@@@ -264,15 -262,16 +267,21 @@@ export function createProviderGroupRout
const config = deps.readGroup(providerId);
if (!config) return { providerId, config: null, members: [] };
const resolved = await deps.directory.resolveMembers(providerId, config);
- const readSupport = options?.includeGuestSupport ? guestSupportReader : null;
++ const viewOptions = typeof options === 'string' ? { model: options } : options;
++ const model = viewOptions?.model;
++ const readSupport = viewOptions?.includeGuestSupport ? guestSupportReader : null;
return {
providerId,
config,
- ...(model ? { model } : {}),
- members: resolved.map((r) => {
+ members: await Promise.all(resolved.map(async (r) => {
+ const guestSupport = readSupport
+ ? (r.member.kind === 'local' || r.state === 'ok' ? await readSupport(r.member) : 'unknown' as const)
+ : undefined;
- const until = coolingUntil(providerId, r.member.key);
+ const quota = providerGroupUsageState(r.claudeUsage, model, deps.now());
+ const remembered = coolingUntil(providerId, r.member.key);
+ const until = quota.limited && quota.resetAtMs === null ? null
+ : remembered === null ? quota.resetAtMs
+ : quota.resetAtMs === null ? remembered : Math.max(remembered, quota.resetAtMs);
const count = memberRunning(providerId, r);
const state = r.member.paused
? 'paused' as const
@@@ -298,7 -295,7 +307,8 @@@
paused: r.member.paused,
...(until !== null ? { coolingUntil: until } : {}),
};
- }),
+ })),
++ ...(model ? { model } : {}),
};
},
diff --cc apps/desktop/src/main/provider-group/runtime.ts
index 0db5eb73f8,7122f12b47..6551649046
--- a/apps/desktop/src/main/provider-group/runtime.ts
+++ b/apps/desktop/src/main/provider-group/runtime.ts
@@@ -7,8 -7,7 +7,9 @@@
* 调用方拿到的是固定的门面,每次调用按当前账号转发。
*/
import type { ProviderView } from '@cindy/model-providers';
+import { REMOTE_AGENT_CHANNEL, parseRemoteAgentCaps } from '@cindy/device-link';
+import { app } from 'electron';
+ import type { ClaudeSubscriptionUsageSnapshot } from '../../shared/claudeSubscriptionUsage.js';
import { activeOwnerScopeKey } from '../appSessionState.js';
import { readProviderGroupSummary, type ProviderGroupSessionGroup } from '../../shared/providerGroup.js';
diff --cc apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
index deaf20c8ef,35c955f9ac..a303d5ec68
--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
@@@ -41,7 -42,7 +42,8 @@@ import
} from '../../../shared/providerGroup';
import { providerShareComputerName, useProviderShareOwnerNameOf } from '../provider-share/providerShareNames';
import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';
+import { GroupMemberDetailsButton, GroupMemberVersion } from './GroupMemberVersion';
+ import { providerWeeklyQuotaSource } from '../../../shared/providerQuotaSource';
import { ProviderGroupAddDialog } from './ProviderGroupAddDialog';
import { useProviderGroup } from './useProviderGroup';
diff --cc apps/desktop/src/shared/providerGroup.ts
index e7887291f7,bf1eccaa6d..ffb40b77ff
--- a/apps/desktop/src/shared/providerGroup.ts
+++ b/apps/desktop/src/shared/providerGroup.ts
@@@ -110,16 -106,10 +110,18 @@@ export interface ProviderGroupView
/** null = 还没有组。 */
config: ProviderGroupConfig | null;
members: ProviderGroupMemberStatus[];
+ /** 发送前按指定模型重新计算状态时由组所在电脑回显。 */
+ model?: string;
}
+export type ProviderGroupGuestSupport = 'supported' | 'needs-update' | 'unknown';
+
+/** 设备目录中的应用版本只用于展示,拒绝异常长字符串和非版本文本。 */
+export function readProviderGroupAppVersion(value: unknown): string | undefined {
+ return typeof value === 'string' && value.length <= 64 && /^[0-9]+[.][0-9]+[.][0-9]+(?:[-+][0-9A-Za-z.+-]+)?$/.test(value)
+ ? value : undefined;
+}
+
export type ProviderGroupCandidateBlock =
/** 已在组里。 */
| 'member'
@@@ -337,7 -327,7 +339,7 @@@ export type ProviderGroupRemoteRequest
/** 这台电脑经组运行、正在跑的任务(整体替换上一份;seq 只增,乱序到达的旧份丢弃)。 */
| { action: 'leases'; seq: number; entries: ProviderGroupRemoteLease[] }
/** 组内电脑的状态(发送前检查、设置页展示)。 */
- | { action: 'view'; providerId: string; includeGuestSupport?: true }
- | { action: 'view'; providerId: string; model?: string }
++ | { action: 'view'; providerId: string; model?: string; includeGuestSupport?: true }
/**
* 这台电脑经组、在组里别的电脑上运行的用量(组所在电脑经手不到):整体替换这台从 sinceDay 起(含;null = 全部)
* 报过的行。seq 只增,乱序到达的旧份丢弃。
@@@ -466,11 -456,16 +468,17 @@@ export function parseProviderGroupRemot
}),
};
}
- case 'view':
+ case 'view': {
+ if (value.model !== undefined && (typeof value.model !== 'string' || !value.model || value.model.length > 512)) {
+ invalidRemote('invalid model');
+ }
return {
- action: 'view', providerId: remoteProviderId(value.providerId),
+ action: 'view',
+ providerId: remoteProviderId(value.providerId),
+ ...(value.model !== undefined ? { model: value.model } : {}),
+ ...(value.includeGuestSupport === true ? { includeGuestSupport: true } : {}),
};
+ }
case 'usage':
case 'usage-part': {
if (!Number.isSafeInteger(value.seq) || (value.seq as number) < 0) invalidRemote('invalid seq');