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(bots): 恢复本地模式头像裁剪并验证拖动结果

nana8b3057ccfb5c
diff --git a/apps/desktop/scripts/fixtures/bot-avatar-crop/bot-avatar-crop-fixture.tsx b/apps/desktop/scripts/fixtures/bot-avatar-crop/bot-avatar-crop-fixture.tsx
index c053fd3ef5..80d31c26d7 100644
--- a/apps/desktop/scripts/fixtures/bot-avatar-crop/bot-avatar-crop-fixture.tsx
+++ b/apps/desktop/scripts/fixtures/bot-avatar-crop/bot-avatar-crop-fixture.tsx
@@ -18,18 +18,22 @@ mountPage({
host: {
profileUpdate: forbid('profileUpdate'),
// Component-only host substitute. Real Electron prepares HDR through
- // profileEdit.chooseAvatarFile; that path has its own main-process tests.
- profileChooseAvatar: async () => {
- const supplied = (window as unknown as { __botAvatarUpload?: string }).__botAvatarUpload;
- if (supplied) return { canceled: false, previewDataUrl: supplied };
- const image = new Image();
- image.src = cindy;
- await image.decode();
- const canvas = document.createElement('canvas');
- canvas.width = image.width;
- canvas.height = image.height;
- canvas.getContext('2d')!.drawImage(image, 0, 0);
- return { canceled: false, previewDataUrl: canvas.toDataURL() };
+ // profileEdit.chooseAvatarSource; that path has its own main-process tests.
+ localDb: {
+ bots: {
+ chooseAvatarSource: async () => {
+ const supplied = (window as unknown as { __botAvatarUpload?: string }).__botAvatarUpload;
+ if (supplied) return { canceled: false, previewDataUrl: supplied };
+ const image = new Image();
+ image.src = cindy;
+ await image.decode();
+ const canvas = document.createElement('canvas');
+ canvas.width = image.width;
+ canvas.height = image.height;
+ canvas.getContext('2d')!.drawImage(image, 0, 0);
+ return { canceled: false, previewDataUrl: canvas.toDataURL() };
+ },
+ },
},
},
render: () => <Portrait />,
diff --git a/apps/desktop/scripts/fixtures/bot-avatar-crop/ui-page.mjs b/apps/desktop/scripts/fixtures/bot-avatar-crop/ui-page.mjs
index 22ffe61de6..827597ef1a 100644
--- a/apps/desktop/scripts/fixtures/bot-avatar-crop/ui-page.mjs
+++ b/apps/desktop/scripts/fixtures/bot-avatar-crop/ui-page.mjs
@@ -67,14 +67,29 @@ export default {
const result = await page.getByTestId('avatar-result').textContent();
assert.notEqual(result, initial);
assert.notEqual(result, dataUrl);
- const size = await page.evaluate(async (src) => {
+ const pixels = await page.evaluate(async (src) => {
const image = new Image();
image.src = src;
await image.decode();
- return [image.naturalWidth, image.naturalHeight];
+ const canvas = document.createElement('canvas');
+ canvas.width = image.naturalWidth;
+ canvas.height = image.naturalHeight;
+ const context = canvas.getContext('2d');
+ context.drawImage(image, 0, 0);
+ const row = context.getImageData(0, Math.floor(canvas.height / 2), canvas.width, 1).data;
+ let green = 0;
+ for (let x = 0; x < canvas.width; x++) if (row[x * 4 + 1] > row[x * 4]) green++;
+ return { width: canvas.width, height: canvas.height, greenFraction: green / canvas.width };
}, result);
- assert.equal(size[0], size[1]);
- assert.ok(size[0] > 0 && size[0] < 400);
+ assert.equal(pixels.width, pixels.height);
+ assert.ok(pixels.width > 0 && pixels.width < 400);
+ // At a centered crop the split is 50%. A 45px rightward image drag must
+ // move the split right by 45 / viewport diameter in the exported pixels.
+ const diameter = Math.min(240, box.width - 48, box.height - 48);
+ assert.ok(
+ Math.abs(pixels.greenFraction - (0.5 + 45 / diameter)) < 0.04,
+ `Drag did not reach exported pixels: green fraction ${pixels.greenFraction}`,
+ );
await ui.capture('confirmed');
await upload();
await stage.waitFor();
diff --git a/apps/desktop/src/main/__tests__/profileEdit.test.ts b/apps/desktop/src/main/__tests__/profileEdit.test.ts
index 0221585be6..4a2aec5a08 100644
--- a/apps/desktop/src/main/__tests__/profileEdit.test.ts
+++ b/apps/desktop/src/main/__tests__/profileEdit.test.ts
@@ -18,6 +18,7 @@ import {
AVATAR_SOURCE_MAX_BYTES,
AVATAR_UPLOAD_MAX_EDGE_PX,
chooseAvatarFile,
+ chooseAvatarSource,
cleanupLegacyProfileOverride,
getProfileEditState,
readAvatarDimensions,
@@ -267,6 +268,26 @@ describe('HDR 头像在取景前转 SDR', () => {
expect(preview.equals((await toSdrAvatarImage({ buffer: hdrPng, mimeType: 'image/png' })).buffer)).toBe(true);
});
+ // Unit regression #6889: local-mode Bot picking must share real HDR
+ // preparation without bypassing the account editor's existing login guard.
+ // Account-only tests previously rejected every unlogged-in chooser.
+ it('local Bot source preparation tone-maps HDR without reading or writing account data', async () => {
+ const hdrPng = fs.readFileSync(path.join(__dirname, 'fixtures/hdr-avatar/pq-bt2100.png'));
+ const { deps } = makeDeps({
+ getCurrentUserId: () => null,
+ showAvatarOpenDialog: vi.fn(async () => '/fixture/avatar.png'),
+ readFile: vi.fn(async () => hdrPng),
+ toSdrAvatar: toSdrAvatarImage,
+ getServerProfile: () => { throw new Error('No account in local mode'); },
+ });
+ await expect(chooseAvatarFile(deps)).rejects.toSatisfy((error) => ipcCode(error) === 'PRECONDITION_FAILED');
+ const result = await chooseAvatarSource(deps);
+ const expected = await toSdrAvatarImage({ buffer: hdrPng, mimeType: 'image/png' });
+ expect(result).toEqual({ canceled: false, previewDataUrl: `data:${expected.mimeType};base64,${expected.buffer.toString('base64')}` });
+ expect(deps.uploadAvatar).not.toHaveBeenCalled();
+ expect(deps.patchProfile).not.toHaveBeenCalled();
+ });
+
it('chooseAvatarFile:转换结果超出源图上限 → 选图阶段就 INVALID_PARAMS', async () => {
const { deps } = makeDeps({
showAvatarOpenDialog: vi.fn(async () => '/pics/hdr.png'),
diff --git a/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts b/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts
index 770659b224..ec48930575 100644
--- a/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts
+++ b/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts
@@ -1337,6 +1337,34 @@ describe('Bot canonical Session lifecycle', () => {
expect(h.showOpenDialog).not.toHaveBeenCalled();
});
+ // #6889 unit: exercise the registered Bot source IPC in local mode,
+ // including sender and owner-boundary errors. Existing tests only saved
+ // avatars for an already-created Bot; source preparation must not mutate it.
+ it('prepares a Bot avatar source in local mode without a profile write', async () => {
+ h.ownerScopeKey = 'local:fixture:1';
+ const filePath = resolve(__dirname, '../../../../renderer/assets/bot-presets/cindy.png');
+ h.showOpenDialog.mockResolvedValueOnce({ canceled: false, filePaths: [filePath] });
+ const before = await invoke('local-db:bots:get', 'bot-1');
+ const source = await invoke('local-db:bots:choose-avatar-source', undefined);
+ expect(source).toEqual({ canceled: false, previewDataUrl: `data:image/png;base64,${readFileSync(filePath).toString('base64')}` });
+ expect(await invoke('local-db:bots:get', 'bot-1')).toEqual(before);
+ });
+
+ it('rejects an untrusted source chooser before opening a file dialog', async () => {
+ h.showOpenDialog.mockClear();
+ vi.mocked(assertTrustedAppRendererEvent).mockImplementationOnce(() => { throw new Error('untrusted'); });
+ await expect(invoke('local-db:bots:choose-avatar-source', undefined)).rejects.toThrow('untrusted');
+ expect(h.showOpenDialog).not.toHaveBeenCalled();
+ });
+
+ it('discards a source chooser result after changing owners', async () => {
+ h.showOpenDialog.mockImplementationOnce(async () => {
+ h.ownerScopeKey = 'another-owner';
+ return { canceled: true, filePaths: [] };
+ });
+ await expect(invoke('local-db:bots:choose-avatar-source', undefined)).rejects.toMatchObject({ code: 'PRECONDITION_FAILED' });
+ });
+
it('retains the old host file chooser when no gallery bytes are supplied', async () => {
h.showOpenDialog.mockClear();
await expect(invoke('local-db:bots:choose-avatar', { botId: 'bot-1' })).resolves.toEqual({ canceled: true });
diff --git a/apps/desktop/src/main/localDb/ipc/bots.ts b/apps/desktop/src/main/localDb/ipc/bots.ts
index c56f96b1c9..fa401ffde3 100644
--- a/apps/desktop/src/main/localDb/ipc/bots.ts
+++ b/apps/desktop/src/main/localDb/ipc/bots.ts
@@ -10,6 +10,8 @@ import { listBotSkillsForBot } from '../../maker-ipc/botSkillService.js';
import { provisionDefaultBot } from '../../maker-ipc/botDefaultProvisioning.js';
import { BOT_TEMPLATE_PRESET_AVATARS, CINDY_DEFAULT_IDENTITY } from '../../../shared/botTemplatePreset.js';
import fs from 'node:fs/promises';
+import { chooseAvatarSource } from '../../profileEdit.js';
+import { toSdrAvatarImage } from '../../hdrAvatarToSdr.js';
import path from 'node:path';
import { randomUUID } from 'node:crypto';
@@ -2169,6 +2171,30 @@ export function registerBotIpc(): void {
return profile;
});
+ // Source preparation is local-only and account-independent, including for a
+ // Bot that has not been created yet. Saving still uses choose-avatar below.
+ ipcMain.handle('local-db:bots:choose-avatar-source', async (event) => {
+ assertTrustedAppRendererEvent(event);
+ const boundary = captureBotOperationOwner();
+ const owner = BrowserWindow.fromWebContents(event.sender);
+ const source = await chooseAvatarSource({
+ showAvatarOpenDialog: async () => {
+ const options: OpenDialogOptions = {
+ properties: ['openFile'],
+ filters: [{ name: 'Images', extensions: ['png', 'jpg', 'jpeg', 'webp'] }],
+ };
+ const selection = owner
+ ? await dialog.showOpenDialog(owner, options)
+ : await dialog.showOpenDialog(options);
+ return selection.canceled ? null : selection.filePaths[0] ?? null;
+ },
+ readFile: (filePath) => fs.readFile(filePath),
+ toSdrAvatar: toSdrAvatarImage,
+ });
+ boundary.assertCurrent();
+ return source;
+ });
+
ipcMain.handle('local-db:bots:choose-avatar', async (event, raw: unknown) => {
assertTrustedAppRendererEvent(event);
const body =
diff --git a/apps/desktop/src/main/profileEdit.ts b/apps/desktop/src/main/profileEdit.ts
index 1a9e4b7a20..c27f0a0d86 100644
--- a/apps/desktop/src/main/profileEdit.ts
+++ b/apps/desktop/src/main/profileEdit.ts
@@ -234,6 +234,13 @@ export function getProfileEditState(deps: ProfileEditDeps): ProfileEditState {
*/
export async function chooseAvatarFile(deps: ProfileEditDeps): Promise<ChooseAvatarResult> {
requireUserId(deps);
+ return chooseAvatarSource(deps);
+}
+
+/** Local image preparation shared by account and Bot editors; never reads or updates a profile. */
+export async function chooseAvatarSource(
+ deps: Pick<ProfileEditDeps, 'showAvatarOpenDialog' | 'readFile' | 'toSdrAvatar'>,
+): Promise<ChooseAvatarResult> {
const filePath = await deps.showAvatarOpenDialog();
if (!filePath) return { canceled: true };
const mime = avatarMimeForPath(filePath);
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 9bb6cc9b3b..92a0a8d090 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -5761,6 +5761,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
locale?: import('../shared/locale').SupportedLocale;
}): Promise<unknown[]> => ipcRenderer.invoke('local-db:bots:list', body),
get: (botId: string): Promise<unknown> => ipcRenderer.invoke('local-db:bots:get', botId),
+ chooseAvatarSource: (): Promise<{ canceled: boolean; previewDataUrl?: string }> =>
+ ipcRenderer.invoke('local-db:bots:choose-avatar-source'),
chooseAvatar: (body: { botId: string; avatarImageBase64?: string }): Promise<unknown> =>
ipcRenderer.invoke('local-db:bots:choose-avatar', body),
searchHistory: (body: unknown): Promise<unknown> =>
diff --git a/apps/desktop/src/renderer/features/bots/BotPortraitPicker.tsx b/apps/desktop/src/renderer/features/bots/BotPortraitPicker.tsx
index 908a5439ae..667c613369 100644
--- a/apps/desktop/src/renderer/features/bots/BotPortraitPicker.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotPortraitPicker.tsx
@@ -146,10 +146,9 @@ export function BotPortraitPicker({
setError(false);
setOpen(false);
try {
- // Account avatars use this same host chooser: validate and tone-map HDR
- // before the renderer's sRGB canvas discards the original HDR metadata.
- // Choosing prepares bytes only; it never saves or updates the account.
- const result = await window.electronAPI.profileChooseAvatar();
+ // Bot source preparation shares account avatars' HDR conversion but is
+ // local-only: local-mode users do not need a Cindy account to pick a file.
+ const result = await window.electronAPI.localDb.bots.chooseAvatarSource();
if (request !== generation.current || result.canceled || !result.previewDataUrl) return;
const source = await loadAvatarSource(result.previewDataUrl);
if (request !== generation.current) {
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botPortraitPicker.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/botPortraitPicker.test.tsx
index 0cefd6f868..478c08cb64 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/botPortraitPicker.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/botPortraitPicker.test.tsx
@@ -14,7 +14,10 @@ const drawImage = vi.fn();
const decode = vi.fn(async () => {});
beforeEach(() => {
chooseAvatar.mockReset().mockResolvedValue({ canceled: true });
- vi.stubGlobal('electronAPI', { profileChooseAvatar: chooseAvatar });
+ vi.stubGlobal('electronAPI', {
+ profileChooseAvatar: vi.fn(() => { throw new Error('Account service is unavailable in local mode'); }),
+ localDb: { bots: { chooseAvatarSource: chooseAvatar } },
+ });
drawImage.mockClear();
decode.mockReset().mockResolvedValue(undefined);
vi.stubGlobal(
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsx
index 82dea4c6a4..6e5c832bd7 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsx
@@ -7,6 +7,13 @@ import { MainViewHistoryContext, type MainViewHistory } from '@/contexts/MainVie
import type { CustomMcpListContext, CustomMcpListResult } from '../../../../shared/customMcp';
import { beginProvidersRefresh, commitProvidersSnapshot } from '@/lib/providersSnapshotStore';
+// #6889 unit regression: the real settings picker must wait for crop
+// confirmation; the old upload-only assertion skipped cancellation entirely.
+vi.mock('@/components/settings/avatarCropImage', () => ({
+ loadAvatarSource: async () => ({ bitmap: { close() {} }, size: { width: 800, height: 400 } }),
+ exportAvatarCrop: async () => ({ blob: new Blob(['cropped'], { type: 'image/png' }) }),
+}));
+
vi.mock('@/state/modelVisibilityPrefs', () => ({ migrateModelVisibilityDefaults: vi.fn() }));
vi.mock('@/hooks/useProviderOnboarding', () => ({
@@ -732,20 +739,35 @@ describe('Bot settings unified autosave', () => {
}
});
- it('keeps the current avatar until uploading through the shared gallery', async () => {
- vi.useFakeTimers();
- renderSettings();
- fireEvent.click(screen.getByRole('button', { name: 'bots.profile.changeAvatar' }));
- expect(screen.getByRole('button', { name: 'Cindy' })).toBeTruthy();
- expect(mocks.chooseBotAvatar).not.toHaveBeenCalled();
- fireEvent.click(screen.getByRole('button', { name: 'bots.guided.upload' }));
- await act(async () => {
- await vi.runAllTimersAsync();
- });
- expect(mocks.chooseBotAvatar).toHaveBeenCalledWith('bot-1');
- expect(document.querySelector('img')?.getAttribute('src')).toBe(
- `cindy-media://blobs/${'a'.repeat(64)}.png`,
- );
+ it('keeps the local Bot avatar through crop cancellation and saves only confirmed bytes', async () => {
+ vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} });
+ const source = vi.fn(async () => ({ canceled: false, previewDataUrl: 'data:image/png;base64,c2Ry' }));
+ window.electronAPI.localDb.bots.chooseAvatarSource = source;
+ window.electronAPI.profileChooseAvatar = vi.fn(async () => { throw new Error('Local mode has no account'); });
+ const previous = `cindy-media://blobs/${'b'.repeat(64)}.png`;
+ try {
+ renderSettings({ avatar: previous });
+ const upload = () => {
+ fireEvent.click(screen.getByRole('button', { name: 'bots.profile.changeAvatar' }));
+ fireEvent.click(screen.getByRole('button', { name: 'bots.guided.upload' }));
+ };
+ upload();
+ await screen.findByRole('alertdialog');
+ expect(mocks.chooseBotAvatar).not.toHaveBeenCalled();
+ expect(document.querySelector('img')?.getAttribute('src')).toBe(previous);
+ fireEvent.click(screen.getByRole('button', { name: 'settings.userProfile.edit.cancel' }));
+ expect(mocks.chooseBotAvatar).not.toHaveBeenCalled();
+ upload();
+ await screen.findByRole('alertdialog');
+ fireEvent.click(screen.getByRole('button', { name: 'settings.userProfile.edit.crop.done' }));
+ await waitFor(() => expect(mocks.chooseBotAvatar).toHaveBeenCalledExactlyOnceWith('bot-1', 'Y3JvcHBlZA=='));
+ expect(document.querySelector('img')?.getAttribute('src')).toBe(`cindy-media://blobs/${'a'.repeat(64)}.png`);
+ expect(mocks.updateBotProfile).not.toHaveBeenCalled();
+ expect(source).toHaveBeenCalledTimes(2);
+ expect(window.electronAPI.profileChooseAvatar).not.toHaveBeenCalled();
+ } finally {
+ vi.unstubAllGlobals();
+ }
});
it('turns memory on and off from the memory page', async () => {
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/remoteBotSettings.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/remoteBotSettings.test.tsx
index 1571fcc9b6..f232edda29 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/remoteBotSettings.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/remoteBotSettings.test.tsx
@@ -627,7 +627,8 @@ it.each(['gallery', 'file'])(
const decodes: Array<() => void> = [];
await openAvatar(() => new Promise<void>((resolve) => decodes.push(resolve)));
let finishChoose!: (result: { canceled: boolean; previewDataUrl: string }) => void;
- window.electronAPI.profileChooseAvatar = vi.fn(() =>
+ Object.assign(window.electronAPI, { localDb: { bots: {} } });
+ window.electronAPI.localDb.bots.chooseAvatarSource = vi.fn(() =>
new Promise<{ canceled: boolean; previewDataUrl: string }>((resolve) => {
finishChoose = resolve;
}),
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index 82673297cf..cb12f42908 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -4946,6 +4946,7 @@ interface ElectronAPI {
body: import('../shared/botCreation').BotCreationRequest,
) => Promise<import('../shared/botCreation').BotCreationDraft>;
generateAvatar: (token: string) => Promise<{ avatarImageBase64: string }>;
+ chooseAvatarSource: () => Promise<{ canceled: boolean; previewDataUrl?: string }>;
chooseAvatar: (body: { botId: string; avatarImageBase64?: string }) => Promise<{
canceled: boolean;
profile?: unknown;