Fimeg/souveraine
Watch
1
0
Fork
You've already forked souveraine
 0
Code Releases Activity

feat(settings): editable N+1 trigger payloads + live/restart propagation marks

Browse source 
B5: every_n_responses and time_based triggers now expose their inner
value (count / interval secs) as a conditional sub-field — previously
stuck at the 5/3600 defaults with no way to edit.

Propagation: FieldLoc::applies_live() marks the three fields that reach
the running system immediately (atmosphere, outfit, primary_model); a
legend line states the rest take effect on restart.
This commit is contained in:
Fimeg 2026-05-16 19:38:37 -04:00
commit afab9ce2d5
1 changed files with 50 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/ui/settings.rs
View file

@ -113,6 +113,8 @@ pub enum FieldLoc {
// Subconscious
ScN1Enabled,
ScN1Trigger,
ScN1Every,
ScN1Secs,
ScInboxEnabled,
ScModel,
ScMaxTokens,
@ -194,7 +196,8 @@ impl FieldLoc {
match self {
FieldLoc::AgSystemPrompt => Category::Agent,
FieldLoc::BfBaseUrl | FieldLoc::BfApiKey | FieldLoc::BfVirtualKey | FieldLoc::BfPrimaryModel | FieldLoc::BfTimeoutSecs => Category::Bifrost,
FieldLoc::ScN1Enabled | FieldLoc::ScN1Trigger | FieldLoc::ScInboxEnabled | FieldLoc::ScModel | FieldLoc::ScMaxTokens => Category::Subconscious,
FieldLoc::ScN1Enabled | FieldLoc::ScN1Trigger | FieldLoc::ScN1Every | FieldLoc::ScN1Secs
| FieldLoc::ScInboxEnabled | FieldLoc::ScModel | FieldLoc::ScMaxTokens => Category::Subconscious,
FieldLoc::RfEnabled | FieldLoc::RfMessageInterval | FieldLoc::RfTrigger | FieldLoc::RfModel => Category::Reflection,
FieldLoc::ArEnabled | FieldLoc::ArInterval | FieldLoc::ArThreshold | FieldLoc::ArCompressionModel => Category::Archivist,
FieldLoc::SaEnabled | FieldLoc::SaMaxConcurrent | FieldLoc::SaTimeout | FieldLoc::SaMaxDepth | FieldLoc::SaMaxToolRounds
@ -222,6 +225,8 @@ impl FieldLoc {
FieldLoc::BfPrimaryModel => "primary_model",
FieldLoc::ScN1Enabled => "n1_enabled",
FieldLoc::ScN1Trigger => "n1_trigger",
FieldLoc::ScN1Every => "n1_every_n_responses",
FieldLoc::ScN1Secs => "n1_interval_secs",
FieldLoc::ScInboxEnabled => "inbox_enabled",
FieldLoc::ScModel => "model",
FieldLoc::ScMaxTokens => "max_tokens",
@ -296,6 +301,8 @@ impl FieldLoc {
FieldLoc::BfPrimaryModel => "primary model",
FieldLoc::ScN1Enabled => "N+1 enabled",
FieldLoc::ScN1Trigger => "N+1 trigger",
FieldLoc::ScN1Every => " └ every N responses",
FieldLoc::ScN1Secs => " └ interval (s)",
FieldLoc::ScInboxEnabled => "inbox",
FieldLoc::ScModel => "model",
FieldLoc::ScMaxTokens => "max tokens",
@ -355,6 +362,17 @@ impl FieldLoc {
FieldLoc::TuShowInterstitial => "interstitial narration",
}
}
/// Whether a change to this field reaches the running system immediately.
/// On save the whole config is written to disk and to the shared config
/// lock — but most subsystems captured their settings at startup and only
/// re-read on restart. These few are wired to apply live.
pub fn applies_live(&self) -> bool {
matches!(
self,
FieldLoc::PrAtmosphere | FieldLoc::PrOutfit | FieldLoc::BfPrimaryModel
)
}
}
// ── Editable value ──────────────────────────────────────────────────────────
@ -565,6 +583,16 @@ impl SettingsView {
};
let n1_variants = vec!["every_response".into(), "every_n_responses".into(), "time_based".into(), "manual".into()];
out.push((ScN1Trigger, EditableValue::EnumVariant { index: n1_idx, variants: n1_variants }));
// Trigger payload — only the field for the active trigger mode.
match sc.n1_trigger {
N1Trigger::EveryNResponses(n) => {
out.push((ScN1Every, EditableValue::Uint(n as u64)));
}
N1Trigger::TimeBased(s) => {
out.push((ScN1Secs, EditableValue::Uint(s)));
}
_ => {}
}
out.push((ScInboxEnabled, EditableValue::Bool(sc.inbox_enabled)));
if self.available_models.is_empty() {
out.push((ScModel, EditableValue::OptionalText(sc.model.clone())));
@ -791,6 +819,16 @@ impl SettingsView {
};
}
}
ScN1Every => {
if let EditableValue::Uint(v) = value {
self.config.subconscious.n1_trigger = N1Trigger::EveryNResponses(v as usize);
}
}
ScN1Secs => {
if let EditableValue::Uint(v) = value {
self.config.subconscious.n1_trigger = N1Trigger::TimeBased(v);
}
}
ScInboxEnabled => { if let EditableValue::Bool(v) = value { self.config.subconscious.inbox_enabled = v; } }
ScModel => {
match value {
@ -1256,6 +1294,7 @@ impl SettingsView {
FieldLoc::SaTimeout | FieldLoc::SaMaxDepth |
FieldLoc::SaMaxToolRounds | FieldLoc::SaInterRoundDelayMs |
FieldLoc::WsPort | FieldLoc::SvPort | FieldLoc::BfTimeoutSecs |
FieldLoc::ScN1Every | FieldLoc::ScN1Secs |
FieldLoc::EvRetainDays | FieldLoc::PrPulseIntervalSecs
);
let is_float = matches!(loc,
@ -1294,6 +1333,7 @@ impl SettingsView {
FieldLoc::SaTimeout | FieldLoc::SaMaxDepth |
FieldLoc::SaMaxToolRounds | FieldLoc::SaInterRoundDelayMs |
FieldLoc::WsPort | FieldLoc::SvPort | FieldLoc::BfTimeoutSecs |
FieldLoc::ScN1Every | FieldLoc::ScN1Secs |
FieldLoc::PrPulseIntervalSecs => {
if let Ok(v) = buffer.parse::<u64>() {
self.apply_field(loc, EditableValue::Uint(v));
@ -1451,9 +1491,18 @@ fn draw_field_panel(frame: &mut Frame, area: Rect, view: &SettingsView) {
}
spans.extend(value.display_spans(is_selected, &view.palette));
if loc.applies_live() {
spans.push(Span::styled(" ◆", Style::default().fg(Color::Rgb(120, 200, 120))));
}
lines.push(Line::from(spans));
}
lines.push(Line::from(""));
lines.push(Line::from(Span::styled(
" ◆ applies live · other changes take effect on restart",
Style::default().fg(p.agent_dim).add_modifier(Modifier::ITALIC),
)));
let focused = view.focus == PanelFocus::Fields;
let border_color = if view.dirty {
let (r, g, b) = match p.agent_primary { Color::Rgb(r, g, b) => (r, g, b), _ => (255, 140, 66) };