Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(providers): 区分 Cindy AI 默认与心动身份图标
Dashb79655587e28
diff --git a/apps/desktop/scripts/fixtures/cindy-ai-identity/state.ts b/apps/desktop/scripts/fixtures/cindy-ai-identity/state.tsindex ad846a2964..8e8c640ac1 100644--- a/apps/desktop/scripts/fixtures/cindy-ai-identity/state.ts+++ b/apps/desktop/scripts/fixtures/cindy-ai-identity/state.ts@@ -1,6 +1,6 @@import type { ProviderView } from '@cindy/model-providers';import i18n from '../../../src/renderer/i18n';-import { cindyAiAccountName } from '../../../src/shared/cindyAiPresentation';+import { cindyAiAccountName, cindyAiAccountLogoKind } from '../../../src/shared/cindyAiPresentation';// Stubbed hooks are separate modules; share only this public fixture selector.const fixtureState = globalThis as typeof globalThis & { __cindyAiScenario?: string };@@ -15,6 +15,7 @@ export const useOptionalAuthUser = () => user();export const useProviders = () => ({providers: [{id: 'xd', name: cindyAiAccountName(user(), key => i18n.t(key)), source: 'builtin',+ logoKind: cindyAiAccountLogoKind(user()),agents: ['codex'], auth: { method: 'managed' }, routing: { codex: {} }, connected: true,models: { codex: [{ id: 'auto', name: 'Auto', group: 'gpt', contextWindow: 272000, efforts: [] }] },} as ProviderView],diff --git a/apps/desktop/scripts/fixtures/unified-model-rail/unified-model-rail-fixture.tsx b/apps/desktop/scripts/fixtures/unified-model-rail/unified-model-rail-fixture.tsxindex 70023f34d1..07b023d0ca 100644--- a/apps/desktop/scripts/fixtures/unified-model-rail/unified-model-rail-fixture.tsx+++ b/apps/desktop/scripts/fixtures/unified-model-rail/unified-model-rail-fixture.tsx@@ -87,6 +87,7 @@ function Fixture({ scenario }: { scenario: string }) {: { membershipKind: 'org', orgSlug: scenario === 'cindy-xd' ? 'xd' : 'example', orgName: 'Example International Game Studio' }, t);const sourceProviders = gateway ? [...providers, {...providers[1], id: 'xd', name: accountName, auth: { method: 'managed' },+ logoKind: scenario === 'cindy-xd' ? 'xd' : 'cindy',models: { codex: [{ id: 'auto', name: 'Auto', group: 'gpt', contextWindow: 272000, efforts: [] }] },} as ProviderView] : providers;return (diff --git a/apps/desktop/src/main/__tests__/deviceLinkDispatch.test.ts b/apps/desktop/src/main/__tests__/deviceLinkDispatch.test.tsindex 6ed0f3e0bd..6f131330a7 100644--- a/apps/desktop/src/main/__tests__/deviceLinkDispatch.test.ts+++ b/apps/desktop/src/main/__tests__/deviceLinkDispatch.test.ts@@ -909,6 +909,13 @@ describe('被控端控制链路生命周期', () => {.not.toHaveProperty('logoKind');});+ // Unit: host membership must survive the real projection; controllers cannot infer it.+ it.each(['xd', 'cindy'] as const)('preserves the host Cindy AI identity: %s', async (logoKind) => {+ registry.register('maker:provider:list', () => ({ providers: [{ id: 'xd', name: 'Cindy AI', logoKind, routing: {} }] }));+ const result = await runInvoke('ctrl-list-only', { channel: 'maker:provider:list', args: [{ capabilities: ['provider-logo-kinds-v2'] }] });+ expect(result).toMatchObject({ ok: true, result: { providers: [{ id: 'xd', logoKind }] } });+ });+it('listing-only invoke can negotiate new logo kinds without link-open', async () => {registry.register('maker:provider:list', () => ({providers: [{diff --git a/apps/desktop/src/main/cindyAiProviderName.ts b/apps/desktop/src/main/cindyAiProviderName.tsindex ce2020fc0e..53f13c108d 100644--- a/apps/desktop/src/main/cindyAiProviderName.ts+++ b/apps/desktop/src/main/cindyAiProviderName.ts@@ -1,4 +1,4 @@-import { cindyAiAccountName } from '../shared/cindyAiPresentation.js';+import { cindyAiAccountName, cindyAiAccountLogoKind } from '../shared/cindyAiPresentation.js';import { getAuthState } from './authManager.js';import { t } from './i18n.js';@@ -7,3 +7,9 @@ export function getCindyAiProviderName(): string {const state = getAuthState();return cindyAiAccountName(state.mode === 'cloud' ? state.user : null, t);}++/** Use the source host's live membership, including remote catalog requests. */+export function getCindyAiProviderLogoKind(): 'xd' | 'cindy' {+ const state = getAuthState();+ return cindyAiAccountLogoKind(state.mode === 'cloud' ? state.user : null);+}diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.tsindex 8ed0f404d6..b5ab5f7782 100644--- a/apps/desktop/src/main/device-link/dispatch.ts+++ b/apps/desktop/src/main/device-link/dispatch.ts@@ -822,10 +822,13 @@ function projectInvokeResultForTunnel(// 只有远程 Agent 的选择入口按它筛选。只放行布尔值。delete rest.remoteInvocationEnabled;if (typeof p.remoteInvocationEnabled === 'boolean') rest.remoteInvocationEnabled = p.remoteInvocationEnabled;- const logoKind = typeof p.id === 'string'- ? resolveProviderLogoKind(p.id, p.routing as ProviderLogoRouting | undefined)- : null;- // Never trust/pass through an arbitrary pre-existing value: only shared resolver output crosses.+ // Only the host's narrow Cindy AI identity override may supersede brand inference.+ const logoKind = p.id === 'xd' && p.logoKind === 'xd'+ ? 'xd'+ : typeof p.id === 'string'+ ? resolveProviderLogoKind(p.id, p.routing as ProviderLogoRouting | undefined)+ : null;+ // Other pre-existing values remain untrusted.delete rest.logoKind;if (logoKinddiff --git a/apps/desktop/src/main/maker-host/__tests__/providerService.test.ts b/apps/desktop/src/main/maker-host/__tests__/providerService.test.tsindex 1c2b77b4ee..fb55c14b9b 100644--- a/apps/desktop/src/main/maker-host/__tests__/providerService.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/providerService.test.ts@@ -4,7 +4,7 @@ import { BUNDLED_CATALOG, buildUserProvider, connectedProvidersForAgent, provideimport { checkModelRoute } from '../model-route-guard.js';import { createProviderService, type ConnectionReadOptions } from '../provider-service.js';-import { cindyAiAccountName } from '../../../shared/cindyAiPresentation.js';+import { cindyAiAccountName, cindyAiAccountLogoKind } from '../../../shared/cindyAiPresentation.js';import type { XdOrgIdentity } from '../../../shared/xdOrg.js';/** 注入内置 bundled 目录作为「当前生效目录」(桌面端真实注入的是 active-catalog 的 getActiveCatalog)。 */@@ -22,24 +22,29 @@ describe('createProviderService', () => {const svc = createProviderService({getCatalog: bundledCatalog,connection: { xd: () => true, anthropic: () => false, openai: () => false, xai: () => false },- getProviderPresentation: (id) => id === 'xd' ? { name: cindyAiAccountName(user, key => labels[key]!) } : {},+ getProviderPresentation: (id) => id === 'xd' ? { name: cindyAiAccountName(user, key => labels[key]!), logoKind: cindyAiAccountLogoKind(user) } : {},});const read = async () => (await svc.listProviders({ snapshotOnly: true })).find(p => p.id === 'xd')!;const personal = await read();expect(personal.name).toBe('Cindy AI · 个人');+ expect(personal.logoKind).toBe('cindy');user = { membershipKind: 'org', orgSlug: 'xd', orgName: '心动网络' };const xd = await read();- expect(xd).toEqual({ ...personal, name: 'Cindy AI · 心动' });+ expect(xd).toEqual({ ...personal, name: 'Cindy AI · 心动', logoKind: 'xd' });user = { membershipKind: 'org', orgSlug: 'other', orgName: ' Example Studio ' };expect((await read()).name).toBe('Cindy AI · Example Studio');+ expect((await read()).logoKind).toBe('cindy');user = { membershipKind: 'org', orgSlug: null, orgName: '心动网络' };expect((await read()).name).toBe('Cindy AI · 心动');+ expect((await read()).logoKind).toBe('xd');user = { membershipKind: 'org', orgSlug: 'other', orgName: '心动网络' };expect((await read()).name).toBe('Cindy AI · 心动网络');+ expect((await read()).logoKind).toBe('cindy');user = { membershipKind: 'org', orgSlug: null, orgName: null };expect((await read()).name).toBe('Cindy AI · 企业');user = null;expect((await read()).name).toBe('Cindy AI');+ expect((await read()).logoKind).toBe('cindy');expect(BUNDLED_CATALOG.providers.find(p => p.id === 'xd')?.name).toBe('XD Gateway');});it('snapshot mode suppresses side effects and skips both account presentation readers', async () => {diff --git a/apps/desktop/src/main/maker-host/createDesktopProviderService.ts b/apps/desktop/src/main/maker-host/createDesktopProviderService.tsindex 5fdb2612b2..2a4e223504 100644--- a/apps/desktop/src/main/maker-host/createDesktopProviderService.ts+++ b/apps/desktop/src/main/maker-host/createDesktopProviderService.ts@@ -131,7 +131,7 @@ import {} from './model-discovery/openai-media.js';import { clearXaiMediaModels } from './model-discovery/xai-media.js';import { getAuthState } from '../authManager.js';-import { getCindyAiProviderName } from '../cindyAiProviderName.js';+import { getCindyAiProviderName, getCindyAiProviderLogoKind } from '../cindyAiProviderName.js';import { getActiveAppSession } from '../appSessionState.js';import { filterProviderCatalogForAccount } from './provider-access-policy.js';import { getAppCapabilities } from '../appCapabilities.js';@@ -1015,6 +1015,7 @@ export function getDesktopProviderService(options: { allowSideEffects?: booleanreturn {...presentation,name: getCindyAiProviderName(),+ logoKind: getCindyAiProviderLogoKind(),};},getCatalog: getDesktopSelectableCatalog,diff --git a/apps/desktop/src/main/maker-host/provider-service.ts b/apps/desktop/src/main/maker-host/provider-service.tsindex 34c4870166..59a1cf7d21 100644--- a/apps/desktop/src/main/maker-host/provider-service.ts+++ b/apps/desktop/src/main/maker-host/provider-service.ts@@ -76,7 +76,7 @@ export interface ProviderConnectionReaders {export interface ProviderServiceDeps {projectProvider?: (provider: ProviderView) => ProviderView;- getProviderPresentation?: (providerId: string) => { name?: string; removed?: boolean };+ getProviderPresentation?: (providerId: string) => { name?: string; removed?: boolean; logoKind?: ProviderView['logoKind'] };/** 返回当前生效目录(同步)。桌面端注入 active-catalog 的 getActiveCatalog。 */getCatalog: () => Catalog;/** 连接状态判定器。 */diff --git a/apps/desktop/src/renderer/__tests__/modelMarkSemantics.test.tsx b/apps/desktop/src/renderer/__tests__/modelMarkSemantics.test.tsxindex d3e2bfc7a8..97aaa0d11a 100644--- a/apps/desktop/src/renderer/__tests__/modelMarkSemantics.test.tsx+++ b/apps/desktop/src/renderer/__tests__/modelMarkSemantics.test.tsx@@ -8,6 +8,7 @@ import { ClaudeMark } from '@/components/icons/ClaudeMark';import { CodexMark } from '@/components/icons/CodexMark';import { OpenAIMark } from '@/components/icons/OpenAIMark';import { ProviderLogoMark } from '@/components/icons/ProviderLogoMark';+import { XDIncMark } from '@/components/icons/XDIncMark';import { ModelIconMark, ProviderMark } from '@/components/new-chat/ModelSelector';function firstPath(ui: React.ReactNode): string | null {@@ -15,6 +16,19 @@ function firstPath(ui: React.ReactNode): string | null {}describe('model mark semantics', () => {+ // User decision: use the existing themeable XD glyph only for host XD membership.+ // Unit: regression input is the same provider ID with personal vs XD presentation.+ it('preserves the original XD glyph and theme color while other identities use Cindy', () => {+ const xdPath = firstPath(<XDIncMark />);+ expect(firstPath(<ProviderMark providerId="xd" logoKind="xd" />)).toBe(xdPath);+ expect(firstPath(<ModelIconMark providerId="xd" logoKind="xd" />)).toBe(xdPath);+ expect(firstPath(<ProviderMark providerId="xd" />)).not.toBe(xdPath);+ expect(firstPath(<ModelIconMark providerId="xd" logoKind="xd" icon="claude" />)).toBe(firstPath(<AnthropicMark />));+ const view = render(<ProviderMark providerId="xd" logoKind="xd" colorClass="text-white" />);+ expect(view.container.querySelector('svg')?.classList.contains('text-white')).toBe(true);+ expect([...view.container.querySelectorAll('path')].every(p => p.getAttribute('fill') === 'currentColor')).toBe(true);+ expect(view.container.querySelector('img')).toBeNull();+ });it('keeps the model-vendor marks monochrome and preserves the size/className API', () => {const anthropic = render(<AnthropicMark size={18} className="brand-mark" />);const anthropicSvg = anthropic.container.querySelector('svg');diff --git a/apps/desktop/src/renderer/cindy-brain/OneshotModelPinPicker.tsx b/apps/desktop/src/renderer/cindy-brain/OneshotModelPinPicker.tsxindex 33c8ecd4fe..7aa8acebce 100644--- a/apps/desktop/src/renderer/cindy-brain/OneshotModelPinPicker.tsx+++ b/apps/desktop/src/renderer/cindy-brain/OneshotModelPinPicker.tsx@@ -21,6 +21,7 @@ export interface OneshotPinOption {subscription: boolean;/** Provider['routing'](IPC 载荷;ProviderLogoMark 的厂牌图标判定用)。 */routing?: import('@cindy/model-providers').Provider['routing'];+ logoKind?: ProviderView['logoKind'];/** Agent used by this exact route. Older snapshots may omit it. */agentSuffix?: string;/** False for a persisted route that is no longer offered or currently usable. */@@ -41,6 +42,7 @@ export function oneshotPickerProviders(options: readonly OneshotPinOption[]): Prif (!provider) {provider = {id: option.providerId, name: option.group, source: 'builtin',+ logoKind: option.logoKind,auth: { method: 'none' }, connected: true, agents: [], routing: {}, models: {},};providers.set(option.providerId, provider);diff --git a/apps/desktop/src/renderer/cindy-brain/__tests__/OneshotModelPinPicker.test.tsx b/apps/desktop/src/renderer/cindy-brain/__tests__/OneshotModelPinPicker.test.tsxindex 2b6a618426..7c8fb18fd0 100644--- a/apps/desktop/src/renderer/cindy-brain/__tests__/OneshotModelPinPicker.test.tsx+++ b/apps/desktop/src/renderer/cindy-brain/__tests__/OneshotModelPinPicker.test.tsx@@ -112,9 +112,10 @@ describe('OneshotModelPinPicker shared A adapter', () => {it('preserves an updated Cindy AI identity in the real picker adapter', () => {const view = mount({ options: [{ ...xdOption, group: 'Cindy AI · 个人' }], groupByProvider: true });expect(picker.providersOverride?.[0].name).toBe('Cindy AI · 个人');- view.rerender(<OneshotModelPinPicker defaultOptionLabel="Automatic" options={[{ ...xdOption, group: 'Cindy AI · 心动' }]}+ view.rerender(<OneshotModelPinPicker defaultOptionLabel="Automatic" options={[{ ...xdOption, group: 'Cindy AI · 心动', logoKind: 'xd' }]}onChange={vi.fn()} ariaLabel="Auxiliary model" groupByProvider />);expect(picker.providersOverride?.[0].name).toBe('Cindy AI · 心动');+ expect(picker.providersOverride?.[0].logoKind).toBe('xd');});it('rejects forged, unavailable, and wrong-Harness routes without saving', async () => {diff --git a/apps/desktop/src/renderer/components/icons/CindyMark.tsx b/apps/desktop/src/renderer/components/icons/CindyMark.tsxnew file mode 100644index 0000000000..ceff7d8135--- /dev/null+++ b/apps/desktop/src/renderer/components/icons/CindyMark.tsx@@ -0,0 +1,18 @@+import {+ CINDY_MARK_TRANSFORM,+ CINDY_MARK_PATH,+ CINDY_MARK_EARRING_PATH,+ CINDY_MARK_EARRING_COLOR,+} from '@cindy/model-providers/branding';++/** Chrome's compact Cindy artwork, with foreground inherited from the surrounding theme. */+export function CindyMark({ size = 14, className }: { size?: number; className?: string }) {+ return (+ <svg width={size} height={size} viewBox="0 0 24 24" className={className} aria-hidden>+ <g transform={CINDY_MARK_TRANSFORM}>+ <path d={CINDY_MARK_PATH} fill="currentColor" />+ <path d={CINDY_MARK_EARRING_PATH} fill={CINDY_MARK_EARRING_COLOR} />+ </g>+ </svg>+ );+}diff --git a/apps/desktop/src/renderer/components/icons/ProviderLogoMark.tsx b/apps/desktop/src/renderer/components/icons/ProviderLogoMark.tsxindex 27b4c236f3..ea4c15ac18 100644--- a/apps/desktop/src/renderer/components/icons/ProviderLogoMark.tsx+++ b/apps/desktop/src/renderer/components/icons/ProviderLogoMark.tsx@@ -17,6 +17,7 @@ import {import { AnthropicMark } from './AnthropicMark';import { OpenAIMark } from './OpenAIMark';import { XDIncMark } from './XDIncMark';+import { CindyMark } from './CindyMark';export { hasProviderLogo, resolveProviderLogoKind };export type { ProviderLogoRouting };@@ -44,6 +45,7 @@ export function ProviderLogoMark({if (!kind) return null;if (kind === 'anthropic') return <AnthropicMark size={size} className={className} />;if (kind === 'openai') return <OpenAIMark size={size} className={className} />;+ if (kind === 'cindy') return <CindyMark size={size} className={className} />;if (kind === 'xd') return <XDIncMark size={size} className={className} />;return (diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsxindex 52b0532919..aa04b99d97 100644--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx@@ -64,7 +64,7 @@ import {import { useOptionalConfirmDialog } from '@/components/ui/confirm-dialog-provider';import { AnthropicMark } from '@/components/icons/AnthropicMark';import { OpenAIMark } from '@/components/icons/OpenAIMark';-import { XDIncMark } from '@/components/icons/XDIncMark';+import { CindyMark } from '@/components/icons/CindyMark';import { hasProviderLogo, ProviderLogoMark } from '@/components/icons/ProviderLogoMark';import { agentOptionOf } from './agentOptions';import type { SelectableVendor } from '@/lib/agentVendors';@@ -426,7 +426,7 @@ export function ProviderMark({logoKind={logoKind}size={markSize}className={- providerId === 'xd'+ logoKind === 'xd'? cn(dense ? 'h-[8.4px] w-[14.2px]' : 'h-[9px] w-[15px]', common): common}@@ -483,9 +483,9 @@ export function ModelIconMark({if (kind === 'claude') return <AnthropicMark size={markSize} className={common} />;if (kind === 'codex') return <OpenAIMark size={markSize} className={common} />;return (- <XDIncMark+ <CindyMarksize={markSize}- className={cn(dense ? 'h-[8.4px] w-[14.2px]' : 'h-[9px] w-[15px]', common)}+ className={common}/>);}diff --git a/apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsx b/apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsxindex f71ae7cca9..33de938e0d 100644--- a/apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsx+++ b/apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsx@@ -84,6 +84,7 @@ export function AuxiliaryModelSection() {// or an in-flight save whose options may still carry the old locale....(option.providerId === 'xd' && cindyAiName ? {group: cindyAiName,+ logoKind: cindyAiProvider?.logoKind,label: `${option.agentSuffix} · ${option.modelName} · ${cindyAiName}`,} : {}),available:@@ -93,7 +94,7 @@ export function AuxiliaryModelSection() {defaultEnabled: option.defaultEnabled,}),})),- [cindyAiName, modelVisibilityVersion, settings?.options],+ [cindyAiName, cindyAiProvider?.logoKind, modelVisibilityVersion, settings?.options],);if (!settings) return null;diff --git a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsxindex b058e29245..f59a681120 100644--- a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx+++ b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx@@ -122,7 +122,7 @@ function RemoteProviderIcon({ provider, size }: { provider: ProviderView; size:return (<RemoteSourceMark markSize={size}>{hasProviderLogo(provider.id, provider.routing) ? (- <ProviderLogoMark providerId={provider.id} routing={provider.routing} size={size} />+ <ProviderLogoMark providerId={provider.id} routing={provider.routing} logoKind={provider.logoKind} size={size} />) : (<span className="text-15 font-medium leading-none">{providerMonogram(provider.name)}</span>)}diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsxindex 69cabc94e6..f405124beb 100644--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx@@ -116,7 +116,7 @@ import { SettingsTextInput } from './SettingsTextInput';import { buildUnionRows, UnifiedModelList } from './UnifiedModelList';import { AnthropicMark } from '@/components/icons/AnthropicMark';import { OpenAIMark } from '@/components/icons/OpenAIMark';-import { XDIncMark } from '@/components/icons/XDIncMark';+import { CindyMark } from '@/components/icons/CindyMark';import { hasProviderLogo, ProviderLogoMark } from '@/components/icons/ProviderLogoMark';import { SortableList } from '@/components/sidebar/SortableList';import { ProviderShareEntryButton } from '@/features/provider-share/ProviderShareEntryButton';@@ -315,7 +315,7 @@ function useRemoteControlEnabled(): boolean | null {/** 供应商行图标(内置品牌 mark / 首字母 monogram)。 */function providerIcon(p: ProviderView, size: number): ReactNode {if (hasProviderLogo(p.id, p.routing)) {- return <ProviderLogoMark providerId={p.id} routing={p.routing} size={size} />;+ return <ProviderLogoMark providerId={p.id} routing={p.routing} logoKind={p.logoKind} size={size} />;}return <span className="text-15 font-medium leading-none">{providerMonogram(p.name)}</span>;}@@ -2020,7 +2020,7 @@ function XdGatewayHeader({return (<DetailHeaderchildren={children}- icon={<XDIncMark size={18} />}+ icon={<ProviderLogoMark providerId="xd" logoKind={provider?.logoKind} size={18} />}title={provider ? providerDisplayName(provider, t) : t('settings.providers.xd.title')}identityBadge={syncStatus.accountTier === 'free' ? (@@ -2234,7 +2234,7 @@ function CindySigninRow({ selected, onSelect }: { selected: boolean; onSelect: (color: 'var(--settings-integration-avatar-icon)',}}>- <XDIncMark size={14} />+ <CindyMark size={14} /></div><spanclassName="min-w-0 flex-1 truncate text-13 font-medium"@@ -3343,7 +3343,7 @@ export function ProvidersSection() {color: 'var(--settings-integration-avatar-icon)',}}>- <XDIncMark size={24} />+ <CindyMark size={24} /></div><spanclassName="mt-4 text-24 font-medium leading-[1.2]"diff --git a/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx b/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsxindex 8516e4783d..27a1a9bada 100644--- a/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx+++ b/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx@@ -936,7 +936,7 @@ export function UnifiedModelList({: explicitIcon === 'codex'? 'openai': explicitIcon === 'cindy'- ? 'xd'+ ? 'cindy': brand?.logoKind;const paymentRequired = isRowPaymentRequired(row);// 能力注记:多 agent 供应商里缺少任一通道就标(单 agent 供应商头部已说明);@@ -968,7 +968,7 @@ export function UnifiedModelList({<ProviderLogoMarkproviderId={provider.id}routing={provider.routing}- {...(logoKind ? { logoKind } : {})}+ logoKind={logoKind ?? provider.logoKind}size={19}/>) : (diff --git a/apps/desktop/src/shared/cindyAiPresentation.ts b/apps/desktop/src/shared/cindyAiPresentation.tsindex 555d94a902..bb2fd4f6c8 100644--- a/apps/desktop/src/shared/cindyAiPresentation.ts+++ b/apps/desktop/src/shared/cindyAiPresentation.ts@@ -1,5 +1,10 @@import { isXdOrgUser, type XdOrgIdentity } from './xdOrg.js';+/** Temporary XD exception; organization avatars are not model icons. */+export function cindyAiAccountLogoKind(user: XdOrgIdentity | null | undefined): 'xd' | 'cindy' {+ return isXdOrgUser(user) ? 'xd' : 'cindy';+}+/** Presentation only: membership determines the name, never the gateway backend. */export function cindyAiAccountName(user: XdOrgIdentity | null | undefined,diff --git a/apps/mobile/src/__tests__/mobileProviderMark.test.tsx b/apps/mobile/src/__tests__/mobileProviderMark.test.tsxnew file mode 100644index 0000000000..0af780afad--- /dev/null+++ b/apps/mobile/src/__tests__/mobileProviderMark.test.tsx@@ -0,0 +1,89 @@+import { createElement } from "react";+import { renderToStaticMarkup as render } from "react-dom/server";+import { expect, it, vi } from "vitest";+import {+ MobileProviderMark,+ MobileModelIconMark,+} from "@/session/MobileProviderMark";++// User request 2026-10-29. Unit: no existing test renders the real mobile provider+// mark. The regression is source-host identity combined with theme color.+vi.mock("react-native", () => ({+ View: ({ children }: any) => createElement("div", null, children),+ StyleSheet: { create: (styles: unknown) => styles },+}));+vi.mock("@/components/AppText", () => ({+ Text: ({ children }: any) => createElement("span", null, children),+}));+vi.mock("react-native-svg", () => ({+ default: ({ children, ...props }: any) =>+ createElement("svg", props, children),+ G: ({ children, ...props }: any) => createElement("g", props, children),+ Path: (props: any) => createElement("path", props),+}));+vi.mock("@/theme", () => ({+ useTheme: () => ({ colors: { textSecondary: "currentColor" } }),+ useThemedStyles: (factory: any) => factory({ textSecondary: "currentColor" }),+}));+vi.mock("@/session/RemoteSourceMark", () => ({+ RemoteSourceMark: ({ children }: any) =>+ createElement("div", { "data-remote": true }, children),+}));++// These marks are stateless; render the real components without a DOM environment.+const firstPath = (markup: string) => markup.match(/<path d="([^"]+)"/)?.[1];++// Unit: provider ID alone cannot distinguish personal and XD organization.+it("uses the original XD paths with the supplied theme color and keeps the remote badge", () => {+ const xd = render(+ <MobileProviderMark+ providerId="xd"+ name="Cindy AI · 心动"+ logoKind="xd"+ color="white"+ remote+ />,+ );+ const paths = xd.match(/<path\b[^>]*>/g) ?? [];+ expect(paths.length).toBe(3);+ expect(paths.every((p) => p.includes('fill="white"'))).toBe(true);+ expect(xd).toContain('data-remote="true"');+ const personal = render(+ <MobileProviderMark+ providerId="xd"+ name="Cindy AI · 个人"+ logoKind="cindy"+ />,+ );+ expect(firstPath(personal)).toBeTruthy();+ expect(firstPath(personal)).not.toBe(firstPath(xd));+ expect(personal).not.toContain("<img");+});+it("preserves explicit model brands instead of overriding them with the organization", () => {+ const xd = render(+ <MobileModelIconMark providerId="xd" name="Cindy AI" logoKind="xd" />,+ );+ const claude = render(+ <MobileModelIconMark+ providerId="xd"+ name="Cindy AI"+ logoKind="xd"+ icon="claude"+ />,+ );+ expect(firstPath(claude)).toBeTruthy();+ expect(firstPath(claude)).not.toBe(firstPath(xd));+ const cindy = render(+ <MobileModelIconMark+ providerId="xd"+ name="Cindy AI"+ logoKind="xd"+ icon="cindy"+ />,+ );+ const fallback = render(+ <MobileProviderMark providerId="xd" name="Cindy AI" />,+ );+ expect(firstPath(cindy)).toBeTruthy();+ expect(firstPath(fallback)).toBe(firstPath(cindy));+});diff --git a/apps/mobile/src/session/MobileProviderMark.tsx b/apps/mobile/src/session/MobileProviderMark.tsxindex f995341213..118801fac8 100644--- a/apps/mobile/src/session/MobileProviderMark.tsx+++ b/apps/mobile/src/session/MobileProviderMark.tsx@@ -8,7 +8,7 @@import type { ReactNode } from 'react';import { StyleSheet, View } from 'react-native';import { Text } from '@/components/AppText';-import Svg, { Path } from 'react-native-svg';+import Svg, { G, Path } from 'react-native-svg';import {ANTHROPIC_PROVIDER_PATH,@@ -21,6 +21,7 @@ import { useTheme, useThemedStyles, type ThemeColors } from '@/theme';import { fontWeight as fontWeightToken, lineHeight, radius, typeScale } from '@/theme/tokens';import {PROVIDER_LOGO_PATHS,+ CINDY_MARK_TRANSFORM, CINDY_MARK_PATH, CINDY_MARK_EARRING_PATH, CINDY_MARK_EARRING_COLOR,isProviderLogoKind,resolveProviderLogoKind,type ProviderLogoRouting,@@ -139,6 +140,8 @@ export function MobileProviderMark({GLYPH_INSET,fill,);+ case 'cindy':+ return withRemote(<View accessible={false} style={styles.markBox}><CindyArtwork fill={fill} /></View>, remote, GLYPH_INSET, fill);case 'xd':return withRemote(<View accessible={false} style={styles.markBox}>@@ -212,19 +215,9 @@ export function MobileModelIconMark({if (kind) {const fill = color ?? colors.textSecondary;if (kind === 'cindy') {- return withRemote(- <View accessible={false} style={styles.markBox}>- <Svg width={XD_WIDTH} height={XD_WIDTH * XD_ASPECT} viewBox={XD_VIEW_BOX}>- {XD_SYMBOL_PATHS.map((p) => (- <Path key={p} d={p} fill={fill} />- ))}- </Svg>- </View>,- remote,- XD_INSET,- fill,- );+ return withRemote(<View accessible={false} style={styles.markBox}><CindyArtwork fill={fill} /></View>, remote, GLYPH_INSET, fill);}+return withRemote(<View accessible={false} style={styles.markBox}><Svg width={GLYPH_SIZE} height={GLYPH_SIZE} viewBox="0 0 24 24">@@ -250,3 +243,12 @@ export function MobileModelIconMark({/>);}++function CindyArtwork({ fill }: { fill: string }) {+ return <Svg width={GLYPH_SIZE} height={GLYPH_SIZE} viewBox="0 0 24 24">+ <G transform={CINDY_MARK_TRANSFORM}>+ <Path d={CINDY_MARK_PATH} fill={fill} />+ <Path d={CINDY_MARK_EARRING_PATH} fill={CINDY_MARK_EARRING_COLOR} />+ </G>+ </Svg>;+}diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.mdindex e48e719461..16b6476171 100644--- a/docs/dev-rules/model-catalog-maintenance.md+++ b/docs/dev-rules/model-catalog-maintenance.md@@ -2,6 +2,19 @@> 权威入口:先读本页,再按问题打开专题。Server 为独立仓库,文档不代表已部署。+## Cindy AI 身份图标++供应商 ID 仍为 `xd`;个人、其他企业和未知身份默认使用 Chrome 插件的 Cindy 剪影。+来源电脑按既有 `isXdOrgUser` 识别心动身份,临时投影 `logoKind: xd`,渲染原来的+单色心动 SVG;其他身份投影 `logoKind: cindy`。心动图形跟随主题和选中状态的前景色。+组织头像 `orgLogoUrl` 不用于模型图标,不新增图片 URL、图片请求或加载失败状态。++同账号远程与手机沿用来源电脑的图标;跨账号分享清除企业图标身份,与名称后缀的+边界一致。复用既有可选 `logoKind` 与能力协商;旧客户端不认识 `cindy` 时按既有+provider ID 回退。中转只转发原目录载荷,无新帧、权限或恢复协议。+显式模型品牌优先,`cindy/xd` 模型品牌使用 Cindy 剪影;不改 Auto 路由或 provider ID。+企业专用模型图标配置需后续由服务端独立提供,不复用组织头像。+## 数据流```textdiff --git a/packages/device-link/src/__tests__/providerShare.test.ts b/packages/device-link/src/__tests__/providerShare.test.tsindex 67cf3f6e5a..a3c2b79ab5 100644--- a/packages/device-link/src/__tests__/providerShare.test.ts+++ b/packages/device-link/src/__tests__/providerShare.test.ts@@ -159,7 +159,7 @@ describe('provider share identity scrubbing', () => {// Existing cases covered subscription identities, not Cindy AI membership names.it.each(['Cindy AI · 个人', 'Cindy AI · 心动', 'Cindy AI · Example Studio'])('removes membership identity from shared labels and catalogs: %s', async (name) => {const { scrubProviderShareLabel, scrubSharedProviderCatalog, parseProviderShareReceivedCatalogs } = await import('../providerShareCatalog.js');- const provider = { id: 'xd', name };+ const provider = { id: 'xd', name, logoKind: 'xd' };expect(scrubProviderShareLabel(name)).toBe('Cindy AI');expect(scrubSharedProviderCatalog({ providers: [provider] })).toEqual({ providers: [{ id: 'xd', name: 'Cindy AI' }] });const [entry] = parseProviderShareReceivedCatalogs({ shares: [{@@ -170,6 +170,7 @@ describe('provider share identity scrubbing', () => {expect(entry?.providerLabel).toBe('Cindy AI');expect(entry?.catalog).toEqual({ providers: [{ id: 'xd', name: 'Cindy AI' }] });expect(provider.name).toBe(name); // Same-account presentation is not mutated.+ expect(provider.logoKind).toBe('xd');});it('drops account identity fields and removes login names or emails from provider names', async () => {diff --git a/packages/device-link/src/providerShareCatalog.ts b/packages/device-link/src/providerShareCatalog.tsindex d60101f278..7d6f1357b8 100644--- a/packages/device-link/src/providerShareCatalog.ts+++ b/packages/device-link/src/providerShareCatalog.ts@@ -174,6 +174,8 @@ export function scrubSharedProvider<T>(provider: T): T {const guestRunning = readProviderShareGuestRunning(provider);const { subscriptionAccount, openAiAccount, ...fields } = provider as Record<string, unknown>;delete fields.group;+ // Sharing a gateway must not disclose the owner's organization identity.+ if (fields.id === 'xd') delete fields.logoKind;delete fields[PROVIDER_RUNNING_TURNS_FIELD];delete fields[PROVIDER_SHARE_GROUP_SIZE_FIELD];delete fields[PROVIDER_SHARE_GROUP_STATUS_FIELD];diff --git a/packages/model-providers/src/__tests__/providerBranding.test.ts b/packages/model-providers/src/__tests__/providerBranding.test.tsindex a453d62db7..54fb7b2a68 100644--- a/packages/model-providers/src/__tests__/providerBranding.test.ts+++ b/packages/model-providers/src/__tests__/providerBranding.test.ts@@ -13,7 +13,7 @@ describe('provider branding', () => {it.each([['anthropic', 'anthropic'],['openai', 'openai'],- ['xd', 'xd'],+ ['xd', 'cindy'],] as const)('maps built-in provider %s to its official mark', (providerId, logoKind) => {expect(resolveProviderLogoKind(providerId)).toBe(logoKind);});@@ -70,6 +70,7 @@ describe('provider branding', () => {});it('guards runtime logo values before indexing shared paths', () => {+ expect(isProviderLogoKind('cindy')).toBe(true);expect(isProviderLogoKind('vercel')).toBe(true);expect(isProviderLogoKind('future-brand')).toBe(false);expect(isProviderLogoKind(null)).toBe(false);diff --git a/packages/model-providers/src/cindyMark.ts b/packages/model-providers/src/cindyMark.tsnew file mode 100644index 0000000000..6327d776f6--- /dev/null+++ b/packages/model-providers/src/cindyMark.ts@@ -0,0 +1,11 @@+/** Cindy Chrome extension action-light-small.svg; shared geometry for Desktop/Mobile.+ * Source: cindy-official-plugins/my-browser/assets/icon-source (2026-10-29).+ * Foreground follows the theme; the earring retains the source artwork's brand red.+ */+export const CINDY_MARK_TRANSFORM =+ "translate(12 12) scale(1.15) translate(-11.97 -11.58)";+export const CINDY_MARK_PATH =+ "M 18.163,3.549 C 18.561,3.879 18.876,4.238 19.198,4.64 C 19.268,4.71 19.339,4.78 19.411,4.852 C 19.492,4.934 19.574,5.015 19.658,5.099 C 19.707,5.148 19.756,5.196 19.807,5.246 C 20.975,6.474 21.548,8.384 21.521,10.044 C 21.495,10.615 21.368,11.261 20.977,11.697 C 20.936,11.732 20.894,11.768 20.852,11.805 C 20.852,11.562 20.852,11.32 20.852,11.07 C 20.633,11.931 20.637,12.526 20.946,13.369 C 21.317,14.501 21.213,15.792 20.72,16.867 C 20.364,17.549 20.364,17.549 20.025,17.775 C 20.039,17.703 20.054,17.631 20.068,17.557 C 20.077,17.511 20.077,17.511 20.123,17.275 C 20.141,17.183 20.159,17.09 20.178,16.994 C 20.188,16.919 20.198,16.843 20.209,16.764 C 20.178,16.734 20.148,16.704 20.117,16.673 C 20.107,16.753 20.098,16.833 20.088,16.915 C 19.896,17.855 19.189,18.653 18.463,19.244 C 17.965,19.568 17.495,19.757 16.902,19.796 C 17.054,19.644 17.205,19.492 17.361,19.336 C 17.086,19.336 17.086,19.336 16.81,19.428 C 16.621,19.435 16.431,19.436 16.242,19.434 C 16.142,19.433 16.042,19.432 15.939,19.431 C 15.863,19.43 15.787,19.429 15.708,19.428 C 15.799,19.368 15.89,19.307 15.983,19.244 C 15.898,19.247 15.813,19.249 15.725,19.251 C 15.611,19.253 15.498,19.254 15.381,19.256 C 15.269,19.258 15.157,19.26 15.042,19.262 C 14.677,19.243 14.4,19.174 14.055,19.061 C 14.149,18.786 14.248,18.513 14.347,18.24 C 14.374,18.162 14.401,18.084 14.429,18.003 C 14.638,17.438 14.638,17.438 14.908,17.298 C 15.231,17.321 15.513,17.399 15.823,17.494 C 16.353,17.646 16.809,17.746 17.361,17.683 C 17.713,17.485 17.801,17.281 17.918,16.902 C 18.096,16.333 18.096,16.333 18.372,16.122 C 18.432,16.122 18.493,16.122 18.555,16.122 C 18.55,16.051 18.544,15.981 18.538,15.909 C 18.555,15.662 18.555,15.662 18.693,15.533 C 18.87,15.345 18.853,15.256 18.848,15.002 C 18.875,14.596 19.004,14.442 19.302,14.17 C 19.37,14.114 19.439,14.059 19.509,14.002 C 19.658,13.825 19.658,13.825 19.651,13.601 C 19.559,13.348 19.446,13.159 19.29,12.941 C 18.966,12.484 18.91,12.168 18.897,11.606 C 18.895,11.541 18.894,11.477 18.892,11.41 C 18.886,11.203 18.882,10.996 18.877,10.788 C 18.858,9.96 18.837,9.138 18.739,8.314 C 18.678,8.314 18.618,8.314 18.555,8.314 C 18.538,8.426 18.521,8.538 18.504,8.653 C 18.133,10.262 16.849,11.349 15.68,12.413 C 14.855,13.168 14.222,13.835 14.115,14.994 C 14.099,15.675 14.158,16.228 14.422,16.856 C 14.109,16.759 13.87,16.672 13.595,16.489 C 13.563,16.603 13.531,16.716 13.498,16.833 C 13.279,17.493 12.925,18.134 12.467,18.657 C 12.309,18.877 12.309,18.877 12.315,19.07 C 12.413,19.269 12.522,19.396 12.677,19.554 C 12.985,19.893 13.235,20.25 13.481,20.634 C 13.515,20.688 13.55,20.741 13.585,20.797 C 14.146,21.686 14.146,21.686 14.146,22 C 13.75,21.874 13.374,21.722 12.993,21.558 C 11.378,20.9 9.722,20.714 7.992,20.622 C 8.028,20.575 8.064,20.528 8.101,20.479 C 8.37,20.121 8.637,19.761 8.894,19.394 C 8.947,19.317 9.001,19.241 9.056,19.162 C 9.187,18.969 9.187,18.969 9.278,18.785 C 9.245,18.78 9.245,18.78 9.077,18.756 C 8.797,18.688 8.6,18.576 8.36,18.418 C 8.36,18.478 8.36,18.539 8.36,18.602 C 7.479,18.463 6.695,17.922 6.155,17.224 C 5.981,16.926 5.832,16.623 5.696,16.305 C 5.74,16.453 5.784,16.6 5.828,16.747 C 5.853,16.829 5.877,16.911 5.903,16.996 C 5.954,17.164 6.008,17.332 6.064,17.499 C 5.299,17.281 4.772,16.857 4.318,16.213 C 3.714,15.033 3.82,13.901 4.043,12.631 C 3.577,13.432 3.387,14.102 3.308,15.019 C 2.824,14.591 2.572,13.903 2.481,13.274 C 2.397,11.547 3.913,10.126 4.944,8.882 C 5.479,8.227 5.879,7.592 6.224,6.822 C 6.567,6.064 6.997,5.455 7.533,4.824 C 7.593,4.75 7.652,4.675 7.713,4.599 C 10.235,1.556 15.063,1.158 18.163,3.549 Z";+export const CINDY_MARK_EARRING_PATH =+ "M 10.22879,11.96118 L 13.40721,13.91787 L 13.40721,14.65125 L 10.22879,16.60782 L 10.22879,15.50708 L 12.30648,14.28390 L 10.22879,13.06192 L 10.22879,11.96118 Z";+export const CINDY_MARK_EARRING_COLOR = "#F70121";diff --git a/packages/model-providers/src/providerBranding.ts b/packages/model-providers/src/providerBranding.tsindex 706ec730a4..3fed2fc617 100644--- a/packages/model-providers/src/providerBranding.ts+++ b/packages/model-providers/src/providerBranding.ts@@ -8,6 +8,8 @@* official Simple Icons glyph; `llamacpp` is an original stack mark.*/+export { CINDY_MARK_TRANSFORM, CINDY_MARK_PATH, CINDY_MARK_EARRING_PATH, CINDY_MARK_EARRING_COLOR } from './cindyMark.js';+// Additional supplier marks: Lobe Icons 5.14.0 (MIT; included in THIRD-PARTY-NOTICES).export const PROVIDER_LOGO_PATHS = {// Agnes official foreground mark: https://platform.agnes-ai.com/images/biglogo.svg@@ -68,7 +70,7 @@ export const PROVIDER_LOGO_PATHS = {vllm: 'm23.6 0-8.721 4.59L9.829 24h7.41zM9.83 24V5.142H.4Z',} as const;-export type ProviderLogoKind = keyof typeof PROVIDER_LOGO_PATHS | 'anthropic' | 'openai' | 'xd';+export type ProviderLogoKind = keyof typeof PROVIDER_LOGO_PATHS | 'anthropic' | 'openai' | 'xd' | 'cindy';/** Device-link 等运行时边界不能信任静态 union;未知未来值应安全回退。 */export function isProviderLogoKind(value: unknown): value is ProviderLogoKind {@@ -76,6 +78,7 @@ export function isProviderLogoKind(value: unknown): value is ProviderLogoKind {value === 'anthropic'|| value === 'openai'|| value === 'xd'+ || value === 'cindy'|| (typeof value === 'string'&& Object.prototype.hasOwnProperty.call(PROVIDER_LOGO_PATHS, value)@@ -125,7 +128,7 @@ const PROVIDER_LOGO_KIND_BY_ID: Readonly<Record<string, ProviderLogoKind>> = {anthropic: 'anthropic',openai: 'openai',- xd: 'xd',+ xd: 'cindy',xai: 'xai',gemini: 'google',openrouter: 'openrouter',diff --git a/packages/model-providers/src/sections.ts b/packages/model-providers/src/sections.tsindex d68252bd0f..604e378f26 100644--- a/packages/model-providers/src/sections.ts+++ b/packages/model-providers/src/sections.ts@@ -55,7 +55,7 @@ export interface ProviderSection {models: SectionModel[];}-/** 客户端有资产可渲染的模型厂牌图标种类(桌面 AnthropicMark / OpenAIMark / XDIncMark,手机同源厂牌 path)。 */+/** 客户端有资产可渲染的模型厂牌图标种类(桌面 AnthropicMark / OpenAIMark / CindyMark,手机同源厂牌 path)。 */export type ModelIconKind = 'claude' | 'codex' | 'cindy';/**