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。

fix(provider-share): 前置分享入口并按供应商组说明运行位置

Lizi1d45ab119509
diff --git a/apps/desktop/src/renderer/features/provider-group/__tests__/useLocalProviderGroups.test.tsx b/apps/desktop/src/renderer/features/provider-group/__tests__/useLocalProviderGroups.test.tsx
index 683f7d166c..7fb73e9718 100644
--- a/apps/desktop/src/renderer/features/provider-group/__tests__/useLocalProviderGroups.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/__tests__/useLocalProviderGroups.test.tsx
@@ -97,7 +97,7 @@ describe('useLocalProviderGroups', () => {
const first = deferred<Record<string, ProviderGroupConfig>>();
command.mockReturnValueOnce(first.promise);
const view = renderHook(() => useLocalProviderGroupsState());
- expect(view.result.current).toEqual({ groups: {}, ready: false });
+ expect(view.result.current).toEqual({ groups: {}, ready: false, failed: false });
await act(async () => {
first.resolve(group('A'));
await first.promise;
@@ -114,7 +114,7 @@ describe('useLocalProviderGroups', () => {
it('becomes ready without groups when the read fails', async () => {
command.mockRejectedValueOnce(new Error('boom'));
const view = renderHook(() => useLocalProviderGroupsState());
- await waitFor(() => expect(view.result.current).toEqual({ groups: {}, ready: true }));
+ await waitFor(() => expect(view.result.current).toEqual({ groups: {}, ready: true, failed: true }));
});
it('forgets readiness after switching accounts', async () => {
@@ -126,6 +126,6 @@ describe('useLocalProviderGroups', () => {
command.mockReturnValueOnce(new Promise(() => undefined));
setDataOwnerGeneration('owner-b', 2);
const second = renderHook(() => useLocalProviderGroupsState());
- expect(second.result.current).toEqual({ groups: {}, ready: false });
+ expect(second.result.current).toEqual({ groups: {}, ready: false, failed: false });
});
});
diff --git a/apps/desktop/src/renderer/features/provider-group/useLocalProviderGroups.ts b/apps/desktop/src/renderer/features/provider-group/useLocalProviderGroups.ts
index 8c33f52c51..232aeeee7e 100644
--- a/apps/desktop/src/renderer/features/provider-group/useLocalProviderGroups.ts
+++ b/apps/desktop/src/renderer/features/provider-group/useLocalProviderGroups.ts
@@ -24,6 +24,8 @@ export interface LocalProviderGroupsState {
groups: LocalGroups;
/** 当前账号至少读完过一次(读失败也算,按没有组处理)。 */
ready: boolean;
+ /** 最近一次未能读取设置;需要准确告知运行位置的审批不能把它当成没有组。 */
+ failed: boolean;
}
const EMPTY: LocalGroups = Object.freeze({});
@@ -32,12 +34,13 @@ interface GroupsState {
owner: DataOwnerGeneration | null;
snapshot: LocalGroups;
ready: boolean;
+ failed: boolean;
loaded: Promise<void> | null;
/** 每次重读或换账号加一,只认最后一次读取的结果。 */
revision: number;
}
-const state: GroupsState = { owner: null, snapshot: EMPTY, ready: false, loaded: null, revision: 0 };
+const state: GroupsState = { owner: null, snapshot: EMPTY, ready: false, failed: false, loaded: null, revision: 0 };
let offChanged: (() => void) | null = null;
const listeners = new Set<() => void>();
@@ -51,6 +54,7 @@ function stateFor(owner: DataOwnerGeneration): GroupsState {
if (state.owner?.dataOwnerId !== owner.dataOwnerId) {
state.snapshot = EMPTY;
state.ready = false;
+ state.failed = false;
}
state.owner = owner;
state.loaded = null;
@@ -70,6 +74,7 @@ function reload(owner: DataOwnerGeneration): Promise<void> {
// 读不到(旧窗口 / 测试)就当没有组,不让等 ready 的界面一直不出现。
if (!state.ready) {
state.ready = true;
+ state.failed = true;
notify();
}
return Promise.resolve();
@@ -79,6 +84,7 @@ function reload(owner: DataOwnerGeneration): Promise<void> {
if (revision !== state.revision || !sameOwner(state.owner, owner) || !isDataOwnerGenerationCurrent(owner)) return;
if (groups) state.snapshot = groups;
state.ready = true;
+ state.failed = groups === null;
notify();
};
state.loaded = Promise.resolve()
@@ -107,7 +113,7 @@ export function peekLocalProviderGroup(providerId: string): { ready: boolean; co
}
function current(source: GroupsState): LocalProviderGroupsState {
- return { groups: source.snapshot, ready: source.ready };
+ return { groups: source.snapshot, ready: source.ready, failed: source.failed };
}
export function useLocalProviderGroupsState(): LocalProviderGroupsState {
@@ -130,6 +136,7 @@ export const __testing = {
state.owner = null;
state.snapshot = EMPTY;
state.ready = false;
+ state.failed = false;
state.loaded = null;
state.revision = 0;
offChanged?.();
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareApproveDialog.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareApproveDialog.tsx
index d67eb85b19..3c626bfcf8 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareApproveDialog.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareApproveDialog.tsx
@@ -2,15 +2,18 @@
* 分享者审批弹窗(设计稿场景 5):只显示申请人的昵称和头像,以及同一个配对码供核对。
* 右上角 × 与 Esc = 稍后处理,申请留在管理页「待处理」里(24 小时内有效)。
* 分享在同账号另一台电脑上时(本机生成的链接),同意 / 拒绝转交那台电脑执行。
+ * 这个供应商建了组时,同意说明写「由供应商组选一台电脑运行 Agent」,不说在这台电脑上运行(供应商组 §8)。
*/
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Button } from '@/components/ui/button';
+import { useLocalProviderGroupsState } from '@/features/provider-group/useLocalProviderGroups';
import { providerManagementErrorKey, providerShareManagementCommand } from '@/features/provider-group/providerManagement';
import { useDeviceProviders } from '@/hooks/useDeviceProviders';
import { useProviders } from '@/hooks/useProviders';
import { toast } from '@/lib/toast';
+import { remoteProviderGroupOf } from '@/lib/remoteProviderGroups';
import { extractIpcError } from '@/utils/ipcError';
import {
@@ -42,9 +45,14 @@ export function ProviderShareApproveDialog({
const remote = useDeviceProviders(hostDeviceId);
const providerForApproval = (hostDeviceId ? remote.providers : providers).find((view) => view.id === share.providerId);
const claudeEmail = sharesClaudeLoginEmail(providerForApproval);
- // 请求成功不代表目录里有目标供应商;找到它并确认类型后才能同意,避免漏掉 Claude 邮箱告知。
+ // 本机的组读本机组设置;另一台电脑上的分享读那台目录里带的组摘要。
+ const localGroups = useLocalProviderGroupsState();
+ const grouped = hostDeviceId
+ ? providerForApproval !== undefined && remoteProviderGroupOf(providerForApproval) !== null
+ : localGroups.groups[share.providerId] !== undefined;
+ // 请求成功不代表目录里有目标供应商;找到它并确认类型、有没有组后才能同意,避免漏掉 Claude 邮箱告知或说错 Agent 在哪运行。
const providerClassificationReady = providerForApproval !== undefined
- && (!hostDeviceId || (!remote.loading && remote.error === null));
+ && (hostDeviceId ? !remote.loading && remote.error === null : localGroups.ready && !localGroups.failed);
const decide = async (action: 'approve' | 'reject') => {
if (busy) return;
@@ -101,7 +109,9 @@ export function ProviderShareApproveDialog({
</p>
</div>
<div className="mt-3.5 flex flex-col gap-1 rounded-lg bg-[var(--surface)] px-3 py-2.5 text-12 leading-[1.5] text-[var(--text-secondary)]">
- <p>{t('providerShare.approve.callout', { name, provider })}</p>
+ {!hostDeviceId && localGroups.failed
+ ? <p role="status">{t('providerGroup.section.loadFailed')}</p>
+ : <p>{t(grouped ? 'providerShare.approve.calloutGroup' : 'providerShare.approve.callout', { name, provider })}</p>}
{claudeEmail ? <p>{t('providerShare.approve.calloutClaudeEmail', { name })}</p> : null}
<p>{t('providerShare.approve.calloutUnknown')}</p>
</div>
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
index 840795e231..049fe2d54a 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
@@ -278,7 +278,7 @@ export function ProviderShareManagePage({
{t('settings.providers.title')}
</button>
- {/* 标题已经说明这页是什么;这台电脑的名字由本机那行与下方「分享」说明承载,不在这里重复一遍。 */}
+ {/* 标题已经说明这页是什么;这台电脑的名字由组里本机那一行承载,不在这里重复一遍。 */}
<div className="flex shrink-0 flex-wrap items-center gap-3">
<div
aria-hidden="true"
@@ -289,6 +289,9 @@ export function ProviderShareManagePage({
<h2 className="min-w-0 flex-1 text-16 font-medium leading-[1.3] text-[var(--settings-section-title)]">
{t('providerGroup.page.title', { provider: providerName })}
</h2>
+ <Button variant="cta" size="md" disabled={!canCreateLink} onClick={() => setLinkOpen(true)}>
+ {t('providerShare.manage.createLink')}
+ </Button>
</div>
{deviceId && (
@@ -296,42 +299,6 @@ export function ProviderShareManagePage({
{t('providerGroup.management.note', { device: selfDeviceName ?? deviceId })}
</p>
)}
- <ProviderGroupSection
- providerId={providerId} providerName={providerName} deviceId={deviceId} deviceName={deviceName}
- initialConfig={initialGroup} remoteProvider={remoteProvider} onConfigChange={setRemoteGroup}
- />
-
- <ProviderUsageSection
- providerId={providerId}
- providerName={providerName}
- own={own}
- ownFailed={ownFailed}
- members={members}
- membersLoading={!state && !loadFailed}
- selfDeviceName={selfDeviceName}
- ownerDeviceId={deviceId}
- groupConfig={deviceId ? remoteGroup : undefined}
- range={range}
- onRangeChange={setRange}
- time={time}
- />
-
- <div className="mt-8 flex shrink-0 flex-wrap items-start gap-3">
- <div className="flex min-w-[240px] flex-1 flex-col gap-1">
- <h3 className="text-13 font-medium text-[var(--settings-section-title)]">
- {t('providerGroup.page.shareTitle')}
- </h3>
- <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">
- {selfDeviceName
- ? t('providerShare.manage.descriptionWithDevice', { provider: providerName, device: selfDeviceName })
- : t('providerShare.manage.description', { provider: providerName })}
- </p>
- </div>
- <Button variant="cta" size="md" disabled={!canCreateLink} onClick={() => setLinkOpen(true)}>
- {t('providerShare.manage.createLink')}
- </Button>
- </div>
-
{(gate !== 'on' || (state && !ready) || loadFailed) && (
<p
role="status"
@@ -457,6 +424,26 @@ export function ProviderShareManagePage({
</section>
)}
+ <ProviderGroupSection
+ providerId={providerId} providerName={providerName} deviceId={deviceId} deviceName={deviceName}
+ initialConfig={initialGroup} remoteProvider={remoteProvider} onConfigChange={setRemoteGroup}
+ />
+
+ <ProviderUsageSection
+ providerId={providerId}
+ providerName={providerName}
+ own={own}
+ ownFailed={ownFailed}
+ members={members}
+ membersLoading={!state && !loadFailed}
+ selfDeviceName={selfDeviceName}
+ ownerDeviceId={deviceId}
+ groupConfig={deviceId ? remoteGroup : undefined}
+ range={range}
+ onRangeChange={setRange}
+ time={time}
+ />
+
<section className="mt-6 shrink-0" aria-labelledby="provider-share-members-title">
<div className="mb-2 flex flex-wrap items-center gap-2">
<h3 id="provider-share-members-title" className="text-13 font-medium text-[var(--settings-section-title)]">
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx
index cfefb21c10..f4cab81299 100644
--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx
@@ -4,6 +4,7 @@ import { MemoryRouter, useLocation } from 'react-router-dom';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ProviderShareReceived } from '@cindy/device-link';
import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+import { __testing as localProviderGroupsTesting } from '@/features/provider-group/useLocalProviderGroups';
import { __resetForTest, addModelFavorite, listModelFavorites, setModelFavoritesOwner } from '@/state/modelFavorites';
import { providerShareFavoriteSource } from '@/state/providerShareFavorites';
@@ -68,7 +69,7 @@ const localCatalog = vi.hoisted(() => ({
}));
const remoteCatalog = vi.hoisted(() => ({
- providers: [] as Array<{ id: string; source: string; auth: { method: string; native?: string } }>,
+ providers: [] as Array<{ id: string; source: string; auth: { method: string; native?: string }; group?: unknown }>,
loading: false,
error: null as string | null,
unsupported: false,
@@ -95,6 +96,7 @@ const membership = (): ProviderShareReceivedSnapshot => ({
beforeEach(() => {
resetProviderShareStoreForTests();
__resetForTest();
+ localProviderGroupsTesting.reset();
window.localStorage.clear();
bus.auth = { dataOwnerId: 'recipient', dataOwnerGeneration: 1 };
bus.received = [receivedShare];
@@ -122,6 +124,7 @@ beforeEach(() => {
});
Object.assign(window, {
electronAPI: {
+ providerGroup: { command: vi.fn(async () => ({})), onChanged: () => () => undefined },
providerShare: {
command: bus.command,
onOwnedChanged: () => () => undefined,
@@ -357,7 +360,8 @@ describe('ProviderShareGlobalHost', () => {
const approve = screen.getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement;
expect(approve.disabled).toBe(true);
fireEvent.click(approve);
- expect(groupCommand).not.toHaveBeenCalled();
+ // 弹窗会读本机组设置(list),这里只确认没把同意转给那台电脑。
+ expect(groupCommand).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'remote-manage' }));
const reject = screen.getByRole('button', { name: 'providerShare.approve.reject' }) as HTMLButtonElement;
expect(reject.disabled).toBe(false);
fireEvent.click(reject);
@@ -398,6 +402,84 @@ describe('ProviderShareGlobalHost', () => {
expect(screen.getByTestId('provider-share-approve-dialog').textContent).toContain('providerShare.approve.calloutClaudeEmail');
});
+ const groupConfig = { strategy: 'least', autoSwitch: true, members: [{ kind: 'local' }] };
+
+ it('waits for local group settings before enabling approval', async () => {
+ let finish!: (groups: Record<string, unknown>) => void;
+ Object.assign(window.electronAPI, {
+ providerGroup: { command: vi.fn(() => new Promise((resolve) => { finish = resolve; })), onChanged: () => () => undefined },
+ });
+ renderHost();
+ await screen.findByTestId('provider-share-approve-dialog');
+ const approve = screen.getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement;
+ expect(approve.disabled).toBe(true);
+ await act(async () => finish({ xd: groupConfig }));
+ await waitFor(() => expect(approve.disabled).toBe(false));
+ expect(screen.getByTestId('provider-share-approve-dialog').textContent).toContain('providerShare.approve.calloutGroup:');
+ });
+
+ it('keeps approval disabled after a failed group read and recovers when settings reload', async () => {
+ const groups = vi.fn().mockRejectedValue(new Error('group settings unavailable'));
+ let changed: () => void = () => undefined;
+ Object.assign(window.electronAPI, {
+ providerGroup: { command: groups, onChanged: (listener: () => void) => { changed = listener; return () => undefined; } },
+ });
+ renderHost();
+ await screen.findByTestId('provider-share-approve-dialog');
+ await waitFor(() => expect(window.electronAPI.providerGroup.command).toHaveBeenCalled());
+ expect((screen.getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement).disabled).toBe(true);
+ expect((screen.getByRole('button', { name: 'providerShare.approve.reject' }) as HTMLButtonElement).disabled).toBe(false);
+ expect(screen.getByRole('status').textContent).toBe('providerGroup.section.loadFailed');
+ groups.mockResolvedValue({ xd: groupConfig });
+ await act(async () => changed());
+ await waitFor(() => expect((screen.getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement).disabled).toBe(false));
+ expect(screen.getByTestId('provider-share-approve-dialog').textContent).toContain('providerShare.approve.calloutGroup:');
+ });
+
+ it.each([
+ ['without a group says the Agent runs on this computer', false, 'providerShare.approve.callout:'],
+ ['with a group says the provider group picks the computer', true, 'providerShare.approve.calloutGroup:'],
+ ])('a local approval %s', async (_name, grouped, callout) => {
+ Object.assign(window.electronAPI, {
+ providerGroup: {
+ command: vi.fn(async (command: { action: string }) => {
+ if (command.action === 'list') return grouped ? { xd: groupConfig } : {};
+ throw new Error(`unexpected ${command.action}`);
+ }),
+ onChanged: () => () => undefined,
+ },
+ });
+ renderHost();
+ await screen.findByTestId('provider-share-approve-dialog');
+ await waitFor(() =>
+ expect((screen.getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement).disabled).toBe(false),
+ );
+ const text = screen.getByTestId('provider-share-approve-dialog').textContent ?? '';
+ expect(text).toContain(callout);
+ expect(text).not.toContain(grouped ? 'providerShare.approve.callout:' : 'providerShare.approve.calloutGroup:');
+ });
+
+ it('an approval for another computer\'s share reads that computer\'s group', async () => {
+ remoteCatalog.providers = [{ id: 'anthropic', source: 'builtin', auth: { method: 'apiKey' }, group: groupConfig }];
+ currentOwner = {
+ ready: true,
+ shares: [],
+ watchedRequests: [{
+ request,
+ share: { shareId: 'share-1', providerId: 'anthropic', providerLabel: 'Anthropic' },
+ hostDeviceId: 'host',
+ }],
+ };
+ renderHost();
+ await screen.findByTestId('provider-share-approve-dialog');
+ await waitFor(() =>
+ expect((screen.getByRole('button', { name: 'providerShare.approve.approve' }) as HTMLButtonElement).disabled).toBe(false),
+ );
+ const text = screen.getByTestId('provider-share-approve-dialog').textContent ?? '';
+ expect(text).toContain('providerShare.approve.calloutGroup:');
+ expect(text).not.toContain('providerShare.approve.callout:');
+ });
+
it('opens the management page from a notification click', async () => {
currentOwner = ownerState([]);
renderHost();
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
index 8e0fa930fb..53aa82966e 100644
--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
@@ -201,6 +201,20 @@ function renderPage(
}
describe('ProviderShareManagePage', () => {
+ it('places link creation in the title row and pending requests before group and usage', async () => {
+ renderPage();
+ await screen.findAllByTestId('provider-share-member-row');
+ const title = screen.getByRole('heading', { name: /providerGroup\.page\.title/ });
+ expect(within(title.parentElement!).getByRole('button', { name: 'providerShare.manage.createLink' })).toBeTruthy();
+ expect(screen.queryByText('providerGroup.page.shareTitle')).toBeNull();
+ expect(screen.queryByText(/providerShare\.manage\.description/)).toBeNull();
+ const pending = screen.getByRole('region', { name: 'providerShare.manage.pending.title' });
+ const usage = screen.getByRole('heading', { name: 'providerGroup.usage.title' });
+ expect(pending.compareDocumentPosition(usage) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+ const group = screen.getByRole('heading', { name: 'providerGroup.section.title' });
+ expect(pending.compareDocumentPosition(group) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+ });
+
it('lists pending requests and members for this provider only, and publishes pending requests', async () => {
renderPage();
expect(await screen.findAllByTestId('provider-share-member-row')).toHaveLength(1);
@@ -208,7 +222,7 @@ describe('ProviderShareManagePage', () => {
expect(command).toHaveBeenCalledWith({ action: 'owned', range: 'month' });
expect(getProviderSharePendingRequests().map((item) => item.request.requestId)).toEqual(['req-1']);
expect(screen.getByText(/providerShare\.manage\.members\.statusRunning/)).toBeTruthy();
- expect(screen.getByText(/providerShare\.manage\.descriptionWithDevice/)).toBeTruthy();
+ expect(screen.queryByText(/providerShare\.manage\.descriptionWithDevice/)).toBeNull();
});
it('lists usage by person: you first (this computer and your other computers together), then the people shared with', async () => {
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index c900fc3391..c065b8c1ba 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -210,8 +210,6 @@
"descriptionOff": "When on, your other computers and the people you share with can use this provider’s models. While it’s off, existing shares are paused, not deleted."
},
"manage": {
- "description": "People you share with can pick {{provider}} models in their own sessions. The Agent runs on this computer and usage counts toward your {{provider}}; their files and commands still run on their own computer.",
- "descriptionWithDevice": "People you share with can pick {{provider}} models in their own sessions. The Agent runs on this computer ({{device}}) and usage counts toward your {{provider}}; their files and commands still run on their own computer.",
"createLink": "Create Share Link",
"loading": "Loading sharing…",
"notReady": "Sharing isn’t available right now. Make sure you’re signed in and online; it will retry automatically.",
@@ -313,7 +311,8 @@
"title": "{{name}} Requested Access to {{provider}}",
"requestedAt": "Requested {{time}} with your share link",
"pairingHint": "Before approving, you can ask them over the channel you sent the link through: “What pairing code do you see?” Approve if it matches.",
- "callout": "Once approved, {{name}} can use {{provider}} models in their own sessions. The Agent runs on this computer and usage counts toward your {{provider}}. You can pause or remove access anytime in “Share {{provider}}”.",
+ "callout": "Once approved, {{name}} can use {{provider}} models in their own sessions. The Agent runs on this computer and usage counts toward your {{provider}}. You can pause or remove access anytime in “{{provider}} · Remote & Sharing”.",
+ "calloutGroup": "Once approved, {{name}} can use {{provider}} models in their own sessions. The provider group picks the computer that runs the Agent, and usage counts toward your {{provider}}. You can pause or remove access anytime in “{{provider}} · Remote & Sharing”.",
"calloutClaudeEmail": "While {{name}} uses it, the Agent can see the email address you sign in to Claude with.",
"calloutUnknown": "If you don’t recognize this person, decline; the link stops working once declined.",
"approve": "Approve Sharing",
@@ -459,8 +458,7 @@
"unsupported": "The Cindy version on the computer with this group does not support remote management yet. Update Cindy on that computer first."
},
"page": {
- "title": "{{provider}} · Remote & Sharing",
- "shareTitle": "Sharing"
+ "title": "{{provider}} · Remote & Sharing"
},
"usage": {
"title": "Usage",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 12e036d0e9..a018ed211a 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -209,8 +209,6 @@
"descriptionOff": "オンにすると、あなたの他のパソコンと共有相手がこのプロバイダーのモデルを使えます。オフの間、既存の共有は一時的に使えなくなりますが、削除はされません。"
},
"manage": {
- "description": "共有すると、相手は自分のセッションで {{provider}} のモデルを選べます。Agent はこのパソコンで実行され、使用量はあなたの {{provider}} に計上されます。相手のファイルとコマンドは引き続き相手のパソコンで実行されます。",
- "descriptionWithDevice": "共有すると、相手は自分のセッションで {{provider}} のモデルを選べます。Agent はこのパソコン({{device}})で実行され、使用量はあなたの {{provider}} に計上されます。相手のファイルとコマンドは引き続き相手のパソコンで実行されます。",
"createLink": "共有リンクを作成",
"loading": "共有を読み込み中…",
"notReady": "共有は現在利用できません。サインインしてネットワークに接続していることを確認してください。自動的に再試行します。",
@@ -309,7 +307,8 @@
"title": "{{name}} があなたの共有した {{provider}} の利用を申請しています",
"requestedAt": "共有リンクから申請: {{time}}",
"pairingHint": "承認する前に、リンクを送ったのと同じ方法で「表示されているペアリングコードは?」と相手に確認できます。一致したら承認してください。",
- "callout": "承認すると、{{name}} は自分のセッションで {{provider}} のモデルを使えます。Agent はこのパソコンで実行され、使用量はあなたの {{provider}} に計上されます。「{{provider}} を共有」からいつでも停止または削除できます。",
+ "callout": "承認すると、{{name}} は自分のセッションで {{provider}} のモデルを使えます。Agent はこのパソコンで実行され、使用量はあなたの {{provider}} に計上されます。「{{provider}} · リモートと共有」からいつでも停止または削除できます。",
+ "calloutGroup": "承認すると、{{name}} は自分のセッションで {{provider}} のモデルを使えます。Agent はプロバイダーグループが選んだパソコンで実行され、使用量はあなたの {{provider}} に計上されます。「{{provider}} · リモートと共有」からいつでも停止または削除できます。",
"calloutClaudeEmail": "{{name}} が使用している間、Agent はあなたが Claude へのログインに使っているメールアドレスを確認できます。",
"calloutUnknown": "申請者に心当たりがない場合は拒否してください。拒否するとこのリンクは無効になります。",
"approve": "共有を承認",
@@ -455,8 +454,7 @@
"unsupported": "グループを作成したパソコンの Cindy は、まだリモート管理に対応していません。先にそのパソコンの Cindy を更新してください。"
},
"page": {
- "title": "{{provider}} · リモートと共有",
- "shareTitle": "共有"
+ "title": "{{provider}} · リモートと共有"
},
"usage": {
"title": "使用量",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 7cd84f6c89..b203543ff2 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -209,8 +209,6 @@
"descriptionOff": "켜면 내 다른 컴퓨터와 공유받은 사람이 이 제공자의 모델을 사용할 수 있습니다. 꺼져 있는 동안 기존 공유는 일시적으로 사용할 수 없지만 삭제되지는 않습니다."
},
"manage": {
- "description": "공유하면 상대방은 자신의 세션에서 {{provider}} 모델을 선택할 수 있습니다. Agent는 이 컴퓨터에서 실행되고 사용량은 내 {{provider}}에 계산됩니다. 상대방의 파일과 명령은 계속 상대방 컴퓨터에서 실행됩니다.",
- "descriptionWithDevice": "공유하면 상대방은 자신의 세션에서 {{provider}} 모델을 선택할 수 있습니다. Agent는 이 컴퓨터({{device}})에서 실행되고 사용량은 내 {{provider}}에 계산됩니다. 상대방의 파일과 명령은 계속 상대방 컴퓨터에서 실행됩니다.",
"createLink": "공유 링크 만들기",
"loading": "공유 정보를 불러오는 중…",
"notReady": "지금은 공유를 사용할 수 없습니다. 로그인되어 있고 네트워크에 연결되어 있는지 확인하세요. 자동으로 다시 시도합니다.",
@@ -309,7 +307,8 @@
"title": "{{name}}님이 내가 공유한 {{provider}} 사용을 요청했습니다",
"requestedAt": "{{time}} 공유 링크로 요청함",
"pairingHint": "승인하기 전에 링크를 보낸 곳에서 “보이는 페어링 코드가 뭐예요?”라고 물어볼 수 있습니다. 일치하면 승인하세요.",
- "callout": "승인하면 {{name}}님이 자신의 세션에서 {{provider}} 모델을 사용할 수 있습니다. Agent는 이 컴퓨터에서 실행되고 사용량은 내 {{provider}}에 계산됩니다. ‘{{provider}} 공유’에서 언제든지 일시 중지하거나 삭제할 수 있습니다.",
+ "callout": "승인하면 {{name}}님이 자신의 세션에서 {{provider}} 모델을 사용할 수 있습니다. Agent는 이 컴퓨터에서 실행되고 사용량은 내 {{provider}}에 계산됩니다. ‘{{provider}} · 원격 및 공유’에서 언제든지 일시 중지하거나 삭제할 수 있습니다.",
+ "calloutGroup": "승인하면 {{name}}님이 자신의 세션에서 {{provider}} 모델을 사용할 수 있습니다. Agent는 제공자 그룹이 선택한 컴퓨터에서 실행되고 사용량은 내 {{provider}}에 계산됩니다. ‘{{provider}} · 원격 및 공유’에서 언제든지 일시 중지하거나 삭제할 수 있습니다.",
"calloutClaudeEmail": "{{name}}님이 사용하는 동안 Agent가 Claude 로그인에 쓰는 내 이메일 주소를 볼 수 있습니다.",
"calloutUnknown": "요청한 사람을 모른다면 거절하세요. 거절하면 이 링크는 더 이상 사용할 수 없습니다.",
"approve": "공유 승인",
@@ -455,8 +454,7 @@
"unsupported": "그룹이 있는 컴퓨터의 Cindy 버전은 아직 원격 관리를 지원하지 않습니다. 먼저 해당 컴퓨터의 Cindy를 업데이트해 주세요."
},
"page": {
- "title": "{{provider}} · 원격 및 공유",
- "shareTitle": "공유"
+ "title": "{{provider}} · 원격 및 공유"
},
"usage": {
"title": "사용량",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 75db35e636..1ef1a70a21 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -209,8 +209,6 @@
"descriptionOff": "开启后,你的其他电脑和你分享的人可以用这个供应商的模型。关闭期间,已有的分享暂时不可用,不会被删除。"
},
"manage": {
- "description": "分享给他人后,对方可以在自己的任务里选用 {{provider}} 的模型。Agent 在这台电脑上运行,用量计入你的 {{provider}};对方的文件和命令仍在对方电脑上执行。",
- "descriptionWithDevice": "分享给他人后,对方可以在自己的任务里选用 {{provider}} 的模型。Agent 在这台电脑({{device}})上运行,用量计入你的 {{provider}};对方的文件和命令仍在对方电脑上执行。",
"createLink": "生成分享链接",
"loading": "正在读取分享…",
"notReady": "分享服务暂时不可用。确认已登录、网络正常后会自动重试。",
@@ -309,7 +307,8 @@
"title": "{{name}} 申请使用你分享的 {{provider}}",
"requestedAt": "{{time}}通过你的分享链接申请",
"pairingHint": "同意前可以通过发链接的渠道问对方一句:「你看到的配对码是多少?」一致再同意。",
- "callout": "同意后,{{name}} 可以在自己的任务里使用 {{provider}} 的模型。Agent 在这台电脑上运行,用量计入你的 {{provider}}。你可以随时在「分享 {{provider}}」里关闭或删除。",
+ "callout": "同意后,{{name}} 可以在自己的任务里使用 {{provider}} 的模型。Agent 在这台电脑上运行,用量计入你的 {{provider}}。你可以随时在「{{provider}} · 远程与分享」里关闭或删除。",
+ "calloutGroup": "同意后,{{name}} 可以在自己的任务里使用 {{provider}} 的模型。由供应商组选一台电脑运行 Agent,用量计入你的 {{provider}}。你可以随时在「{{provider}} · 远程与分享」里关闭或删除。",
"calloutClaudeEmail": "{{name}} 使用时,Agent 能看到你登录 Claude 用的邮箱。",
"calloutUnknown": "如果你不认识申请人,请拒绝;拒绝后这条链接作废。",
"approve": "同意分享",
@@ -455,8 +454,7 @@
"unsupported": "建组电脑的 Cindy 版本暂不支持远程管理。请先更新那台电脑上的 Cindy。"
},
"page": {
- "title": "{{provider}} · 远程与分享",
- "shareTitle": "分享"
+ "title": "{{provider}} · 远程与分享"
},
"usage": {
"title": "用量",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 82802b641b..cf419ec439 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -209,8 +209,6 @@
"descriptionOff": "開啟後,你的其他電腦和你分享的人可以用這個供應商的模型。關閉期間,已有的分享暫時無法使用,不會被刪除。"
},
"manage": {
- "description": "分享給他人後,對方可以在自己的任務裡選用 {{provider}} 的模型。Agent 在這臺電腦上執行,用量計入你的 {{provider}};對方的檔案和指令仍在對方電腦上執行。",
- "descriptionWithDevice": "分享給他人後,對方可以在自己的任務裡選用 {{provider}} 的模型。Agent 在這臺電腦({{device}})上執行,用量計入你的 {{provider}};對方的檔案和指令仍在對方電腦上執行。",
"createLink": "產生分享連結",
"loading": "正在讀取分享…",
"notReady": "分享服務暫時無法使用。確認已登入且網路正常後會自動重試。",
@@ -309,7 +307,8 @@
"title": "{{name}} 申請使用你分享的 {{provider}}",
"requestedAt": "{{time}}透過你的分享連結申請",
"pairingHint": "同意前可以透過傳連結的管道問對方一句:「你看到的配對碼是多少?」一致再同意。",
- "callout": "同意後,{{name}} 可以在自己的任務裡使用 {{provider}} 的模型。Agent 在這臺電腦上執行,用量計入你的 {{provider}}。你可以隨時在「分享 {{provider}}」裡關閉或刪除。",
+ "callout": "同意後,{{name}} 可以在自己的任務裡使用 {{provider}} 的模型。Agent 在這臺電腦上執行,用量計入你的 {{provider}}。你可以隨時在「{{provider}} · 遠端與分享」裡關閉或刪除。",
+ "calloutGroup": "同意後,{{name}} 可以在自己的任務裡使用 {{provider}} 的模型。由供應商組選一台電腦執行 Agent,用量計入你的 {{provider}}。你可以隨時在「{{provider}} · 遠端與分享」裡關閉或刪除。",
"calloutClaudeEmail": "{{name}} 使用時,Agent 能看到你登入 Claude 用的電子郵件地址。",
"calloutUnknown": "如果你不認識申請人,請拒絕;拒絕後這條連結作廢。",
"approve": "同意分享",
@@ -455,8 +454,7 @@
"unsupported": "建立組的電腦上的 Cindy 版本暫不支援遠端管理。請先更新那台電腦上的 Cindy。"
},
"page": {
- "title": "{{provider}} · 遠端與分享",
- "shareTitle": "分享"
+ "title": "{{provider}} · 遠端與分享"
},
"usage": {
"title": "用量",
diff --git a/docs/design-previews/provider-groups/index.html b/docs/design-previews/provider-groups/index.html
index 382e65ec23..8fec4f20e1 100644
--- a/docs/design-previews/provider-groups/index.html
+++ b/docs/design-previews/provider-groups/index.html
@@ -412,10 +412,11 @@
</button>
<div class="mhead">
<span class="mark" style="width:36px;height:36px;border-radius:12px">A</span>
- <!-- 标题已经说明这页是什么;这台电脑的名字由本机那行与下方「分享」说明承载,不在这里重复。 -->
+ <!-- 标题已经说明这页是什么;这台电脑的名字由组内本机那一行承载。 -->
<div class="grow">
<h1>Anthropic · 远程与分享</h1>
</div>
+ <button type="button" class="btn cta sm">生成分享链接</button>
</div>
<div class="section">
@@ -456,8 +457,7 @@
</div>
<div class="section">
- <h3 class="section-title">分享 <span class="count">2</span><span class="grow"></span>
- <button type="button" class="btn cta sm">生成分享链接</button>
+ <h3 class="section-title">已分享的人 <span class="count">2</span>
</h3>
<div class="card">
<div class="row">
@@ -819,7 +819,7 @@
let scene = 'settings', othersVariant = 'normal';
const notes = {
settings: '供应商详情在「允许被远程调用」下方增加「供应商组」一行。供应商组不依赖远程调用:只给本机用时也可以建组。两处按钮都进入同一个「远程与分享」页。',
- page: '原「分享 {供应商}」管理页扩成三块:供应商组、用量、分享。用量可按使用方或按组内电脑查看,两种合计相同;按人的用量从「已分享的人」移到这里。',
+ page: '「生成分享链接」放在标题右侧,有待处理申请时紧跟标题。下面是供应商组、用量与已分享的人;不再单设「分享」标题和重复说明。审批弹窗有组时写「由供应商组选一台电脑运行 Agent」。用量维度切换仍是设计预览,当前实现按人查看。',
add: '添加电脑与模型列表里的远程供应商同一个来源:你的其他电脑和别人分享给你的放在一个列表里直接勾选;还不能用的别人的电脑,粘贴分享链接走申请与配对码。链接的供应商不一致(订阅账号按品牌、自定义供应商按名称判断)或属于自己账号时不发送申请。',
others: '任务正常时固定在第一次分到的电脑上,头部写明在哪台运行。那台撞到用量上限、登录失效或离线时,自动交接到组里下一台继续这一轮,消息流显示一行活动记录;每台最多试一次,全部失败才报错并逐台列出原因,有撞上限的就等最早恢复的那台自动继续。同账号其他电脑的模型列表标题写「供应商组」。',
apply: '受邀者申请弹窗不论有没有组都写「Agent 在 Lizi 的电脑或 Lizi 安排的其他电脑上运行」,内容保存在实际运行的那台电脑上。之后建组、加减电脑都不再打扰受邀者,受邀者那边也不显示组内电脑的名称。',
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index e9adbe00ef..436981e054 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -459,6 +459,9 @@
自动换电脑的活动记录写「已自动换一台电脑继续」。组内电脑的名称属于分享者和组内电脑主人,不透给受邀者;
分享者的电脑名同样不给受邀者(供应商分享 §6)。
- 分享者这边也不弹确认:「远程与分享」页的供应商组一块写明「分享的人的任务也按组分配」。
+ - 分享者的审批弹窗有组时写「由供应商组选一台电脑运行 Agent」;本机审批读本机组设置,其他电脑审批读供应商所在电脑的组摘要。
+ 组信息尚未读到或读取失败时,不启用「同意分享」,避免按错误的运行位置说明审批。实现与回归见
+ `ProviderShareApproveDialog.tsx` 与 `ProviderShareGlobalHost.test.tsx`(2026-10-17)。
- 已知差异(2026-10-09 确认接受):这条规则上线前加入的受邀者,以及仍在用旧版本申请的受邀者,看到的是
「Agent 在 {分享者} 的电脑上运行」。不补提醒,只更新「分享给我的供应商」详情里的说明。
- 分享来的组内电脑上,组所在电脑作为受邀者照常受到受邀者隔离(供应商分享 §9);它的主人只看到组所在电脑账号的昵称与头像,
@@ -516,13 +519,14 @@
- **不闪状态**:入口按钮读本机组设置(全窗口共用的快照),不等组内电脑的实时状态;第一次读完之前整行不出现,
不先显示「没有组」再跳成组。「远程与分享」页再次打开时先显示上次读到的组,没读过就按本机组设置先排出组内电脑、
状态写「检查中」,再在后台刷新。
-- **「远程与分享」页**(原「分享 {供应商}」管理页扩展)分三块:
+- **「远程与分享」页**(原「分享 {供应商}」管理页扩展):标题右侧放「生成分享链接」,待处理申请紧跟标题,下面分三块:
1. **供应商组**:组内电脑列表(来源、状态、正在运行的任务数、冷却到何时——不在今天恢复的带上日期,如周上限)、并发上限、
添加电脑、组策略;
2. **用量**(P3):按人列出(自己在第一行),时间段切换;每人收起是总量,展开后按组内每台电脑、再按模型(§7);
还没有单独的「按组内电脑」切换;
- 3. **分享**:生成分享链接、待处理、已分享的人(按人用量已移到「用量」块,这里只管分享本身)。
- 未开启「允许被远程调用」时,这一块置灰并说明先开启哪一级(供应商分享 §3)。
+ 3. **已分享的人**:只管分享本身(按人用量已移到「用量」块);不再另设「分享」标题与重复说明。
+ 未开启「允许被远程调用」时,标题处的生成链接按钮置灰,并紧跟标题说明先开启哪一级(供应商分享 §3)。
+ 生成链接与待处理从底部移到标题处,避免难找;运行位置与用量归属在审批弹窗里说明(2026-10-16 用户要求)。
- **同账号任意电脑管理**(2026-10-14 用户裁决:组属于账号,不该只能在建组电脑上管):登录同一账号的任意电脑,
都能从设置页左栏组那一项的详情点「远程与分享」,进入与建组电脑同一个页面,管理组内电脑、并发上限与权重、组策略、
添加电脑,生成分享链接、处理申请、暂停或删除分享的人,查看用量。当前电脑不需要在组里。
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 3a71e83bf7..720e047a56 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -89,6 +89,7 @@
的昵称和头像(见 §6)、申请的供应商与同一个配对码,选择「同意分享」或「拒绝」。
分享的是 Claude 订阅登录时,弹窗另写一句:受邀者使用时,Agent 能看到分享者登录 Claude 用的邮箱
(Claude Code 自己会把它交给模型,Cindy 目前挡不住;2026-10-10 裁决先告知分享者)。
+ 这个供应商建了组时,同意说明写「由供应商组选一台电脑运行 Agent」,不说在这台电脑上运行([供应商组](provider-groups.md) §8)。
- **弹窗跟着生成链接的电脑**(2026-10-14 用户裁决):同账号另一台电脑可以从「远程与分享」为供应商组生成链接
([供应商组](provider-groups.md) §10 同账号管理)。这时审批弹窗与系统通知出现在**生成链接的那台电脑**上,
供应商所在电脑与其他电脑都不弹,只在管理页「待处理」和入口提示点里显示;同意、拒绝转交供应商所在电脑执行。
@@ -282,10 +283,12 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
### 7.2 管理页内容
-管理页按供应商划分,标题为「分享 {供应商}」,从设置页进入、可返回:
+管理页按供应商划分,标题为「{供应商} · 远程与分享」,从设置页进入、可返回:
-- **生成分享链接**:主操作。
-- **待处理**:待审批的申请(同意/拒绝),以及转分享请求(§4.3,同意/拒绝);为空时整块隐藏。链接 5 分钟即过期,不列出未使用的链接。
+- **生成分享链接**:放在页面标题右侧(2026-10-16 用户反馈:底部难找)。去掉原「分享」标题和重复说明;
+ Agent 在哪运行、用量算谁的由审批弹窗的同意说明(§4.1 第 4 步)讲清。分享未开启的原因紧跟标题提示(§3)。
+- **待处理**:待审批的申请(同意/拒绝),以及转分享请求(§4.3,同意/拒绝);紧跟标题,排在供应商组与用量前面,为空时整块隐藏。
+ 链接 5 分钟即过期,不列出未使用的链接。
- **已分享的人**:每人一行,显示头像、昵称、加入时间、最近使用、当前状态(正常/已暂停)与是否有任务正在运行;这个人经自己的
供应商组转给别人用、已处理过的请求列在这一行下方(已同意的可撤回,拒绝的可改为同意,§4.3)。
- **用量**(2026-10-11 起移到页面上方的「用量」块,见[供应商组](provider-groups.md) §7):按人列出——第一行是自己(当前登录账号),