Merge branch 'claudedo/2de2f008758640b3a75e95719b1555bf'

This commit is contained in:
mika kuns
2026-08-05 16:07:10 +02:00
22 changed files with 1093 additions and 50 deletions
@@ -1,6 +1,7 @@
using System.Collections.ObjectModel;
using ClaudeDo.Data.Models;
using ClaudeDo.Localization;
using ClaudeDo.Ui.Localization;
using ClaudeDo.Ui.Services;
using ClaudeDo.Ui.ViewModels.Agent;
using CommunityToolkit.Mvvm.ComponentModel;
@@ -15,7 +16,11 @@ public sealed partial class GeneralSettingsTabViewModel : ViewModelBase
[ObservableProperty] private string _defaultClaudeInstructions = "";
[ObservableProperty] private string _defaultModel = ModelRegistry.DefaultAlias;
[ObservableProperty] private int _defaultMaxTurns = 100;
[ObservableProperty] private int _defaultMaxTurns = 40;
// Hard ceiling every resolved max-turns value is clamped to before a run starts. Not directly
// editable here yet — loaded and echoed back on save so it round-trips, and drives the clamp
// hints on the preset rows below and on AgentConfigEditorViewModel.
[ObservableProperty] private int _maxTurnsCeiling = 80;
[ObservableProperty] private string _defaultPermissionMode = PermissionModeRegistry.DefaultMode;
[ObservableProperty] private int _maxParallelExecutions = 1;
// Percentage of the 5h/7d Claude usage window at which the autonomous queue pauses. 0 = gate off.
@@ -56,14 +61,14 @@ public sealed partial class GeneralSettingsTabViewModel : ViewModelBase
/// model. Supplies the global defaults; list- and task-level max-turns overrides still win.</summary>
public ObservableCollection<ModelPresetRowViewModel> ModelPresets { get; } = new();
public void LoadModelPresets(IReadOnlyCollection<ModelPresetDto>? presets)
public void LoadModelPresets(IReadOnlyCollection<ModelPresetDto>? presets, int ceiling)
{
ModelPresets.Clear();
var source = presets is { Count: > 0 }
? presets.Select(p => new ModelPreset(p.Model, p.Effort, p.MaxTurns)).ToList()
: Data.Models.ModelPresets.Defaults.ToList();
foreach (var p in Data.Models.ModelPresets.Parse(Data.Models.ModelPresets.Serialize(source)))
ModelPresets.Add(new ModelPresetRowViewModel(p));
ModelPresets.Add(new ModelPresetRowViewModel(p, ceiling));
}
public List<ModelPresetDto> ModelPresetDtos()
@@ -130,11 +135,20 @@ public sealed partial class ModelPresetRowViewModel : ViewModelBase
[ObservableProperty] private string _effort;
// decimal so it binds straight to a NumericUpDown, like the other numeric settings.
[ObservableProperty] private decimal _maxTurns;
[ObservableProperty] private int _ceiling;
public ModelPresetRowViewModel(ModelPreset preset)
public ModelPresetRowViewModel(ModelPreset preset, int ceiling)
{
Model = preset.Model;
_effort = preset.Effort;
_maxTurns = preset.MaxTurns;
_ceiling = ceiling;
}
public string ClampHint => MaxTurns > Ceiling
? Loc.T("settings.turnsCeilingHint", Ceiling)
: "";
partial void OnMaxTurnsChanged(decimal value) => OnPropertyChanged(nameof(ClampHint));
partial void OnCeilingChanged(int value) => OnPropertyChanged(nameof(ClampHint));
}
@@ -59,6 +59,7 @@ public sealed partial class SettingsModalViewModel : ViewModelBase
General.DefaultClaudeInstructions = dto.DefaultClaudeInstructions ?? "";
General.DefaultModel = dto.DefaultModel ?? "sonnet";
General.DefaultMaxTurns = dto.DefaultMaxTurns;
General.MaxTurnsCeiling = dto.MaxTurnsCeiling;
General.DefaultPermissionMode = dto.DefaultPermissionMode ?? "auto";
General.MaxParallelExecutions = dto.MaxParallelExecutions;
General.UsageGateFiveHourPct = dto.UsageGateFiveHourPct;
@@ -80,7 +81,7 @@ public sealed partial class SettingsModalViewModel : ViewModelBase
await OnlineInbox.LoadAsync();
await SessionSkills.LoadAsync();
await General.LoadSessionSkillsAsync(_worker, dto?.SessionSkills);
General.LoadModelPresets(dto?.ModelPresets);
General.LoadModelPresets(dto?.ModelPresets, General.MaxTurnsCeiling);
}
finally { IsBusy = false; }
}
@@ -113,7 +114,8 @@ public sealed partial class SettingsModalViewModel : ViewModelBase
General.SelectedSessionSkillNames(),
General.ModelPresetDtos(),
General.UsageGateFiveHourPct,
General.UsageGateSevenDayPct);
General.UsageGateSevenDayPct,
General.MaxTurnsCeiling);
await _worker.UpdateAppSettingsAsync(dto);
await Prime.SaveAsync();
await OnlineInbox.SaveAsync();