Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-share): let invitees pick shared models; list shares with providers
Lizi2734d64d3e99
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.tsindex bb7410ffee..20792009d4 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts@@ -104,6 +104,54 @@ describe('provider share invoke', () => {expect(handle).toHaveBeenCalledTimes(1);});+ it('answers the picker reads narrowed to the shared provider', async () => {+ state.access = ACCESS;+ const { __testing: registry } = await import('../invoke-registry');+ registry.reset();+ registry.register('maker:provider:list', async () => ({+ dataOwnerId: 'owner-1',+ ownerGeneration: 1,+ providers: [+ { id: 'anthropic', name: 'Anthropic', agents: ['claude-code'], remoteInvocationEnabled: true, models: { 'claude-code': [{ id: 'claude-opus-5-5' }] } },+ { id: 'openai', name: 'OpenAI', agents: ['codex'], remoteInvocationEnabled: true, models: { codex: [{ id: 'gpt-5.5' }] } },+ ],+ }));+ registry.register('maker:get-capabilities', async () => ({+ availableModels: [{ id: 'claude-opus-5-5' }, { id: 'claude-opus-5-5[1m]' }, { id: 'claude-sonnet-5' }, { id: 'gpt-5.5' }],+ permissionModes: [{ id: 'default' }],+ }));+ registry.register('maker:list-available-agents', async () => ['claude-code', 'codex', 'pi']);+ registry.register('maker:agent:status', async () => ({+ binaryReady: true, binaryPath: '/Users/alice/bin/claude', authReady: true, identity: '[email protected]',+ }));+ try {+ await expect(runInvoke(GUEST, { channel: 'maker:get-capabilities', args: ['claude-code'] })).resolves.toEqual({+ ok: true,+ // Exact ids: `x[1m]` is a separate catalog model the shared provider does not list.+ result: { availableModels: [{ id: 'claude-opus-5-5' }], permissionModes: [{ id: 'default' }] },+ });+ await expect(runInvoke(GUEST, { channel: 'maker:get-capabilities', args: ['codex'] }))+ .resolves.toMatchObject({ ok: true, result: { availableModels: [] } });+ await expect(runInvoke(GUEST, { channel: 'maker:list-available-agents', args: [] }))+ .resolves.toEqual({ ok: true, result: ['claude-code'] });+ // Readiness only says whether an agent the share serves is installed (no sign-in, path or identity).+ await expect(runInvoke(GUEST, { channel: 'maker:agent:status', args: ['claude-code'] }))+ .resolves.toEqual({ ok: true, result: { binaryReady: true } });+ await expect(runInvoke(GUEST, { channel: 'maker:agent:status', args: ['codex'] }))+ .resolves.toEqual({ ok: true, result: { binaryReady: false } });+ await expect(runInvoke(GUEST, { channel: 'maker:get-capabilities', args: ['../x'] }))+ .resolves.toMatchObject({ ok: false, error: { message: expect.stringContaining('INVALID_PARAMS') } });+ // A failed read of the shared provider is reported, not answered as an empty list.+ registry.register('maker:provider:list', async () => {+ throw new Error('[MODEL_VISIBILITY_NOT_READY] later');+ });+ await expect(runInvoke(GUEST, { channel: 'maker:list-available-agents', args: [] }))+ .resolves.toMatchObject({ ok: false });+ } finally {+ registry.reset();+ }+ });+it('projects the provider list down to the shared provider', () => {const projected = __testing.projectProviderListForShare({dataOwnerId: 'owner-membership-1',diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareInvokeIpc.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareInvokeIpc.test.tsnew file mode 100644index 0000000000..20127d384f--- /dev/null+++ b/apps/desktop/src/main/device-link/__tests__/providerShareInvokeIpc.test.ts@@ -0,0 +1,69 @@+/**+ * 受邀者电脑上 Renderer 对分享来的供应商(`share:<id>`)的只读请求:只放行模型列表与发送前检查+ * 要读的几项,就绪只回是否装好 Agent,分享者电脑拒绝时给分享专属原因。+ */+import { DeviceLinkError } from '@cindy/device-link';+import { beforeEach, describe, expect, it, vi } from 'vitest';++vi.mock('electron', () => ({+ app: { getAppPath: () => '/tmp/cindy-share-ipc-test/app', getPath: () => '/tmp/cindy-share-ipc-test', getVersion: () => '0.0.0-test' },+ ipcMain: { handle: vi.fn() },+ powerSaveBlocker: { start: () => 0, stop: () => {}, isStarted: () => false },+ nativeImage: { createFromPath: () => ({ isEmpty: () => true }) },+}));+vi.mock('../../logger', () => ({+ createLogger: () => ({ info: vi.fn(), debug: vi.fn(), warn: vi.fn(), error: vi.fn() }),+}));+const noteFailure = vi.hoisted(() => vi.fn());+vi.mock('../providerShareGuest.js', async (importOriginal) => ({+ ...(await importOriginal<typeof import('../providerShareGuest.js')>()),+ resolveRemoteAgentTargetWhenReady: async () => 'host-peer',+ noteProviderShareAccessFailure: noteFailure,+}));+vi.mock('../providerShareCrossRegion.js', () => ({+ isCrossRegionProviderShareTarget: () => false,+ crossRegionInvoke: vi.fn(),+}));++import { handleProviderShareInvoke } from '../ipc';++const invoke = vi.fn();+const deps = { invoke } as unknown as Parameters<typeof handleProviderShareInvoke>[0];++beforeEach(() => {+ invoke.mockReset();+ noteFailure.mockReset();+});++describe('provider share renderer reads', () => {+ it('passes the picker and send-gate reads to the owner computer only', async () => {+ invoke.mockResolvedValue({ ok: true, result: ['claude-code'] });+ await expect(handleProviderShareInvoke(deps, 'share:s1', 'maker:list-available-agents', [])).resolves.toEqual(['claude-code']);+ invoke.mockResolvedValue({ ok: true, result: { availableModels: [] } });+ await expect(handleProviderShareInvoke(deps, 'share:s1', 'maker:get-capabilities', ['claude-code']))+ .resolves.toEqual({ availableModels: [] });+ expect(invoke).toHaveBeenLastCalledWith('host-peer', 'maker:get-capabilities', ['claude-code']);+ for (const channel of ['local-db:sessions:list', 'maker:model-favorites:get', undefined]) {+ await expect(handleProviderShareInvoke(deps, 'share:s1', channel, [])).rejects.toThrow(/DEVICE_LINK_CHANNEL_NOT_ALLOWED/);+ }+ });++ it('keeps only whether the agent is installed from the owner readiness', async () => {+ invoke.mockResolvedValue({ ok: true, result: { binaryReady: true, authReady: true, binaryPath: '/Users/alice/bin', identity: '[email protected]' } });+ await expect(handleProviderShareInvoke(deps, 'share:s1', 'maker:agent:status', ['codex'])).resolves.toEqual({ binaryReady: true });+ });++ it('scrubs the owner identity from the provider list', async () => {+ invoke.mockResolvedValue({ ok: true, result: { providers: [{ id: 'openai', name: 'OpenAI · [email protected]', openAiAccount: { identity: '[email protected]' } }] } });+ const result = await handleProviderShareInvoke(deps, 'share:s1', 'maker:provider:list', []);+ expect(JSON.stringify(result)).not.toContain('alice');+ });++ it('turns a refusal by the owner computer into the share-specific reason', async () => {+ invoke.mockResolvedValue({ ok: false, error: { code: 'ACCESS_REVOKED', message: 'no' } });+ await expect(handleProviderShareInvoke(deps, 'share:s1', 'maker:get-capabilities', ['pi'])).rejects.toThrow(/REMOTE_AGENT_SHARE_UNAVAILABLE/);+ invoke.mockRejectedValue(new DeviceLinkError('REMOTE_DISABLED', 'remote control disabled'));+ await expect(handleProviderShareInvoke(deps, 'share:s1', 'maker:provider:list', [])).rejects.toThrow(/REMOTE_AGENT_SHARE_UNAVAILABLE/);+ expect(noteFailure).toHaveBeenCalledTimes(2);+ });+});diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.tsindex e955273fb9..867f8dff80 100644--- a/apps/desktop/src/main/device-link/dispatch.ts+++ b/apps/desktop/src/main/device-link/dispatch.ts@@ -3930,8 +3930,85 @@ const PROVIDER_SHARE_ACCESS_FAILURE: InvokeResultPayload = {ok: false,error: { code: 'ACCESS_REVOKED', message: 'provider share is not available' },};-/** The only channels a provider-share guest may invoke. */-const PROVIDER_SHARE_CHANNELS: ReadonlySet<string> = new Set([REMOTE_AGENT_CHANNEL, 'maker:provider:list']);+/**+ * The only channels a provider-share guest may invoke: the remote agent, and the read-only+ * catalog reads its model picker and send gate need (provider list, agent capabilities,+ * available agents, agent readiness), each narrowed to the shared provider below.+ */+const PROVIDER_SHARE_CHANNELS: ReadonlySet<string> = new Set([+ REMOTE_AGENT_CHANNEL,+ 'maker:provider:list',+ 'maker:get-capabilities',+ 'maker:list-available-agents',+ 'maker:agent:status',+]);+const PROVIDER_SHARE_AGENT_ARG_CHANNELS: ReadonlySet<string> = new Set(['maker:get-capabilities', 'maker:agent:status']);+const PROVIDER_SHARE_AGENT_KINDS: ReadonlySet<string> = new Set(['claude-code', 'codex', 'pi']);++type SharedProviderView = { agents: string[]; models: Record<string, string[]> };++/**+ * The shared provider as the guest sees it: `null` when it is no longer open for remote use,+ * or the failed read itself (the guest then retries instead of caching an empty answer).+ */+async function sharedProviderView(+ src: string, providerId: string,+): Promise<SharedProviderView | null | Extract<InvokeResultPayload, { ok: false }>> {+ // Own timing: the slow-invoke log must not file this read under the guest's channel.+ const listed = await runAuthorizedInvoke(src, { channel: 'maker:provider:list', args: [] }, new RemoteInvokeTiming());+ if (!listed.ok) return listed;+ const projected = projectProviderListForShare(listed.result, providerId) as { providers?: Array<Record<string, unknown>> };+ const provider = projected.providers?.[0];+ if (!provider) return null;+ const agents = Array.isArray(provider.agents) ? provider.agents.filter((agent): agent is string => typeof agent === 'string') : [];+ const models: Record<string, string[]> = {};+ if (provider.models && typeof provider.models === 'object') {+ for (const [agent, entries] of Object.entries(provider.models as Record<string, unknown>)) {+ // Exact ids: in the catalog `x[1m]` and `x` are separate models, possibly from other providers.+ models[agent] = Array.isArray(entries)+ ? entries.flatMap((entry) => (entry && typeof (entry as { id?: unknown }).id === 'string' ? [(entry as { id: string }).id] : []))+ : [];+ }+ }+ return { agents, models };+}++/**+ * Narrow a read-only answer to what the shared provider offers: capabilities keep only its+ * models, available agents only the agents it serves, and agent readiness only says whether+ * an agent the share serves is installed (no local path, account identity or this computer's+ * own sign-in state; the guest takes readiness from the shared provider list).+ */+async function projectProviderShareRead(+ src: string, channel: string, args: unknown[], result: unknown, providerId: string,+): Promise<{ ok: true; value: unknown } | Extract<InvokeResultPayload, { ok: false }>> {+ if (channel === 'maker:provider:list') return { ok: true, value: projectProviderListForShare(result, providerId) };+ const view = await sharedProviderView(src, providerId);+ if (view && 'ok' in view) return view;+ if (channel === 'maker:agent:status') {+ const status = result && typeof result === 'object' ? result as { binaryReady?: unknown } : {};+ return { ok: true, value: { binaryReady: view?.agents.includes(String(args[0])) === true && status.binaryReady === true } };+ }+ if (channel === 'maker:list-available-agents') {+ return { ok: true, value: Array.isArray(result) && view ? result.filter((agent) => view.agents.includes(String(agent))) : [] };+ }+ // maker:get-capabilities+ if (!result || typeof result !== 'object' || Array.isArray(result)) return { ok: true, value: result };+ const offered = new Set(view?.models[String(args[0])] ?? []);+ const capabilities = result as { availableModels?: unknown };+ return {+ ok: true,+ value: {+ ...capabilities,+ availableModels: Array.isArray(capabilities.availableModels)+ ? capabilities.availableModels.filter((model) => {+ const id = model && typeof (model as { id?: unknown }).id === 'string' ? (model as { id: string }).id : '';+ return id !== '' && offered.has(id);+ })+ : [],+ },+ };+}/** Keep only the shared provider (and only while it stays open for remote use). */function projectProviderListForShare(result: unknown, providerId: string): unknown {@@ -3967,12 +4044,16 @@ async function runProviderShareInvoke(log.warn(`blocked provider-share channel from ${shortId(src)}: ${payload.channel}`);return { ok: false, error: { code: 'CHANNEL_NOT_ALLOWED', message: `channel '${payload.channel}' not allowed for shared providers` } };}+ const args = Array.isArray(payload.args) ? payload.args : [];+ if (PROVIDER_SHARE_AGENT_ARG_CHANNELS.has(payload.channel) && !PROVIDER_SHARE_AGENT_KINDS.has(String(args[0]))) {+ return { ok: false, error: { code: 'IPC_ERROR', message: '[INVALID_PARAMS] unknown agent' } };+ }const result = await runAuthorizedInvoke(src, payload, timing);if (!providerShareGuestAccess(src)) return PROVIDER_SHARE_ACCESS_FAILURE;- if (payload.channel === 'maker:provider:list' && result.ok) {- return { ...result, result: projectProviderListForShare(result.result, access.providerId) };- }- return result;+ if (payload.channel === REMOTE_AGENT_CHANNEL || !result.ok) return result;+ const projected = await projectProviderShareRead(src, payload.channel, args, result.result, access.providerId);+ if (!providerShareGuestAccess(src)) return PROVIDER_SHARE_ACCESS_FAILURE;+ return projected.ok ? { ...result, result: projected.value } : projected;}/** For diagnostics: whether any provider share is currently known on this computer. */diff --git a/apps/desktop/src/main/device-link/ipc.ts b/apps/desktop/src/main/device-link/ipc.tsindex 7b04246355..9240b3c010 100644--- a/apps/desktop/src/main/device-link/ipc.ts+++ b/apps/desktop/src/main/device-link/ipc.ts@@ -738,16 +738,37 @@ export async function handleInvoke(}/**- * 分享来的供应商(`share:<id>`):Renderer 只能读那台电脑上分享给自己的模型目录;+ * 分享来的供应商(`share:<id>`)的 Renderer 只读请求:模型列表与发送前检查要读的那几项+ * (模型目录、Agent 能力、可用 Agent、Agent 就绪),分享者电脑已按分享的供应商收窄。* Agent 本身由主进程的远程 Agent 客户端连接,不经这里。*/+const PROVIDER_SHARE_RENDERER_CHANNELS: ReadonlySet<string> = new Set([+ 'maker:provider:list',+ 'maker:get-capabilities',+ 'maker:list-available-agents',+ 'maker:agent:status',+]);++function projectProviderShareResult(channel: string, value: unknown): unknown {+ // 分享者电脑已去掉账号身份;受邀者这边再过一遍,旧版本分享者也不会把登录邮箱带进界面。+ if (channel === 'maker:provider:list') return scrubSharedProviderCatalog(value);+ if (channel === 'maker:agent:status') {+ // 只认 Agent 是否装好:就绪以分享的模型目录为准,不带对方的登录状态、本机路径与身份。+ const status = value && typeof value === 'object' ? value as { binaryReady?: unknown } : {};+ return { binaryReady: status.binaryReady === true };+ }+ return value;+}+export async function handleProviderShareInvoke(deps: Pick<DeviceLinkIpcDeps, 'invoke'>,agentDeviceId: string,channel: unknown,args: unknown,): Promise<unknown> {- if (channel !== 'maker:provider:list') throwIpcError('DEVICE_LINK_CHANNEL_NOT_ALLOWED', 'Not available for shared providers');+ if (typeof channel !== 'string' || !PROVIDER_SHARE_RENDERER_CHANNELS.has(channel)) {+ throwIpcError('DEVICE_LINK_CHANNEL_NOT_ALLOWED', 'Not available for shared providers');+ }const target = await resolveRemoteAgentTargetWhenReady(agentDeviceId);const callArgs = Array.isArray(args) ? args : [];let result: InvokeResultPayload;@@ -759,8 +780,7 @@ export async function handleProviderShareInvoke(if (err instanceof DeviceLinkError && isProviderShareRefusal(err.code, err.message)) refuseProviderShare();rethrowDeviceLinkError(err);}- // 分享者电脑已去掉账号身份;受邀者这边再过一遍,旧版本分享者也不会把登录邮箱带进界面。- if (result.ok) return scrubSharedProviderCatalog(result.result);+ if (result.ok) return projectProviderShareResult(channel, result.result);// 分享者电脑拒绝了(暂停、关了远程控制或这个供应商的「允许被远程调用」):分享专属原因。if (isProviderShareRefusal(result.error.code, result.error.message)) refuseProviderShare();if (result.error.code === 'IPC_ERROR') throw new Error(result.error.message);diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsxindex af9462dde1..27994be9ca 100644--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx@@ -23,6 +23,8 @@ import { useAgentDeviceModelMemoryVersion } from '@/state/agentDeviceModelMemoryimport { flashScrollbar } from '@/lib/scrollbarAutoHide';import { MORPH_CONTENT_RESIZE_EVENT } from '@/components/ui/morph-popover';+import { isProviderShareAgentDeviceId } from '../../../shared/providerShare';+import { ModelConfigFlyout, type ModelConfigFlyoutState } from './ModelConfigFlyout';// ModelSelector 反过来也 import 本文件 —— ESM 循环 import 在这里安全:两边用到的都是// **函数声明**(提升),且只在 render 时求值,不在模块求值期互相读值。@@ -343,7 +345,8 @@ export function UnifiedModelPanel({}: UnifiedModelPanelProps) {const { t } = useTranslation();const storedFavorites = useModelFavorites();- const remoteFavorites = useRemoteModelFavorites(deviceId);+ // 分享来的供应商(`share:<id>`)不是同账号的电脑,没有可同步的收藏:不去读,也不报同步失败。+ const remoteFavorites = useRemoteModelFavorites(isProviderShareAgentDeviceId(deviceId) ? undefined : deviceId);const favorites = selectionPolicy === 'official' ? NO_FAVORITES : deviceId ? remoteFavorites.items : storedFavorites;// 引擎 override / 深度 / Fast 三份 store 的版本号:任一变化都要重算行三元组与浮层// (其它窗口的 storage 事件、device-link 推送同样经这两个版本号进来)。远程 Agent 的档位记忆diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsxindex 717bca859f..284995a962 100644--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx@@ -106,13 +106,19 @@ import { hasProviderLogo, ProviderLogoMark } from '@/components/icons/ProviderLoimport { SortableList } from '@/components/sidebar/SortableList';import { ProviderShareEntryButton } from '@/features/provider-share/ProviderShareEntryButton';import { ProviderShareManagePage } from '@/features/provider-share/ProviderShareManagePage';-import { ProviderShareReceivedSection } from '@/features/provider-share/ProviderShareReceivedSection';+import {+ ProviderShareReceivedDetail,+ ProviderShareReceivedRailGroup,+} from '@/features/provider-share/ProviderShareReceivedRail';import {pendingRequestCountByProvider,providerShareGate,} from '@/features/provider-share/providerShareFormat';import { PROVIDER_SHARE_MANAGE_PARAM } from '@/features/provider-share/providerShareNavigation';-import { useProviderSharePendingRequests } from '@/features/provider-share/providerShareStore';+import {+ useProviderSharePendingRequests,+ useProviderShareReceived,+} from '@/features/provider-share/providerShareStore';import { localCliDisplayName, type LocalCliDetection } from '../../../shared/localCliDetect';import { isBuiltinRefreshableProviderId } from '../../../shared/providerModelRefresh';@@ -2403,6 +2409,17 @@ export function ProvidersSection() {const openaiReconnectRequired = codexAuth.state.kind === 'reconnect-required';const [selectedId, setSelectedId] = useState<string | null>(null);+ // 左栏「分享给我的」里选中的一条;选中自己的供应商或登录引导时清空。+ const [selectedShareId, setSelectedShareId] = useState<string | null>(null);+ const { received: receivedShares } = useProviderShareReceived();+ const selectedShare = selectedShareId+ ? receivedShares.find((share) => share.shareId === selectedShareId) ?? null+ : null;+ // 用户或深链、向导完成、导入完成等「打开某个供应商」时,右栏回到那个供应商(即使它就是当前选中项)。+ const selectProvider = useCallback((providerId: string) => {+ setSelectedShareId(null);+ setSelectedId(providerId);+ }, []);const [pendingProviderOrder, setPendingProviderOrder] = useState<{dataOwnerId: string | null;ids: string[];@@ -2438,10 +2455,10 @@ export function ProvidersSection() {const finishProviderImport = useCallback((providerId: string) => {setProviderImportId(null);- setSelectedId(providerId);+ selectProvider(providerId);refetch();},- [refetch],+ [refetch, selectProvider],);const addProviderButtonRef = useRef<HTMLButtonElement>(null);const [detections, setDetections] = useState<LocalCliDetection[]>([]);@@ -2718,13 +2735,13 @@ export function ProvidersSection() {} else if (connect) {const target = byId.get(connect);if (listProviders.some((p) => p.id === connect)) {- setSelectedId(connect);+ selectProvider(connect);setFocusedModel(model ? { providerId: connect, modelId: model, ...(agent ? { agent } : {}) } : null,);} else if (connect === 'xd') {// 无账号会话目录不含 xd → 落到登录引导行(不能当 preset 交给向导)。- setSelectedId(CINDY_SIGNIN_ID);+ selectProvider(CINDY_SIGNIN_ID);} else if (connect === MANAGED_OLLAMA_PROVIDER_ID) {setWizard({});} else if (target && target.source === 'builtin') {@@ -2742,7 +2759,7 @@ export function ProvidersSection() {next.delete('agent');next.delete('import');setSearchParams(next, { replace: true });- }, [loading, searchParams, setSearchParams, byId, listProviders]);+ }, [loading, searchParams, setSearchParams, byId, listProviders, selectProvider]);// Cindy AI 登录引导:无账号会话目录不含 xd(见 CindySigninRow 头注释),置顶// 引导行;列表为空时默认选中它(右栏直接展示登录引导,不留「点击添加」空态)。@@ -3029,8 +3046,10 @@ export function ProvidersSection() {<div className="flex min-h-0 flex-1 flex-col gap-0.5 overflow-y-auto p-2">{showCindySignin && (<CindySigninRow- selected={cindySigninActive}- onSelect={() => setSelectedId(CINDY_SIGNIN_ID)}+ selected={cindySigninActive && !selectedShare}+ onSelect={() => {+ selectProvider(CINDY_SIGNIN_ID);+ }}/>)}{listProviders.length > 1 && (@@ -3047,14 +3066,14 @@ export function ProvidersSection() {renderItem={(provider, index) => (<ListRowprovider={provider}- selected={!cindySigninActive && effectiveSelected?.id === provider.id}+ selected={!selectedShare && !cindySigninActive && effectiveSelected?.id === provider.id}reconnectRequired={(provider.id === 'openai' && openaiReconnectRequired) ||provider.openAiAccount?.reconnectRequired === true}onSelect={() => {setFocusedModel(null);- setSelectedId(provider.id);+ selectProvider(provider.id);}}position={index + 1}total={listProviders.length}@@ -3071,6 +3090,14 @@ export function ProvidersSection() {<span className="sr-only" aria-live="polite" aria-atomic="true">{orderAnnouncement}</span>+ {/* 分享给我的供应商(受邀者):与自己的供应商同列,单独成组。 */}+ <ProviderShareReceivedRailGroup+ selectedShareId={selectedShare?.shareId ?? null}+ onSelect={(shareId) => {+ setFocusedModel(null);+ setSelectedShareId(shareId);+ }}+ />{suggestions.length > 0 && (<><span@@ -3111,8 +3138,13 @@ export function ProvidersSection() {</div>{/* 右栏身份固定;说明、资产和模型共用 DetailHeader 的滚动区。 */}- <div key={effectiveSelected?.id} className="flex min-h-0 min-w-0 flex-1 flex-col">- {cindySigninActive ? (+ <div+ key={selectedShare ? `share:${selectedShare.shareId}` : effectiveSelected?.id}+ className="flex min-h-0 min-w-0 flex-1 flex-col"+ >+ {selectedShare ? (+ <ProviderShareReceivedDetail share={selectedShare} />+ ) : cindySigninActive ? (/* 登录引导是 brand-scale surface(DESIGN §3):48px 标识 → 24px 名字 →一行价值主张 → 赠送余额徽标 → 黑 CTA,间距走 8px 系统。底部留白比顶部多,视觉重心才落在上三分之一。 */@@ -3347,9 +3379,6 @@ export function ProvidersSection() {</div>)}- {/* 分享给我的供应商(受邀者):常驻在本页底部,含「粘贴分享链接」入口——分享链接的加入- 网页在唤起 Cindy 失败时会指引用户到这里粘贴。 */}- {!loading && <ProviderShareReceivedSection />}</>)}{wizard && (@@ -3364,7 +3393,7 @@ export function ProvidersSection() {onDone={async (providerId) => {await refetch();setWizard(null);- if (providerId) setSelectedId(providerId);+ if (providerId) selectProvider(providerId);}}/>)}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareEntryButton.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareEntryButton.tsxindex 1047e80952..85a2460a60 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareEntryButton.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareEntryButton.tsx@@ -2,7 +2,7 @@* 「允许被远程调用」一行开关左侧的「管理分享」图标按钮(产品规则 §7.1;设计稿场景 1)。* 能力未开启时不可点击,Tip 与无障碍名称说明需先开启哪一级;有待审批申请时带提示点。*/-import { Users } from 'lucide-react';+import { Share2 } from 'lucide-react';import { useTranslation } from 'react-i18next';import { Tip } from '@/components/ui/tooltip';@@ -44,7 +44,7 @@ export function ProviderShareEntryButton({: 'cursor-default opacity-50',)}>- <Users size={16} aria-hidden />+ <Share2 size={16} aria-hidden />{enabled && pendingCount > 0 && (<spanaria-hidden="true"diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderSharePasteDialog.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderSharePasteDialog.tsxnew file mode 100644index 0000000000..5c6133ff53--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/ProviderSharePasteDialog.tsx@@ -0,0 +1,85 @@+/**+ * 粘贴分享链接:网页唤起 Cindy 失败时,加入页会让用户把链接粘贴到「设置 → 模型供应商」里,+ * 交给同一个申请弹窗。+ */+import { useRef, useState, type FormEvent } from 'react';+import { useTranslation } from 'react-i18next';++import { Button } from '@/components/ui/button';+import { FormField } from '@/components/ui/form-field';+import { Input } from '@/components/ui/input';++import { requestProviderShareJoin } from './joinIntent';+import {+ ProviderShareDialog,+ ProviderShareDialogFooter,+ ProviderShareDialogTitle,+} from './ProviderShareDialog';++/** 粘贴分享链接:交给全局申请弹窗读取(链接带前后文字也可以,main 会从中找出链接)。 */+export function ProviderSharePasteDialog({ onClose }: { onClose: () => void }) {+ const { t } = useTranslation();+ const [value, setValue] = useState('');+ const [error, setError] = useState<string | null>(null);+ const inputRef = useRef<HTMLInputElement>(null);++ const submit = (event?: FormEvent) => {+ event?.preventDefault();+ const text = value.trim();+ if (!text) {+ setError(t('providerShare.received.pasteDialog.empty'));+ inputRef.current?.focus();+ return;+ }+ onClose();+ requestProviderShareJoin(text);+ };++ return (+ <ProviderShareDialog+ open+ onOpenChange={(open) => { if (!open) onClose(); }}+ initialFocusRef={inputRef}+ testId="provider-share-paste-dialog"+ >+ <form onSubmit={submit} className="flex flex-col">+ <ProviderShareDialogTitle>{t('providerShare.received.pasteDialog.title')}</ProviderShareDialogTitle>+ <p className="mt-2 text-13 leading-[1.5] text-[var(--confirm-desc)]">+ {t('providerShare.received.pasteDialog.description')}+ </p>+ <FormField+ className="mt-4"+ label={t('providerShare.received.pasteDialog.label')}+ error={error}+ >+ {(control) => (+ <Input+ id={control.id}+ aria-describedby={control['aria-describedby']}+ aria-invalid={control['aria-invalid']}+ error={control.error}+ inputRef={inputRef}+ size="md"+ value={value}+ onChange={(next) => {+ setValue(next);+ if (error) setError(null);+ }}+ placeholder={t('providerShare.received.pasteDialog.placeholder')}+ autoComplete="off"+ spellCheck={false}+ />+ )}+ </FormField>+ <ProviderShareDialogFooter>+ <Button type="submit" variant="cta" palette="confirmation" size="lg">+ {t('providerShare.received.pasteDialog.open')}+ </Button>+ <Button variant="secondary" palette="confirmation" size="lg" onClick={onClose}>+ {t('providerShare.received.pasteDialog.cancel')}+ </Button>+ </ProviderShareDialogFooter>+ </form>+ </ProviderShareDialog>+ );+}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsxnew file mode 100644index 0000000000..1a0daf4226--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx@@ -0,0 +1,310 @@+/**+ * 设置 → 模型供应商里「分享给我的」(受邀者)。别人分享给我的供应商与自己的供应商同在左栏,+ * 单独成组、用分享者头像标明来自谁;点开后右栏显示状态、可用的模型与「退出」。+ * 组末是「粘贴分享链接」——分享链接的加入网页在唤起 Cindy 失败时会指引用户到这里粘贴。+ *+ * 模型清单读分享者电脑上分享给我的那份目录(`share:<id>`),只读:开关与排序由分享者决定。+ */+import { Link2 } from 'lucide-react';+import { useMemo, useRef, useState } from 'react';+import { useTranslation } from 'react-i18next';++import type { ProviderShareReceived } from '@cindy/device-link';+import type { AgentKind } from '@cindy/model-providers';++import { hasProviderLogo, ProviderLogoMark } from '@/components/icons/ProviderLogoMark';+import { Button } from '@/components/ui/button';+import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';+import { Tip } from '@/components/ui/tooltip';+import { useDeviceProviders } from '@/hooks/useDeviceProviders';+import { isDeviceModelVisible, providerMonogram } from '@/lib/providerModels';+import { toast } from '@/lib/toast';+import { cn } from '@/lib/utils';+import { mapIpcErrorToI18nKey } from '@/utils/ipcError';++import { providerShareAgentDeviceId } from './providerShareFormat';+import { ProviderSharePasteDialog } from './ProviderSharePasteDialog';+import { useProviderShareReceived } from './providerShareStore';+import { ShareAvatar } from './ShareAvatar';++type ReceivedStatus = 'active' | 'paused' | 'offline' | 'needs-update';++function receivedStatus(share: ProviderShareReceived): ReceivedStatus {+ if (share.status !== 'active') return 'paused';+ if (!share.hostOnline) return 'offline';+ return share.hostCapable ? 'active' : 'needs-update';+}++const STATUS_LABEL_KEY: Record<ReceivedStatus, string> = {+ active: 'providerShare.received.statusActive',+ paused: 'providerShare.received.statusPaused',+ offline: 'providerShare.received.hostOffline',+ 'needs-update': 'providerShare.received.hostUnavailable',+};++function StatusDot({ status }: { status: ReceivedStatus }) {+ return (+ <span+ aria-hidden="true"+ className="h-1.5 w-1.5 shrink-0 rounded-full"+ style={{+ backgroundColor: status === 'active' ? 'var(--remote-status-ready)' : 'var(--border-default)',+ }}+ />+ );+}++/** 左栏的「分享给我的供应商」一组;没有分享时只留标题、一句说明与粘贴入口。 */+export function ProviderShareReceivedRailGroup({+ selectedShareId,+ onSelect,+}: {+ selectedShareId: string | null;+ onSelect: (shareId: string) => void;+}) {+ const { t } = useTranslation();+ const { received } = useProviderShareReceived();+ const [pasteOpen, setPasteOpen] = useState(false);+ const pasteButtonRef = useRef<HTMLButtonElement>(null);++ return (+ <div data-testid="provider-share-received" className="flex flex-col gap-0.5">+ <span+ className="truncate px-2.5 pb-1 pt-3 text-11 font-medium"+ style={{ color: 'var(--text-tertiary)' }}+ >+ {t('providerShare.received.title')}+ </span>+ {received.length === 0 ? (+ <p className="px-2.5 pb-1 text-11 leading-[1.5]" style={{ color: 'var(--text-tertiary)' }}>+ {t('providerShare.received.empty')}+ </p>+ ) : (+ received.map((share) => {+ const status = receivedStatus(share);+ const owner = t('providerShare.received.fromOwner', { name: share.owner.displayName });+ const selected = selectedShareId === share.shareId;+ return (+ <Tip+ key={share.shareId}+ text={`${owner} · ${share.deviceName}`}+ side="right"+ contentClassName="max-w-[360px] break-words"+ >+ <button+ type="button"+ data-testid="provider-share-received-row"+ aria-current={selected}+ aria-label={`${share.providerLabel} · ${owner} · ${t(STATUS_LABEL_KEY[status])}`}+ onClick={() => onSelect(share.shareId)}+ className={cn(+ 'flex w-full items-center gap-2.5 rounded-lg py-2 pl-3 pr-2.5 text-left transition-colors',+ selected+ ? 'bg-[var(--settings-menu-bg-selected)]'+ : 'hover:bg-[var(--settings-menu-bg-hover)]',+ )}+ >+ <ShareAvatar displayName={share.owner.displayName} avatarUrl={share.owner.avatarUrl} size="sm" />+ <span className="flex min-w-0 flex-1 flex-col">+ <span+ className="truncate text-13 font-medium"+ style={{+ color: status === 'active' ? 'var(--settings-section-title)' : 'var(--text-tertiary)',+ }}+ >+ {share.providerLabel}+ </span>+ <span className="truncate text-11" style={{ color: 'var(--text-tertiary)' }}>+ {owner}+ </span>+ </span>+ <StatusDot status={status} />+ </button>+ </Tip>+ );+ })+ )}+ <button+ ref={pasteButtonRef}+ type="button"+ onClick={() => setPasteOpen(true)}+ className="flex w-full items-center gap-2.5 rounded-lg px-3 py-2 text-left text-13 transition-colors hover:bg-[var(--settings-menu-bg-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[var(--focus-ring-soft)]"+ style={{ color: 'var(--text-secondary)' }}+ >+ <span className="flex h-7 w-7 shrink-0 items-center justify-center" aria-hidden="true">+ <Link2 size={15} />+ </span>+ <span className="min-w-0 flex-1 truncate">{t('providerShare.received.paste')}</span>+ </button>+ {pasteOpen && (+ <ProviderSharePasteDialog+ onClose={() => {+ setPasteOpen(false);+ pasteButtonRef.current?.focus();+ }}+ />+ )}+ </div>+ );+}++const AGENT_ORDER: readonly AgentKind[] = ['claude-code', 'codex', 'pi'];++/** 右栏:一条分享给我的供应商。 */+export function ProviderShareReceivedDetail({ share }: { share: ProviderShareReceived }) {+ const { t } = useTranslation();+ const { confirm } = useConfirmDialog();+ const [leaving, setLeaving] = useState(false);+ const status = receivedStatus(share);+ const catalog = useDeviceProviders(status === 'active' ? providerShareAgentDeviceId(share.shareId) : undefined);+ const provider = catalog.providers.find((entry) => entry.id === share.providerId) ?? catalog.providers[0] ?? null;++ const models = useMemo(() => {+ if (!provider) return [];+ const seen = new Set<string>();+ const rows: { id: string; name: string }[] = [];+ for (const agent of AGENT_ORDER) {+ for (const model of provider.models[agent] ?? []) {+ if (model.disabled || seen.has(model.id)) continue;+ if (!isDeviceModelVisible(catalog.modelVisibilityOverrides, agent, provider.id, model)) continue;+ seen.add(model.id);+ rows.push({ id: model.id, name: model.name || model.id });+ }+ }+ return rows;+ }, [provider, catalog.modelVisibilityOverrides]);++ const leave = async () => {+ const ok = await confirm({+ presentation: 'standard',+ title: t('providerShare.received.leaveConfirm.title', {+ name: share.owner.displayName,+ provider: share.providerLabel,+ }),+ description: t('providerShare.received.leaveConfirm.description'),+ confirmText: t('providerShare.received.leaveConfirm.confirm'),+ confirmVariant: 'destructive',+ });+ if (!ok) return;+ setLeaving(true);+ try {+ await window.electronAPI.providerShare.command({ action: 'leave', memberId: share.memberId });+ toast.success(+ t('providerShare.received.left', { name: share.owner.displayName, provider: share.providerLabel }),+ );+ } catch (error) {+ toast.error(t(mapIpcErrorToI18nKey(error)));+ } finally {+ setLeaving(false);+ }+ };++ const owner = t('providerShare.received.fromOwner', { name: share.owner.displayName });+ let body: string | null = null;+ if (status === 'paused') body = t('providerShare.received.pausedNote');+ else if (status === 'offline') body = t('providerShare.received.offlineNote');+ else if (status === 'needs-update') body = t('providerShare.received.needsUpdateNote');+ else if (catalog.error) body = t('providerShare.received.modelsFailed');+ else if (catalog.loading) body = t('providerShare.received.modelsLoading');+ else if (models.length === 0) body = t('providerShare.received.modelsEmpty');++ return (+ <div data-testid="provider-share-received-detail" className="flex min-h-0 flex-1 flex-col">+ <div className="shrink-0 px-5 py-4">+ <div className="flex flex-wrap items-center gap-3 gap-y-2">+ <div className="flex min-w-0 flex-auto basis-[220px] items-center gap-3">+ <div+ className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg"+ style={{+ backgroundColor: 'var(--settings-integration-avatar-bg)',+ border: '1px solid var(--settings-integration-avatar-border)',+ color: 'var(--settings-integration-avatar-icon)',+ }}+ >+ {provider && hasProviderLogo(provider.id, provider.routing) ? (+ <ProviderLogoMark providerId={provider.id} routing={provider.routing} size={18} />+ ) : (+ <span className="text-15 font-medium leading-none">{providerMonogram(share.providerLabel)}</span>+ )}+ </div>+ <div className="flex min-w-0 flex-1 flex-col gap-0.5">+ <span+ className="min-w-0 truncate text-14 font-medium leading-tight"+ style={{ color: 'var(--settings-section-title)' }}+ >+ {share.providerLabel}+ </span>+ <span+ className="truncate text-13 leading-tight"+ style={{ color: 'var(--settings-integration-subtitle)' }}+ >+ {`${owner} · ${share.deviceName}`}+ </span>+ </div>+ </div>+ <div className="flex shrink-0 items-center gap-2.5">+ <span role="status" className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]">+ <StatusDot status={status} />+ {t(STATUS_LABEL_KEY[status])}+ </span>+ <Button+ variant="secondary"+ size="md"+ loading={leaving}+ aria-label={t('providerShare.received.leaveAria', {+ name: share.owner.displayName,+ provider: share.providerLabel,+ })}+ onClick={() => void leave()}+ >+ {t('providerShare.received.leave')}+ </Button>+ </div>+ </div>+ </div>++ <div+ className="flex shrink-0 items-start gap-3 border-t px-5 py-3"+ style={{ borderColor: 'var(--settings-theme-card-border)' }}+ >+ <ShareAvatar displayName={share.owner.displayName} avatarUrl={share.owner.avatarUrl} size="sm" />+ <p className="min-w-0 flex-1 text-13 leading-[1.5]" style={{ color: 'var(--settings-section-desc)' }}>+ {t('providerShare.received.detailNote', { name: share.owner.displayName })}+ </p>+ </div>++ <div+ className="flex min-h-0 flex-1 flex-col border-t"+ style={{ borderColor: 'var(--settings-theme-card-border)' }}+ >+ <div className="flex shrink-0 items-baseline gap-2 px-5 pb-2 pt-3">+ <span className="text-13 font-medium" style={{ color: 'var(--settings-section-title)' }}>+ {t('providerShare.received.modelsTitle')}+ </span>+ {body === null && (+ <span className="text-12 tabular-nums" style={{ color: 'var(--text-tertiary)' }}>+ {t('settings.providers.models.modelCount', { count: models.length })}+ </span>+ )}+ </div>+ {body !== null ? (+ <p className="px-5 pb-4 text-13 leading-[1.5]" style={{ color: 'var(--text-tertiary)' }}>+ {body}+ </p>+ ) : (+ <ul data-testid="provider-share-received-models" className="min-h-0 flex-1 overflow-y-auto px-2 pb-3">+ {models.map((model) => (+ <li+ key={model.id}+ className="flex items-center gap-3 rounded-lg px-3 py-2 text-13"+ style={{ color: 'var(--text-primary)' }}+ >+ <span className="min-w-0 flex-1 truncate">{model.name}</span>+ </li>+ ))}+ </ul>+ )}+ </div>+ </div>+ );+}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedSection.tsxdeleted file mode 100644index ceb53ea126..0000000000--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedSection.tsx+++ /dev/null@@ -1,233 +0,0 @@-/**- * 设置 → 模型供应商底部的「分享给我的供应商」(受邀者)。常驻显示:- * - 列出别人分享给我的供应商(分享者头像与昵称、供应商 · 电脑、正常 / 已暂停、对方电脑不在线),- * 可以退出某个分享;- * - 「粘贴分享链接」:网页唤起 Cindy 失败时,加入页会让用户把链接粘贴到这里,交给同一个申请弹窗。- */-import { useRef, useState, type FormEvent } from 'react';-import { useTranslation } from 'react-i18next';--import type { ProviderShareReceived } from '@cindy/device-link';--import { Button } from '@/components/ui/button';-import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';-import { FormField } from '@/components/ui/form-field';-import { Input } from '@/components/ui/input';-import { toast } from '@/lib/toast';-import { cn } from '@/lib/utils';-import { mapIpcErrorToI18nKey } from '@/utils/ipcError';--import { requestProviderShareJoin } from './joinIntent';-import {- ProviderShareDialog,- ProviderShareDialogFooter,- ProviderShareDialogTitle,-} from './ProviderShareDialog';-import { useProviderShareReceived } from './providerShareStore';-import { ShareAvatar } from './ShareAvatar';--export function ProviderShareReceivedSection({ className }: { className?: string }) {- const { t } = useTranslation();- const { confirm } = useConfirmDialog();- const { received } = useProviderShareReceived();- const [pasteOpen, setPasteOpen] = useState(false);- const [leaving, setLeaving] = useState<string | null>(null);- const pasteButtonRef = useRef<HTMLButtonElement>(null);-- const leave = async (share: ProviderShareReceived) => {- const ok = await confirm({- presentation: 'standard',- title: t('providerShare.received.leaveConfirm.title', {- name: share.owner.displayName,- provider: share.providerLabel,- }),- description: t('providerShare.received.leaveConfirm.description'),- confirmText: t('providerShare.received.leaveConfirm.confirm'),- confirmVariant: 'destructive',- });- if (!ok) return;- setLeaving(share.memberId);- try {- await window.electronAPI.providerShare.command({ action: 'leave', memberId: share.memberId });- toast.success(- t('providerShare.received.left', { name: share.owner.displayName, provider: share.providerLabel }),- );- } catch (error) {- toast.error(t(mapIpcErrorToI18nKey(error)));- } finally {- setLeaving(null);- }- };-- return (- <section- className={cn('flex shrink-0 flex-col gap-2', className)}- aria-labelledby="provider-share-received-title"- data-testid="provider-share-received"- >- <div className="flex flex-wrap items-center gap-x-3 gap-y-1">- <div className="flex min-w-[220px] flex-1 flex-col gap-0.5">- <h3- id="provider-share-received-title"- className="text-13 font-medium leading-[1.3] text-[var(--settings-section-title)]"- >- {t('providerShare.received.title')}- </h3>- <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">- {received.length > 0 ? t('providerShare.received.description') : t('providerShare.received.empty')}- </p>- </div>- <Button- ref={pasteButtonRef}- variant="secondary"- size="sm"- compact- onClick={() => setPasteOpen(true)}- >- {t('providerShare.received.paste')}- </Button>- </div>-- {received.length > 0 && (- <ul className="max-h-[176px] overflow-y-auto rounded-xl border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)]">- {received.map((share, index) => {- const paused = share.status !== 'active';- const offline = !paused && (!share.hostOnline || !share.hostCapable);- return (- <li- key={share.shareId}- data-testid="provider-share-received-row"- className={cn(- 'flex items-center gap-3 px-4 py-2.5',- index > 0 && 'border-t border-[var(--settings-theme-card-border)]',- )}- >- <ShareAvatar displayName={share.owner.displayName} avatarUrl={share.owner.avatarUrl} size="sm" />- <div className="flex min-w-0 flex-1 flex-col gap-0.5">- <div className="flex min-w-0 flex-wrap items-center gap-2 text-13">- <span className="truncate font-medium text-[var(--text-primary)]">- {t('providerShare.received.fromOwner', { name: share.owner.displayName })}- </span>- <span className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]">- <span- aria-hidden="true"- className={cn(- 'h-1.5 w-1.5 shrink-0 rounded-full',- paused || offline- ? 'bg-[var(--remote-status-disconnected)]'- : 'bg-[var(--remote-status-ready)]',- )}- />- {paused- ? t('providerShare.received.statusPaused')- : offline- ? t(share.hostOnline ? 'providerShare.received.hostUnavailable' : 'providerShare.received.hostOffline')- : t('providerShare.received.statusActive')}- </span>- </div>- <span className="truncate text-12 text-[var(--text-secondary)]">- {t('providerShare.received.providerOnDevice', {- provider: share.providerLabel,- device: share.deviceName,- })}- </span>- </div>- <Button- variant="secondary"- size="sm"- compact- loading={leaving === share.memberId}- disabled={leaving !== null}- aria-label={t('providerShare.received.leaveAria', {- name: share.owner.displayName,- provider: share.providerLabel,- })}- onClick={() => void leave(share)}- >- {t('providerShare.received.leave')}- </Button>- </li>- );- })}- </ul>- )}-- {pasteOpen && (- <ProviderSharePasteDialog- onClose={() => {- setPasteOpen(false);- pasteButtonRef.current?.focus();- }}- />- )}- </section>- );-}--/** 粘贴分享链接:交给全局申请弹窗读取(链接带前后文字也可以,main 会从中找出链接)。 */-export function ProviderSharePasteDialog({ onClose }: { onClose: () => void }) {- const { t } = useTranslation();- const [value, setValue] = useState('');- const [error, setError] = useState<string | null>(null);- const inputRef = useRef<HTMLInputElement>(null);-- const submit = (event?: FormEvent) => {- event?.preventDefault();- const text = value.trim();- if (!text) {- setError(t('providerShare.received.pasteDialog.empty'));- inputRef.current?.focus();- return;- }- onClose();- requestProviderShareJoin(text);- };-- return (- <ProviderShareDialog- open- onOpenChange={(open) => { if (!open) onClose(); }}- initialFocusRef={inputRef}- testId="provider-share-paste-dialog"- >- <form onSubmit={submit} className="flex flex-col">- <ProviderShareDialogTitle>{t('providerShare.received.pasteDialog.title')}</ProviderShareDialogTitle>- <p className="mt-2 text-13 leading-[1.5] text-[var(--confirm-desc)]">- {t('providerShare.received.pasteDialog.description')}- </p>- <FormField- className="mt-4"- label={t('providerShare.received.pasteDialog.label')}- error={error}- >- {(control) => (- <Input- id={control.id}- aria-describedby={control['aria-describedby']}- aria-invalid={control['aria-invalid']}- error={control.error}- inputRef={inputRef}- size="md"- value={value}- onChange={(next) => {- setValue(next);- if (error) setError(null);- }}- placeholder={t('providerShare.received.pasteDialog.placeholder')}- autoComplete="off"- spellCheck={false}- />- )}- </FormField>- <ProviderShareDialogFooter>- <Button type="submit" variant="cta" palette="confirmation" size="lg">- {t('providerShare.received.pasteDialog.open')}- </Button>- <Button variant="secondary" palette="confirmation" size="lg" onClick={onClose}>- {t('providerShare.received.pasteDialog.cancel')}- </Button>- </ProviderShareDialogFooter>- </form>- </ProviderShareDialog>- );-}diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedSection.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsxsimilarity index 55%rename from apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedSection.test.tsxrename to apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsxindex 833a0e691b..cd646f4971 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedSection.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import type { ProviderShareReceived } from '@cindy/device-link';-import { ProviderShareReceivedSection } from '../ProviderShareReceivedSection';+import { ProviderShareReceivedDetail, ProviderShareReceivedRailGroup } from '../ProviderShareReceivedRail';import { resetProviderShareStoreForTests } from '../providerShareStore';vi.mock('react-i18next', () => ({@@ -20,6 +20,16 @@ const confirmSpy = vi.hoisted(() => vi.fn(async () => true));vi.mock('@/components/ui/confirm-dialog-provider', () => ({ useConfirmDialog: () => ({ confirm: confirmSpy }) }));const joinSpy = vi.hoisted(() => vi.fn());vi.mock('../joinIntent', () => ({ requestProviderShareJoin: joinSpy }));+const catalog = vi.hoisted(() => ({+ value: { providers: [] as unknown[], loading: false, error: null as string | null, unsupported: false },+}));+const catalogDeviceIds = vi.hoisted(() => [] as Array<string | undefined>);+vi.mock('@/hooks/useDeviceProviders', () => ({+ useDeviceProviders: (deviceId?: string) => {+ catalogDeviceIds.push(deviceId);+ return catalog.value;+ },+}));const share: ProviderShareReceived = {shareId: 'share-1',@@ -41,6 +51,8 @@ beforeEach(() => {resetProviderShareStoreForTests();joinSpy.mockClear();confirmSpy.mockClear();+ catalogDeviceIds.length = 0;+ catalog.value = { providers: [], loading: false, error: null, unsupported: false };received = [];command.mockReset();command.mockImplementation(async (cmd: { action: string }) => {@@ -55,9 +67,9 @@ beforeEach(() => {afterEach(() => cleanup());-describe('ProviderShareReceivedSection', () => {+describe('ProviderShareReceivedRailGroup', () => {it('stays visible when empty and hands a pasted link to the apply dialog', async () => {- render(<ProviderShareReceivedSection />);+ render(<ProviderShareReceivedRailGroup selectedShareId={null} onSelect={() => undefined} />);expect(screen.getByText('providerShare.received.title')).toBeTruthy();expect(screen.getByText('providerShare.received.empty')).toBeTruthy();@@ -75,14 +87,53 @@ describe('ProviderShareReceivedSection', () => {await waitFor(() => expect(screen.queryByTestId('provider-share-paste-dialog')).toBeNull());});- it('lists received shares with their status and leaves after confirmation', async () => {+ it('lists received shares next to the providers and selects one', async () => {received = [share];- render(<ProviderShareReceivedSection />);- expect(await screen.findByTestId('provider-share-received-row')).toBeTruthy();+ const onSelect = vi.fn();+ render(<ProviderShareReceivedRailGroup selectedShareId={null} onSelect={onSelect} />);+ const row = await screen.findByTestId('provider-share-received-row');+ expect(row.textContent).toContain('Cindy AI');+ expect(row.getAttribute('aria-label')).toContain('providerShare.received.statusPaused');+ fireEvent.click(row);+ expect(onSelect).toHaveBeenCalledWith('share-1');+ });+});++describe('ProviderShareReceivedDetail', () => {+ it('explains a paused share without reading its models, and leaves after confirmation', async () => {+ render(<ProviderShareReceivedDetail share={share} />);expect(screen.getByText('providerShare.received.statusPaused')).toBeTruthy();+ expect(screen.getByText('providerShare.received.pausedNote')).toBeTruthy();+ expect(catalogDeviceIds.every((deviceId) => deviceId === undefined)).toBe(true);fireEvent.click(screen.getByRole('button', { name: /providerShare\.received\.leaveAria/ }));await waitFor(() => expect(command).toHaveBeenCalledWith({ action: 'leave', memberId: 'mem-1' }));expect(confirmSpy).toHaveBeenCalledWith(expect.objectContaining({ confirmVariant: 'destructive' }));});++ it('lists the shared models the owner left visible', () => {+ catalog.value = {+ providers: [{+ id: 'xd', name: 'Cindy AI', agents: ['claude-code', 'codex'], connected: true, routing: {},+ models: {+ 'claude-code': [{ id: 'opus', name: 'Opus 5.5' }, { id: 'hidden', name: 'Hidden' }],+ codex: [{ id: 'opus', name: 'Opus 5.5' }, { id: 'gpt', name: 'GPT-5.5' }],+ },+ }],+ modelVisibilityOverrides: { 'claude-code:xd:hidden': false },+ loading: false,+ error: null,+ unsupported: false,+ } as typeof catalog.value;+ render(<ProviderShareReceivedDetail share={{ ...share, status: 'active' }} />);+ expect(catalogDeviceIds).toContain('share:share-1');+ const list = screen.getByTestId('provider-share-received-models');+ expect(Array.from(list.querySelectorAll('li')).map((item) => item.textContent)).toEqual(['Opus 5.5', 'GPT-5.5']);+ });++ it('says when the models cannot be read', () => {+ catalog.value = { providers: [], loading: false, error: 'boom', unsupported: false };+ render(<ProviderShareReceivedDetail share={{ ...share, status: 'active' }} />);+ expect(screen.getByText('providerShare.received.modelsFailed')).toBeTruthy();+ });});diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 4477c14f82..e1ee0a1616 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -351,7 +351,6 @@},"received": {"title": "Providers Shared with Me",- "description": "Providers others share with you appear among the remote providers in the model list.","empty": "No one has shared a provider with you yet. When you get a share link, open it or paste it here.","paste": "Paste Share Link","fromOwner": "Shared by {{name}}",@@ -376,7 +375,15 @@"empty": "Paste a share link first","open": "Open Link","cancel": "Cancel"- }+ },+ "detailNote": "The agent runs on {{name}}'s computer, using their sign-in and quota. To use it, choose it in the model list when you start a task.",+ "modelsTitle": "Available Models",+ "modelsLoading": "Loading the models they shared…",+ "modelsFailed": "Couldn't load the models they shared. Try again later.",+ "modelsEmpty": "They haven't made any models available yet.",+ "pausedNote": "They've paused this share. You can use it again once they resume it.",+ "offlineNote": "Their computer is offline. You can use it again once it is back online.",+ "needsUpdateNote": "They need to update Cindy before you can use this share."},"picker": {"deviceName": "{{device}} · Shared by {{owner}}",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 30439ebe40..bb1784daa3 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -349,7 +349,6 @@},"received": {"title": "共有されたプロバイダー",- "description": "他の人から共有されたプロバイダーは、モデル一覧のリモートプロバイダーに表示されます。","empty": "まだ共有されたプロバイダーはありません。共有リンクを受け取ったら、開くかここに貼り付けてください。","paste": "共有リンクを貼り付け","fromOwner": "{{name}} からの共有",@@ -374,7 +373,15 @@"empty": "先に共有リンクを貼り付けてください","open": "リンクを開く","cancel": "キャンセル"- }+ },+ "detailNote": "Agent は {{name}} のパソコンで動き、相手のログインとクォータを使います。タスクを新規作成するときにモデル一覧で選ぶと使えます。",+ "modelsTitle": "利用できるモデル",+ "modelsLoading": "相手が公開しているモデルを読み込んでいます…",+ "modelsFailed": "相手が公開しているモデルを読み込めませんでした。しばらくしてからもう一度お試しください。",+ "modelsEmpty": "相手はまだ利用できるモデルを公開していません。",+ "pausedNote": "相手がこの共有を一時停止しています。再開されると使えるようになります。",+ "offlineNote": "相手のパソコンがオフラインです。オンラインに戻ると使えるようになります。",+ "needsUpdateNote": "相手の Cindy が更新されると、この共有を使えるようになります。"},"picker": {"deviceName": "{{device}} · {{owner}} からの共有",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex a5f49101ad..8b7db5230a 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -349,7 +349,6 @@},"received": {"title": "나에게 공유된 제공자",- "description": "다른 사람이 공유한 제공자는 모델 목록의 원격 제공자에 표시됩니다.","empty": "아직 공유받은 제공자가 없습니다. 공유 링크를 받으면 열거나 여기에 붙여넣으세요.","paste": "공유 링크 붙여넣기","fromOwner": "{{name}}님의 공유",@@ -374,7 +373,15 @@"empty": "먼저 공유 링크를 붙여넣으세요","open": "링크 열기","cancel": "취소"- }+ },+ "detailNote": "Agent는 {{name}}님의 컴퓨터에서 실행되며 상대방의 로그인과 할당량을 씁니다. 새 작업을 만들 때 모델 목록에서 선택하면 사용할 수 있습니다.",+ "modelsTitle": "사용 가능한 모델",+ "modelsLoading": "상대방이 공개한 모델을 불러오는 중…",+ "modelsFailed": "상대방이 공개한 모델을 불러오지 못했습니다. 잠시 후 다시 시도하세요.",+ "modelsEmpty": "상대방이 아직 사용 가능한 모델을 공개하지 않았습니다.",+ "pausedNote": "상대방이 이 공유를 일시 중지했습니다. 다시 시작하면 사용할 수 있습니다.",+ "offlineNote": "상대방 컴퓨터가 오프라인입니다. 다시 온라인이 되면 사용할 수 있습니다.",+ "needsUpdateNote": "상대방이 Cindy를 업데이트해야 이 공유를 사용할 수 있습니다."},"picker": {"deviceName": "{{device}} · {{owner}}님의 공유",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex d026cd6ae5..ece765b5b0 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -349,7 +349,6 @@},"received": {"title": "分享给我的供应商",- "description": "别人分享给你的供应商会出现在模型列表的远程供应商里。","empty": "还没有人分享供应商给你。收到分享链接后,点开它或粘贴到这里。","paste": "粘贴分享链接","fromOwner": "来自 {{name}} 的分享",@@ -374,7 +373,15 @@"empty": "请先粘贴分享链接","open": "打开链接","cancel": "取消"- }+ },+ "detailNote": "Agent 在 {{name}} 的电脑上运行,用的是对方的登录和配额。新建任务时在模型列表里选择它就能用。",+ "modelsTitle": "可用的模型",+ "modelsLoading": "正在读取对方开放的模型…",+ "modelsFailed": "暂时读不到对方开放的模型,请稍后再试。",+ "modelsEmpty": "对方还没有开放可用的模型。",+ "pausedNote": "对方暂停了这个分享,恢复后才能使用。",+ "offlineNote": "对方电脑不在线,上线后就能继续使用。",+ "needsUpdateNote": "对方的 Cindy 更新后才能使用这个分享。"},"picker": {"deviceName": "{{device}} · 来自 {{owner}} 的分享",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 7802ca9359..26cc978a96 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -349,7 +349,6 @@},"received": {"title": "分享給我的供應商",- "description": "別人分享給你的供應商會出現在模型列表的遠端供應商裡。","empty": "還沒有人分享供應商給你。收到分享連結後,點開它或貼到這裡。","paste": "貼上分享連結","fromOwner": "來自 {{name}} 的分享",@@ -374,7 +373,15 @@"empty": "請先貼上分享連結","open": "開啟連結","cancel": "取消"- }+ },+ "detailNote": "Agent 在 {{name}} 的電腦上執行,使用的是對方的登入和配額。新建任務時在模型列表裡選擇它就能用。",+ "modelsTitle": "可用的模型",+ "modelsLoading": "正在讀取對方開放的模型…",+ "modelsFailed": "暫時讀不到對方開放的模型,請稍後再試。",+ "modelsEmpty": "對方還沒有開放可用的模型。",+ "pausedNote": "對方暫停了這個分享,恢復後才能使用。",+ "offlineNote": "對方電腦不在線,上線後就能繼續使用。",+ "needsUpdateNote": "對方的 Cindy 更新後才能使用這個分享。"},"picker": {"deviceName": "{{device}} · 來自 {{owner}} 的分享",diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex ee741abb71..fe241be04e 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -566,8 +566,9 @@ handler 无 sender 依赖;不加入共享任务访客白名单,不进入自(`packages/device-link-protocol/src/providerShare.ts`,两仓同文件),与 `sharedTask` 并列、同一帧不能同时带两种范围;客户端只在 relay 的 hello-ack 声明该能力后才发带范围的帧,本地 peer key(`providerSharePeer.ts`)只在 socket 边界编解码、不上 wire。Desktop 在 hello 与控制端 `CONTROLLER_CAPABILITIES` 里追加声明 `provider-share-v1`(append-only);B 只接受声明了它的- 受邀者 link-open,并只建后台链路。受邀者只能 invoke `maker:remote-agent:v1` 与 `maker:provider:list`(只返回分享的那个- 供应商),订阅与其他 channel 一律拒绝,撤权后迟到的结果改写为 `ACCESS_REVOKED`。受邀者的任务把 `sessions.agent_device_id`+ 受邀者 link-open,并只建后台链路。受邀者只能 invoke `maker:remote-agent:v1`、`maker:provider:list`(只返回分享的那个+ 供应商),以及按该供应商收窄的 `maker:get-capabilities` / `maker:list-available-agents` / `maker:agent:status`+ (旧版分享者回 `CHANNEL_NOT_ALLOWED`,受邀者的模型列表读不到这个分享),订阅与其他 channel 一律拒绝,撤权后迟到的结果改写为 `ACCESS_REVOKED`。受邀者的任务把 `sessions.agent_device_id`记成 `share:<shareId>`(不改 schema),旧版本读到它按连不上的电脑处理。受邀者对端的 `open` 载荷按白名单复核(hooks / env / apiKeyHelper 剥离、越界 `@` 引用与 `!` 命令语法中和、不加载 B 的个人化与托管 Skill),只能恢复自己建立的会话;remote-agent wire 本身不变。新错误码 `REMOTE_AGENT_SHARE_PAUSED` / `REMOTE_AGENT_SHARE_REMOVED` / `REMOTE_AGENT_SHARE_UNAVAILABLE`diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex d0b535235f..078d0cc25a 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -112,7 +112,13 @@Desktop 与 Mobile 使用同一写法。-### 5.2 不可用时+### 5.2 供应商设置++Desktop「设置 → 模型供应商」的左栏里,自己的供应商下方单独一组「分享给我的供应商」:每条用分享者+头像标明来自谁,带状态点;点开在右栏看来源、状态、对方开放的模型(只读,开关由分享者决定),并可+「退出」。组末是「粘贴分享链接」——网页唤起 Cindy 失败时,加入页指引用户到这里粘贴。++### 5.3 不可用时以下情况下,受邀者已选用该供应商的任务在发送时给出明确原因,并提供「换成其他模型」(复用已建任务换 Agent 所在电脑的能力):@@ -153,7 +159,7 @@ Desktop 与 Mobile 使用同一写法。### 7.1 入口-供应商设置详情中「允许被远程调用」一行,在开关左侧增加一个图标按钮(「管理分享」,带 Tip 与+供应商设置详情中「允许被远程调用」一行,在开关左侧增加一个分享图标按钮(「管理分享」,带 Tip 与无障碍名称),点击进入该供应商的分享管理页;有待审批申请时图标带提示点。能力未开启时按钮不可点击,Tip 说明需先开启哪一级(§3)。diff --git a/docs/provider-sharing-contract.md b/docs/provider-sharing-contract.mdindex 27b1826f14..57e5b120d2 100644--- a/docs/provider-sharing-contract.md+++ b/docs/provider-sharing-contract.md@@ -123,7 +123,7 @@ interface ReceivedShare {仿 `/shared-task/join`:口令在 `#` 之后(`#<token>[?app=cindy|cindycn|cindydev]`),页面不访问数据库。桌面浏览器一律唤起 `cindy://provider-share/join?invitation=<token>&server=<origin+prefix>`(与共享任务一致:各区域与 dev 的桌面版-都注册 `cindy://`;`app` 提示只给手机网页用)。唤起失败时提示把链接粘贴到 Cindy(设置 → 模型供应商 →「分享给我的供应商」)。+都注册 `cindy://`;`app` 提示只给手机网页用)。唤起失败时提示把链接粘贴到 Cindy(设置 → 模型供应商 → 左栏「分享给我的供应商」→「粘贴分享链接」)。手机浏览器不唤起 App,显示「请在电脑上打开这个链接」并提供复制链接。五种语言、深浅色、严格 CSP。## 4. 身份名片(auth-server)@@ -140,7 +140,9 @@ interface ReceivedShare {## 5. 分享者电脑本地(客户端)- 受邀者对端由 peer key 判定(`controllerTrust` 返回 guest);准入要求:允许远程控制、该分享供应商的「允许被远程调用」、本机缓存里分享与成员 active。-- 只放行 invoke channel:`maker:remote-agent:v1`、`maker:provider:list`(只返回该分享的供应商);订阅与其他 channel 全拒,迟到的结果在撤权后改写为拒绝。+- 只放行 invoke channel:`maker:remote-agent:v1`、`maker:provider:list`(只返回该分享的供应商),以及模型列表与发送前检查要读的+ `maker:get-capabilities`(只留该供应商的模型)、`maker:list-available-agents`(只留它支持的 Agent)、`maker:agent:status`+ (只回该供应商支持的 Agent 是否装好 `binaryReady`,不带本机路径、登录身份与分享者自己的登录状态);订阅与其他 channel 全拒,迟到的结果在撤权后改写为拒绝。- 远程 Agent 运行按受邀者设备隔离(peer key 含分享、成员与设备):运行数上限沿用每个控制端的上限;暂停或删除时立即结束任务,删除时清理本机会话数据(影子工作区、附件、会话记录);用量记录保留。## 6. P3 跨区域(服务端开关 `PROVIDER_SHARE_CROSS_REGION_ENABLED`,默认关)diff --git a/docs/provider-sharing-implementation-plan.md b/docs/provider-sharing-implementation-plan.mdindex dc11dfb619..6249966079 100644--- a/docs/provider-sharing-implementation-plan.md+++ b/docs/provider-sharing-implementation-plan.md@@ -51,6 +51,11 @@- **只经分享的供应商(复审补)**:受邀者的请求不走视觉桥(视觉后端是 B 的其它供应商;Pi 的 vision 工具还会直接读本机文件),Claude Code 的工具循环复核也不对受邀者开(复核用 B 的辅助模型),疑似循环按缺省中断。Pi 受邀者的 env 只留分享的供应商引用到的变量(api key 与请求头)。同一任务重新打开时,迟到的旧实例不再登记出站边界。+- **受邀者选模型(真机反馈补)**:模型列表与发送前检查还要读分享者电脑的 Agent 能力、可用 Agent 与 Agent 就绪;+ 分享者电脑对受邀者放行这三项只读请求并按分享的供应商收窄(能力只留它的模型、可用 Agent 只留它支持的、就绪只回+ `binaryReady`,不带分享者自己的登录状态)。此前只放行模型目录,受邀者点了分享来的模型也选不上。两边都要更新到含此修复的版本。+- **供应商设置**:「分享给我的供应商」从页面底部移进左栏,与自己的供应商同列、单独成组;右栏显示来源、状态、对方+ 开放的模型与「退出」;「粘贴分享链接」在组末。管理分享的入口图标改为分享图标。- **待产品决定**:受邀者能看到分享者电脑的设备名(macOS 默认是「<全名>的 MacBook」,可能含真实姓名)。任务运行中途被拒绝、或轮询放弃时,个别错误仍是同账号文案(「到那台电脑上打开…」)。- **P3 客户端**:凭证只在内存,不落盘;本机只记不含凭证的区域标记,没有标记的账号从不联系对方区域;对方区域请求