merge: integrate upstream main with local Makelore changes

tests/unit/agent-creation-dialog.test.tsx

@@ -51,7 +51,7 @@ describe('AgentCreationDialog plugin Skill availability', () => {
     expect(checkbox).toBeDisabled();
     expect(screen.getByText('插件未启用；现有分配会保留，但当前不可用。')).toBeVisible();
 
-    fireEvent.click(screen.getByRole('button', { name: '保存伙伴' }));
+    fireEvent.click(screen.getByRole('button', { name: '保存智能体' }));
     await waitFor(() => expect(onUpdate).toHaveBeenCalledWith(
       expect.objectContaining({ skillIds: ['data-service'] }),
     ));