Merge branch 'worktree-agent-af5a53986b9441608' into feature_chore_bug_005

# Conflicts:
#	src-tauri/src/llm/mod.rs
#	src/lib/views/Settings.svelte
#	src/lib/views/SummaryPanel.svelte
This commit is contained in:
iamdoubz committed 2026-07-07 08:15:04 -05:00
commit e966181ab8
9 files changed
+1207 -72

No files matched your search

+7
View File
@@ -202,6 +202,13 @@ pub struct Settings {
// Recording retention (ADR-0009). Default OFF.
pub default_record: bool,
pub consent_acknowledged: bool,
/// One-time "data leaves your device" acknowledgment for hosted
/// (non-local) AI providers — Anthropic, or a hosted OpenAI-compatible
/// gateway (ADR-0011, T10.3/M3.3). Shown once before first hosted use;
/// this flag is what makes it not nag every time. Independent of
/// `consent_acknowledged` (that one's specifically about recording law).
#[serde(default)]
pub hosted_ai_acknowledged: bool,
// Sync master switch (ADR-0010). Default OFF. Target rows live in the DB; secrets in OS keychain.
pub sync_enabled: bool,
// Storage retention policy (FR-STORE-2). None = no cap on that dimension.