refactor(FN-5633): AI merge reviewer uses the project reviewer/validator model
Drop the bespoke `merger.reviewerModel` setting. The AI merge reviewer now resolves its model via `resolveValidatorSettingsModel` — the same reviewer/validator lane used elsewhere (project validator → global validator → project default) — falling back to the merger model only if that lane is empty. Removes the setting from the type, schema default, and the Settings UI. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -262,7 +262,7 @@ export const DEFAULT_PROJECT_SETTINGS = {
|
||||
],
|
||||
prerebaseDivergenceThreshold: 50,
|
||||
mergeConflictStrategy: "smart-prefer-main",
|
||||
merger: { mode: "ai", reviewerModel: undefined, maxReviewPasses: 3 },
|
||||
merger: { mode: "ai", maxReviewPasses: 3 },
|
||||
mergeDiffVolumeMinLines: undefined,
|
||||
mergeDiffVolumeThreshold: undefined,
|
||||
mergeDiffVolumeAllowlist: undefined,
|
||||
|
||||
@@ -336,10 +336,9 @@ export function normalizeMergerMode(value: unknown): MergerMode {
|
||||
export interface MergerSettings {
|
||||
/** Which merge path to use. Default: "ai". */
|
||||
mode?: MergerMode;
|
||||
/** Optional `provider/modelId` override for the read-only reviewer agent. */
|
||||
reviewerModel?: string;
|
||||
/** How many AI corrective rounds before landing the best result (advisory) or
|
||||
* hard-failing (blocking). Default: 3. */
|
||||
* hard-failing (blocking). Default: 3. The reviewer uses the project's
|
||||
* validator/reviewer model lane — there is no merge-specific model setting. */
|
||||
maxReviewPasses?: number;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user