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

2026-07-09 08:41:58 +08:00
parent 38f15a6fe1
commit 7b4f737ce5
10 changed files with 85 additions and 17 deletions
@@ -854,6 +854,7 @@ export class KanbanWebviewPanel {
        worktreePreRemoveScript: s.worktreePreRemoveScript,
        implTabPreCreateScript: s.implTabPreCreateScript,
        implTabPostCloseScript: s.implTabPostCloseScript,
+        conflictResolutionProfilePath: s.conflictResolutionProfilePath,
      })
      return
    }
@@ -916,6 +917,7 @@ export class KanbanWebviewPanel {
          worktreePreRemoveScript: s.worktreePreRemoveScript,
          implTabPreCreateScript: s.implTabPreCreateScript,
          implTabPostCloseScript: s.implTabPostCloseScript,
+          conflictResolutionProfilePath: s.conflictResolutionProfilePath,
        })
        return
      }
@@ -926,13 +928,15 @@ export class KanbanWebviewPanel {
  }

  /**
-   * Pick the profile.json that the *implement-class* cc sessions
-   * (handleImplement / handleResumeSession when sessionKind === 'implement' /
-   * startConflictResolution) should launch with. Priority:
+   * Pick the profile.json that implement-class cc sessions
+   * (handleImplement / handleResumeSession when sessionKind === 'implement')
+   * should launch with. Priority:
   *   1. The per-issue `profilePath` recorded in state JSON (preserves the
   *      brainstorm-time choice, overridable from the issue detail panel).
   *   2. The hard-coded `DEFAULT_PROFILE_PATH` fallback.
   *
+   * Conflict-resolution sessions use the global
+   * `settings.conflictResolutionProfilePath` instead of this helper.
   * Brainstorm sessions deliberately don't go through this helper — they
   * keep the legacy `profilePath || DEFAULT_PROFILE_PATH` so creators can
   * still pick a profile per issue at brainstorm time.