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): log why invitees can't read a share; say why in settings
MagicLizi5f63c0eaaf52
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.tsindex 20792009d4..d43bfbd238 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts@@ -13,8 +13,9 @@ vi.mock('electron', () => ({powerSaveBlocker: { start: () => 0, stop: () => {}, isStarted: () => false },nativeImage: { createFromPath: () => ({ isEmpty: () => true }) },}));+const warn = vi.hoisted(() => vi.fn());vi.mock('../../logger', () => ({- createLogger: () => ({ info: vi.fn(), debug: vi.fn(), warn: vi.fn(), error: vi.fn() }),+ createLogger: () => ({ info: vi.fn(), debug: vi.fn(), warn, error: vi.fn() }),}));vi.mock('../settings-store', async (importOriginal) => ({...(await importOriginal<typeof import('../settings-store')>()),@@ -64,6 +65,20 @@ describe('provider share link admission', () => {expect(__testing.getActiveControllers()).toEqual([]);});+ it('logs why a guest is refused, at most once a minute per reason', async () => {+ warn.mockClear();+ setProviderShareAccess({+ guestAccess: () => null, ensureKnown: async () => undefined, hasShares: () => true,+ denial: () => 'provider-not-remote',+ });+ await runInvoke(GUEST, { channel: 'maker:provider:list', args: [] });+ await runInvoke(GUEST, { channel: 'maker:provider:list', args: [] });+ const refusals = warn.mock.calls.filter(([line]) => String(line).startsWith('provider-share guest refused'));+ expect(refusals).toHaveLength(1);+ expect(String(refusals[0][0])).toContain('invoke maker:provider:list');+ expect(String(refusals[0][0])).toContain('provider-not-remote');+ });+it('refuses guests without access or without the capability', () => {const client = fakeClient();__testing.handleLinkOpen(client, GUEST, 'req-1', { capabilities: [PROVIDER_SHARE_RELAY_CAPABILITY] } as never, 0, true);diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareInvokeIpc.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareInvokeIpc.test.tsindex 20127d384f..fbec273ceb 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareInvokeIpc.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareInvokeIpc.test.ts@@ -11,8 +11,9 @@ vi.mock('electron', () => ({powerSaveBlocker: { start: () => 0, stop: () => {}, isStarted: () => false },nativeImage: { createFromPath: () => ({ isEmpty: () => true }) },}));+const warn = vi.hoisted(() => vi.fn());vi.mock('../../logger', () => ({- createLogger: () => ({ info: vi.fn(), debug: vi.fn(), warn: vi.fn(), error: vi.fn() }),+ createLogger: () => ({ info: vi.fn(), debug: vi.fn(), warn, error: vi.fn() }),}));const noteFailure = vi.hoisted(() => vi.fn());vi.mock('../providerShareGuest.js', async (importOriginal) => ({@@ -53,6 +54,16 @@ describe('provider share renderer reads', () => {await expect(handleProviderShareInvoke(deps, 'share:s1', 'maker:agent:status', ['codex'])).resolves.toEqual({ binaryReady: true });});+ it('logs why a read failed, once a minute per error', async () => {+ warn.mockClear();+ invoke.mockResolvedValue({ ok: false, error: { code: 'DEVICE_OFFLINE', message: 'peer offline' } });+ for (let i = 0; i < 2; i++) {+ await expect(handleProviderShareInvoke(deps, 'share:s9', 'maker:provider:list', [])).rejects.toThrow();+ }+ const lines = warn.mock.calls.map(([line]) => String(line)).filter((line) => line.startsWith('provider share read failed'));+ expect(lines).toEqual(['provider share read failed: maker:provider:list on share:s9: DEVICE_OFFLINE peer offline']);+ });+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', []);diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.tsindex f1f7d90760..9ceda4250b 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.ts@@ -42,6 +42,7 @@ vi.mock('../providerShareApi.js', () => ({import {applyLocalMemberChange,providerShareGuestAccess,+ providerShareGuestDenial,providerShareMemberMatcher,refreshProviderShareHost,startProviderShareHost,@@ -104,6 +105,26 @@ describe('provider share host snapshot', () => {expect(providerShareGuestAccess(guest('m1'))).toBeNull();});+ it('names the reason a guest is refused, for the diagnostic log', async () => {+ expect(providerShareGuestDenial(guest('m1'))).toBe('host-not-running');+ state.owned = [share([member('m1'), member('m2', 'paused')])];+ startProviderShareHost(events());+ expect(providerShareGuestDenial(guest('m1'))).toBe('snapshot-not-loaded');+ await refreshProviderShareHost('test');+ expect(providerShareGuestDenial(guest('m1'))).toBeNull();+ expect(providerShareGuestDenial(guest('m2'))).toBe('member-not-active');+ expect(providerShareGuestDenial(providerShareGuestPeer('share-9', 'm1', 'laptop'))).toBe('share-unknown');+ expect(providerShareGuestDenial(guest('m1', 'host-device'))).toBe('self-device');+ state.allowed.clear();+ expect(providerShareGuestDenial(guest('m1'))).toBe('provider-not-remote');+ state.allowed.add('anthropic');+ state.remoteControl = false;+ expect(providerShareGuestDenial(guest('m1'))).toBe('remote-control-off');+ state.remoteControl = true;+ state.scope = 'cloud:other:2';+ expect(providerShareGuestDenial(guest('m1'))).toBe('host-scope-stale');+ });+it('announces pending requests once and reconciles stale guests on the first snapshot', async () => {const request = { ...person, requestId: 'r1', pairingCode: '0427', createdAt: 'x', expiresAt: 'y' };state.owned = [share([member('m1')], [request])];diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.tsindex 867f8dff80..d09203735b 100644--- a/apps/desktop/src/main/device-link/dispatch.ts+++ b/apps/desktop/src/main/device-link/dispatch.ts@@ -111,7 +111,7 @@ import {redactMessageRowForSharedGuest,redactSharedGuestPush,} from './sharedTaskMessageOrigin';-import { isProviderSharePeer, isSharedTaskPeer, PROVIDER_SHARE_RELAY_CAPABILITY, SHARED_TASK_CAPABILITY } from '@cindy/device-link';+import { isProviderSharePeer, isSharedTaskPeer, parseProviderSharePeer, PROVIDER_SHARE_RELAY_CAPABILITY, SHARED_TASK_CAPABILITY } from '@cindy/device-link';import { captureSharedTaskPeer, captureSharedTaskPush, assertSharedTaskInvoke, sharedTaskMetadataTopic, sharedTaskAccessFailure } from './sharedTaskDispatch.js';import { runAsBackgroundDbRpc } from '../localDb/client/rpcAdmission.js';import { fetchLocalMediaToOss } from './mediaFetch';@@ -339,6 +339,8 @@ export interface ProviderShareAccessPort {/** 不认识的受邀者连进来时按需刷新一次分享快照。 */ensureKnown(controller: string): Promise<void>;hasShares(): boolean;+ /** 受邀者被拒的原因(只进本机日志);放行时为 null。 */+ denial?(controller: string): string | null;}let providerShareAccess: ProviderShareAccessPort | null = null;@@ -350,6 +352,23 @@ function providerShareGuestAccess(controller: string): ReturnType<ProviderShareAreturn providerShareAccess?.guestAccess(controller) ?? null;}+/**+ * 受邀者被拒时在本机日志记下原因(同一对端、同一位置、同一原因每分钟最多一条)。对方只收到+ * 「暂时不可用」,排查「受邀者读不到模型」只能靠这里。+ */+const providerShareDenialLoggedAt = new Map<string, number>();+function logProviderShareDenial(src: string, where: string, reason?: string): void {+ const why = reason ?? (providerShareAccess ? providerShareAccess.denial?.(src) ?? 'unknown' : 'host-not-wired');+ const key = `${src}\u0000${where}\u0000${why}`;+ const now = Date.now();+ if (now - (providerShareDenialLoggedAt.get(key) ?? 0) < 60_000) return;+ if (providerShareDenialLoggedAt.size >= 256) providerShareDenialLoggedAt.clear();+ providerShareDenialLoggedAt.set(key, now);+ const peer = parseProviderSharePeer(src);+ const who = peer?.role === 'guest' ? `share ${peer.shareId.slice(0, 8)} member ${peer.memberId.slice(0, 8)}` : shortId(src);+ log.warn(`provider-share guest refused at ${where} from ${who}: ${why}`);+}+export interface RemoteAgentHandler {handle(controller: string, raw: unknown): Promise<unknown>;abortAll(): void;@@ -2553,6 +2572,7 @@ function handleLinkOpen(}if (!providerShareGuestAccess(src)|| !sanitizeControllerCapabilities(payload?.capabilities).includes(PROVIDER_SHARE_RELAY_CAPABILITY)) {+ logProviderShareDenial(src, 'link-open', providerShareGuestAccess(src) ? 'missing-relay-capability' : undefined);client.closeLink(src, 'revoked', 'inbound');return;}@@ -2992,7 +3012,11 @@ function settleRemoteInvokeWithOrphanDeadline(}function currentRemoteInvokeAdmissionFailure(src: string): InvokeResultPayload | null {- if (isProviderSharePeer(src)) return providerShareGuestAccess(src) ? null : PROVIDER_SHARE_ACCESS_FAILURE;+ if (isProviderSharePeer(src)) {+ if (providerShareGuestAccess(src)) return null;+ logProviderShareDenial(src, 'admission');+ return PROVIDER_SHARE_ACCESS_FAILURE;+ }if (isSharedTaskPeer(src)) return captureSharedTaskPeer(src) ? null : sharedTaskAccessFailure(src);if (!readDeviceLinkSettings().remoteControlEnabled) {return { ok: false, error: { code: 'REMOTE_DISABLED', message: 'remote control disabled' } };@@ -4039,7 +4063,11 @@ async function runProviderShareInvoke(src: string, payload: InvokePayload | undefined, timing: RemoteInvokeTiming,): Promise<InvokeResultPayload> {const access = providerShareGuestAccess(src);- if (!access || !payload || typeof payload.channel !== 'string') return PROVIDER_SHARE_ACCESS_FAILURE;+ if (!access) {+ logProviderShareDenial(src, `invoke ${typeof payload?.channel === 'string' ? payload.channel : '?'}`);+ return PROVIDER_SHARE_ACCESS_FAILURE;+ }+ if (!payload || typeof payload.channel !== 'string') return PROVIDER_SHARE_ACCESS_FAILURE;if (!PROVIDER_SHARE_CHANNELS.has(payload.channel)) {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` } };@@ -4492,6 +4520,7 @@ export const __testing = {onRemoteInvokeBusyChanged = null;inFlightRemoteInvokeCount = 0;completedRemoteInvokeResults.clear();+ providerShareDenialLoggedAt.clear();completedRemoteInvokeResultBytes = 0;inFlightRemoteInvokeResults.clear();inFlightRemoteInvokeBytes = 0;diff --git a/apps/desktop/src/main/device-link/ipc.ts b/apps/desktop/src/main/device-link/ipc.tsindex 9240b3c010..e3a2b01ec8 100644--- a/apps/desktop/src/main/device-link/ipc.ts+++ b/apps/desktop/src/main/device-link/ipc.ts@@ -760,6 +760,20 @@ function projectProviderShareResult(channel: string, value: unknown): unknown {return value;}+/**+ * 分享来的供应商读不到时在本机日志记下错误(同一分享、同一请求、同一错误每分钟最多一条)。+ * 界面只能说「暂时读不到」,排查要靠这里和分享者电脑上的拒绝原因。+ */+const providerShareReadFailureLoggedAt = new Map<string, number>();+function logProviderShareReadFailure(agentDeviceId: string, channel: string, code: string, message: string): void {+ const key = `${agentDeviceId}\u0000${channel}\u0000${code}`;+ const now = Date.now();+ if (now - (providerShareReadFailureLoggedAt.get(key) ?? 0) < 60_000) return;+ if (providerShareReadFailureLoggedAt.size >= 256) providerShareReadFailureLoggedAt.clear();+ providerShareReadFailureLoggedAt.set(key, now);+ log.warn(`provider share read failed: ${channel} on ${agentDeviceId}: ${code} ${message.slice(0, 200)}`);+}+export async function handleProviderShareInvoke(deps: Pick<DeviceLinkIpcDeps, 'invoke'>,agentDeviceId: string,@@ -769,7 +783,14 @@ export async function handleProviderShareInvoke(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);+ let target: string;+ try {+ target = await resolveRemoteAgentTargetWhenReady(agentDeviceId);+ } catch (err) {+ const message = err instanceof Error ? err.message : String(err);+ logProviderShareReadFailure(agentDeviceId, channel, 'RESOLVE', message);+ throw err;+ }const callArgs = Array.isArray(args) ? args : [];let result: InvokeResultPayload;try {@@ -777,10 +798,17 @@ export async function handleProviderShareInvoke(? await crossRegionInvoke(target, channel, callArgs): await deps.invoke(target, channel, callArgs);} catch (err) {+ logProviderShareReadFailure(+ agentDeviceId,+ channel,+ err instanceof DeviceLinkError ? err.code : 'THROWN',+ err instanceof Error ? err.message : String(err),+ );if (err instanceof DeviceLinkError && isProviderShareRefusal(err.code, err.message)) refuseProviderShare();rethrowDeviceLinkError(err);}if (result.ok) return projectProviderShareResult(channel, result.result);+ logProviderShareReadFailure(agentDeviceId, channel, result.error.code, result.error.message);// 分享者电脑拒绝了(暂停、关了远程控制或这个供应商的「允许被远程调用」):分享专属原因。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/main/device-link/providerShareHost.ts b/apps/desktop/src/main/device-link/providerShareHost.tsindex 5c941c9466..e5635aa3e8 100644--- a/apps/desktop/src/main/device-link/providerShareHost.ts+++ b/apps/desktop/src/main/device-link/providerShareHost.ts@@ -183,24 +183,52 @@ export function getProviderShareHostSnapshot(): readonly ProviderShareOwned[] {return runtime?.shares ?? [];}-/**- * 受邀者对端的准入:分享与成员在本机快照里 active、这台电脑允许远程控制、分享的供应商仍开放- * 「允许被远程调用」。任一不满足返回 null。- */-export function providerShareGuestAccess(controller: string): ProviderShareGuestAccess | null {+/** 受邀者对端被拒的原因(只进日志,不发给对方)。 */+export type ProviderShareGuestDenial =+ | 'host-not-running'+ | 'host-scope-stale'+ | 'not-guest-peer'+ | 'self-device'+ | 'snapshot-not-loaded'+ | 'share-unknown'+ | 'share-on-other-device'+ | 'member-not-active'+ | 'remote-control-off'+ | 'provider-not-remote';++type GuestAccessCheck = { access: ProviderShareGuestAccess } | { denied: ProviderShareGuestDenial };++function checkGuestAccess(controller: string): GuestAccessCheck {const rt = runtime;- if (!rt || !current(rt)) return null;+ if (!rt || rt.stopped || runtime !== rt) return { denied: 'host-not-running' };+ if (!current(rt)) return { denied: 'host-scope-stale' };const peer = parseProviderSharePeer(controller);- if (!peer || peer.role !== 'guest') return null;+ if (!peer || peer.role !== 'guest') return { denied: 'not-guest-peer' };const self = getDeviceId();- if (self && peer.deviceId === self) return null;+ if (self && peer.deviceId === self) return { denied: 'self-device' };const share = rt.shares.find((item) => item.shareId === peer.shareId);- if (!share || (self && share.hostDeviceId !== self)) return null;+ if (!share) return { denied: rt.fetchedAt === 0 ? 'snapshot-not-loaded' : 'share-unknown' };+ if (self && share.hostDeviceId !== self) return { denied: 'share-on-other-device' };const member = share.members.find((item) => item.memberId === peer.memberId);- if (!member || member.status !== 'active') return null;- if (!readDeviceLinkSettings().remoteControlEnabled) return null;- if (!isRemoteProviderInvocationAllowed(share.providerId)) return null;- return { shareId: share.shareId, memberId: member.memberId, providerId: share.providerId };+ if (!member || member.status !== 'active') return { denied: 'member-not-active' };+ if (!readDeviceLinkSettings().remoteControlEnabled) return { denied: 'remote-control-off' };+ if (!isRemoteProviderInvocationAllowed(share.providerId)) return { denied: 'provider-not-remote' };+ return { access: { shareId: share.shareId, memberId: member.memberId, providerId: share.providerId } };+}++/**+ * 受邀者对端的准入:分享与成员在本机快照里 active、这台电脑允许远程控制、分享的供应商仍开放+ * 「允许被远程调用」。任一不满足返回 null。+ */+export function providerShareGuestAccess(controller: string): ProviderShareGuestAccess | null {+ const result = checkGuestAccess(controller);+ return 'access' in result ? result.access : null;+}++/** 受邀者对端为什么被拒;放行时为 null。只用于诊断日志。 */+export function providerShareGuestDenial(controller: string): ProviderShareGuestDenial | null {+ const result = checkGuestAccess(controller);+ return 'denied' in result ? result.denied : null;}/** 不认识的受邀者连进来:可能是刚同意的成员,按需立即拉一次(限频)。 */diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex edd37a7611..74ba3dc50f 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -57,6 +57,7 @@ import {getProviderShareHostSnapshot,markProviderShareHostActive,providerShareGuestAccess,+ providerShareGuestDenial,providerShareMemberMatcher,refreshProviderShareHost,startProviderShareHost,@@ -406,6 +407,7 @@ export function registerProviderShareIpc(): void {guestAccess: providerShareGuestAccess,ensureKnown: ensureProviderSharePeerKnown,hasShares: () => getProviderShareHostSnapshot().length > 0,+ denial: providerShareGuestDenial,});// 同账号的手机经设备互联调用(已在同账号 allowlist);本机窗口也可调用。ipcMain.handle(PROVIDER_SHARE_RECEIVED_CATALOGS_CHANNEL, async (event, ...args: unknown[]) => {diff --git a/apps/desktop/src/renderer/components/settings/ReadOnlyProviderModels.tsx b/apps/desktop/src/renderer/components/settings/ReadOnlyProviderModels.tsxindex fe8bc9ff87..076961e11c 100644--- a/apps/desktop/src/renderer/components/settings/ReadOnlyProviderModels.tsx+++ b/apps/desktop/src/renderer/components/settings/ReadOnlyProviderModels.tsx@@ -2,6 +2,7 @@* 另一台电脑上的供应商(自己其他电脑的远程供应商、别人分享给我的供应商)在设置右栏里的* 只读模型清单:开关与排序都由那台电脑决定,这里只列出它开放的模型。*/+import type { ReactNode } from 'react';import { useTranslation } from 'react-i18next';import type { AgentKind, ProviderView } from '@cindy/model-providers';@@ -34,16 +35,18 @@ export function readOnlyProviderModels(return rows;}-/** 「可用的模型」一节;note 非空时以一句说明代替清单(读取中、读不到、暂停等)。 */+/** 「可用的模型」一节;note 非空时以一句说明代替清单(读取中、读不到、暂停等),action 跟在说明下面。 */export function ReadOnlyProviderModelSection({title,models,note,+ action,testId,}: {title: string;models: readonly ReadOnlyProviderModel[];note: string | null;+ action?: ReactNode;testId?: string;}) {const { t } = useTranslation();@@ -63,9 +66,12 @@ export function ReadOnlyProviderModelSection({)}</div>{note !== null ? (- <p className="px-5 pb-4 text-13 leading-[1.5]" style={{ color: 'var(--text-tertiary)' }}>- {note}- </p>+ <div className="flex flex-col items-start gap-2 px-5 pb-4">+ <p className="text-13 leading-[1.5]" style={{ color: 'var(--text-tertiary)' }}>+ {note}+ </p>+ {action}+ </div>) : (<ul data-testid={testId} className="min-h-0 flex-1 overflow-y-auto px-2 pb-3">{models.map((model) => (diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsxindex 2f3c718ab1..df93fb1e32 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx@@ -20,9 +20,10 @@ import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';import { Tip } from '@/components/ui/tooltip';import { useDeviceProviders } from '@/hooks/useDeviceProviders';import { providerMonogram } from '@/lib/providerModels';+import { refreshRemoteCatalogSnapshot } from '@/lib/remoteCatalogSnapshot';import { toast } from '@/lib/toast';import { cn } from '@/lib/utils';-import { mapIpcErrorToI18nKey } from '@/utils/ipcError';+import { extractIpcError, mapIpcErrorToI18nKey } from '@/utils/ipcError';import { providerShareAgentDeviceId } from './providerShareFormat';import { useProviderShareReceived } from './providerShareStore';@@ -128,7 +129,8 @@ export function ProviderShareReceivedDetail({ share }: { share: ProviderShareRecconst { confirm } = useConfirmDialog();const [leaving, setLeaving] = useState(false);const status = receivedStatus(share);- const catalog = useDeviceProviders(status === 'active' ? providerShareAgentDeviceId(share.shareId) : undefined);+ const catalogDeviceId = providerShareAgentDeviceId(share.shareId);+ const catalog = useDeviceProviders(status === 'active' ? catalogDeviceId : undefined);const provider = catalog.providers.find((entry) => entry.id === share.providerId) ?? catalog.providers[0] ?? null;const models = useMemo(@@ -166,7 +168,14 @@ export function ProviderShareReceivedDetail({ share }: { share: ProviderShareRecif (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.error) {+ // 分享者电脑拒绝(关了远程控制 / 允许被远程调用,或那边还没加载好分享)与连不上要分开说;+ // 其余错误带上错误代码,截图就能看出卡在哪一步。+ const code = extractIpcError(new Error(catalog.error))?.code ?? null;+ body = code === 'REMOTE_AGENT_SHARE_UNAVAILABLE'+ ? t('providerShare.received.modelsRefused')+ : t('providerShare.received.modelsFailedWithCode', { code: code ?? 'UNKNOWN' });+ }else if (catalog.loading) body = t('providerShare.received.modelsLoading');else if (models.length === 0) body = t('providerShare.received.modelsEmpty');@@ -239,6 +248,17 @@ export function ProviderShareReceivedDetail({ share }: { share: ProviderShareRectitle={t('providerShare.received.modelsTitle')}models={models}note={body}+ action={+ status === 'active' && catalog.error ? (+ <Button+ variant="secondary"+ size="sm"+ onClick={() => void refreshRemoteCatalogSnapshot(catalogDeviceId).catch(() => undefined)}+ >+ {t('providerShare.received.retryModels')}+ </Button>+ ) : null+ }testId="provider-share-received-models"/></div>diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsxindex 4e8774b7af..a4aa3e104a 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx@@ -16,7 +16,8 @@ vi.mock('react-i18next', () => ({}),}));vi.mock('@/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn(), info: vi.fn() } }));-vi.mock('@/lib/remoteCatalogSnapshot', () => ({ refreshRemoteCatalogSnapshot: vi.fn(async () => undefined) }));+const refreshCatalog = vi.hoisted(() => vi.fn(async () => undefined));+vi.mock('@/lib/remoteCatalogSnapshot', () => ({ refreshRemoteCatalogSnapshot: refreshCatalog }));const confirmSpy = vi.hoisted(() => vi.fn(async () => true));vi.mock('@/components/ui/confirm-dialog-provider', () => ({ useConfirmDialog: () => ({ confirm: confirmSpy }) }));const joinSpy = vi.hoisted(() => vi.fn());@@ -139,9 +140,22 @@ describe('ProviderShareReceivedDetail', () => {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 };+ it('says why the models cannot be read and offers a reload', () => {+ catalog.value = {+ providers: [], loading: false, error: '[DEVICE_LINK_TIMEOUT] timed out', unsupported: false,+ };+ render(<ProviderShareReceivedDetail share={{ ...share, status: 'active' }} />);+ expect(screen.getByText('providerShare.received.modelsFailedWithCode:{"code":"DEVICE_LINK_TIMEOUT"}')).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'providerShare.received.retryModels' }));+ expect(refreshCatalog).toHaveBeenCalledWith('share:share-1');+ });++ it('tells a refusal by the owner computer apart from a failed read', () => {+ catalog.value = {+ providers: [], loading: false,+ error: 'Error invoking remote method: Error: [REMOTE_AGENT_SHARE_UNAVAILABLE] not available', unsupported: false,+ };render(<ProviderShareReceivedDetail share={{ ...share, status: 'active' }} />);- expect(screen.getByText('providerShare.received.modelsFailed')).toBeTruthy();+ expect(screen.getByText('providerShare.received.modelsRefused')).toBeTruthy();});});diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 7425018043..7e2af7b72a 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -378,7 +378,9 @@"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.",+ "modelsRefused": "The owner’s computer isn’t allowing this share right now. It may not allow remote control, “Allow remote use” may be off for this provider, or their Cindy may still be starting. Try again shortly, or ask them to check both settings.",+ "modelsFailedWithCode": "Couldn’t read the models they made available. Try again shortly. (Error code: {{code}})",+ "retryModels": "Reload Models","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.",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex a1393fbdc2..9c126d836e 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -376,7 +376,9 @@"detailNote": "Agent は {{name}} のパソコンで動き、相手のログインとクォータを使います。タスクを新規作成するときにモデル一覧で選ぶと使えます。","modelsTitle": "利用できるモデル","modelsLoading": "相手が公開しているモデルを読み込んでいます…",- "modelsFailed": "相手が公開しているモデルを読み込めませんでした。しばらくしてからもう一度お試しください。",+ "modelsRefused": "相手のパソコンが今この共有の読み込みを許可していません。リモート操作を許可していないか、このプロバイダーの「リモート利用を許可」がオフになっているか、相手の Cindy が起動したばかりでまだ準備できていない可能性があります。しばらくしてから再試行するか、相手にこの 2 つの設定を確認してもらってください。",+ "modelsFailedWithCode": "相手が公開しているモデルを読み込めませんでした。しばらくしてから再試行してください。(エラーコード:{{code}})",+ "retryModels": "モデルを再読み込み","modelsEmpty": "相手はまだ利用できるモデルを公開していません。","pausedNote": "相手がこの共有を一時停止しています。再開されると使えるようになります。","offlineNote": "相手のパソコンがオフラインです。オンラインに戻ると使えるようになります。",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex f4c55c330f..06e1b845c0 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -376,7 +376,9 @@"detailNote": "Agent는 {{name}}님의 컴퓨터에서 실행되며 상대방의 로그인과 할당량을 씁니다. 새 작업을 만들 때 모델 목록에서 선택하면 사용할 수 있습니다.","modelsTitle": "사용 가능한 모델","modelsLoading": "상대방이 공개한 모델을 불러오는 중…",- "modelsFailed": "상대방이 공개한 모델을 불러오지 못했습니다. 잠시 후 다시 시도하세요.",+ "modelsRefused": "상대방 컴퓨터가 지금 이 공유를 읽도록 허용하지 않습니다. 원격 제어를 허용하지 않았거나 이 제공자의 원격 사용 허용이 꺼져 있거나, 상대방 Cindy가 방금 시작되어 아직 준비되지 않았을 수 있습니다. 잠시 후 다시 시도하거나 상대방에게 두 설정을 확인해 달라고 하세요.",+ "modelsFailedWithCode": "상대방이 공개한 모델을 읽을 수 없습니다. 잠시 후 다시 시도하세요. (오류 코드: {{code}})",+ "retryModels": "모델 다시 읽기","modelsEmpty": "상대방이 아직 사용 가능한 모델을 공개하지 않았습니다.","pausedNote": "상대방이 이 공유를 일시 중지했습니다. 다시 시작하면 사용할 수 있습니다.","offlineNote": "상대방 컴퓨터가 오프라인입니다. 다시 온라인이 되면 사용할 수 있습니다.",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 9d7e683911..97ca25c95d 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -376,7 +376,9 @@"detailNote": "Agent 在 {{name}} 的电脑上运行,用的是对方的登录和配额。新建任务时在模型列表里选择它就能用。","modelsTitle": "可用的模型","modelsLoading": "正在读取对方开放的模型…",- "modelsFailed": "暂时读不到对方开放的模型,请稍后再试。",+ "modelsRefused": "对方电脑暂时不让读取这个分享:可能没有允许远程控制、关了这个供应商的「允许被远程调用」,也可能对方的 Cindy 刚启动、还没准备好。请稍后重试,或让对方检查这两项设置。",+ "modelsFailedWithCode": "暂时读不到对方开放的模型,请稍后重试。(错误代码:{{code}})",+ "retryModels": "重新读取模型","modelsEmpty": "对方还没有开放可用的模型。","pausedNote": "对方暂停了这个分享,恢复后才能使用。","offlineNote": "对方电脑不在线,上线后就能继续使用。",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 311eaa75c4..9162c4279e 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -376,7 +376,9 @@"detailNote": "Agent 在 {{name}} 的電腦上執行,使用的是對方的登入和配額。新建任務時在模型列表裡選擇它就能用。","modelsTitle": "可用的模型","modelsLoading": "正在讀取對方開放的模型…",- "modelsFailed": "暫時讀不到對方開放的模型,請稍後再試。",+ "modelsRefused": "對方電腦暫時不讓讀取這個分享:可能沒有允許遠端控制、關了這個供應商的「允許遠端呼叫」,也可能對方的 Cindy 剛啟動、還沒準備好。請稍後重試,或請對方檢查這兩項設定。",+ "modelsFailedWithCode": "暫時讀不到對方開放的模型,請稍後重試。(錯誤代碼:{{code}})",+ "retryModels": "重新讀取模型","modelsEmpty": "對方還沒有開放可用的模型。","pausedNote": "對方暫停了這個分享,恢復後才能使用。","offlineNote": "對方電腦不在線,上線後就能繼續使用。",