✨ feat(vscode): 冲突解决会话 profile 可在设置面板配置

vscode/webview-ui/src/App.tsx

@@ -452,10 +452,12 @@ export function App() {
         initialWorktreePreRemoveScript={settings?.worktreePreRemoveScript ?? ''}
         initialImplTabPreCreateScript={settings?.implTabPreCreateScript ?? ''}
         initialImplTabPostCloseScript={settings?.implTabPostCloseScript ?? ''}
+        initialConflictResolutionProfilePath={settings?.conflictResolutionProfilePath ?? ''}
         initialYoutrackBaseUrl={settings?.youtrackBaseUrl ?? ''}
         initialYoutrackProjectShortName={settings?.youtrackProjectShortName ?? ''}
         initialYoutrackCloseCommand={settings?.youtrackCloseCommand ?? ''}
         initialYoutrackTokenSaved={settings?.youtrackTokenSaved ?? false}
+        profiles={profiles}
         youtrackProjects={youtrackProjects}
         onListYouTrackProjects={listYouTrackProjects}
         onSubmit={saveSettings}