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

vscode/src/panel/handlers/settings.ts

@@ -32,6 +32,7 @@ export async function handleSettingsSave(panel: KanbanWebviewPanel, payload: {
   worktreePreRemoveScript: string
   implTabPreCreateScript: string
   implTabPostCloseScript: string
+  conflictResolutionProfilePath: string
   youtrackBaseUrl: string
   youtrackProjectShortName: string
   youtrackCloseCommand: string
@@ -58,6 +59,8 @@ export async function handleSettingsSave(panel: KanbanWebviewPanel, payload: {
   const trimmedPreRemove = payload.worktreePreRemoveScript.trim()
   const trimmedImplPre = payload.implTabPreCreateScript.trim()
   const trimmedImplPost = payload.implTabPostCloseScript.trim()
+  // conflict-resolution profile: '' is meaningful (= DEFAULT_PROFILE_PATH).
+  const trimmedConflictProfile = payload.conflictResolutionProfilePath.trim()
   const prev = getSettings(panel.context)
   // Capture the previous token *for this host* before overwriting it, so
   // we can decide below whether the kanban needs a re-fetch. (Only host
@@ -87,6 +90,7 @@ export async function handleSettingsSave(panel: KanbanWebviewPanel, payload: {
       worktreePreRemoveScript: trimmedPreRemove,
       implTabPreCreateScript: trimmedImplPre,
       implTabPostCloseScript: trimmedImplPost,
+      conflictResolutionProfilePath: trimmedConflictProfile,
     })
     return
   }
@@ -108,6 +112,7 @@ export async function handleSettingsSave(panel: KanbanWebviewPanel, payload: {
     worktreePreRemoveScript: trimmedPreRemove,
     implTabPreCreateScript: trimmedImplPre,
     implTabPostCloseScript: trimmedImplPost,
+    conflictResolutionProfilePath: trimmedConflictProfile,
     youtrackBaseUrl: trimmedYtBase,
     youtrackProjectShortName: trimmedYtProject,
     youtrackCloseCommand: trimmedYtClose,
@@ -190,6 +195,7 @@ export async function handleEditSettingsRequest(panel: KanbanWebviewPanel): Prom
     worktreePreRemoveScript: s.worktreePreRemoveScript,
     implTabPreCreateScript: s.implTabPreCreateScript,
     implTabPostCloseScript: s.implTabPostCloseScript,
+    conflictResolutionProfilePath: s.conflictResolutionProfilePath,
     youtrackBaseUrl: s.youtrackBaseUrl,
     youtrackProjectShortName: s.youtrackProjectShortName,
     youtrackCloseCommand: s.youtrackCloseCommand,