Skip to content

armgit / cindy

Public Imported from GitHub
0

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

fix(providers): 分享 Cindy AI 时剥离身份后缀

Dash4d9a3a736856
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
index 1dc40075cb..840588389b 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
@@ -329,6 +329,16 @@ describe('same-account share management during account transitions', () => {
expect(remember).toHaveBeenCalledExactlyOnceWith('https://cindy.app/s#test-link', expect.any(String));
});
+ // PR #7744: exercise the production share-management entry, not only the scrubber.
+ // provider-sharing.md §6 forbids sending org identity to the sharing service.
+ it('uploads only the generic Cindy AI brand when creating an enterprise share link', async () => {
+ listProviders.mockResolvedValue([{ id: 'xd', name: 'Cindy AI · Example Studio', connected: true, agents: ['codex'] }]);
+ await executeProviderShareManagementCommand({ action: 'create-link', providerId: 'xd' });
+ expect(api.createLink).toHaveBeenCalledExactlyOnceWith({
+ providerId: 'xd', providerLabel: 'Cindy AI', deviceName: 'Cindy', identityCard: { card: 'test-identity-card' },
+ });
+ });
+
it('rejects an old server before exposing or registering a remote link', async () => {
api.createLink.mockResolvedValueOnce({ invitation: 'test-invitation' });
await expect(executeProviderShareManagementCommand(createLink)).rejects.toThrow(/UNSUPPORTED_CAPABILITY/);
diff --git a/packages/device-link/src/__tests__/providerShare.test.ts b/packages/device-link/src/__tests__/providerShare.test.ts
index 94919e16a1..67cf3f6e5a 100644
--- a/packages/device-link/src/__tests__/providerShare.test.ts
+++ b/packages/device-link/src/__tests__/providerShare.test.ts
@@ -155,6 +155,23 @@ describe('provider share received catalogs', () => {
});
describe('provider share identity scrubbing', () => {
+ // provider-sharing.md §6: org/membership suffixes must not cross accounts.
+ // 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 };
+ expect(scrubProviderShareLabel(name)).toBe('Cindy AI');
+ expect(scrubSharedProviderCatalog({ providers: [provider] })).toEqual({ providers: [{ id: 'xd', name: 'Cindy AI' }] });
+ const [entry] = parseProviderShareReceivedCatalogs({ shares: [{
+ agentDeviceId: 'share:s1', shareId: 's1', providerId: 'xd', providerLabel: name, deviceName: 'Cindy',
+ owner: { displayName: 'Alice', avatarUrl: null }, status: 'active', hostOnline: true,
+ catalog: { providers: [provider] },
+ }] });
+ 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.
+ });
+
it('drops account identity fields and removes login names or emails from provider names', async () => {
const { scrubProviderShareLabel, scrubSharedProvider, scrubSharedProviderCatalog } = await import('../providerShareCatalog.js');
expect(scrubProviderShareLabel('OpenAI · [email protected]')).toBe('OpenAI');
diff --git a/packages/device-link/src/providerShareCatalog.ts b/packages/device-link/src/providerShareCatalog.ts
index 49ddba84ae..d60101f278 100644
--- a/packages/device-link/src/providerShareCatalog.ts
+++ b/packages/device-link/src/providerShareCatalog.ts
@@ -86,7 +86,7 @@ const MAX_SHARES = 64;
const EMAIL_LIKE = /[^\s@@<>()[\]{},;:"'`·]+[@@][^\s@@<>()[\]{},;:"'`·]+/g;
const EDGE_SEPARATORS = /^[\s·•|::\-–—/]+|[\s·•|::\-–—/]+$/g;
// 登录后自动生成的名称「<供应商> · <登录名>」,截到 50 字符后可能只剩半个登录名(也可能不是邮箱)。
-const GENERATED_ACCOUNT_NAME = /^(?:OpenAI|Anthropic|Claude|xAI|Grok)\s*·/;
+const GENERATED_ACCOUNT_NAME = /^(?:OpenAI|Anthropic|Claude|xAI|Grok|Cindy AI)\s*·/;
// 同名时自动追加的序号「 (2)」:保留,同一台电脑分享的两个同类账号才分得清。
const COPY_SUFFIX = /\s\((?:[2-9]|[1-9]\d+)\)$/;
// 登录名去掉后留下的空括号。
@@ -133,7 +133,7 @@ function stripNestedUrlSecrets(value: unknown, depth: number): unknown {
}
/**
- * 分享给他人的供应商名称:去掉分享者的账号身份(订阅或 ChatGPT 登录名、任何邮箱)。
+ * 分享给他人的供应商名称:去掉分享者的账号身份(订阅或 ChatGPT 登录名、任何邮箱、Cindy AI 个人/企业后缀)。
* 例如自动命名的「OpenAI · [email protected]」→「OpenAI」。带账号身份的供应商、或名称是
* 自动生成的形状时,第一个「·」之后的部分整段去掉(登录名可能被截断,按原文匹配不到)。
* 去空后用 fallback。