Merge branch 'master' into editor-agent-right-click

# Conflicts:
#	src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.tsx

src/components/image-editor/EditorAgentConversation/AttachmentPicker.tsx

@@ -1,5 +1,5 @@
 import { PlatformActionButton } from '@/src/components/common/PlatformActionButton.tsx';
-import { UnifiedModal } from '@/src/components/common/UnifiedModal.tsx';
+import { PlatformToolModalShell } from '@/src/components/common/PlatformToolModalShell.tsx';
 import { ResolvedAssetImage } from '@/src/components/ResolvedAssetImage.tsx';
 
 import type {
@@ -33,7 +33,7 @@ export function AttachmentPicker({
   const visibleOptions = tab === 'canvas' ? canvasOptions : libraryOptions;
 
   return (
-    <UnifiedModal
+    <PlatformToolModalShell
       open={open}
       title="选择图片附件"
       size="md"
@@ -111,6 +111,6 @@ export function AttachmentPicker({
           })}
         </div>
       </div>
-    </UnifiedModal>
+    </PlatformToolModalShell>
   );
 }

src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.test.tsx

@@ -268,6 +268,10 @@ describe('EditorAgentConversationPanelView', () => {
     const attachmentDialog = screen.getByRole('dialog', {
       name: '选择图片附件',
     });
+    expect(attachmentDialog.parentElement?.className).toContain(
+      'platform-theme--light',
+    );
+    expect(attachmentDialog.className).toContain('platform-remap-surface');
     expect(
       within(attachmentDialog).queryByRole('checkbox', {
         name: '选择画布图片 未入库图层',